From 9f457ffb1602f0a708b4fd83c708570b6814ca96 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 30 Jul 2015 10:26:55 +0200
Subject: [PATCH] fix alignement

---
 Classes/Base.lproj/ContactsViewController.xib |   5 +-
 Classes/Base.lproj/DialerViewController.xib   |   4 +-
 Classes/ContactsViewController.m              |   3 +
 Classes/LaunchScreen.xib                      | 107 ++-----------
 .../Base.lproj/UICompositeViewController.xib  |   4 +-
 Classes/LinphoneUI/Base.lproj/UIStateBar.xib  |  10 +-
 Classes/SideMenuViewController.xib            |   4 +-
 linphone.xcodeproj/project.pbxproj            | 150 ++++++++++++++++++
 8 files changed, 180 insertions(+), 107 deletions(-)

diff --git a/Classes/Base.lproj/ContactsViewController.xib b/Classes/Base.lproj/ContactsViewController.xib
index 97ae960f0..423fb9663 100644
--- a/Classes/Base.lproj/ContactsViewController.xib
+++ b/Classes/Base.lproj/ContactsViewController.xib
@@ -131,7 +131,7 @@
                             <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="zOo-FS-W6l" userLabel="tableView">
-                            <rect key="frame" x="0.0" y="84" width="375" height="475"/>
+                            <rect key="frame" x="0.0" y="86" width="375" height="475"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
@@ -144,14 +144,13 @@
                         </tableView>
                         <searchBar contentMode="redraw" showsCancelButton="YES" id="5jE-oF-d45" userLabel="searchBar">
                             <rect key="frame" x="0.0" y="42" width="375" height="44"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <textInputTraits key="textInputTraits"/>
                             <connections>
                                 <outlet property="delegate" destination="-1" id="4jL-Rv-dW7"/>
                             </connections>
                         </searchBar>
                     </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib
index 1075b5ef7..d4af200fd 100644
--- a/Classes/Base.lproj/DialerViewController.xib
+++ b/Classes/Base.lproj/DialerViewController.xib
@@ -44,7 +44,7 @@
                             <subviews>
                                 <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
                                     <rect key="frame" x="0.0" y="0.0" width="312" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <accessibility key="accessibilityConfiguration" label="Enter a address"/>
                                     <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
@@ -56,7 +56,7 @@
                                 </textField>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8dc-hj-rvt" userLabel="backspaceButton" customClass="UIIconButton">
                                     <rect key="frame" x="300" y="0.0" width="60" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <state key="normal" image="backspace_default.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m
index e25feb260..ba7132535 100644
--- a/Classes/ContactsViewController.m
+++ b/Classes/ContactsViewController.m
@@ -142,6 +142,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	// UITextField *searchText = [_searchBar valueForKey:@"_searchField"];
 	// [searchText setFont:[UIFont fontWithName:@"CustomFont" size:12]];
 	_searchBar.showsCancelButton = (_searchBar.text.length > 0);
