diff --git a/.DS_Store b/.DS_Store
index 0a5f1ad0838..890d5490db0 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/admin/admin-settings.php b/admin/admin-settings.php
index c861ffa1529..75804e8e1cf 100644
--- a/admin/admin-settings.php
+++ b/admin/admin-settings.php
@@ -161,6 +161,14 @@ $woocommerce_settings['general'] = apply_filters('woocommerce_general_settings',
 		'std' 		=> 'no',
 	),
 	
+	array(  
+		'name' => __('Localisation', 'woothemes'),
+		'desc' 		=> __('Use informal localisation file if it exists.', 'woothemes'),
+		'id' 		=> 'woocommerce_informal_localisation_type',
+		'type' 		=> 'checkbox',
+		'std' 		=> 'no',
+	),
+	
 	array( 'type' => 'sectionend', 'id' => 'general_options'),
 	
 	array( 'name' => __( 'ShareThis', 'woothemes' ), 'type' => 'title', 'desc' => '', 'id' => 'share_this' ),
diff --git a/languages/woothemes-de_DE.mo b/languages/formal/woothemes-de_DE.mo
similarity index 100%
rename from languages/woothemes-de_DE.mo
rename to languages/formal/woothemes-de_DE.mo
diff --git a/languages/woothemes-de_DE.po b/languages/formal/woothemes-de_DE.po
similarity index 100%
rename from languages/woothemes-de_DE.po
rename to languages/formal/woothemes-de_DE.po
diff --git a/readme.txt b/readme.txt
index afb3576ebcf..cd4c0d0e729 100644
--- a/readme.txt
+++ b/readme.txt
@@ -104,6 +104,7 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
 * Attributes can be added to nav bar via filter
 * External/Affiliate product type
 * Added Spanish translation by lluis masachs
+* Support for informal/formal localisations
 
 = 1.2 - 03/11/2011 =
 * Added quick status change buttons (processing/complete) to orders panel
diff --git a/woocommerce.php b/woocommerce.php
index afeb224baac..892444fe343 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -18,6 +18,14 @@ if (!session_id()) session_start();
 load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/languages');
 load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/../../languages/woocommerce');
 
+if (get_option('woocommerce_informal_localisation_type')=='yes') :
+	load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/informal');
+	load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/../../languages/woocommerce/informal');
+else :
+	load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/formal');
+	load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ ) ) . '/../../languages/woocommerce/formal');
+endif;
+
 /**
  * Constants
  **/