project: rename Ring to Jami

Change-Id: Id137adf6aa12f6d7b764c25620f0ef73882d8bfa
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>

CMakeLists.txt

@@ -4,7 +4,7 @@ IF(POLICY CMP0022)
   CMAKE_POLICY(SET CMP0022 NEW)
 ENDIF(POLICY CMP0022)
 
-SET(PROJ_NAME Ring)
+SET(PROJ_NAME Jami)
 option(RELEASE_TYPE "RELEASE_TYPE" "website")
 
 # To build nighlies we need to update RING_VERSION with an optional command line arg
@@ -454,7 +454,7 @@ IF("${RELEASE_TYPE}" STREQUAL "AppStore")
     SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in
         MACOSX_BUNDLE_GUI_IDENTIFIER "com.savoirfairelinux.ring.macos"
-        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/data/Ring.entitlements"
+        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/data/Jami.entitlements"
         MACOSX_BUNDLE_SHORT_VERSION_STRING "${RING_VERSION_NAME}"
         MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJ_NAME} ${RING_VERSION_NAME}"
         MACOSX_BUNDLE_BUNDLE_VERSION ${RING_VERSION}

Credits.rtf

-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf100
+{\fonttbl\f0\fswiss\fcharset0 Helvetica-Oblique;\f1\fswiss\fcharset0 Helvetica-BoldOblique;\f2\fswiss\fcharset0 Helvetica-Bold;
+}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
 \margl1440\margr1440\vieww9000\viewh8400\viewkind0
@@ -8,16 +9,16 @@
 \f0\i\fs24 \cf0 \
 
 \fs28 "
-\b Live Free or Die"
-\b0\fs24 \
+\f1\b Live Free or Die"
+\f0\b0\fs24 \
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://ring.cx/"}}{\fldrslt \cf0 https://ring.cx/}}\
+{\field{\*\fldinst{HYPERLINK "https://ring.cx/"}}{\fldrslt \cf0 jami.net}}\
 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
 
-\i0\b \cf0 Authors
-\i\b0 \
+\f2\i0\b \cf0 Authors
+\f0\i\b0 \
 Adrien B\'e9raud\
 Alexandr Sergheev\
 Aline Bonnet\
@@ -58,8 +59,8 @@ Thibault Wittemberg\
 Based on SFLphone's project\
 \
 
