diff --git a/.tx/config b/.tx/config
index 3f7fcb407..914aae0f4 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,220 +2,176 @@
 host = https://www.transifex.com
 minimum_perc = 1
 
-[linphone-ios.localizablestrings]
-file_filter = Resources/<lang>.lproj/Localizable.strings
+
+
+	[linphone-ios.aboutviewstrings]
+	file_filter = Classes/<lang>.lproj/AboutView.strings
+	source_file = Classes/Base.lproj/AboutView.strings
+	source_lang = en
+	
+
+	[linphone-ios.assistantsubviewsstrings]
+	file_filter = Classes/<lang>.lproj/AssistantSubviews.strings
+	source_file = Classes/Base.lproj/AssistantSubviews.strings
+	source_lang = en
+	
+
+	[linphone-ios.assistantviewstrings]
+	file_filter = Classes/<lang>.lproj/AssistantView.strings
+	source_file = Classes/Base.lproj/AssistantView.strings
+	source_lang = en
+	
+
+	[linphone-ios.callincomingviewstrings]
+	file_filter = Classes/<lang>.lproj/CallIncomingView.strings
+	source_file = Classes/Base.lproj/CallIncomingView.strings
+	source_lang = en
+	
+
+	[linphone-ios.calloutgoingviewstrings]
+	file_filter = Classes/<lang>.lproj/CallOutgoingView.strings
+	source_file = Classes/Base.lproj/CallOutgoingView.strings
+	source_lang = en
+	
+
+	[linphone-ios.callviewstrings]
+	file_filter = Classes/<lang>.lproj/CallView.strings
+	source_file = Classes/Base.lproj/CallView.strings
+	source_lang = en
+	
+
+	[linphone-ios.chatconversationcreateviewstrings]
+	file_filter = Classes/<lang>.lproj/ChatConversationCreateView.strings
+	source_file = Classes/Base.lproj/ChatConversationCreateView.strings
+	source_lang = en
+	
+
+	[linphone-ios.chatconversationviewstrings]
+	file_filter = Classes/<lang>.lproj/ChatConversationView.strings
+	source_file = Classes/Base.lproj/ChatConversationView.strings
+	source_lang = en
+	
+
+	[linphone-ios.chatslistviewstrings]
+	file_filter = Classes/<lang>.lproj/ChatsListView.strings
+	source_file = Classes/Base.lproj/ChatsListView.strings
+	source_lang = en
+	
+
+	[linphone-ios.contactdetailsviewstrings]
+	file_filter = Classes/<lang>.lproj/ContactDetailsView.strings
+	source_file = Classes/Base.lproj/ContactDetailsView.strings
+	source_lang = en
+	
+
+	[linphone-ios.contactslistviewstrings]
+	file_filter = Classes/<lang>.lproj/ContactsListView.strings
+	source_file = Classes/Base.lproj/ContactsListView.strings
+	source_lang = en
+	
+
+	[linphone-ios.dialerviewstrings]
+	file_filter = Classes/<lang>.lproj/DialerView.strings
+	source_file = Classes/Base.lproj/DialerView.strings
+	source_lang = en
+	
+
+	[linphone-ios.historydetailsviewstrings]
+	file_filter = Classes/<lang>.lproj/HistoryDetailsView.strings
+	source_file = Classes/Base.lproj/HistoryDetailsView.strings
+	source_lang = en
+	
+
+	[linphone-ios.historylistviewstrings]
+	file_filter = Classes/<lang>.lproj/HistoryListView.strings
+	source_file = Classes/Base.lproj/HistoryListView.strings
+	source_lang = en
+	
+
+	[linphone-ios.imageviewstrings]
+	file_filter = Classes/<lang>.lproj/ImageView.strings
+	source_file = Classes/Base.lproj/ImageView.strings
+	source_lang = en
+	
+
+	[linphone-ios.settingsviewstrings]
+	file_filter = Classes/<lang>.lproj/SettingsView.strings
+	source_file = Classes/Base.lproj/SettingsView.strings
+	source_lang = en
+	
+
+	[linphone-ios.statusbarviewstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/StatusBarView.strings
+	source_file = Classes/LinphoneUI/Base.lproj/StatusBarView.strings
+	source_lang = en
+	
+
+	[linphone-ios.tabbarviewstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/TabBarView.strings
+	source_file = Classes/LinphoneUI/Base.lproj/TabBarView.strings
+	source_lang = en
+	
+
+	[linphone-ios.uicallconferencecellstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/UICallConferenceCell.strings
+	source_file = Classes/LinphoneUI/Base.lproj/UICallConferenceCell.strings
+	source_lang = en
+	
+
+	[linphone-ios.uichatcellstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/UIChatCell.strings
+	source_file = Classes/LinphoneUI/Base.lproj/UIChatCell.strings
+	source_lang = en
+	
+
+	[linphone-ios.uicontactcellstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/UIContactCell.strings
+	source_file = Classes/LinphoneUI/Base.lproj/UIContactCell.strings
+	source_lang = en
+	
+
+	[linphone-ios.uihistorycellstrings]
+	file_filter = Classes/LinphoneUI/<lang>.lproj/UIHistoryCell.strings
+	source_file = Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings
+	source_lang = en
+	
+
+[linphone-ios.accountstrings]
+file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Account.strings
 source_lang = en
 
-[linphone-ios.inappsettingsadvancedstrings]
+
+[linphone-ios.advancedstrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Advanced.strings
 source_lang = en
 
-[linphone-ios.inappsettingsaudiostrings]
+
+[linphone-ios.audiostrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Audio.strings
 source_lang = en
 
-[linphone-ios.inappsettingscallstrings]
+
+[linphone-ios.callstrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Call.strings
 source_lang = en
 
-[linphone-ios.inappsettingsnetworkstrings]
+
+[linphone-ios.networkstrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Network.strings
 source_lang = en
 
-[linphone-ios.inappsettingsrootstrings]
+
+[linphone-ios.rootstrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Root.strings
 source_lang = en
 
-[linphone-ios.inappsettingstunnelstrings]
+
+[linphone-ios.tunnelstrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Tunnel.strings
 source_lang = en
 
-[linphone-ios.inappsettingsvideostrings]
+
+[linphone-ios.videostrings]
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Video.strings
 source_lang = en
 
-[linphone-ios.aboutviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/AboutViewController.strings
-source_file = Classes/Base.lproj/AboutViewController.strings
-source_lang = en
-
-
-[linphone-ios.chatroomviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ChatRoomViewController.strings
-source_file = Classes/Base.lproj/ChatRoomViewController.strings
-source_lang = en
-
-
-[linphone-ios.chatviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ChatViewController.strings
-source_file = Classes/Base.lproj/ChatViewController.strings
-source_lang = en
-
-
-[linphone-ios.contactdetailslabelviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ContactDetailsLabelViewController.strings
-source_file = Classes/Base.lproj/ContactDetailsLabelViewController.strings
-source_lang = en
-
-
-[linphone-ios.contactdetailsviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ContactDetailsViewController.strings
-source_file = Classes/Base.lproj/ContactDetailsViewController.strings
-source_lang = en
-
-
-[linphone-ios.contactsviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ContactsViewController.strings
-source_file = Classes/Base.lproj/ContactsViewController.strings
-source_lang = en
-
-
-[linphone-ios.dialerviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/DialerViewController.strings
-source_file = Classes/Base.lproj/DialerViewController.strings
-source_lang = en
-
-
-[linphone-ios.dialerviewcontrolleripadstrings]
-file_filter = Classes/<lang>.lproj/DialerViewController~ipad.strings
-source_file = Classes/Base.lproj/DialerViewController~ipad.strings
-source_lang = en
-
-
-[linphone-ios.firstloginviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/FirstLoginViewController.strings
-source_file = Classes/Base.lproj/FirstLoginViewController.strings
-source_lang = en
-
-
-[linphone-ios.historydetailsviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/HistoryDetailsViewController.strings
-source_file = Classes/Base.lproj/HistoryDetailsViewController.strings
-source_lang = en
-
-
-[linphone-ios.historyviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/HistoryViewController.strings
-source_file = Classes/Base.lproj/HistoryViewController.strings
-source_lang = en
-
-
-[linphone-ios.imageviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/ImageViewController.strings
-source_file = Classes/Base.lproj/ImageViewController.strings
-source_lang = en
-
-
-[linphone-ios.incallviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/InCallViewController.strings
-source_file = Classes/Base.lproj/InCallViewController.strings
-source_lang = en
-
-
-[linphone-ios.incomingcallviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/IncomingCallViewController.strings
-source_file = Classes/Base.lproj/IncomingCallViewController.strings
-source_lang = en
-
-
-[linphone-ios.incomingcallviewcontrolleripadstrings]
-file_filter = Classes/<lang>.lproj/IncomingCallViewController~ipad.strings
-source_file = Classes/Base.lproj/IncomingCallViewController~ipad.strings
-source_lang = en
-
-
-[linphone-ios.wizardviewcontrollerstrings]
-file_filter = Classes/<lang>.lproj/WizardViewController.strings
-source_file = Classes/Base.lproj/WizardViewController.strings
-source_lang = en
-
-
-[linphone-ios.wizardviewcontrolleripadstrings]
-file_filter = Classes/<lang>.lproj/WizardViewController~ipad.strings
-source_file = Classes/Base.lproj/WizardViewController~ipad.strings
-source_lang = en
-
-
-[linphone-ios.wizardviewsstrings]
-file_filter = Classes/<lang>.lproj/WizardViews.strings
-source_file = Classes/Base.lproj/WizardViews.strings
-source_lang = en
-
-
-[linphone-ios.uicallbarstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UICallBar.strings
-source_file = Classes/LinphoneUI/Base.lproj/UICallBar.strings
-source_lang = en
-
-
-[linphone-ios.uicallbaripadstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UICallBar~ipad.strings
-source_file = Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings
-source_lang = en
-
-
-[linphone-ios.uicallcellstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UICallCell.strings
-source_file = Classes/LinphoneUI/Base.lproj/UICallCell.strings
-source_lang = en
-
-
-[linphone-ios.uichatcellstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIChatCell.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIChatCell.strings
-source_lang = en
-
-
-[linphone-ios.uichatroomcellstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIChatRoomCell.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings
-source_lang = en
-
-
-[linphone-ios.uiconferenceheaderstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIConferenceHeader.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIConferenceHeader.strings
-source_lang = en
-
-
-[linphone-ios.uicontactcellstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIContactCell.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIContactCell.strings
-source_lang = en
-
-
-[linphone-ios.uicontactdetailsfooterstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIContactDetailsFooter.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIContactDetailsFooter.strings
-source_lang = en
-
-
-[linphone-ios.uicontactdetailsheaderstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIContactDetailsHeader.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings
-source_lang = en
-
-
-[linphone-ios.uihistorycellstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIHistoryCell.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings
-source_lang = en
-
-
-[linphone-ios.uimainbarstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIMainBar.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIMainBar.strings
-source_lang = en
-
-
-[linphone-ios.uimainbaripadstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIMainBar~ipad.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.strings
-source_lang = en
-
-
-[linphone-ios.uistatebarstrings]
-file_filter = Classes/LinphoneUI/<lang>.lproj/UIStateBar.strings
-source_file = Classes/LinphoneUI/Base.lproj/UIStateBar.strings
-source_lang = en
-
diff --git a/Classes/Base.lproj/AboutView.strings b/Classes/Base.lproj/AboutView.strings
new file mode 100644
index 000000000..5cce46d13
Binary files /dev/null and b/Classes/Base.lproj/AboutView.strings differ
diff --git a/Classes/Base.lproj/AssistantSubviews.strings b/Classes/Base.lproj/AssistantSubviews.strings
new file mode 100644
index 000000000..10e7b95e4
Binary files /dev/null and b/Classes/Base.lproj/AssistantSubviews.strings differ
diff --git a/Classes/Base.lproj/AssistantSubviews.xib b/Classes/Base.lproj/AssistantSubviews.xib
index c3c6fa332..d62e30100 100644
--- a/Classes/Base.lproj/AssistantSubviews.xib
+++ b/Classes/Base.lproj/AssistantSubviews.xib
@@ -53,7 +53,7 @@
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <state key="normal" title="CREATE AN ACCOUNT ON LINPHONE.ORG">
+                    <state key="normal" title="CREATE ACCOUNT">
                         <color key="titleColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <connections>
@@ -68,7 +68,7 @@
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <state key="normal" title="I HAVE ALREADY A LINPHONE.ORG ACCOUNT">
+                    <state key="normal" title="USE LINPHONE ACCOUNT">
                         <color key="titleColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <state key="highlighted">
@@ -86,7 +86,7 @@
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <state key="normal" title="I HAVE ALREADY A SIP ACCOUNT">
+                    <state key="normal" title="USE SIP ACCOUNT">
                         <color key="titleColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <state key="highlighted">
@@ -104,7 +104,7 @@
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                    <state key="normal" title="REMOTE PROVISIONING">
+                    <state key="normal" title="FETCH REMOTE CONFIGURATION">
                         <color key="titleColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <state key="highlighted">
@@ -125,7 +125,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="4Aj-nv-TyO" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="4Aj-nv-TyO" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
@@ -258,7 +258,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="Gyl-37-emh" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="Gyl-37-emh" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
@@ -327,7 +327,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LOGIN WITH YOUR LINPHONE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LbS-op-QAh" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CONFIGURE LINPHONE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LbS-op-QAh" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
@@ -418,7 +418,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LOGIN WITH YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="wen-Vj-Wgv" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CONFIGURE SIP ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="wen-Vj-Wgv" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
@@ -552,7 +552,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="REMOTE PROVISIONNING" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="dpv-8C-qt6" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="FETCH REMOTE CONFIGURATION" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="dpv-8C-qt6" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
@@ -622,7 +622,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="PROVISIONNED LOGIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8ko-YU-KdD" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CONFIGURE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8ko-YU-KdD" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <animations/>
diff --git a/Classes/Base.lproj/AssistantView.strings b/Classes/Base.lproj/AssistantView.strings
new file mode 100644
index 000000000..2895c27cf
Binary files /dev/null and b/Classes/Base.lproj/AssistantView.strings differ
diff --git a/Classes/Base.lproj/CallIncomingView.strings b/Classes/Base.lproj/CallIncomingView.strings
new file mode 100644
index 000000000..c666b6a2f
Binary files /dev/null and b/Classes/Base.lproj/CallIncomingView.strings differ
diff --git a/Classes/Base.lproj/CallOutgoingView.strings b/Classes/Base.lproj/CallOutgoingView.strings
new file mode 100644
index 000000000..e51e1fbdd
Binary files /dev/null and b/Classes/Base.lproj/CallOutgoingView.strings differ
diff --git a/Classes/Base.lproj/CallView.strings b/Classes/Base.lproj/CallView.strings
new file mode 100644
index 000000000..266257d1f
Binary files /dev/null and b/Classes/Base.lproj/CallView.strings differ
diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index e533bcf65..9fb54a674 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -244,7 +244,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <animations/>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You have paused all your calls" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b5q-sb-qbU" userLabel="pausedLabel">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No active call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b5q-sb-qbU" userLabel="pausedLabel">
                                     <rect key="frame" x="0.0" y="241" width="375" height="100"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <animations/>
diff --git a/Classes/Base.lproj/ChatConversationCreateView.strings b/Classes/Base.lproj/ChatConversationCreateView.strings
new file mode 100644
index 000000000..59fc38050
Binary files /dev/null and b/Classes/Base.lproj/ChatConversationCreateView.strings differ
diff --git a/Classes/Base.lproj/ChatConversationView.strings b/Classes/Base.lproj/ChatConversationView.strings
new file mode 100644
index 000000000..ab11ec48f
Binary files /dev/null and b/Classes/Base.lproj/ChatConversationView.strings differ
diff --git a/Classes/Base.lproj/ChatsListView.strings b/Classes/Base.lproj/ChatsListView.strings
new file mode 100644
index 000000000..6fd56853b
Binary files /dev/null and b/Classes/Base.lproj/ChatsListView.strings differ
diff --git a/Classes/Base.lproj/ChatsListView.xib b/Classes/Base.lproj/ChatsListView.xib
index 38c07ff6c..80291a1c8 100644
--- a/Classes/Base.lproj/ChatsListView.xib
+++ b/Classes/Base.lproj/ChatsListView.xib
@@ -140,7 +140,7 @@
                                 <outlet property="delegate" destination="4" id="12"/>
                             </connections>
                         </tableView>
-                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No conversation." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MSn-PY-yf1" userLabel="emptyTableLabel">
+                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No conversations" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MSn-PY-yf1" userLabel="emptyTableLabel">
                             <rect key="frame" x="0.0" y="66" width="375" height="493"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <animations/>
diff --git a/Classes/Base.lproj/ContactDetailsView.strings b/Classes/Base.lproj/ContactDetailsView.strings
new file mode 100644
index 000000000..9e2711690
Binary files /dev/null and b/Classes/Base.lproj/ContactDetailsView.strings differ
diff --git a/Classes/Base.lproj/ContactsListView.strings b/Classes/Base.lproj/ContactsListView.strings
new file mode 100644
index 000000000..ce7d29fef
Binary files /dev/null and b/Classes/Base.lproj/ContactsListView.strings differ
diff --git a/Classes/Base.lproj/ContactsListView.xib b/Classes/Base.lproj/ContactsListView.xib
index 5efbd62a1..8ff83ca98 100644
--- a/Classes/Base.lproj/ContactsListView.xib
+++ b/Classes/Base.lproj/ContactsListView.xib
@@ -190,7 +190,7 @@
                                 <outlet property="delegate" destination="TJG-JZ-YRR" id="V1N-gI-U4J"/>
                             </connections>
                         </tableView>
-                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contacts." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JR3-k7-gVP" userLabel="emptyTableLabel">
+                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contact in your address book" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JR3-k7-gVP" userLabel="emptyTableLabel">
                             <rect key="frame" x="0.0" y="66" width="375" height="493"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <animations/>
diff --git a/Classes/Base.lproj/DialerView.strings b/Classes/Base.lproj/DialerView.strings
new file mode 100644
index 000000000..0b67722f7
Binary files /dev/null and b/Classes/Base.lproj/DialerView.strings differ
diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib
index f92c677a9..ba8c0f444 100644
--- a/Classes/Base.lproj/DialerView.xib
+++ b/Classes/Base.lproj/DialerView.xib
@@ -47,7 +47,7 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                     <animations/>
                                 </imageView>
-                                <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" adjustsFontSizeToFit="NO" minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
+                                <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter a number or an address" adjustsFontSizeToFit="NO" minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
                                     <rect key="frame" x="31" y="0.0" width="288" height="63"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <animations/>
diff --git a/Classes/Base.lproj/HistoryDetailsView.strings b/Classes/Base.lproj/HistoryDetailsView.strings
new file mode 100644
index 000000000..2a9606155
Binary files /dev/null and b/Classes/Base.lproj/HistoryDetailsView.strings differ
diff --git a/Classes/Base.lproj/HistoryListView.strings b/Classes/Base.lproj/HistoryListView.strings
new file mode 100644
index 000000000..19132ec6e
Binary files /dev/null and b/Classes/Base.lproj/HistoryListView.strings differ
diff --git a/Classes/Base.lproj/HistoryListView.xib b/Classes/Base.lproj/HistoryListView.xib
index bfe1bc1c2..d13b72750 100644
--- a/Classes/Base.lproj/HistoryListView.xib
+++ b/Classes/Base.lproj/HistoryListView.xib
@@ -154,7 +154,7 @@
                                 <outlet property="delegate" destination="18" id="24"/>
                             </connections>
                         </tableView>
-                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No history." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xtr-Fp-60Z" userLabel="emptyTableLabel">
+                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No call in your history" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xtr-Fp-60Z" userLabel="emptyTableLabel">
                             <rect key="frame" x="0.0" y="66" width="375" height="493"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <animations/>
diff --git a/Classes/Base.lproj/ImageView.strings b/Classes/Base.lproj/ImageView.strings
new file mode 100644
index 000000000..ade838734
Binary files /dev/null and b/Classes/Base.lproj/ImageView.strings differ
diff --git a/Classes/Base.lproj/SettingsView.strings b/Classes/Base.lproj/SettingsView.strings
new file mode 100644
index 000000000..01bdecffd
Binary files /dev/null and b/Classes/Base.lproj/SettingsView.strings differ
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index aa2092aa2..88094adf9 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -430,9 +430,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onDeleteClick:(id)sender {
-	NSString *msg =
-		[NSString stringWithFormat:NSLocalizedString(@"Are you sure that you want to delete %d messages?", nil),
-								   _tableController.selectedItems.count];
+	NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected message?", nil)];
 	[UIConfirmationDialog ShowWithMessage:msg
 		cancelMessage:nil
 		confirmMessage:nil
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index 214b9d7bd..b6f3c83b1 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -80,9 +80,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onDeleteClick:(id)sender {
-	NSString *msg =
-		[NSString stringWithFormat:NSLocalizedString(@"Are you sure that you want to delete %d conversations?", nil),
-								   _tableController.selectedItems.count];
+	NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected conversation?", nil)];
 	[UIConfirmationDialog ShowWithMessage:msg
 		cancelMessage:nil
 		confirmMessage:nil
diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index 9324ad5ab..fe2d410f4 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -270,7 +270,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onDeleteClick:(id)sender {
-	NSString *msg = NSLocalizedString(@"Are you sure that you want to delete your contact?", nil);
+	NSString *msg = NSLocalizedString(@"Do you want to delete selected this contact?", nil);
 	[UIConfirmationDialog ShowWithMessage:msg
 							cancelMessage:nil
 						   confirmMessage:nil
diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index b578daf52..ff11b1a8b 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -202,9 +202,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onDeleteClick:(id)sender {
-	NSString *msg =
-		[NSString stringWithFormat:NSLocalizedString(@"Are you sure that you want to delete %d contacts?", nil),
-								   tableController.selectedItems.count];
+	NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected contact?", nil)];
 	[UIConfirmationDialog ShowWithMessage:msg
 		cancelMessage:nil
 		confirmMessage:nil
diff --git a/Classes/HistoryListView.m b/Classes/HistoryListView.m
index ee39e5ac9..e84077530 100644
--- a/Classes/HistoryListView.m
+++ b/Classes/HistoryListView.m
@@ -91,9 +91,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onDeleteClick:(id)event {
-	NSString *msg =
-		[NSString stringWithFormat:NSLocalizedString(@"Are you sure that you want to delete %d history?", nil),
-								   _tableController.selectedItems.count];
+	NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete selected log?", nil)];
 	[UIConfirmationDialog ShowWithMessage:msg
 		cancelMessage:nil
 		confirmMessage:nil
diff --git a/Classes/LinphoneUI/Base.lproj/StatusBarView.strings b/Classes/LinphoneUI/Base.lproj/StatusBarView.strings
new file mode 100644
index 000000000..663762925
Binary files /dev/null and b/Classes/LinphoneUI/Base.lproj/StatusBarView.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/TabBarView.strings b/Classes/LinphoneUI/Base.lproj/TabBarView.strings
new file mode 100644
index 000000000..ab101de97
Binary files /dev/null and b/Classes/LinphoneUI/Base.lproj/TabBarView.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.strings b/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.strings
new file mode 100644
index 000000000..e24779e2c
Binary files /dev/null and b/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCell.strings b/Classes/LinphoneUI/Base.lproj/UIChatCell.strings
index 679cbe790..545f9b00e 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIChatCell.strings and b/Classes/LinphoneUI/Base.lproj/UIChatCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactCell.strings b/Classes/LinphoneUI/Base.lproj/UIContactCell.strings
index 5566c17f2..aca210d0b 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIContactCell.strings and b/Classes/LinphoneUI/Base.lproj/UIContactCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings
index 832c06353..13e932b7e 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings and b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.strings differ
diff --git a/Classes/LinphoneUI/StatusBarView.m b/Classes/LinphoneUI/StatusBarView.m
index 480f8f137..32ecb5e26 100644
--- a/Classes/LinphoneUI/StatusBarView.m
+++ b/Classes/LinphoneUI/StatusBarView.m
@@ -182,7 +182,7 @@
 	} else if (config == NULL) {
 		state = LinphoneRegistrationNone;
 		if (linphone_core_is_network_reachable([LinphoneManager getLc]))
-			message = NSLocalizedString(@"No SIP account configured", nil);
+			message = NSLocalizedString(@"No account configured", nil);
 		else
 			message = NSLocalizedString(@"Network down", nil);
 	} else {
diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json b/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 000000000..f62085cfc
--- /dev/null
+++ b/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,89 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "orientation" : "portrait"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "orientation" : "portrait"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 4b27020b3..ba99386ac 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/en.lproj/Account.strings b/Settings/InAppSettings.bundle/en.lproj/Account.strings
new file mode 100644
index 000000000..66ca65ec5
--- /dev/null
+++ b/Settings/InAppSettings.bundle/en.lproj/Account.strings
@@ -0,0 +1,10 @@
+"Remove Account" = "Remove Account";
+"User name" = "User name";
+"User ID" = "User ID";
+"Password" = "Password";
+"Domain" = "Domain";
+"Proxy" = "Proxy";
+"Transport" = "Transport";
+"Outbound proxy" = "Outbound proxy";
+"AVPF" = "AVPF";
+"More options" = "More options";
diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index 0ad29dc36..ffc10ecaf 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -1,15 +1,10 @@
-"SIP account" = "SIP account";
+"SIP accounts" = "SIP accounts";
 "Run assistant" = "Run assistant";
-"Clear Account" = "Clear Account";
-"User name" = "User name";
-"User ID" = "User ID";
-"Password" = "Password";
-"Domain" = "Domain";
-"Proxy" = "Proxy";
-"Transport" = "Transport";
-"Outbound proxy" = "Outbound proxy";
-"AVPF" = "AVPF";
-"More options" = "More options";
+"Account 1" = "Account 1";
+"Account 2" = "Account 2";
+"Account 3" = "Account 3";
+"Account 4" = "Account 4";
+"Account 5" = "Account 5";
 "Settings" = "Settings";
 "Enable video" = "Enable video";
 "Audio" = "Audio";
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index f6459e520..0844a4296 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -3890,6 +3890,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -3977,6 +3978,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CODE_SIGN_ENTITLEMENTS = "";
@@ -4061,6 +4063,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -4145,6 +4148,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CODE_SIGN_ENTITLEMENTS = "";