From b746d9e8ed4866c345df44a68333d06c008a3cd3 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Sun, 14 Apr 2019 14:56:28 +0200 Subject: [PATCH] set text 'registered' to 'connected' --- Classes/AssistantView.m | 4 ++-- Classes/InAppProductsManager.m | 2 +- Classes/LinphoneAppDelegate.m | 4 ++-- Classes/LinphoneManager.m | 2 +- Classes/LinphoneUI/StatusBarView.m | 8 ++++---- Classes/PhoneMainView.m | 4 ++-- Resources/ar.lproj/Localizable.strings | Bin 72408 -> 72384 bytes Resources/de.lproj/Localizable.strings | Bin 78152 -> 78128 bytes Resources/en.lproj/Localizable.strings | Bin 74716 -> 74668 bytes Resources/fr.lproj/Localizable.strings | Bin 78042 -> 77972 bytes Resources/ja.lproj/Localizable.strings | Bin 70544 -> 70514 bytes Resources/nl.lproj/Localizable.strings | Bin 75488 -> 75456 bytes Resources/ru.lproj/Localizable.strings | Bin 76270 -> 76246 bytes TestsUI/AssistantTester.m | 2 +- TestsUI/ContactsTester.m | 2 +- TestsUI/LinphoneTestCase.m | 6 +++--- 16 files changed, 17 insertions(+), 17 deletions(-) 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 91ea6fa3cdf1d2f5ad8908272be198aefbe9ba06..e44719c9b1945f4e5c768e59e6f35d7b7dcc064e 100644 GIT binary patch delta 132 zcmcbymF2)zmJN&8CJUTqW6xtqWk_Zy*}ReMdKY&xLq0IpFR=BPCZGQ3E}0&O~Zf)Eb%p$krCoG86{-9$FA$qP2Ha3iUn zd~kUwidYdt;$+7a6S0ViZ~n4k1``$u;mNC3w}Hgjp$1Q8Tq3&JXHA3*x-&L!Ji#9X E09+tFUH||9 diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings index 39e382c4415021e92c5718d87f5124af1b2ebe2f..7e2638334f5698bfc4af394483a60a5cf4c2b42d 100644 GIT binary patch delta 120 zcmX@{h-Cv1iLp;ES}QbJ<0{YO9jttl>)3cU2e9)^0t=ow#I?C*<}-=OA57R7^CllW xBs#faQyz#nxvXDcGRNj+F!tsXnm1mJMR;qD2g;4CxG+48;s3Ko*FX!k{<#A-m+{IyRooe(Zdc_|cSX&YbyG zVsgSp7Jf8+lOJx8pWL@83M9u3lPh9KoVR=;k@wE#xtr^YEH~6aeqLL_q)m diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index d166e116dfa5cfe4df832a1f8a5c79b1428bf8a7..b7f9ddaba9e931040bf16561499cb042d7b759a0 100644 GIT binary patch delta 306 zcmca}oMp{%mJQR`Cik6ZZ=%dJhDY_aA5qx0m8KuhKr@obh`Tf>N?gk$o%bsUrLMRUNF zfJEZpD$>>~KxNX_OH3}v0vg%rvYBH8pR6E~bD@52Jf%MAtQd+vW?#;p{Naq)^fye5 LT$}%$y%!1qTN`h= delta 403 zcmZ2;oaN4OmJQR`M2i?w8PXXt8HyQ7fGiL%g+Xufdsb=T5(Wh@A4zty;imY>2UrCr zfBPUZ`2(vInAT!T+5C!~tD7IqsL70z#WBP_PE6k1G5Lwud+E z+)>1kIJtA3GCz`HUv6~Of{v|&7gEbpt-sJU%MJN9=V`GI&g2X4Qofnw= zL0$|bGkMNVzR8oeq`<^C3v4~W1mjG8wOx(BltF<3VME2_{idm41D5Sjm@G3%Wb>09 Z9&&;R1<4F0K!>DEPQ0ePIq7;uBmlVcSJ40f delta 273 zcmbR8kmc4xmJK)9_=^})8PXXt8HyQ7fUKg)Pua95-C&tq=E*mC6KmGy4)z6;mC@7y z)uk{fF(@$D0* zCqLXGK3Q+G+T?;QY3OpBA8t9#gf0lwAUyfhcDc!X3LKM*JY^>96!J~Ju*r`d>XXU( o>qRH;m?kyZVzbQVc{{x1Fua*~TXeGCHKEA{4>>lgTrY?O05NJ;f&c&j diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings index 8adb332c964c8d7236ceeaa5e30e42d595128727..75c51b4ad097fc8d76789926dc57631c7fe757df 100644 GIT binary patch delta 173 zcmbQRoaNIpmJJiwCg&Yvo6NO0$Qbf$p0KQj5ut)(vfhdUD0lOY6*bZz+ctX~@$d%#U4}y1 delta 234 zcmeygjAg=dmJJiw_=^})8PXXt8HyQ7fUKg)bJ8Z1!N!>7BgH zo^Nu;WSPwmrsRlEE-+$a&tphsNMAO#Z+s1*WywQZ~P0Ki0#KX42-pQ#!>bH*96$h8w_8G`UeucyijBJdpTgmbC(t zpR8E`V{e|a)`D^Jj13}_r>w2m9I{@F5hgRaYQqK?d$ZNXce3bqP0l^*$cth>#H|Kr P6($E7L(&fvU_swdGXCo7uQ4p E00t;Ei2wiq delta 189 zcmcb1ndRMOmJKV|_=^})8PXXt8HyQ7fUKg;TiMR`aU%&%HnbC-9H7XudC}AmiOC6D zSlFSe!4g92N