-\i0\b Translated by
-\i\b0 \
+\f2\i0\b Translated by
+\f0\i\b0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\qc\partightenfactor0
 {\field{\*\fldinst{HYPERLINK "https://www.transifex.com/savoirfairelinux/ring/"}}{\fldrslt \cf0 https://www.transifex.com/savoirfairelinux/ring/}}\
 }
\ No newline at end of file

cmake/MacOSXBundleInfo.plist.in

@@ -47,11 +47,11 @@
     <key>NSPrincipalClass</key>
     <string>${MACOSX_BUNDLE_NSPRINCIPAL_CLASS}</string>
     <key>NSCameraUsageDescription</key>
-    <string>Ring requires to access your camera to make calls and record video</string>
+    <string>Jami requires to access your camera to make calls and record video</string>
     <key>NSMicrophoneUsageDescription</key>
-    <string>Ring requires to access your microphone to make calls and record audio</string>
+    <string>Jami requires to access your microphone to make calls and record audio</string>
     <key>NSPhotoLibraryUsageDescription</key>
-    <string>Ring requires to access your photo library to show image on profile and send via chat</string>
+    <string>Jami requires to access your photo library to show image on profile and send via chat</string>
     <key>CFBundleURLTypes</key>
         <array>
         <dict>

signAndDeploy.sh

@@ -14,11 +14,11 @@ security import certificates/certificates/distribution/Certificates.p12 -k $KEYC
 DELIVER_PASSWORD=$APPLE_PASSWORD fastlane sigh --app_identifier $BUNDLE_ID --username $APPLE_ACCOUNT --readonly true --platform macos --team_id $TEAM_ID
 security set-key-partition-list -S apple-tool:,apple:,productbuild: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN_NAME > /dev/null 2>&1
 echo "start signing"
-macdeployqt ./Ring.app -codesign="${APP_CERTIFICATE}"
-codesign --force --sign "${APP_CERTIFICATE}" --entitlements ../data/Ring.entitlements Ring.app
-codesign --verify Ring.app
+macdeployqt ./Jami.app -codesign="${APP_CERTIFICATE}"
+codesign --force --sign "${APP_CERTIFICATE}" --entitlements ../data/Jami.entitlements Jami.app
+codesign --verify Jami.app
 echo "create .pkg"
-productbuild --component Ring.app/ /Applications --sign "${INSTALLER_CERTIFICATE}" --product Ring.app/Contents/Info.plist Ring.pkg
-/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --validate-app  --type osx -f Ring.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
+productbuild --component Jami.app/ /Applications --sign "${INSTALLER_CERTIFICATE}" --product Jami.app/Contents/Info.plist Jami.pkg
+/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --validate-app  --type osx -f Jami.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
 echo "start deploying"
-/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --upload-app  --type osx -f Ring.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD
+/Applications/Xcode.app/Contents/Applications/Application\ Loader.app/Contents/Frameworks/ITunesSoftwareService.framework/Support/altool  --upload-app  --type osx -f Jami.pkg -u $APPLE_ACCOUNT --password $APPLE_PASSWORD

src/AppDelegate.mm

@@ -87,6 +87,13 @@ std::unique_ptr<lrc::api::Lrc> lrc;
 
     NSAppleEventManager* appleEventManager = [NSAppleEventManager sharedAppleEventManager];
     [appleEventManager setEventHandler:self andSelector:@selector(handleQuitEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEQuitApplication];
+
+    dispatch_queue_t queue = NULL;
+    queue = dispatch_queue_create("scNetworkReachability", DISPATCH_QUEUE_SERIAL);
+    [self setScNetworkQueue:queue];
+    [self beginObservingReachabilityStatus];
+    NSActivityOptions options = NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled | NSActivityBackground;
+    self.activity = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Receiving calls and messages"];
     lrc = std::make_unique<lrc::api::Lrc>();
 
     if([self checkForRingAccount]) {
@@ -95,13 +102,6 @@ std::unique_ptr<lrc::api::Lrc> lrc;
         [self showWizard];
     }
     [self connect];
-
-    dispatch_queue_t queue = NULL;
-    queue = dispatch_queue_create("scNetworkReachability", DISPATCH_QUEUE_SERIAL);
-    [self setScNetworkQueue:queue];
-    [self beginObservingReachabilityStatus];
-    NSActivityOptions options = NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled | NSActivityBackground;
-    self.activity = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"Receiving calls and messages"];
 }
 
 - (void) beginObservingReachabilityStatus

src/ChooseAccountVC.mm

@@ -230,7 +230,7 @@ NSMutableDictionary* menuItemsTags;
             [itemView.accountTypeLabel setStringValue:@"SIP"];
             break;
         case lrc::api::profile::Type::RING:
-            [itemView.accountTypeLabel setStringValue:@"RING"];
+            [itemView.accountTypeLabel setStringValue:@"Jami"];
             break;
         default:
             break;

src/ExportPasswordWC.mm

@@ -118,7 +118,7 @@ QMetaObject::Connection accountConnection;
 
     [thePin addAttributes:[NSDictionary dictionaryWithObject:mutParaStyle forKey:NSParagraphStyleAttributeName] range:range];
 
