diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index a7f94af1c..c856fe490 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -821,8 +821,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)emailAttachments:(NSArray *)attachments {
 	NSString *error = nil;
 #if TARGET_IPHONE_SIMULATOR
-	error =
-		NSLocalizedString(@"Cannot send emails on the Simulator. To test this feature, please use a real device.", nil);
+	error = @"Cannot send emails on the Simulator. To test this feature, please use a real device.";
 #else
 	if ([MFMailComposeViewController canSendMail] == NO) {
 		error = NSLocalizedString(
@@ -842,12 +841,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 		MFMailComposeViewController *picker = [[MFMailComposeViewController alloc] init];
 		picker.mailComposeDelegate = self;
 
-		[picker setSubject:NSLocalizedString(@"Linphone iOS Logs", nil)];
+		[picker setSubject:@"Linphone iOS Logs"];
 		[picker setToRecipients:[NSArray arrayWithObjects:@"linphone-iphone@belledonne-communications.com", nil]];
-		[picker setMessageBody:NSLocalizedString(@"Here are information about an issue I had on my device.\nI was "
-												 @"doing ...\nI expected Linphone to ...\nInstead, I got an "
-												 @"unexpected result: ...",
-												 nil)
+		[picker setMessageBody:@"Here are information about an issue I had on my device.\nI was "
+							   @"doing ...\nI expected Linphone to ...\nInstead, I got an "
+							   @"unexpected result: ..."
 						isHTML:NO];
 		for (NSArray *attachment in attachments) {
 			if ([[NSFileManager defaultManager] fileExistsAtPath:attachment[0]]) {
diff --git a/Classes/ja.lproj/AboutViewController.strings b/Classes/ja.lproj/AboutViewController.strings
index 87fc01f1a..c91bba9f2 100644
Binary files a/Classes/ja.lproj/AboutViewController.strings and b/Classes/ja.lproj/AboutViewController.strings differ
diff --git a/Classes/ja.lproj/ChatRoomViewController.strings b/Classes/ja.lproj/ChatRoomViewController.strings
index 0674cec33..9e0ce9df2 100644
Binary files a/Classes/ja.lproj/ChatRoomViewController.strings and b/Classes/ja.lproj/ChatRoomViewController.strings differ
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index a16b264e9..84e769d8e 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 6bae1b237..d45af878a 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 a47243281..363d63fa6 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 4c7f01725..a53a2440c 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 c6d2059c8..4c88bfe97 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 e73fc007d..a6a4ce74b 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 95d4318c1..bc44093ba 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 6609b4448..db4d2ef95 100644
Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Network.strings b/Settings/InAppSettings.bundle/ar.lproj/Network.strings
index dee6be3f2..39af69ecb 100644
Binary files a/Settings/InAppSettings.bundle/ar.lproj/Network.strings and b/Settings/InAppSettings.bundle/ar.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/de.lproj/Network.strings b/Settings/InAppSettings.bundle/de.lproj/Network.strings
index 037fd04be..714fa62e6 100644
Binary files a/Settings/InAppSettings.bundle/de.lproj/Network.strings and b/Settings/InAppSettings.bundle/de.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings
index c090abb46..398390089 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Network.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings
@@ -12,4 +12,3 @@
 "Limits" = "Limits";
 "Adaptive rate control" = "Adaptive rate control";
 "Adaptive rate control" = "Adaptive rate control";
-"Adaptive rate algorithm" = "Adaptive rate algorithm";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings
index 014bf5b59..c2e7c915d 100644
Binary files a/Settings/InAppSettings.bundle/fr.lproj/Network.strings and b/Settings/InAppSettings.bundle/fr.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/ja.lproj/Call.strings b/Settings/InAppSettings.bundle/ja.lproj/Call.strings
new file mode 100644
index 000000000..f1cb65f2d
Binary files /dev/null and b/Settings/InAppSettings.bundle/ja.lproj/Call.strings differ
diff --git a/Settings/InAppSettings.bundle/ja.lproj/Network.strings b/Settings/InAppSettings.bundle/ja.lproj/Network.strings
index bf538146c..b7393dcb0 100644
Binary files a/Settings/InAppSettings.bundle/ja.lproj/Network.strings and b/Settings/InAppSettings.bundle/ja.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/nl.lproj/Network.strings b/Settings/InAppSettings.bundle/nl.lproj/Network.strings
index bf538146c..b7393dcb0 100644
Binary files a/Settings/InAppSettings.bundle/nl.lproj/Network.strings and b/Settings/InAppSettings.bundle/nl.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/ru.lproj/Network.strings b/Settings/InAppSettings.bundle/ru.lproj/Network.strings
index e0e20f8cf..f8a969aeb 100644
Binary files a/Settings/InAppSettings.bundle/ru.lproj/Network.strings and b/Settings/InAppSettings.bundle/ru.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings
index bf538146c..b7393dcb0 100644
Binary files a/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings and b/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings differ
diff --git a/Tools/i18n_generate_strings_files.sh b/Tools/i18n_generate_strings_files.sh
index 0af7fccc6..4860c5b3e 100755
--- a/Tools/i18n_generate_strings_files.sh
+++ b/Tools/i18n_generate_strings_files.sh
@@ -34,7 +34,8 @@ function generate_localizable_from_sources {
 	#WARNING: sed issue "extra characters at the end of g command" means that
 	# we are trying to modify an UTF-16 file which is not supported..
 	localizable_en=$root_directory/Resources/en.lproj/Localizable.strings
-	find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $(dirname $localizable_en)
+	rm -f $localizable_en
+	find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o "$(dirname $localizable_en)"
 }
 
 ##### 2. Generate .strings for all XIB files