diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index fc6a5efed..e02ca09b8 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -411,7 +411,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 			linphone_address_destroy(parsedAddress);
 		UIAlertView *errorView =
 			[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Check error(s)", nil)
-									   message:NSLocalizedString(@"Please enter a valid username", nil)
+									   message:NSLocalizedString(@"Please enter a valid username.", nil)
 									  delegate:nil
 							 cancelButtonTitle:NSLocalizedString(@"Continue", nil)
 							 otherButtonTitles:nil, nil];
@@ -701,11 +701,13 @@ static UICompositeViewDescription *compositeDescription = nil;
 				   withTransport:(NSString *)transport {
 	NSMutableString *errors = [NSMutableString string];
 	if ([username length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if (domain != nil && [domain length] == 0) {
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid domain.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid domain.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
@@ -779,26 +781,28 @@ static UICompositeViewDescription *compositeDescription = nil;
 	NSInteger password_length = [[LinphoneManager instance] lpConfigIntForKey:@"password_length" forSection:@"wizard"];
 
 	if ([username length] < username_length) {
-		[errors
-			appendString:[NSString stringWithFormat:NSLocalizedString(
-														@"The username is too short (minimum %d characters).\n", nil),
-													username_length]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(
+															@"The username is too short (minimum %d characters).", nil),
+														username_length]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([password length] < password_length) {
-		[errors
-			appendString:[NSString stringWithFormat:NSLocalizedString(
-														@"The password is too short (minimum %d characters).\n", nil),
-													password_length]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(
+															@"The password is too short (minimum %d characters).", nil),
+														password_length]];
+		[errors appendString:@"\n"];
 	}
 
 	if (![password2 isEqualToString:password]) {
-		[errors appendString:NSLocalizedString(@"The passwords are different.\n", nil)];
+		[errors appendString:NSLocalizedString(@"The passwords are different.", nil)];
+		[errors appendString:@"\n"];
 	}
 
 	NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", @".+@.+\\.[A-Za-z]{2}[A-Za-z]*"];
 	if (![emailTest evaluateWithObject:email]) {
-		[errors appendString:NSLocalizedString(@"The email is invalid.\n", nil)];
+		[errors appendString:NSLocalizedString(@"The email is invalid.", nil)];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
@@ -837,7 +841,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	NSMutableString *errors = [NSMutableString string];
 	if ([username length] == 0) {
 
-		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.\n", nil)]];
+		[errors appendString:[NSString stringWithFormat:NSLocalizedString(@"Please enter a valid username.", nil)]];
+		[errors appendString:@"\n"];
 	}
 
 	if ([errors length]) {
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 66fea75f7..921f348f9 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 eed4a9dd3..b5abfbd2e 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 ad0a1f4a3..4b27020b3 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 94f329f08..a103c4c9f 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 7f4aa07b8..901ca5386 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 7326dae19..ddbae2a99 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 035caa73b..7c6aeaeed 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 edbc17b01..4c936fb0d 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/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index b570484c6..0ad29dc36 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -24,3 +24,4 @@
 "Release core" = "Release core";
 "Clear cache" = "Clear cache";
 "Battery alert" = "Battery alert";
+"Auto answer call immediately" = "Auto answer call immediately";