-    NSMutableAttributedString* infos = [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.","Title shown to user to concat with Pin")];
+    NSMutableAttributedString* infos = [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.","Title shown to user to concat with Pin")];
     [thePin appendAttributedString:infos];
     [thePin endEditing];
 

src/RingWindowController.mm

@@ -76,6 +76,7 @@ typedef NS_ENUM(NSInteger, ViewState) {
     __unsafe_unretained IBOutlet NSView* welcomeContainer;
     __unsafe_unretained IBOutlet NSView* callView;
     __unsafe_unretained IBOutlet NSTextField* ringIDLabel;
+    __unsafe_unretained IBOutlet NSTextField* explanationLabel;
     __unsafe_unretained IBOutlet NSButton* shareButton;
     __unsafe_unretained IBOutlet NSImageView* qrcodeView;
 
@@ -291,8 +292,10 @@ NSString* const kOpenAccountToolBarItemIdentifier    = @"OpenAccountToolBarItemI
         NSString* uriToDisplay = nullptr;
         if (!registeredName.empty()) {
             uriToDisplay = @(registeredName.c_str());
+            [explanationLabel setStringValue: NSLocalizedString(@"This is your Jami username. \nCopy and share it with your friends!", @"Explanation label when user have Jami username")];
         } else {
             uriToDisplay = @(ringID.c_str());
+            [explanationLabel setStringValue: NSLocalizedString(@"This is your ID. \nCopy and share it with your friends!", @"Explanation label when user have just ID")];
         }
         [ringIDLabel setStringValue:uriToDisplay];
         [self drawQRCode:@(ringID.c_str())];
@@ -316,8 +319,9 @@ NSString* const kOpenAccountToolBarItemIdentifier    = @"OpenAccountToolBarItemI
 
 - (IBAction)toggleQRCode:(id)sender {
     // Toggle pressed state of QRCode button
-    [sender setPressed:![sender isPressed]];
-    [self showQRCode:[sender isPressed]];
+  //  [sender setPressed:![sender isPressed]];
+    bool show = qrcodeView.animator.alphaValue == 0.0f ? YES: NO;
+    [self showQRCode: show];
 }
 
 /**

src/RingWizardWC.mm

@@ -114,7 +114,7 @@
 }
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel andAdvanced:(BOOL)showAdvanced {
-    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Jami",
                                                         @"Welcome title")];
     [ringImage setHidden: NO];
     titleConstraint.constant = -26.5;
@@ -129,7 +129,7 @@
 
 - (void)showChooseWithCancelButton:(BOOL)showCancel
 {
-    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Ring",
+    [self.windowHeader setStringValue: NSLocalizedString(@"Welcome to Jami",
                                                          @"Welcome title")];
     [ringImage setHidden: NO];
     titleConstraint.constant = -26.5;

ui/Base.lproj/ExportPasswordWindow.strings

@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Please provide your Ring account password to start";
+/* Class = "NSTextFieldCell"; title = "Please provide your password to start"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.title" = "Please provide your password to start";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Window";

ui/Base.lproj/ExportPasswordWindow.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="ExportPasswordWC">
@@ -21,7 +20,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="410" height="161"/>
@@ -33,7 +32,7 @@
                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
                         <rect key="frame" x="15" y="0.0" width="380" height="151"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
                                 <rect key="frame" x="-2" y="78" width="384" height="40"/>
                                 <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" placeholderString="error label" id="e7n-Ev-bK7">
                                     <font key="font" metaFont="system"/>
@@ -79,7 +78,7 @@ DQ
                                     <action selector="cancelPressed:" target="-2" id="NWs-SH-M68"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M0M-Fg-Znl">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="M0M-Fg-Znl">
                                 <rect key="frame" x="-2" y="44" width="384" height="107"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="107" id="egH-qZ-wBG"/>
@@ -118,7 +117,7 @@ DQ
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
                         <rect key="frame" x="15" y="0.0" width="380" height="151"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
                                 <rect key="frame" x="50" y="68" width="63" height="17"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
                                     <font key="font" metaFont="system"/>
@@ -126,11 +125,11 @@ DQ
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <secureTextField verticalHuggingPriority="750" ambiguous="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
+                            <secureTextField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
                                 <rect key="frame" x="118" y="65" width="210" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -149,7 +148,7 @@ DQ
                                     <outlet property="delegate" destination="-2" id="UEj-AI-SPU"/>
                                 </connections>
                             </secureTextField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YR8-e7-f8B">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YR8-e7-f8B">
                                 <rect key="frame" x="18" y="126" width="231" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="227" id="6Fn-hi-Ji3"/>
@@ -173,12 +172,12 @@ DQ
                                     <action selector="completeAction:" target="-2" id="4me-jZ-4mk"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qx0-KE-jEl">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Qx0-KE-jEl">
                                 <rect key="frame" x="18" y="104" width="344" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="14" id="g34-vr-Zas"/>
                                 </constraints>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" title="Please provide your Ring account password to start" id="859-10-HEb">
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" title="Please provide your password to start" id="859-10-HEb">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

ui/Base.lproj/GeneralPrefs.strings

@@ -47,8 +47,8 @@
 /* Class = "NSButtonCell"; title = "Enable notifications for incoming calls"; ObjectID = "uCL-ye-tsv"; */
 "uCL-ye-tsv.title" = "Enable notifications for incoming calls";
 
-/* Class = "NSButtonCell"; title = "Bring Ring to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
-"uYI-hA-JHk.title" = "Bring Ring to foreground on incoming calls";
+/* Class = "NSButtonCell"; title = "Bring Jami to foreground on incoming calls"; ObjectID = "uYI-hA-JHk"; */
+"uYI-hA-JHk.title" = "Bring Jami to foreground on incoming calls";
 
 /* Class = "NSTextFieldCell"; title = "This is shared with your contacts "; ObjectID = "vbU-2S-O58"; */
 "vbU-2S-O58.title" = "This is shared with your contacts ";

ui/Base.lproj/GeneralPrefs.xib

@@ -136,8 +136,11 @@
                     </constraints>
                 </customView>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
-                    <rect key="frame" x="38" y="162" width="280" height="18"/>
-                    <buttonCell key="cell" type="check" title="Bring Ring to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
+                    <rect key="frame" x="56" y="237" width="423" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="419" id="iUi-lt-J9M"/>
+                    </constraints>
+                    <buttonCell key="cell" type="check" title="Bring Jami to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>

ui/Base.lproj/Localizable.strings

@@ -68,7 +68,7 @@
 "Copy number" = "Copy number";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -132,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -153,16 +153,16 @@
 "The entered username is not available" = "The entered username is not available";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "The following account needs to be migrated to the new Ring account format:";
+"The following account needs to be migrated to the new Jami account format:" = "The following account needs to be migrated to the new Jami account format:";
 
 /* Error shown to the user */
 "The password you entered does not unlock this account" = "The password you entered does not unlock this account";
 
 /* Title shown to user to concat with Pin */
-"To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Ring on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
+"To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes." = "To complete the processs, you need to open Jami on the new device and choose the option \"Link this device to an account\". Your pin is valid for 10 minutes.";
 
 /* Text shown to the user */
-"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If you are not ready to choose a password, you may close Ring and resume the migration later.";
+"To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later." = "To proceed with the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If you are not ready to choose a password, you may close Jami and resume the migration later.";
 
 /* Name used when user leave field empty */
 "Unknown" = "Unknown";
@@ -183,10 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Create a new account";
 "Add a SIP account" = "Add a SIP account";
 
 /* Notification message */
 "Send you a contact request" = "Send you a contact request";
 
+/* Explanation label when user have Jami username */
+"This is your Jami username. \nCopy and share it with your friends!" = "This is your Jami username. \nCopy and share it with your friends!";
+
+/* Explanation label when user have just ID */
+"This is your ID. \nCopy and share it with your friends!" = "This is your ID. \nCopy and share it with your friends!";

ui/Base.lproj/MainMenu.strings

@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Ring";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Ring";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "About Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferences…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Hide Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Quit Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Hide Others";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Help";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Help";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Find and Replace…";

ui/Base.lproj/MainMenu.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="RingWindowController">
@@ -13,10 +13,10 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
-                <menuItem title="Ring" id="56">
-                    <menu key="submenu" title="Ring" systemMenu="apple" id="57">
+                <menuItem title="Jami" id="56">
+                    <menu key="submenu" title="Jami" systemMenu="apple" id="57">
                         <items>
-                            <menuItem title="About Ring" id="58">
+                            <menuItem title="About Jami" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
@@ -45,7 +45,7 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide Ring" keyEquivalent="h" id="134">
+                            <menuItem title="Hide Jami" keyEquivalent="h" id="134">
                                 <connections>
                                     <action selector="hide:" target="-1" id="367"/>
                                 </connections>
@@ -64,7 +64,7 @@
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit Ring" keyEquivalent="q" id="136">
+                            <menuItem title="Quit Jami" keyEquivalent="q" id="136">
                                 <connections>
                                     <action selector="terminate:" target="-3" id="449"/>
                                 </connections>
@@ -324,7 +324,7 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="Ring Help" keyEquivalent="?" id="492">
+                            <menuItem title="Jami Help" keyEquivalent="?" id="492">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="493"/>
                                 </connections>

ui/Base.lproj/MigrateRingAccountsWindow.strings

@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Account migration completed";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "RingID";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "ID";
 
 /* Class = "NSTextFieldCell"; title = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later."; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "The following account needs to be migrated to the new Ring account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.";
+"859-10-HEb.title" = "The following account needs to be migrated to the new Jami account format:\\n Alias : \\nID:\\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If your not ready to choose a password, you may close Jami and resume the migration later.";
 
 /* Class = "NSTextFieldCell"; title = "Account migration error"; ObjectID = "8K3-9Z-MKH"; */
 "8K3-9Z-MKH.title" = "Account migration error";

ui/Base.lproj/MigrateRingAccountsWindow.xib

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MigrateRingAccountsWC">
@@ -21,7 +21,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="508" height="296"/>
@@ -45,16 +45,16 @@
                                 <rect key="frame" x="-2" y="144" width="472" height="85"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="justified" placeholderString="RingID" id="859-10-HEb">
                                     <font key="font" metaFont="system"/>
-                                    <string key="title">The following account needs to be migrated to the new Ring account format:\n Alias : \nID:\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Ring account. If your not ready to choose a password, you may close Ring and resume the migration later.</string>
+                                    <string key="title">The following account needs to be migrated to the new Jami account format:\n Alias : \nID:\n To proceed the migration, you must choose a password for your account. This password will be used to encrypt your master key. It will be required for adding new devices to your Jami account. If your not ready to choose a password, you may close Jami and resume the migration later.</string>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
                             <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
-                                <rect key="frame" x="105" y="105" width="243" height="22"/>
+                                <rect key="frame" x="105" y="105" width="244" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>
@@ -101,10 +101,10 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fb6-6f-oqD" userLabel="Password confirmation">
-                                <rect key="frame" x="105" y="62" width="243" height="22"/>
+                                <rect key="frame" x="105" y="62" width="244" height="22"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Confirm your new password..." drawsBackground="YES" usesSingleLineMode="YES" id="KuO-oT-zhY">
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <allowedInputSourceLocales>
                                         <string>NSAllRomanInputSourcesLocaleIdentifier</string>

ui/Base.lproj/PreferencesWindow.strings

 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Preferences";
+/* Class = "NSWindow"; title = "Jami Preferences"; ObjectID = "C1T-wE-wxb"; */
+"C1T-wE-wxb.title" = "Jami Preferences";
 
 /* Class = "NSToolbarItem"; label = "General"; ObjectID = "GQi-nL-0Ey"; */
 "GQi-nL-0Ey.label" = "General";

ui/Base.lproj/PreferencesWindow.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,13 +13,13 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Ring Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" showsToolbarButton="NO" animationBehavior="default" id="C1T-wE-wxb">
+        <window title="Jami Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" animationBehavior="default" id="C1T-wE-wxb">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="469" y="334" width="653" height="383"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="33Y-I6-Ofh">
                 <rect key="frame" x="0.0" y="0.0" width="653" height="383"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="pWP-Wb-B2n">
                         <rect key="frame" x="0.0" y="0.0" width="653" height="383"/>
@@ -70,7 +70,7 @@
         </window>
     </objects>
     <resources>
-        <image name="NSAdvanced" width="32" height="32"/>
+        <image name="NSAdvanced" width="128" height="128"/>
         <image name="audio" width="36" height="36"/>
         <image name="general" width="36" height="36"/>
         <image name="video" width="36" height="36"/>

ui/Base.lproj/RegisterNameWindow.strings

@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Other users can use it instead of your RingID";
+/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your ID"; ObjectID = "9gi-0u-67t"; */
+"9gi-0u-67t.title" = "Other users can use it instead of your ID";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during your username registration"; ObjectID = "Aeh-tK-RjX"; */
 "Aeh-tK-RjX.title" = "An error occured during your username registration";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Enter your password";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Window";