diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index f195c2d18..c322a0e66 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -849,7 +849,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		}
 		case LinphoneRegistrationFailed: {
 			_waitView.hidden = true;
-			UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
+			UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
 																			 message:message
 																	  preferredStyle:UIAlertControllerStyleAlert];
 			
@@ -923,7 +923,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)showErrorPopup:(const char *)error {
 	const char *err = error ? error : "";
 	if (strcmp(err, "ERROR_BAD_CREDENTIALS") == 0) {
-		UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
+		UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
 																		 message:[AssistantView StringForXMLRPCError:err]
 																  preferredStyle:UIAlertControllerStyleAlert];
 		
diff --git a/Classes/InAppProductsManager.m b/Classes/InAppProductsManager.m
index d367464b3..cda0cad80 100644
--- a/Classes/InAppProductsManager.m
+++ b/Classes/InAppProductsManager.m
@@ -473,7 +473,7 @@
 									LOGE(@"Failed with error %@", response);
 									NSString *errorMsg;
 									if ([response isEqualToString:@"ERROR_ACCOUNT_ALREADY_EXISTS"]) {
-										errorMsg = NSLocalizedString(@"This account is already registered.", nil);
+										errorMsg = NSLocalizedString(@"This account is already connected.", nil);
 									} else if ([response isEqualToString:@"ERROR_UID_ALREADY_IN_USE"]) {
 										errorMsg = NSLocalizedString(@"You already own an account.", nil);
 									} else if ([response isEqualToString:@"ERROR_ACCOUNT_DOESNT_EXIST"]) {
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index 94c19af0e..0a0a1287a 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -154,7 +154,7 @@
 	self.voipRegistry.delegate = self;
 
 	// Initiate registration.
-	LOGI(@"[PushKit] Registering for push notifications");
+	LOGI(@"[PushKit] Connecting for push notifications");
 	self.voipRegistry.desiredPushTypes = [NSSet setWithObject:PKPushTypeVoIP];
 
 	[self configureUINotification];
@@ -164,7 +164,7 @@
 	if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max)
 		return;
 
-	LOGI(@"Registering for UNNotifications");
+	LOGI(@"Connecting for UNNotifications");
 	// Call category
 	UNNotificationAction *act_ans =
 	[UNNotificationAction actionWithIdentifier:@"Answer"
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 6fcf226bf..7804568b8 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1061,7 +1061,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
 		NSString *username = [NSString stringWithUTF8String:usernameC];
 		NSString *domain = [NSString stringWithUTF8String:domainC];
 		alertView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Authentification needed", nil)
-														message:[NSString stringWithFormat:NSLocalizedString(@"Registration failed because authentication is "
+														message:[NSString stringWithFormat:NSLocalizedString(@"Connection failed because authentication is "
 																											 @"missing or invalid for %@@%@.\nYou can "
 																											 @"provide password again, or check your "
 																											 @"account configuration in the settings.", nil), username, realm]
diff --git a/Classes/LinphoneUI/StatusBarView.m b/Classes/LinphoneUI/StatusBarView.m
index 45f323ce4..f04569de7 100644
--- a/Classes/LinphoneUI/StatusBarView.m
+++ b/Classes/LinphoneUI/StatusBarView.m
@@ -204,17 +204,17 @@
 
 		switch (state) {
 			case LinphoneRegistrationOk:
-				message = NSLocalizedString(@"Registered", nil);
+				message = NSLocalizedString(@"Connected", nil);
 				break;
 			case LinphoneRegistrationNone:
 			case LinphoneRegistrationCleared:
-				message = NSLocalizedString(@"Not registered", nil);
+				message = NSLocalizedString(@"Not connected", nil);
 				break;
 			case LinphoneRegistrationFailed:
-				message = NSLocalizedString(@"Registration failed", nil);
+				message = NSLocalizedString(@"Connection failed", nil);
 				break;
 			case LinphoneRegistrationProgress:
-				message = NSLocalizedString(@"Registration in progress", nil);
+				message = NSLocalizedString(@"Connection in progress", nil);
 				break;
 			default:
 				break;
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index cdc7d6c7c..d80664c37 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -319,7 +319,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 	LinphoneRegistrationState state = [[notif.userInfo objectForKey:@"state"] intValue];
 	if (state == LinphoneRegistrationFailed && ![currentView equal:AssistantView.compositeViewDescription] &&
 		[UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
-		UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Registration failure", nil)
+		UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Connection failure", nil)
 																		 message:[notif.userInfo objectForKey:@"message"]
 																  preferredStyle:UIAlertControllerStyleAlert];
 		
@@ -761,7 +761,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 
 	switch (linphone_call_get_reason(call)) {
 		case LinphoneReasonNotFound:
-			lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is not registered.", nil), lUserName];
+			lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is not connected.", nil), lUserName];
 			break;
 		case LinphoneReasonBusy:
 			lMessage = [NSString stringWithFormat:NSLocalizedString(@"%@ is busy.", nil), lUserName];
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 91ea6fa3c..e44719c9b 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 39e382c44..7e2638334 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 d166e116d..b7f9ddaba 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 2b033b920..0102c0a47 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 8adb332c9..75c51b4ad 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 6cf2fc904..ffb1aa037 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 7bcb3d037..6708f04e1 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/TestsUI/AssistantTester.m b/TestsUI/AssistantTester.m
index 075197df8..4208add22 100644
--- a/TestsUI/AssistantTester.m
+++ b/TestsUI/AssistantTester.m
@@ -98,7 +98,7 @@
 	[self setInvalidAccountSet:true];
 
 	UIView *alertViewText =
-		[tester waitForViewWithAccessibilityLabel:@"Registration failure" traits:UIAccessibilityTraitStaticText];
+		[tester waitForViewWithAccessibilityLabel:@"Connection failure" traits:UIAccessibilityTraitStaticText];
 	if (alertViewText) {
 		UIView *reason = [tester waitForViewWithAccessibilityLabel:@"Bad credentials, check your account settings"
 															traits:UIAccessibilityTraitStaticText];
diff --git a/TestsUI/ContactsTester.m b/TestsUI/ContactsTester.m
index d6fc89b38..fe1e17c21 100644
--- a/TestsUI/ContactsTester.m
+++ b/TestsUI/ContactsTester.m
@@ -84,7 +84,7 @@
 	NSString *phone = @"+5 15 #0664;447*46";
 	[self createContact:contactName lastName:@"dummy" phoneNumber:phone SIPAddress:nil];
 	[tester tapViewWithAccessibilityLabel:[@"Call " stringByAppendingString:phone]];
-	[tester waitForViewWithAccessibilityLabel:[phone stringByAppendingString:@" is not registered."]];
+	[tester waitForViewWithAccessibilityLabel:[phone stringByAppendingString:@" is not connected."]];
 	[tester tapViewWithAccessibilityLabel:@"Cancel"];
 }
 
diff --git a/TestsUI/LinphoneTestCase.m b/TestsUI/LinphoneTestCase.m
index 5ca6f0da5..3cbda1d9e 100644
--- a/TestsUI/LinphoneTestCase.m
+++ b/TestsUI/LinphoneTestCase.m
@@ -169,18 +169,18 @@
 }
 
 - (void)waitForRegistration {
-	// wait for account to be registered
+	// wait for account to be connected
 	int timeout = 15;
 	while (timeout &&
 		   ![tester tryFindingViewWithAccessibilityLabel:@"Registration state"
-												   value:@"Registered"
+												   value:@"Connected"
 												  traits:UIAccessibilityTraitButton
 												   error:nil]) {
 		[tester waitForTimeInterval:1];
 		timeout--;
 	}
 	[tester waitForViewWithAccessibilityLabel:@"Registration state"
-										value:@"Registered"
+										value:@"Connected"
 									   traits:UIAccessibilityTraitButton];
 }