diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
index 0c50ea240..1f047e2f7 100644
--- a/Classes/AboutViewController.m
+++ b/Classes/AboutViewController.m
@@ -51,10 +51,6 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
-	[linkLabel setText:NSLocalizedString(@"http://www.linphone.org", nil)];
-	[licenseLabel setText:NSLocalizedString(@"GNU General Public License V2 ", nil)];
-	[copyrightLabel setText:NSLocalizedString(@"© 2010 Belledonne Communications ", nil)];
 	
     [linkLabel addGestureRecognizer:linkTapGestureRecognizer];
     
diff --git a/Classes/Base.lproj/AboutViewController.strings b/Classes/Base.lproj/AboutViewController.strings
index ba945f814..4879af6af 100644
Binary files a/Classes/Base.lproj/AboutViewController.strings and b/Classes/Base.lproj/AboutViewController.strings differ
diff --git a/Classes/Base.lproj/AboutViewController.xib b/Classes/Base.lproj/AboutViewController.xib
index 8248666f4..792ff4842 100644
--- a/Classes/Base.lproj/AboutViewController.xib
+++ b/Classes/Base.lproj/AboutViewController.xib
@@ -48,14 +48,14 @@
                     <color key="textColor" red="0.81176471709999998" green="0.29803922770000002" blue="0.16078431900000001" alpha="1" colorSpace="deviceRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Linphone iPhone 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="65" userLabel="linphoneIphoneVersionLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Linphone iPhone 1.0 (placeholder)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="65" userLabel="linphoneIphoneVersionLabel">
                     <rect key="frame" x="10" y="150" width="300" height="21"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <color key="textColor" red="0.35686275360000003" green="0.3960784376" blue="0.43529412150000002" alpha="1" colorSpace="deviceRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Linphone Core 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="66" userLabel="linphoneCoreVersionLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Linphone Core 1.0 (placeholder)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="66" userLabel="linphoneCoreVersionLabel">
                     <rect key="frame" x="10" y="172" width="300" height="21"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
diff --git a/Classes/Base.lproj/WizardViews.strings b/Classes/Base.lproj/WizardViews.strings
index 302614eda..25d437836 100644
Binary files a/Classes/Base.lproj/WizardViews.strings and b/Classes/Base.lproj/WizardViews.strings differ
diff --git a/Classes/InAppProductsManager.m b/Classes/InAppProductsManager.m
index 186d6f604..847697868 100644
--- a/Classes/InAppProductsManager.m
+++ b/Classes/InAppProductsManager.m
@@ -417,7 +417,7 @@
 				} else {
 					errorMsg=[NSString stringWithFormat:NSLocalizedString(@"Unknown error (%@).", nil), error];
 				}
-				NSDictionary* dict = @{@"product_id": productID, @"error_msg": NSLocalizedString(errorMsg, nil)};
+				NSDictionary* dict = @{@"product_id": productID, @"error_msg": errorMsg};
 				[self postNotificationforStatus:kIAPPurchaseFailed withDict:dict];
 			}
 		}
@@ -506,6 +506,6 @@
 }
 
 - (void)request:(XMLRPCRequest *)request didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
-	
+
 }
 @end