+	CGRect frame = _searchBar.frame;
+	frame.origin.y = toolBar.frame.origin.y + toolBar.frame.size.height;
+	_searchBar.frame = frame;
 
 	BOOL use_system = [[LinphoneManager instance] lpConfigBoolForKey:@"use_system_contacts"];
 	if (use_system && !self.sysViewController) { // use system contacts
diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib
index 9f955140f..1be441a93 100644
--- a/Classes/LaunchScreen.xib
+++ b/Classes/LaunchScreen.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" launchScreen="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -7,105 +7,26 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="E3v-Fo-iBf" userLabel="iphone6MetricsView">
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
-                    <subviews>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="background-launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="sxt-rJ-Xjr">
-                            <rect key="frame" x="0.0" y="53" width="480" height="374"/>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" ambiguous="YES" misplaced="YES" image="logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="pz0-nR-x0f" userLabel="logo">
-                            <rect key="frame" x="10" y="70" width="460" height="340"/>
-                            <constraints>
-                                <constraint firstAttribute="height" relation="lessThanOrEqual" constant="500" id="jhC-bn-LAU"/>
-                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="zP0-FQ-B8L"/>
-                            </constraints>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="strech-top.png" translatesAutoresizingMaskIntoConstraints="NO" id="Mkx-Sj-OCT">
-                            <rect key="frame" x="0.0" y="0.0" width="480" height="54"/>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="strech-bottom.png" translatesAutoresizingMaskIntoConstraints="NO" id="hjO-N8-axw">
-                            <rect key="frame" x="0.0" y="426" width="480" height="54"/>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="corner-left-bottom.png" translatesAutoresizingMaskIntoConstraints="NO" id="fMp-hm-0u4">
-                            <rect key="frame" x="0.0" y="426" width="187" height="54"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="54" id="j0e-1d-CxT"/>
-                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="187" id="pSC-Ql-eUO"/>
-                            </constraints>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" image="corner-left-top.png" translatesAutoresizingMaskIntoConstraints="NO" id="Nah-ag-b2G">
-                            <rect key="frame" x="0.0" y="0.0" width="187" height="54"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="54" id="DfB-0A-Y2w"/>
-                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="187" id="In0-Wf-9ye"/>
-                            </constraints>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="corner-right-bottom.png" translatesAutoresizingMaskIntoConstraints="NO" id="mmR-OO-GHS">
-                            <rect key="frame" x="293" y="426" width="187" height="54"/>
-                            <constraints>
-                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="187" id="3Ub-mh-okF"/>
-                                <constraint firstAttribute="height" constant="54" id="Cvy-bX-Kmw"/>
-                            </constraints>
-                        </imageView>
-                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" image="corner-right-top.png" translatesAutoresizingMaskIntoConstraints="NO" id="U5z-uv-4XA">
-                            <rect key="frame" x="293" y="0.0" width="187" height="54"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="54" id="JvO-A4-MZ3"/>
-                                <constraint firstAttribute="width" relation="lessThanOrEqual" constant="187" id="Vsa-Cw-3na"/>
-                            </constraints>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstItem="Nah-ag-b2G" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="0Ua-U9-3jR"/>
-                        <constraint firstAttribute="trailing" secondItem="Mkx-Sj-OCT" secondAttribute="trailing" id="0bE-cG-4eb"/>
-                        <constraint firstAttribute="centerY" secondItem="pz0-nR-x0f" secondAttribute="centerY" id="5Fc-zB-W6p"/>
-                        <constraint firstItem="hjO-N8-axw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="5wh-4L-kum"/>
-                        <constraint firstAttribute="trailing" secondItem="hjO-N8-axw" secondAttribute="trailing" id="6xB-GZ-ab2"/>
-                        <constraint firstAttribute="centerY" secondItem="sxt-rJ-Xjr" secondAttribute="centerY" id="Fci-Yk-YE8"/>
-                        <constraint firstAttribute="centerX" secondItem="sxt-rJ-Xjr" secondAttribute="centerX" id="HZV-eE-fyd"/>
-                        <constraint firstItem="fMp-hm-0u4" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="JHk-2I-TEf"/>
-                        <constraint firstAttribute="trailing" secondItem="sxt-rJ-Xjr" secondAttribute="trailing" id="N4R-bA-EGz"/>
-                        <constraint firstItem="pz0-nR-x0f" firstAttribute="top" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="top" constant="70" id="O8w-6s-Ilj"/>
-                        <constraint firstItem="pz0-nR-x0f" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="OAc-b0-w4Y"/>
-                        <constraint firstItem="sxt-rJ-Xjr" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="SSn-fs-hBd"/>
-                        <constraint firstAttribute="bottom" secondItem="mmR-OO-GHS" secondAttribute="bottom" id="UuR-5E-cSP"/>
-                        <constraint firstItem="Mkx-Sj-OCT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="YM1-yZ-AWI"/>
-                        <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="pz0-nR-x0f" secondAttribute="bottom" constant="70" id="csL-0B-XBe"/>
-                        <constraint firstItem="Mkx-Sj-OCT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="frD-O4-NkM"/>
-                        <constraint firstAttribute="bottom" secondItem="hjO-N8-axw" secondAttribute="bottom" id="jy1-Ed-AK2"/>
-                        <constraint firstAttribute="centerX" secondItem="hjO-N8-axw" secondAttribute="centerX" id="mF7-u0-az0"/>
-                        <constraint firstAttribute="centerX" secondItem="Mkx-Sj-OCT" secondAttribute="centerX" id="mFQ-Ep-iyz"/>
-                        <constraint firstAttribute="trailing" secondItem="U5z-uv-4XA" secondAttribute="trailing" id="nf2-Bd-6fl"/>
-                        <constraint firstItem="sxt-rJ-Xjr" firstAttribute="top" secondItem="Nah-ag-b2G" secondAttribute="bottom" constant="-1" id="pml-hI-aZZ"/>
-                        <constraint firstItem="Mkx-Sj-OCT" firstAttribute="height" secondItem="U5z-uv-4XA" secondAttribute="height" id="qke-PJ-6Iy"/>
-                        <constraint firstAttribute="centerX" secondItem="pz0-nR-x0f" secondAttribute="centerX" id="sIh-Bg-0MZ"/>
-                        <constraint firstItem="fMp-hm-0u4" firstAttribute="top" secondItem="sxt-rJ-Xjr" secondAttribute="bottom" constant="-1" id="tso-TD-8RN"/>
-                        <constraint firstItem="U5z-uv-4XA" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="txE-Z5-fPI"/>
-                        <constraint firstItem="Nah-ag-b2G" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="vdc-ri-iKX"/>
-                        <constraint firstAttribute="bottom" secondItem="fMp-hm-0u4" secondAttribute="bottom" id="wW6-W6-PtF"/>
-                        <constraint firstAttribute="trailing" secondItem="mmR-OO-GHS" secondAttribute="trailing" id="zHx-QB-MaY"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="pz0-nR-x0f" secondAttribute="trailing" constant="10" id="zvX-0I-um7"/>
-                        <constraint firstItem="mmR-OO-GHS" firstAttribute="height" secondItem="hjO-N8-axw" secondAttribute="height" id="zyn-hq-BJe"/>
-                    </constraints>
-                </view>
+                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="splashscreen.png" id="pz0-nR-x0f" userLabel="logo">
+                    <rect key="frame" x="95" y="249" width="185" height="169"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                </imageView>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <point key="canvasLocation" x="157.5" y="1049.5"/>
         </view>
     </objects>
     <resources>
-        <image name="background-launch.png" width="1536" height="1580"/>
-        <image name="corner-left-bottom.png" width="748" height="215"/>
-        <image name="corner-left-top.png" width="748" height="215"/>
-        <image name="corner-right-bottom.png" width="748" height="215"/>
-        <image name="corner-right-top.png" width="748" height="215"/>
-        <image name="logo.png" width="958" height="801"/>
-        <image name="strech-bottom.png" width="40" height="215"/>
-        <image name="strech-top.png" width="40" height="215"/>
+        <image name="splashscreen.png" width="185" height="169"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib
index 589238e07..d6a132afd 100644
--- a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" promptedForUpgradeToXcode5="NO">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <development version="6000" identifier="xcode"/>
@@ -46,7 +46,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                 </view>
             </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="0.42048451599999997" green="1" blue="0.24647464969999999" alpha="1" colorSpace="calibratedRGB"/>
             <nil key="simulatedStatusBarMetrics"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
             <point key="canvasLocation" x="-110.5" y="22.5"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
index 7970a1fc3..be7e16b40 100644
--- a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
@@ -19,11 +19,11 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="4" userLabel="Portrait View">
-            <rect key="frame" x="0.0" y="0.0" width="360" height="40"/>
+            <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view hidden="YES" contentMode="scaleToFill" id="0Vp-VF-wmX" userLabel="incallView">
-                    <rect key="frame" x="0.0" y="0.0" width="360" height="40"/>
+                    <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" tag="4" contentMode="scaleToFill" image="call_quality_indicator_2.png" id="13" userLabel="callQualityImage">
@@ -52,7 +52,7 @@
                     </subviews>
                 </view>
                 <view contentMode="scaleToFill" id="lfO-I4-PXi" userLabel="outcallView">
-                    <rect key="frame" x="0.0" y="0.0" width="360" height="40"/>
+                    <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yg7-rx-XVv" userLabel="sideMenuButton">
@@ -66,7 +66,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="3Jg-EU-ajT" userLabel="voicemailButton">
-                            <rect key="frame" x="48" y="0.0" width="312" height="40"/>
+                            <rect key="frame" x="48" y="1" width="312" height="40"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <inset key="contentEdgeInsets" minX="0.0" minY="0.0" maxX="5" maxY="0.0"/>
                             <inset key="titleEdgeInsets" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -77,7 +77,7 @@
                     </subviews>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Mhg-P6-RfU" userLabel="registrationState" customClass="UIIconButton">
-                    <rect key="frame" x="46" y="0.0" width="194" height="40"/>
+                    <rect key="frame" x="46" y="0.0" width="194" height="42"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <inset key="titleEdgeInsets" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
                     <state key="normal" title="Registered" image="led_disconnected.png">
diff --git a/Classes/SideMenuViewController.xib b/Classes/SideMenuViewController.xib
index 359392be0..c0b075ee5 100644
--- a/Classes/SideMenuViewController.xib
+++ b/Classes/SideMenuViewController.xib
@@ -38,14 +38,14 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XbU-2B-u1b" userLabel="nameLabel">
-                                    <rect key="frame" x="98" y="15" width="202" height="32"/>
+                                    <rect key="frame" x="98" y="15" width="194" height="32"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="37"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="aQ3-qc-xBv" userLabel="addressLabel">
-                                    <rect key="frame" x="98" y="54" width="202" height="22"/>
+                                    <rect key="frame" x="98" y="54" width="194" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index f61fc31aa..c94a16e64 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -270,6 +270,33 @@
 		639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB081A1DF4F1004DE38F /* UIChatRoomCell.xib */; };
 		639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; };
 		63A4280A1B26F576000DAB93 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; };
