diff --git a/Classes/AssistantLinkView.m b/Classes/AssistantLinkView.m index 2163512d8..7411d2cc7 100644 --- a/Classes/AssistantLinkView.m +++ b/Classes/AssistantLinkView.m @@ -205,10 +205,10 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph initWithTitle:NSLocalizedString(@"What will my phone number be used for?", nil) message:NSLocalizedString(@"Your friends will find your more easily if you link your account to your " @"phone number. \n\nYou will see in your address book who is using " - @"Linphone and your friend will know that they can reach you on Linphone " + @"Linphone and your friends will know that they can reach you on Linphone " @"as well. \n\nYou can use your phone number with only one Linphone " @"account. If you had already linked your number to an other account but " - @"you prefere to use this one, simply link it now and your number will " + @"you prefer to use this one, simply link it now and your number will " @"automatically be moved to this account.", nil) delegate:nil diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 9e7cec6d1..adbfb6163 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -767,8 +767,7 @@ static UICompositeViewDescription *compositeDescription = nil; } } else { if (status == LinphoneAccountCreatorAccountExist || status == LinphoneAccountCreatorAccountExistWithAlias) { - ViewElement ve = ([self findTextField:ViewElement_Username].isVisible) ? ViewElement_Username : ViewElement_Phone; - [[self findTextField:ve] showError:NSLocalizedString(@"This account already exists.", nil)]; + [self showErrorPopup:"ERROR_ALIAS_ALREADY_IN_USE"]; [self findButton:ViewElement_NextButton].enabled = NO; } else if (status == LinphoneAccountCreatorAccountNotExist) { linphone_account_creator_create_account(account_creator); diff --git a/Classes/Base.lproj/AssistantLinkView.xib b/Classes/Base.lproj/AssistantLinkView.xib index 2691532dc..8e9fdd41e 100644 --- a/Classes/Base.lproj/AssistantLinkView.xib +++ b/Classes/Base.lproj/AssistantLinkView.xib @@ -1,5 +1,5 @@ - + @@ -29,6 +29,18 @@ + @@ -74,8 +86,8 @@ - - + + @@ -136,8 +148,8 @@ - diff --git a/Classes/Base.lproj/AssistantViewScreens.xib b/Classes/Base.lproj/AssistantViewScreens.xib index 2eea5fd4c..2863c8171 100644 --- a/Classes/Base.lproj/AssistantViewScreens.xib +++ b/Classes/Base.lproj/AssistantViewScreens.xib @@ -40,7 +40,7 @@ -