diff --git a/Classes/ar.lproj/AboutViewController.strings b/Classes/ar.lproj/AboutViewController.strings
index 9f9de5d7a..e87200985 100644
Binary files a/Classes/ar.lproj/AboutViewController.strings and b/Classes/ar.lproj/AboutViewController.strings differ
diff --git a/Classes/ar.lproj/WizardViews.strings b/Classes/ar.lproj/WizardViews.strings
index ffb10394d..db03ac124 100644
Binary files a/Classes/ar.lproj/WizardViews.strings and b/Classes/ar.lproj/WizardViews.strings differ
diff --git a/Classes/de.lproj/AboutViewController.strings b/Classes/de.lproj/AboutViewController.strings
index fe932b98a..e5d07b775 100644
Binary files a/Classes/de.lproj/AboutViewController.strings and b/Classes/de.lproj/AboutViewController.strings differ
diff --git a/Classes/de.lproj/WizardViews.strings b/Classes/de.lproj/WizardViews.strings
index 208d593a1..924c05771 100644
Binary files a/Classes/de.lproj/WizardViews.strings and b/Classes/de.lproj/WizardViews.strings differ
diff --git a/Classes/fr.lproj/AboutViewController.strings b/Classes/fr.lproj/AboutViewController.strings
index ba945f814..87fc01f1a 100644
Binary files a/Classes/fr.lproj/AboutViewController.strings and b/Classes/fr.lproj/AboutViewController.strings differ
diff --git a/Classes/fr.lproj/WizardViews.strings b/Classes/fr.lproj/WizardViews.strings
index 5c8df2897..a848126ff 100644
Binary files a/Classes/fr.lproj/WizardViews.strings and b/Classes/fr.lproj/WizardViews.strings differ
diff --git a/Classes/ja.lproj/AboutViewController.strings b/Classes/ja.lproj/AboutViewController.strings
index ba945f814..87fc01f1a 100644
Binary files a/Classes/ja.lproj/AboutViewController.strings and b/Classes/ja.lproj/AboutViewController.strings differ
diff --git a/Classes/ja.lproj/WizardViews.strings b/Classes/ja.lproj/WizardViews.strings
index 500424d40..7e1a68a70 100644
Binary files a/Classes/ja.lproj/WizardViews.strings and b/Classes/ja.lproj/WizardViews.strings differ
diff --git a/Classes/nl.lproj/AboutViewController.strings b/Classes/nl.lproj/AboutViewController.strings
index 19cf84878..f2a51f6f1 100644
Binary files a/Classes/nl.lproj/AboutViewController.strings and b/Classes/nl.lproj/AboutViewController.strings differ
diff --git a/Classes/nl.lproj/WizardViews.strings b/Classes/nl.lproj/WizardViews.strings
index 8678be0cf..c33ea7838 100644
Binary files a/Classes/nl.lproj/WizardViews.strings and b/Classes/nl.lproj/WizardViews.strings differ
diff --git a/Classes/ru.lproj/AboutViewController.strings b/Classes/ru.lproj/AboutViewController.strings
index ba945f814..87fc01f1a 100644
Binary files a/Classes/ru.lproj/AboutViewController.strings and b/Classes/ru.lproj/AboutViewController.strings differ
diff --git a/Classes/ru.lproj/WizardViews.strings b/Classes/ru.lproj/WizardViews.strings
index 95a7e3345..288c7f0a1 100644
Binary files a/Classes/ru.lproj/WizardViews.strings and b/Classes/ru.lproj/WizardViews.strings differ
diff --git a/Classes/zh_TW.lproj/AboutViewController.strings b/Classes/zh_TW.lproj/AboutViewController.strings
index 9c46154a0..1abd31d94 100644
Binary files a/Classes/zh_TW.lproj/AboutViewController.strings and b/Classes/zh_TW.lproj/AboutViewController.strings differ
diff --git a/Classes/zh_TW.lproj/WizardViews.strings b/Classes/zh_TW.lproj/WizardViews.strings
index 302614eda..25d437836 100644
Binary files a/Classes/zh_TW.lproj/WizardViews.strings and b/Classes/zh_TW.lproj/WizardViews.strings differ
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index ad98c915c..315cda811 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index cbef1d4c0..872136b17 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 0b8e79cf6..c9e1b2b28 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index e896d2d0b..80a3c5ce6 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 8f2e68d29..1f7d8c8ae 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings
index 880bf8b53..3aaf4fe79 100644
Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index 23de0527f..36ef11b63 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
index 9b46bcd9e..a4f1a9c09 100644
Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Tools/generate_strings_files.sh b/Tools/generate_strings_files.sh
index e3f5df17d..b4ef23abc 100755
--- a/Tools/generate_strings_files.sh
+++ b/Tools/generate_strings_files.sh
@@ -11,19 +11,24 @@ fi
 
 ##### 1. Generate Localizable.strings from source files (.m)
 function generate_localizable_from_sources {
+	#WARNING: in case of sed issue "extra characters at the end of g command", it means that
+	# we are trying to modify an UTF-16 file which is not supported..
+
 	localizable_en=$root_directory/Resources/en.lproj/Localizable.strings
 	# The 2 only specific cases of the application: since we are length limited for push
 	# notifications, the ID is not matching the English translation... so we must keep
 	# the translations!
-	IC_MSG_EN=$(sed -nE 's/"IC_MSG" = "(.*)";/\1/p' $localizable_en)
-	IM_MSG_EN=$(sed -nE 's/"IM_MSG" = "(.*)";/\1/p' $localizable_en)
-	rm -f $localizable_en
-	find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en)
 	iconv -f utf-16 -t utf-8 $localizable_en > $localizable_en.tmp
-	mv $localizable_en.tmp $localizable_en
-	sed -i.bak "s/= \"IC_MSG\";/= \"$IC_MSG_EN\";/" $localizable_en
-	sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en
-	rm $localizable_en.bak
+	IC_MSG_EN=$(sed -nE 's/"IC_MSG" = "(.*)";/\1/p' $localizable_en.tmp)
+	IM_MSG_EN=$(sed -nE 's/"IM_MSG" = "(.*)";/\1/p' $localizable_en.tmp)
+	rm -f $localizable_en $localizable_en.tmp
+
+	find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en)
+	iconv -f utf-16LE -t utf-8 $localizable_en > $localizable_en.tmp
+	sed -i.bak "s/= \"IC_MSG\";/= \"$IC_MSG_EN\";/" $localizable_en.tmp
+	sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en.tmp
+	iconv -f utf-8 -t utf-16LE $localizable_en.tmp > $localizable_en
+	rm $localizable_en.tmp.bak $localizable_en.tmp
 }
 
 ##### 2. Generate .strings for all XIB files
@@ -36,7 +41,7 @@ function generate_strings_from_xib {
 
 		# remove if empty
 		iconv -f utf-16 -t utf-8 "$stringsfile" > "$to_utf8_file"
-		if [ ! -s "$to_utf8_file" ]; then
+		if [ $(stat -f '%z' $to_utf8_file) -le 1 ]; then
 			echo "$(basename "$stringsfile") is empty, removing"
 			rm "$stringsfile"
 		else
@@ -84,6 +89,6 @@ source_lang = en
 	done
 }
 
-# generate_localizable_from_sources
-# generate_strings_from_xib
+generate_localizable_from_sources
+generate_strings_from_xib
 generate_strings_from_inappsettings_plist