+		63AADBE81B6A0FF200AA16FD /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBC41B6A0FF200AA16FD /* Localizable.strings */; };
+		63AADBE91B6A0FF200AA16FD /* hold.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBC91B6A0FF200AA16FD /* hold.wav */; };
+		63AADBEA1B6A0FF200AA16FD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBCA1B6A0FF200AA16FD /* Images.xcassets */; };
+		63AADBEB1B6A0FF200AA16FD /* background-launch.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBCD1B6A0FF200AA16FD /* background-launch.png */; };
+		63AADBEC1B6A0FF200AA16FD /* corner-left-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBCE1B6A0FF200AA16FD /* corner-left-bottom.png */; };
+		63AADBED1B6A0FF200AA16FD /* corner-left-top.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBCF1B6A0FF200AA16FD /* corner-left-top.png */; };
+		63AADBEE1B6A0FF200AA16FD /* corner-right-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD01B6A0FF200AA16FD /* corner-right-bottom.png */; };
+		63AADBEF1B6A0FF200AA16FD /* corner-right-top.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD11B6A0FF200AA16FD /* corner-right-top.png */; };
+		63AADBF01B6A0FF200AA16FD /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD21B6A0FF200AA16FD /* logo.png */; };
+		63AADBF11B6A0FF200AA16FD /* strech-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD31B6A0FF200AA16FD /* strech-bottom.png */; };
+		63AADBF21B6A0FF200AA16FD /* strech-top.png in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD41B6A0FF200AA16FD /* strech-top.png */; };
+		63AADBF31B6A0FF200AA16FD /* licenses.html in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD51B6A0FF200AA16FD /* licenses.html */; };
+		63AADBF41B6A0FF200AA16FD /* licenses.md in Sources */ = {isa = PBXBuildFile; fileRef = 63AADBD61B6A0FF200AA16FD /* licenses.md */; };
+		63AADBF51B6A0FF200AA16FD /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD71B6A0FF200AA16FD /* linphonerc */; };
+		63AADBF61B6A0FF200AA16FD /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD81B6A0FF200AA16FD /* linphonerc-factory */; };
+		63AADBF71B6A0FF200AA16FD /* linphonerc-factory~ipad in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD91B6A0FF200AA16FD /* linphonerc-factory~ipad */; };
+		63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */; };
+		63AADBF91B6A0FF200AA16FD /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDB1B6A0FF200AA16FD /* msg.caf */; };
+		63AADBFA1B6A0FF200AA16FD /* msg.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDC1B6A0FF200AA16FD /* msg.wav */; };
+		63AADBFB1B6A0FF200AA16FD /* ring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDE1B6A0FF200AA16FD /* ring.caf */; };
+		63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDF1B6A0FF200AA16FD /* ring.wav */; };
+		63AADBFD1B6A0FF200AA16FD /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE01B6A0FF200AA16FD /* ringback.wav */; };
+		63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE21B6A0FF200AA16FD /* shortring.caf */; };
+		63AADBFF1B6A0FF200AA16FD /* wizard_external_sip.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */; };
+		63AADC001B6A0FF200AA16FD /* wizard_linphone_create.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */; };
+		63AADC011B6A0FF200AA16FD /* wizard_linphone_existing.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */; };
+		63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */; };
 		63B81A0C1B57DA33009604A6 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 63B81A031B57DA33009604A6 /* LICENSE.txt */; };
 		63B81A0D1B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B81A051B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.m */; };
 		63B81A0E1B57DA33009604A6 /* TPKeyboardAvoidingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B81A071B57DA33009604A6 /* TPKeyboardAvoidingScrollView.m */; };
@@ -845,6 +872,40 @@
 		639CEB0A1A1DF4FA004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatCell.xib; sourceTree = "<group>"; };
 		639CEB0C1A1DF528004DE38F /* fr */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UICallCell.strings; sourceTree = "<group>"; };
 		639CEB0D1A1DF52C004DE38F /* ru */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UICallCell.strings; sourceTree = "<group>"; };
+		63AADBC51B6A0FF200AA16FD /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBC61B6A0FF200AA16FD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBC71B6A0FF200AA16FD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBC81B6A0FF200AA16FD /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBC91B6A0FF200AA16FD /* hold.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = hold.wav; sourceTree = "<group>"; };
+		63AADBCA1B6A0FF200AA16FD /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		63AADBCB1B6A0FF200AA16FD /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBCD1B6A0FF200AA16FD /* background-launch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "background-launch.png"; sourceTree = "<group>"; };
+		63AADBCE1B6A0FF200AA16FD /* corner-left-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "corner-left-bottom.png"; sourceTree = "<group>"; };
+		63AADBCF1B6A0FF200AA16FD /* corner-left-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "corner-left-top.png"; sourceTree = "<group>"; };
+		63AADBD01B6A0FF200AA16FD /* corner-right-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "corner-right-bottom.png"; sourceTree = "<group>"; };
+		63AADBD11B6A0FF200AA16FD /* corner-right-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "corner-right-top.png"; sourceTree = "<group>"; };
+		63AADBD21B6A0FF200AA16FD /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
+		63AADBD31B6A0FF200AA16FD /* strech-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-bottom.png"; sourceTree = "<group>"; };
+		63AADBD41B6A0FF200AA16FD /* strech-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-top.png"; sourceTree = "<group>"; };
+		63AADBD51B6A0FF200AA16FD /* licenses.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = licenses.html; sourceTree = "<group>"; };
+		63AADBD61B6A0FF200AA16FD /* licenses.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = licenses.md; sourceTree = "<group>"; };
+		63AADBD71B6A0FF200AA16FD /* linphonerc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = linphonerc; sourceTree = "<group>"; };
+		63AADBD81B6A0FF200AA16FD /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-factory"; sourceTree = "<group>"; };
+		63AADBD91B6A0FF200AA16FD /* linphonerc-factory~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-factory~ipad"; sourceTree = "<group>"; };
+		63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc~ipad"; sourceTree = "<group>"; };
+		63AADBDB1B6A0FF200AA16FD /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = msg.caf; sourceTree = "<group>"; };
+		63AADBDC1B6A0FF200AA16FD /* msg.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = msg.wav; sourceTree = "<group>"; };
+		63AADBDD1B6A0FF200AA16FD /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBDE1B6A0FF200AA16FD /* ring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ring.caf; sourceTree = "<group>"; };
+		63AADBDF1B6A0FF200AA16FD /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ring.wav; sourceTree = "<group>"; };
+		63AADBE01B6A0FF200AA16FD /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ringback.wav; sourceTree = "<group>"; };
+		63AADBE11B6A0FF200AA16FD /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		63AADBE21B6A0FF200AA16FD /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = shortring.caf; sourceTree = "<group>"; };
+		63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_external_sip.rc; sourceTree = "<group>"; };
+		63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_linphone_create.rc; sourceTree = "<group>"; };
+		63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_linphone_existing.rc; sourceTree = "<group>"; };
+		63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wizard_remote.rc; sourceTree = "<group>"; };
+		63AADBE71B6A0FF200AA16FD /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
 		63B81A031B57DA33009604A6 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
 		63B81A041B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPKeyboardAvoidingCollectionView.h; sourceTree = "<group>"; };
 		63B81A051B57DA33009604A6 /* TPKeyboardAvoidingCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPKeyboardAvoidingCollectionView.m; sourceTree = "<group>"; };
@@ -1472,6 +1533,7 @@
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				633E388219FFB0F400936D1C /* README.md */,
+				63AADBC31B6A0FF200AA16FD /* Resources */,
 				63060B351B5FA0A60075FB75 /* ResourcesV3 */,
 				D398D3031594B0FB00FD553C /* Settings */,
 				63058A301B4E822F00EFAE36 /* TestsLiblinphone */,
@@ -1806,6 +1868,48 @@
 			path = images;
 			sourceTree = "<group>";
 		};
+		63AADBC31B6A0FF200AA16FD /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				63AADBC41B6A0FF200AA16FD /* Localizable.strings */,
+				63AADBC91B6A0FF200AA16FD /* hold.wav */,
+				63AADBCA1B6A0FF200AA16FD /* Images.xcassets */,
+				63AADBCC1B6A0FF200AA16FD /* launchscreen */,
+				63AADBD51B6A0FF200AA16FD /* licenses.html */,
+				63AADBD61B6A0FF200AA16FD /* licenses.md */,
+				63AADBD71B6A0FF200AA16FD /* linphonerc */,
+				63AADBD81B6A0FF200AA16FD /* linphonerc-factory */,
+				63AADBD91B6A0FF200AA16FD /* linphonerc-factory~ipad */,
+				63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */,
+				63AADBDB1B6A0FF200AA16FD /* msg.caf */,
+				63AADBDC1B6A0FF200AA16FD /* msg.wav */,
+				63AADBDE1B6A0FF200AA16FD /* ring.caf */,
+				63AADBDF1B6A0FF200AA16FD /* ring.wav */,
+				63AADBE01B6A0FF200AA16FD /* ringback.wav */,
+				63AADBE21B6A0FF200AA16FD /* shortring.caf */,
+				63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */,
+				63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */,
+				63AADBE51B6A0FF200AA16FD /* wizard_linphone_existing.rc */,
+				63AADBE61B6A0FF200AA16FD /* wizard_remote.rc */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		63AADBCC1B6A0FF200AA16FD /* launchscreen */ = {
+			isa = PBXGroup;
+			children = (
+				63AADBCD1B6A0FF200AA16FD /* background-launch.png */,
+				63AADBCE1B6A0FF200AA16FD /* corner-left-bottom.png */,
+				63AADBCF1B6A0FF200AA16FD /* corner-left-top.png */,
+				63AADBD01B6A0FF200AA16FD /* corner-right-bottom.png */,
+				63AADBD11B6A0FF200AA16FD /* corner-right-top.png */,
+				63AADBD21B6A0FF200AA16FD /* logo.png */,
+				63AADBD31B6A0FF200AA16FD /* strech-bottom.png */,
+				63AADBD41B6A0FF200AA16FD /* strech-top.png */,
+			);
+			path = launchscreen;
+			sourceTree = "<group>";
+		};
 		63B81A021B57DA33009604A6 /* TPKeyboardAvoiding */ = {
 			isa = PBXGroup;
 			children = (
@@ -2128,6 +2232,10 @@
 				ru,
 				Base,
 				ar,
+				de,
+				ja,
+				nl,
+				zh_TW,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
@@ -2225,14 +2333,17 @@
 				634CEDF31B6630DB00D7A921 /* options_start_conference.png in Resources */,
 				634CEE071B6630DB00D7A921 /* speaker_default.png in Resources */,
 				634CEDD51B6630DB00D7A921 /* history_chat_indicator.png in Resources */,
+				63AADBF31B6A0FF200AA16FD /* licenses.html in Resources */,
 				6315603C1B69175F0047F4D3 /* color_I.png in Resources */,
 				631560361B69175F0047F4D3 /* color_C.png in Resources */,
 				6315603F1B69175F0047F4D3 /* color_L.png in Resources */,
 				634CED981B6630DB00D7A921 /* backspace_over.png in Resources */,
+				63AADBFF1B6A0FF200AA16FD /* wizard_external_sip.rc in Resources */,
 				634CEDF11B6630DB00D7A921 /* options_default.png in Resources */,
 				634CEE141B6630DB00D7A921 /* status_disconnected_desktop.png in Resources */,
 				634CEDD41B6630DB00D7A921 /* history_all_selected.png in Resources */,
 				D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */,
+				63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */,
 				634CEE051B6630DB00D7A921 /* security_pending.png in Resources */,
 				636316D91A1DECC90009B839 /* PhoneMainView.xib in Resources */,
 				634CEDC91B6630DB00D7A921 /* delete_field_over.png in Resources */,
@@ -2246,6 +2357,7 @@
 				634CEDDE1B6630DB00D7A921 /* linphone_user.png in Resources */,
 				634CEDF51B6630DB00D7A921 /* pause_big_default.png in Resources */,
 				634CEDBB1B6630DB00D7A921 /* chat_start_body_disabled.png in Resources */,
+				63AADBEF1B6A0FF200AA16FD /* corner-right-top.png in Resources */,
 				D38187F815FE355D00C3EDCA /* UIMainBar.xib in Resources */,
 				D38187D115FE346B00C3EDCA /* HistoryViewController.xib in Resources */,
 				634CEDA51B6630DB00D7A921 /* call_start_body_disabled.png in Resources */,
@@ -2256,18 +2368,21 @@
 				634CEE031B6630DB00D7A921 /* security_ko.png in Resources */,
 				634CEDAE1B6630DB00D7A921 /* camera_switch_default.png in Resources */,
 				634CEDA11B6630DB00D7A921 /* call_quality_indicator_2.png in Resources */,
+				63AADBEC1B6A0FF200AA16FD /* corner-left-bottom.png in Resources */,
 				639CEAFD1A1DF4D9004DE38F /* UIStateBar.xib in Resources */,
 				634CEE0F1B6630DB00D7A921 /* status_away_phone.png in Resources */,
 				634CEDA71B6630DB00D7A921 /* call_status_incoming.png in Resources */,
 				634CED9D1B6630DB00D7A921 /* call_back.png in Resources */,
 				F088488A19FF8C41007FFCF3 /* UIContactCell.xib in Resources */,
 				634CEDB91B6630DB00D7A921 /* chat_send_over.png in Resources */,
+				63AADBFB1B6A0FF200AA16FD /* ring.caf in Resources */,
 				634CEDF71B6630DB00D7A921 /* pause_big_over_selected.png in Resources */,
 				634CEDEA1B6630DB00D7A921 /* numpad_6.png in Resources */,
 				D38187E115FE349700C3EDCA /* UICallBar.xib in Resources */,
 				639CEB001A1DF4E4004DE38F /* UIHistoryCell.xib in Resources */,
 				634CEDCC1B6630DB00D7A921 /* dialer_back.png in Resources */,
 				634CEDED1B6630DB00D7A921 /* numpad_9.png in Resources */,
+				63AADBF11B6A0FF200AA16FD /* strech-bottom.png in Resources */,
 				634CEE001B6630DB00D7A921 /* resizable_chat_bubble_outgoing.png in Resources */,
 				634CEDB41B6630DB00D7A921 /* chat_message_inprogress.png in Resources */,
 				634CEDDA1B6630DB00D7A921 /* led_connected.png in Resources */,
@@ -2279,25 +2394,31 @@
 				634CEE0E1B6630DB00D7A921 /* status_away_desktop.png in Resources */,
 				D38187B115FE340500C3EDCA /* ChatViewController.xib in Resources */,
 				631560381B69175F0047F4D3 /* color_E.png in Resources */,
+				63AADBFA1B6A0FF200AA16FD /* msg.wav in Resources */,
 				634CEDCE1B6630DB00D7A921 /* edit_list.png in Resources */,
 				634CED9F1B6630DB00D7A921 /* call_quality_indicator_0.png in Resources */,
 				634CED941B6630DB00D7A921 /* add_field_over.png in Resources */,
 				634CED9E1B6630DB00D7A921 /* call_hangup.png in Resources */,
+				63AADC011B6A0FF200AA16FD /* wizard_linphone_existing.rc in Resources */,
 				631560341B69175F0047F4D3 /* color_A.png in Resources */,
 				636316D41A1DEC650009B839 /* SettingsViewController.xib in Resources */,
+				63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */,
 				D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */,
 				634CEDFC1B6630DB00D7A921 /* quit_over.png in Resources */,
 				634CEDBF1B6630DB00D7A921 /* conference_exit_default.png in Resources */,
 				639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */,
 				634CEDE21B6630DB00D7A921 /* micro_default.png in Resources */,
+				63AADBF61B6A0FF200AA16FD /* linphonerc-factory in Resources */,
 				D38187D915FE347700C3EDCA /* IncomingCallViewController.xib in Resources */,
 				639CEB031A1DF4EB004DE38F /* UICompositeViewController.xib in Resources */,
 				634CEE0D1B6630DB00D7A921 /* status_away.png in Resources */,
 				631560391B69175F0047F4D3 /* color_F.png in Resources */,
+				63AADBF21B6A0FF200AA16FD /* strech-top.png in Resources */,
 				D38187F015FE354000C3EDCA /* UIConferenceHeader.xib in Resources */,
 				634CEDF61B6630DB00D7A921 /* pause_big_disabled.png in Resources */,
 				634CEDB81B6630DB00D7A921 /* chat_send_default.png in Resources */,
 				634CEDC31B6630DB00D7A921 /* contacts_all_default.png in Resources */,
+				63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */,
 				634CEDFF1B6630DB00D7A921 /* resizable_chat_bubble_incoming.png in Resources */,
 				634CEDF21B6630DB00D7A921 /* options_selected.png in Resources */,
 				D38187DD15FE348A00C3EDCA /* WizardViewController.xib in Resources */,
@@ -2312,6 +2433,7 @@
 				634CEDE11B6630DB00D7A921 /* menu.png in Resources */,
 				634CEDAB1B6630DB00D7A921 /* call_video_start.png in Resources */,
 				639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */,
+				63AADBF71B6A0FF200AA16FD /* linphonerc-factory~ipad in Resources */,
 				634CEDD11B6630DB00D7A921 /* footer_dialer.png in Resources */,
 				D38187B915FE342200C3EDCA /* ContactDetailsViewController.xib in Resources */,
 				D38187B515FE341B00C3EDCA /* ContactDetailsLabelViewController.xib in Resources */,
@@ -2330,6 +2452,8 @@
 				634CEE171B6630DB00D7A921 /* voicemail.png in Resources */,
 				634CEE151B6630DB00D7A921 /* status_disconnected_phone.png in Resources */,
 				634CEDE91B6630DB00D7A921 /* numpad_5.png in Resources */,
+				63AADC001B6A0FF200AA16FD /* wizard_linphone_create.rc in Resources */,
+				63AADBEE1B6A0FF200AA16FD /* corner-right-bottom.png in Resources */,
 				634CEDE41B6630DB00D7A921 /* numpad_0.png in Resources */,
 				D38187CD15FE346700C3EDCA /* HistoryDetailsViewController.xib in Resources */,
 				634CEDA21B6630DB00D7A921 /* call_quality_indicator_3.png in Resources */,
@@ -2340,6 +2464,7 @@
 				634CEDC41B6630DB00D7A921 /* contacts_all_selected.png in Resources */,
 				F0642EF119DAC891009DB336 /* MainStoryboard.storyboard in Resources */,
 				634CEDBC1B6630DB00D7A921 /* chat_start_body_over.png in Resources */,
+				63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */,
 				D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */,
 				D38187E515FE349D00C3EDCA /* UICallBar~ipad.xib in Resources */,
 				634CEE121B6630DB00D7A921 /* status_busy_phone.png in Resources */,
@@ -2348,12 +2473,16 @@
 				634CED9A1B6630DB00D7A921 /* call_alt_back.png in Resources */,
 				634CEDCF1B6630DB00D7A921 /* footer_chat.png in Resources */,
 				634CEDDF1B6630DB00D7A921 /* list_details_default.png in Resources */,
+				63AADBE91B6A0FF200AA16FD /* hold.wav in Resources */,
 				63B81A0C1B57DA33009604A6 /* LICENSE.txt in Resources */,
+				63AADBF01B6A0FF200AA16FD /* logo.png in Resources */,
 				634CEDDD1B6630DB00D7A921 /* led_inprogress.png in Resources */,
+				63AADBEB1B6A0FF200AA16FD /* background-launch.png in Resources */,
 				634CEDEE1B6630DB00D7A921 /* numpad_sharp.png in Resources */,
 				D38187C115FE345B00C3EDCA /* DialerViewController.xib in Resources */,
 				634CEDD61B6630DB00D7A921 /* history_missed_default.png in Resources */,
 				D37EE10D16035793003608A6 /* ImageViewController.xib in Resources */,
+				63AADBE81B6A0FF200AA16FD /* Localizable.strings in Resources */,
 				D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */,
 				634CEDCA1B6630DB00D7A921 /* deselect_all.png in Resources */,
 				634CEDC51B6630DB00D7A921 /* contacts_sip_default.png in Resources */,
@@ -2364,6 +2493,7 @@
 				634CEDD01B6630DB00D7A921 /* footer_contacts.png in Resources */,
 				634CEDE51B6630DB00D7A921 /* numpad_1.png in Resources */,
 				634CEE061B6630DB00D7A921 /* select_all.png in Resources */,
+				63AADBEA1B6A0FF200AA16FD /* Images.xcassets in Resources */,
 				634CEDC81B6630DB00D7A921 /* delete_field_default.png in Resources */,
 				634CEDA31B6630DB00D7A921 /* call_quality_indicator_4.png in Resources */,
 				6315603D1B69175F0047F4D3 /* color_J.png in Resources */,
@@ -2373,6 +2503,7 @@
 				631560371B69175F0047F4D3 /* color_D.png in Resources */,
 				634CEDA81B6630DB00D7A921 /* call_status_missed.png in Resources */,
 				634CEDB31B6630DB00D7A921 /* chat_message_delivered.png in Resources */,
+				63AADBED1B6A0FF200AA16FD /* corner-left-top.png in Resources */,
 				634CEE131B6630DB00D7A921 /* status_disconnected.png in Resources */,
 				D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */,
 				634CEDB71B6630DB00D7A921 /* chat_picture_over.png in Resources */,
@@ -2388,9 +2519,11 @@
 				634CEE0B1B6630DB00D7A921 /* status_available_desktop.png in Resources */,
 				634CEDF01B6630DB00D7A921 /* options_add_call.png in Resources */,
 				634CEDF81B6630DB00D7A921 /* pause_small_default.png in Resources */,
+				63AADBFD1B6A0FF200AA16FD /* ringback.wav in Resources */,
 				634CEDB21B6630DB00D7A921 /* chat_list_indicator.png in Resources */,
 				634CEDE31B6630DB00D7A921 /* micro_selected.png in Resources */,
 				634CEDEC1B6630DB00D7A921 /* numpad_8.png in Resources */,
+				63AADBF51B6A0FF200AA16FD /* linphonerc in Resources */,
 				634CED931B6630DB00D7A921 /* add_field_default.png in Resources */,
 				634CEDD71B6630DB00D7A921 /* history_missed_selected.png in Resources */,
 				634CED9C1B6630DB00D7A921 /* call_audio_start.png in Resources */,
@@ -2401,6 +2534,7 @@
 				634CEDAD1B6630DB00D7A921 /* camera_selected.png in Resources */,
 				634CEDE01B6630DB00D7A921 /* list_details_over.png in Resources */,
 				634CEDC61B6630DB00D7A921 /* contacts_sip_selected.png in Resources */,
+				63AADBF91B6A0FF200AA16FD /* msg.caf in Resources */,
 				634CEDAF1B6630DB00D7A921 /* camera_switch_disabled.png in Resources */,
 				634CEDD81B6630DB00D7A921 /* incoming_call.png in Resources */,
 			);
@@ -2561,6 +2695,7 @@
 				D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */,
 				D3128FE115AABC7E00A2147A /* ContactDetailsViewController.m in Sources */,
 				D37C639B15AADEF6009D0BAC /* ContactDetailsTableViewController.m in Sources */,
+				63AADBF41B6A0FF200AA16FD /* licenses.md in Sources */,
 				63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */,
 				D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */,
 				D378906515AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */,
@@ -2802,6 +2937,21 @@
 			name = UIChatCell.xib;
 			sourceTree = "<group>";
 		};
+		63AADBC41B6A0FF200AA16FD /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				63AADBC51B6A0FF200AA16FD /* ar */,
+				63AADBC61B6A0FF200AA16FD /* de */,
+				63AADBC71B6A0FF200AA16FD /* en */,
+				63AADBC81B6A0FF200AA16FD /* fr */,
+				63AADBCB1B6A0FF200AA16FD /* ja */,
+				63AADBDD1B6A0FF200AA16FD /* nl */,
+				63AADBE11B6A0FF200AA16FD /* ru */,
+				63AADBE71B6A0FF200AA16FD /* zh_TW */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
 		D37EE11016035793003608A6 /* ImageViewController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (