diff --git a/ui/ar.lproj/ExportPasswordWindow.strings b/ui/ar.lproj/ExportPasswordWindow.strings
index 0ae4faf88c24c546104baabc8b596e81d789f184..2e8f768812d04031b9bc1c982cf6ffb30c3d2d11 100644
--- a/ui/ar.lproj/ExportPasswordWindow.strings
+++ b/ui/ar.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "كلمة السر...";
 
-/* 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" = "نافذة";
diff --git a/ui/ar.lproj/GeneralPrefs.strings b/ui/ar.lproj/GeneralPrefs.strings
index f522d5e4ab0ac9e07346ca0c51d99a8fe2d162d1..ac0ad3943878a1973b90e9ac8836b63a1179ddac 100644
--- a/ui/ar.lproj/GeneralPrefs.strings
+++ b/ui/ar.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "التحديث";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "أحضر Ring إلى الأمام عند تلقي مكالمة";
+/* 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 ";
diff --git a/ui/ar.lproj/Localizable.strings b/ui/ar.lproj/Localizable.strings
index 6ca992751e941a1f6ef13e351f56b648627d4879..86d35342e3069995f3e4e43cde18667713d414c3 100644
--- a/ui/ar.lproj/Localizable.strings
+++ b/ui/ar.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "مكالمة قادمة من %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "رسالة من %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "أرفض";
+"Accept" = "اقبل";
 
 /* Contextual menu entry */
 "Remove value" = "حذف";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "مشاركة";
@@ -149,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" = "مجهول";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "مرحبا بك في 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!";
diff --git a/ui/ar.lproj/MainMenu.strings b/ui/ar.lproj/MainMenu.strings
index 986c54168c464e41905da6340b06e8790d59213b..8bc26db4985c24c2d327babb5519524d1bb800d6 100644
--- a/ui/ar.lproj/MainMenu.strings
+++ b/ui/ar.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "القائمة الرئيسية";
 
-/* 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" = "عن RING";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "تفضيلات Ring";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "خدمات";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "أخف Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "غادر Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "أخفي الآخرين";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "مساعدة";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "مساعدة Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "أجد و غير...";
diff --git a/ui/ar.lproj/MigrateRingAccountsWindow.strings b/ui/ar.lproj/MigrateRingAccountsWindow.strings
index d32ae77424e3fa5842f69048a2778481e5449060..6c2197fb09035a5805cdf8714d4d19e7da54b813 100644
--- a/ui/ar.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ar.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";
diff --git a/ui/ar.lproj/PreferencesWindow.strings b/ui/ar.lproj/PreferencesWindow.strings
index 20c3838b296645e5a8a80734dc6bd014d541304c..2c93f2a46b87b6efad11ba39b77b6f03624cfadb 100644
--- a/ui/ar.lproj/PreferencesWindow.strings
+++ b/ui/ar.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "تفضيلات Ring";
+/* 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" = "عام";
diff --git a/ui/ar.lproj/RegisterNameWindow.strings b/ui/ar.lproj/RegisterNameWindow.strings
index e9bd072c9445b58cc637f22ce73ffcb4c74287db..5eca5ed2eb122d9c76715b73257ca84c46c3b24b 100644
--- a/ui/ar.lproj/RegisterNameWindow.strings
+++ b/ui/ar.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" = "نافذة";
diff --git a/ui/ar.lproj/RingWindow.strings b/ui/ar.lproj/RingWindow.strings
index c38a6e106432f33eb365dc74b4ee2cc9c4bb34c6..98623f2748a496560f6ea91608e77f4a547fea2f 100644
--- a/ui/ar.lproj/RingWindow.strings
+++ b/ui/ar.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "التفاصيل";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "طريقة الإتصال";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "تاريخ";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "هاذا معرفك RingID، بثه لأصدقائك!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "الاتصالات";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "صنف";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "صنف";
diff --git a/ui/ar.lproj/RingWizardChoose.strings b/ui/ar.lproj/RingWizardChoose.strings
index cceac774856d7be6bb93d5310c3aab097a306c2f..2e5d48cb4560251f26b3e14611bb52f5d67021b0 100644
--- a/ui/ar.lproj/RingWizardChoose.strings
+++ b/ui/ar.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ar.lproj/RingWizardLinkAccount.strings b/ui/ar.lproj/RingWizardLinkAccount.strings
index 3b0724821d97f17c8b8c50dbba9cd0f3d3fd8c56..cec595be36ca90441ca7d833f6059216d2a6445b 100644
--- a/ui/ar.lproj/RingWizardLinkAccount.strings
+++ b/ui/ar.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "ألغِ";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "ألغِ";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/ar.lproj/RingWizardNewAccount.strings b/ui/ar.lproj/RingWizardNewAccount.strings
index 0abed500e2733c374357df14cf476122d50bf0c7..5318c459118d8fb54fe74388fd378213e04bb644 100644
--- a/ui/ar.lproj/RingWizardNewAccount.strings
+++ b/ui/ar.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/bg.lproj/ExportPasswordWindow.strings b/ui/bg.lproj/ExportPasswordWindow.strings
index 3c0ae978d06cd063c7eae45526d4c7162f1b6202..70c43bf380fb7b78adf667f23fc1485441b03952 100644
--- a/ui/bg.lproj/ExportPasswordWindow.strings
+++ b/ui/bg.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Парола…";
 
-/* 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" = "Прозорец";
diff --git a/ui/bg.lproj/GeneralPrefs.strings b/ui/bg.lproj/GeneralPrefs.strings
index 057ae23e4128a04dd9d98078bfe39e24570d8e21..f628f14e2c075df748027773eaa80c896a9c5cb8 100644
--- a/ui/bg.lproj/GeneralPrefs.strings
+++ b/ui/bg.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Обновяване";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "Извеждане на Ring на преден план при входящо обаждане";
+/* 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 ";
diff --git a/ui/bg.lproj/Localizable.strings b/ui/bg.lproj/Localizable.strings
index 313254f9cf6ff4b718fa293d367c403045c8d3a9..2371dcf8d85d8165f0bb4bca155d77e8d3633fda 100644
--- a/ui/bg.lproj/Localizable.strings
+++ b/ui/bg.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Входящо обаждане от %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Съобщение от %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Отказ";
+"Accept" = "Приемане";
 
 /* Contextual menu entry */
 "Remove value" = "Премахване на стойността";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Споделяне";
@@ -149,16 +153,16 @@
 "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" = "Неизвестно";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Добре дошли в 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!";
diff --git a/ui/bg.lproj/MainMenu.strings b/ui/bg.lproj/MainMenu.strings
index 1516b4d33080fa332ea354698ab8a2c9d23c6195..a0651ebfd678c6eec0f2e07be8b58051ec7dcc30 100644
--- a/ui/bg.lproj/MainMenu.strings
+++ b/ui/bg.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" = "Относно Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Настройки…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Услуги";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Скриване на Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Изход от Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Скриване на останалите";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Помощ";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Помощ за Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Търсене и замяна…";
diff --git a/ui/bg.lproj/MigrateRingAccountsWindow.strings b/ui/bg.lproj/MigrateRingAccountsWindow.strings
index c25225b1dab353b4f6a368156726b044256ce3cb..ae88e8f85d2a2f3e3851234b88dba20b277da801 100644
--- a/ui/bg.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/bg.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";
diff --git a/ui/bg.lproj/PreferencesWindow.strings b/ui/bg.lproj/PreferencesWindow.strings
index 22560377b72fbaf5fead111d3b19bc837c6cdb87..46e7c77d3a9351f65d56410e113820c4937938fe 100644
--- a/ui/bg.lproj/PreferencesWindow.strings
+++ b/ui/bg.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Настройки на Ring";
+/* 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" = "Общи";
diff --git a/ui/bg.lproj/RegisterNameWindow.strings b/ui/bg.lproj/RegisterNameWindow.strings
index 703d671cde528e25666aa18458af6814addfa0aa..f3b78517f6652db50921d671400e200d8de47f88 100644
--- a/ui/bg.lproj/RegisterNameWindow.strings
+++ b/ui/bg.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Задължително*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Останалите могат да го използват вместо идентификатора Ви за Ring";
+/* 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" = "Възникна грешка при регистрацията на потребителското Ви име";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Въведете паролата за акаунта си в Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Въведете паролата си";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Прозорец";
diff --git a/ui/bg.lproj/RingWindow.strings b/ui/bg.lproj/RingWindow.strings
index 3adcae316f03590cb80186cf307d59800934ccfa..f91e7aad057e6aa7d3d64b7ea0f5375091eb376a 100644
--- a/ui/bg.lproj/RingWindow.strings
+++ b/ui/bg.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "подробности";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "История";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Това е Вашият идентификатор за Ring. Копирайте го и го споделете с приятелите си!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Контакти";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Категория";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Категория";
diff --git a/ui/bg.lproj/RingWizardChoose.strings b/ui/bg.lproj/RingWizardChoose.strings
index e836988b2754165567c842da43cd143a5f91b7c7..6755b772f2566ca0da011e78bc0b8ec6ef3e90bc 100644
--- a/ui/bg.lproj/RingWizardChoose.strings
+++ b/ui/bg.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Свържете това устройство с акаунт";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Създаване на акаунт за Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/bg.lproj/RingWizardLinkAccount.strings b/ui/bg.lproj/RingWizardLinkAccount.strings
index e15fbd863fd84f371f542dbc5f59dcbef949484e..852af7aa2cf8e35e56027bd0298fd1e62331f942 100644
--- a/ui/bg.lproj/RingWizardLinkAccount.strings
+++ b/ui/bg.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отказ";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Отказ";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Въведете паролата за акаунта си в Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Въведете парола";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/bg.lproj/RingWizardNewAccount.strings b/ui/bg.lproj/RingWizardNewAccount.strings
index ed8a18ad70af1982a11570a218209b76c3d3700d..4d630f101b83f13d2b6cb9fab415c9f377199f15 100644
--- a/ui/bg.lproj/RingWizardNewAccount.strings
+++ b/ui/bg.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Задължително*";
diff --git a/ui/ca.lproj/ExportPasswordWindow.strings b/ui/ca.lproj/ExportPasswordWindow.strings
index e9b1c35ad5c3976a45d6529b16d3b0f04d9943bf..99d3aa5954871946a96b6facdf67a96d7e795d15 100644
--- a/ui/ca.lproj/ExportPasswordWindow.strings
+++ b/ui/ca.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contrasenya...";
 
-/* 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" = "Finestra";
diff --git a/ui/ca.lproj/GeneralPrefs.strings b/ui/ca.lproj/GeneralPrefs.strings
index 37b9cf4341d4678b239394c1898f7bc2fbce2b79..0ea78bba9b5334caf501cb1993a3e0c0ffb9e88c 100644
--- a/ui/ca.lproj/GeneralPrefs.strings
+++ b/ui/ca.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/ca.lproj/Localizable.strings b/ui/ca.lproj/Localizable.strings
index 425701df51391a1f5b693d1388fe729f10e55249..92a1a1ee1677aa8f6f76d807120b2c32608dfd98 100644
--- a/ui/ca.lproj/Localizable.strings
+++ b/ui/ca.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copia el número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Rebutja";
+"Accept" = "Accepta";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "El nom d'usuari introduït no està disponible";
 
 /* 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" = "Desconegut";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Benvigut a 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!";
diff --git a/ui/ca.lproj/MainMenu.strings b/ui/ca.lproj/MainMenu.strings
index e619301f8f5d9ac211e008a64b3dce2752117284..11cd157f2f54bc4b49a0fc421cb1002fb7b6211c 100644
--- a/ui/ca.lproj/MainMenu.strings
+++ b/ui/ca.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" = "Sobre 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…";
diff --git a/ui/ca.lproj/MigrateRingAccountsWindow.strings b/ui/ca.lproj/MigrateRingAccountsWindow.strings
index 2c9d406cddc7ee77d9cb2adda6fe1b7aff397f4c..55ada7d892352916fb13e93ebeba0c6eb92400c0 100644
--- a/ui/ca.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ca.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migració de compte finalitzada";
 
-/* 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" = "Migració de compte errònia";
diff --git a/ui/ca.lproj/PreferencesWindow.strings b/ui/ca.lproj/PreferencesWindow.strings
index d42f77cc590a246458af399d8796886bd748f501..74d9edf97c22ecca6e621d913079c222b2994319 100644
--- a/ui/ca.lproj/PreferencesWindow.strings
+++ b/ui/ca.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Preferències del Ring";
+/* 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";
diff --git a/ui/ca.lproj/RegisterNameWindow.strings b/ui/ca.lproj/RegisterNameWindow.strings
index ec7ed559ff5facc6fcb281ed0c2f4f54063b469f..d9978c358d23940c6a387289b30b91192117ea7b 100644
--- a/ui/ca.lproj/RegisterNameWindow.strings
+++ b/ui/ca.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" = "Finestra";
diff --git a/ui/ca.lproj/RingWindow.strings b/ui/ca.lproj/RingWindow.strings
index 9afde96127c86ede406d796985a0f7f4e9621380..63a7bcaa80f708c7c779f62d9ffab862a096b8e6 100644
--- a/ui/ca.lproj/RingWindow.strings
+++ b/ui/ca.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalls";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historial";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactes";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "El Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/ca.lproj/RingWizardChoose.strings b/ui/ca.lproj/RingWizardChoose.strings
index bcec99c0b2cd2f8a85a4233f2452acc0dce9e459..279cfc79196292711f2d7ed754eb22e4baff952f 100644
--- a/ui/ca.lproj/RingWizardChoose.strings
+++ b/ui/ca.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Enllaça aquest dispositiu a un compte";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Crear un compte de Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ca.lproj/RingWizardLinkAccount.strings b/ui/ca.lproj/RingWizardLinkAccount.strings
index da3bf401400a96c121563191042c5d48570d4999..a7d59a518a6ed39d03aa9a2155cd437f3538ff7e 100644
--- a/ui/ca.lproj/RingWizardLinkAccount.strings
+++ b/ui/ca.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel·la";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancel·la";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Introduïu la contrasenya";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/ca.lproj/RingWizardNewAccount.strings b/ui/ca.lproj/RingWizardNewAccount.strings
index 1ed79c281947e41c910ac21f63d9f24e5a77bf88..3d1de3ee44dec054164498516e65f824265022d4 100644
--- a/ui/ca.lproj/RingWizardNewAccount.strings
+++ b/ui/ca.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/cs_CZ.lproj/ExportPasswordWindow.strings b/ui/cs_CZ.lproj/ExportPasswordWindow.strings
index 2cc7f06abcae35191bbd88237ddfc979d544e993..68e109714684d0b1ca5d0fb649203b007f8a46e9 100644
--- a/ui/cs_CZ.lproj/ExportPasswordWindow.strings
+++ b/ui/cs_CZ.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Heslo…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Pro začátek prosím poskytněte heslo ke svému účtu Ring";
+/* 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" = "Okno";
diff --git a/ui/cs_CZ.lproj/GeneralPrefs.strings b/ui/cs_CZ.lproj/GeneralPrefs.strings
index a36c44bb9fe1417afa01d599c64403671a53955d..a11822460485d80cdd9ddfaf19eee1317522a539 100644
--- a/ui/cs_CZ.lproj/GeneralPrefs.strings
+++ b/ui/cs_CZ.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Aktualizovat";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Povolit oznámení na ploše";
+/* 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" = "Při příchozích hovorech přenést okno Ringu do popředí.";
+/* 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" = "Toto je sdíleno s vašimi kontakty";
diff --git a/ui/cs_CZ.lproj/Localizable.strings b/ui/cs_CZ.lproj/Localizable.strings
index ced09edd7e43130fc557198727775b1f89e06626..36abdf44253e947f3ad71184267eb0c84e1c4512 100644
--- a/ui/cs_CZ.lproj/Localizable.strings
+++ b/ui/cs_CZ.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopírovat číslo";
 
 /* Contextual menu entry */
-"Create RING Account" = "Vytvořit účet RING";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Vytvořit účet SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Příchozí hovor od %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Zpráva od  %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Odmítnout";
+"Accept" = "Přijmout";
 
 /* Contextual menu entry */
 "Remove value" = "Odstranit hodnotu";
@@ -128,7 +132,7 @@
 "Revise Input" = "Pozměnit vstup";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID: ";
 
 /* No comment provided by engineer. */
 "Share" = "Sdílet";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Zadané uživatelské jméno není dostupné";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Následující účet musí být převeden do nového formátu účtů Ring:";
+"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" = "Vámi zadané heslo neodemkne tento účet";
 
 /* 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." = "Pro dokončení tohoto postupu otevřete Ring na novém zařízení a vyberte volbu „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.";
+"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." = "Pro pokračování v převodu si musíte k účtu zvolit heslo. Toto heslo bude použito k zašifrování vašeho hlavního klíče. Bude požadováno pro přidávání nových zařízení k vašemu účtu Ring. Pokud nejste připraveni si heslo zvolit, můžete Ring zavřít a pokračovat v převodu později.";
+"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" = "Neznámé";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Vítejte v Ringu";
+"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!";
diff --git a/ui/cs_CZ.lproj/MainMenu.strings b/ui/cs_CZ.lproj/MainMenu.strings
index 30d7086cf425d5de1d9ea999f2b452bcd9d0bf48..80040a044bd2a9131fcd6335090bd451662fb0c9 100644
--- a/ui/cs_CZ.lproj/MainMenu.strings
+++ b/ui/cs_CZ.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Hlavní nabídka";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Kruh";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Kruh";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "O Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Nastavení...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Služby";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Skrýt Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ukončit Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Skrýt ostatní";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Nápověda";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Nápověda k Ringu";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Najít a nahradit...";
diff --git a/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings b/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
index b783fb714175e7336696bd09b68eba5ae58fc188..3bded1953f7b828552d78472c97aaf69a960bbd3 100644
--- a/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/cs_CZ.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Převod účtu dokončen";
 
-/* 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" = "Následující účet musí být převeden do nového formátu účtu Ring:\\nPřezdívka: \\nID:\\nAbyste převedení provedli, musíte si k účtu zvolit heslo. Toto heslo bude použito k zašifrování vašeho hlavního klíče. Budete na něj dotázáni při přidávání dalších zařízení k účtu Ring. Pokud ještě nejste na vybírání hesla připraveni, můžete Ring zavřít a pokračovat v převedení později.";
+"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" = "Chyba při převodu účtu";
diff --git a/ui/cs_CZ.lproj/PreferencesWindow.strings b/ui/cs_CZ.lproj/PreferencesWindow.strings
index c14fa84c8890442a4c7816dbf2e001038d4e209e..1ce3758b45b5f57d4152c48ef5f436c16f5c244e 100644
--- a/ui/cs_CZ.lproj/PreferencesWindow.strings
+++ b/ui/cs_CZ.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring nastavení";
+/* 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" = "Obecné";
diff --git a/ui/cs_CZ.lproj/RegisterNameWindow.strings b/ui/cs_CZ.lproj/RegisterNameWindow.strings
index 5f6c72e4f1a2016cef9c7d96b013506755c27a84..0051d58d29741f27298244621f81cd19673bb5db 100644
--- a/ui/cs_CZ.lproj/RegisterNameWindow.strings
+++ b/ui/cs_CZ.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Povinné*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Ostatní uživatelé to mohou použít namísto vašeho 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" = "Při registraci uživatelského jména nastala chyba";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Zadejte své heslo k účtu Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Zadejte své heslo";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Okno";
diff --git a/ui/cs_CZ.lproj/RingWindow.strings b/ui/cs_CZ.lproj/RingWindow.strings
index 752a482c075bf5160a7aa618b9751536344b4e02..2ee8957aa655911b0b712e554162c2a57a53ed1a 100644
--- a/ui/cs_CZ.lproj/RingWindow.strings
+++ b/ui/cs_CZ.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "podrobnosti";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Způsob kontaktu";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historie";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Toto je vaše RingID. Kopírujte jej a sdílejte s přáteli!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakty";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorie";
diff --git a/ui/cs_CZ.lproj/RingWizardChoose.strings b/ui/cs_CZ.lproj/RingWizardChoose.strings
index f95b2002737f781a9bb38deef2e674ae5f98d5e0..a9907dbbd3e3526b6e0f8732b305cc13f8c17e1b 100644
--- a/ui/cs_CZ.lproj/RingWizardChoose.strings
+++ b/ui/cs_CZ.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Připojit toto zařízení k účtu";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Vytvořit účet Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/cs_CZ.lproj/RingWizardLinkAccount.strings b/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
index b6e7c4e7fc10386c73bfd1ea4f3ef2f492b7dfa2..69c2a47f50eb9e2505be2987f3613ab23d031137 100644
--- a/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
+++ b/ui/cs_CZ.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Zrušit";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Přejděte do nastavení správy účtů, zvolte používaný Ring účet a vyberte „Připojit k tomuto účtu další zařízení“. 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Odkaz";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Zrušit";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Zadejte své heslo k účtu Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Zadejte heslo";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Můžeme začít";
diff --git a/ui/cs_CZ.lproj/RingWizardNewAccount.strings b/ui/cs_CZ.lproj/RingWizardNewAccount.strings
index aece30514324cc40ee7986170563cb8f6c1eaa56..6362df6e6790d223e65789e0ba84d8bd5fbc76c4 100644
--- a/ui/cs_CZ.lproj/RingWizardNewAccount.strings
+++ b/ui/cs_CZ.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Zaškrtnutím tohoto nastavení si zaregistrujete jedinečné uživatelské jméno na síti Ring. Ostatní ho budou moci použít k navázání kontaktu, namísto obvyklého RingID, které je 40 znaků dlouhé.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Povinné*";
diff --git a/ui/da.lproj/ExportPasswordWindow.strings b/ui/da.lproj/ExportPasswordWindow.strings
index fca8251027ad34ef369aafca6ad30269ddcb1055..c99401e22908d86eaad0a5b66c05cb59a9ed9b0e 100644
--- a/ui/da.lproj/ExportPasswordWindow.strings
+++ b/ui/da.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Adgangskode...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Angiv venligst adgangskoden til din Ring-konto for at starte";
+/* 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" = "Vindue";
diff --git a/ui/da.lproj/GeneralPrefs.strings b/ui/da.lproj/GeneralPrefs.strings
index cbef7b2c6356657999b0c8dbd4a5fab9579eb5df..664b10740372cb253ec496a78a471cb48ad8e2cc 100644
--- a/ui/da.lproj/GeneralPrefs.strings
+++ b/ui/da.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Opdatér";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Aktivér skrivebordsnotifikationer";
+/* 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 til forgrunden ved indkommende opkald";
+/* 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" = "Dette er delt med dine kontakter";
diff --git a/ui/da.lproj/Localizable.strings b/ui/da.lproj/Localizable.strings
index 2a07dea55baacd3f067c7467b1eaba0cbd9507b1..c2bcdd325438a31dbebf610b80741b0df3531fb9 100644
--- a/ui/da.lproj/Localizable.strings
+++ b/ui/da.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopiér nummer";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Afvis";
+"Accept" = "Accepter";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Del";
@@ -149,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" = "Den adgangskode du har indtastet låser ikke op for denne konto";
 
 /* 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" = "Ukendt";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Velkommen til Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Opret en ny konto";
 "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!";
diff --git a/ui/da.lproj/MainMenu.strings b/ui/da.lproj/MainMenu.strings
index aebb8aa3007ba1b91a3d700480eecbcf5e686bfd..87a6c635cfe005797eb93e2fb80d0f5a88f178dc 100644
--- a/ui/da.lproj/MainMenu.strings
+++ b/ui/da.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" = "Om Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Præferencer...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Tjenester";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Skjul Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Slut Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Skjul andre";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Hjælp";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring-hjælp";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Find og Erstat...";
diff --git a/ui/da.lproj/MigrateRingAccountsWindow.strings b/ui/da.lproj/MigrateRingAccountsWindow.strings
index 6f2f48fc5ff67e589af11b5510fd478bb2743654..6b41d7dc06dc7cf46c1fb1d1f416d6743e1cec51 100644
--- a/ui/da.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/da.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Konto-migrering afsluttede";
 
-/* 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" = "Følgende konto har behov for at blive migreret til en ny Ring-konto.\nformat:\\n Alias : \\nID:\\nFor at kunne fortsætte med migreringen, skal du først vælge en adgangskode til din konto. Denne adgangskode vil blive brugt til at kryptere din hovednøgle. Det vil være en forudsætning for at kunne tilføje nye enheder til din Ring konto. Hvis du ikke er klar til at vælge en adgangskode, kan du lukke Ring og fortsætte migreringen senere.";
+"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" = "Konto-migreringsfejl";
diff --git a/ui/da.lproj/PreferencesWindow.strings b/ui/da.lproj/PreferencesWindow.strings
index a971c803236185e49b95b4294244cb079c7912fc..c867f3cc833f84d4013547893f197fd6552f2673 100644
--- a/ui/da.lproj/PreferencesWindow.strings
+++ b/ui/da.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring-præferencer";
+/* 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" = "Generelt";
diff --git a/ui/da.lproj/RegisterNameWindow.strings b/ui/da.lproj/RegisterNameWindow.strings
index 516c4d338c73e757dffc13e40d25687569b58460..165d41b46a0db22192186e0eb55b3f45f8c823ad 100644
--- a/ui/da.lproj/RegisterNameWindow.strings
+++ b/ui/da.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Påkrævet*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andre brugere kan bruge det i stedet for dit 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" = "Der opstod en fejl under registreringen af dit brugernavn.";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Indtast adgangskoden til din Ring-konto";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Indtast din adgangskode";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Vindue";
diff --git a/ui/da.lproj/RingWindow.strings b/ui/da.lproj/RingWindow.strings
index 94917cf33e8298ab6dbb0d61f3df24172a84ea40..4619a7ea0a284cb4058aa9a486758a29b12fe88a 100644
--- a/ui/da.lproj/RingWindow.strings
+++ b/ui/da.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "Detaljer";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontaktmetode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historik";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Her er dit RingID. Kopiér og del det med dine venner!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakter";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategori";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategori";
diff --git a/ui/da.lproj/RingWizardChoose.strings b/ui/da.lproj/RingWizardChoose.strings
index 8eb5b4a491b04f7bc97c6763f829fdf24024b145..b6b562382bc6fa73c46b83d1751a273309276f80 100644
--- a/ui/da.lproj/RingWizardChoose.strings
+++ b/ui/da.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Tilknyt denne enhed til en konto";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Opret en Ring-konto";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/da.lproj/RingWizardLinkAccount.strings b/ui/da.lproj/RingWizardLinkAccount.strings
index 3967389100455f501a47a414623db1e161654ca2..d18af7585f21f60036928353871f3d75cbe2f7c6 100644
--- a/ui/da.lproj/RingWizardLinkAccount.strings
+++ b/ui/da.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuller";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Gå ind på Konto-indstillinger på enheden, vælg hvilken Ring-konto der skal bruges og vælg så \"Tilknyt en anden enhed til denne konto\".";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Tilknyt";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuller";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Indtast adgangskoden til din Ring-konto";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Indtast adgangskode";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Jeg er klar";
diff --git a/ui/da.lproj/RingWizardNewAccount.strings b/ui/da.lproj/RingWizardNewAccount.strings
index 3c91b2d173b3a39f124cb093c7a18ef4c9fe9035..a14c6623b9c7f2498be3682cefdd70777592158a 100644
--- a/ui/da.lproj/RingWizardNewAccount.strings
+++ b/ui/da.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Ved at markere dette, registrerer du et unikt brugernavn på Ring-netværket. Andre brugere kan bruge dette til at kontakte dig frem for dit RingID, som er 40 tegn langt.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Påkrævet*";
diff --git a/ui/de.lproj/ExportPasswordWindow.strings b/ui/de.lproj/ExportPasswordWindow.strings
index 6c02a6886c59bcdd969cf6f417a2a95e1e11e35c..083dc1a09758aa88dd5aad91bdb286cd4f78c525 100644
--- a/ui/de.lproj/ExportPasswordWindow.strings
+++ b/ui/de.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Passwort...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Bitte geben Sie das Kennwort Ihres Ring-Kontos ein.";
+/* 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" = "Fenster";
diff --git a/ui/de.lproj/GeneralPrefs.strings b/ui/de.lproj/GeneralPrefs.strings
index ca800f398ca16fa559c1a0da5e08f69e2efad29b..8346a1145f666aac0278fe91e2cc6dbe25f1df5a 100644
--- a/ui/de.lproj/GeneralPrefs.strings
+++ b/ui/de.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Aktualisierungen";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Desktop-Benachrichtigungen aktivieren";
+/* 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" = "Ring bei eingehenden Anrufen in den Vordergrund bringen";
+/* 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" = "Dies wird mit ihren Kontakten geteilt";
diff --git a/ui/de.lproj/Localizable.strings b/ui/de.lproj/Localizable.strings
index 07f5b10e52b279c7e43d5306ae00667556c71c3c..704f073a589042f981eacbc20f3b6f4a378edec1 100644
--- a/ui/de.lproj/Localizable.strings
+++ b/ui/de.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Nummer kopieren";
 
 /* Contextual menu entry */
-"Create RING Account" = "RING-Konto erstellen";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SIP-Konto erstellen";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Eingehender Anruf von %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Nachricht von %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Verweigern";
+"Accept" = "Akzeptieren";
 
 /* Contextual menu entry */
 "Remove value" = "Wert entfernen";
@@ -128,7 +132,7 @@
 "Revise Input" = "Eingabe korrigieren";
 
 /* Text shown to the user */
-"RingID : " = "Ring-ID :";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Teilen";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Der angegebene Benutzername ist nicht verfügbar";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Diese Konten müssen in das neue Ring-Kontoformat migriert werden:";
+"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" = "Das eingegebene Kennwort entsperrt dieses Konto nicht.";
 
 /* 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." = "Um den Prozess abzuschließen, öffnen Sie Ring auf dem neuen Gerät. Erstellen Sie ein Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.";
+"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." = "Um die Migration fortzusetzen müssen Sie ein Kontopasswort festlegen. Dieses Passwort wird verwendet, um den Hauptschlüssel zu sichern, mit dem neue Geräte zu Ihrem Ring-Konto hinzuzufügt werden können. Wenn Sie momentan kein Passwort festlegen möchten, können Sie Ring beenden und die Migration später fortsetzen.";
+"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" = "Unbekannt";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Willkommen zu Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Neues Konto erstellen";
 "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!";
diff --git a/ui/de.lproj/MainMenu.strings b/ui/de.lproj/MainMenu.strings
index 4f944066b27354facb22143fe1b41e70d8e8d575..9be6e2747adbab6d500f107af7890ae2e4daa82b 100644
--- a/ui/de.lproj/MainMenu.strings
+++ b/ui/de.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" = "Über Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Einstellungen...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Dienste";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ring verstecken";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ring beenden";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Andere verstecken";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Hilfe";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Hilfe zu Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Suchen und Ersetzen";
diff --git a/ui/de.lproj/MigrateRingAccountsWindow.strings b/ui/de.lproj/MigrateRingAccountsWindow.strings
index ddf3f5461498efe578111305de6596726b36cf85..22337214f2f3f7a1fa3c73ce33ad249593b0d4bb 100644
--- a/ui/de.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/de.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Kontomigration abgeschlossen";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Ring-ID";
+/* 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" = "Folgendes Konto muss auf das neue Ring-Konto-Format migriert werden:\\nAlias : \\nID:\\nDamit Sie die Migration durchführen können, müssen Sie ein Kennwort auswählen. Damit wird Ihr Hauptschlüssel verschlüsselt, welcher nötig ist, um ihrem Konto weitere Geräte zuzuordnen. Falls Sie noch nicht bereit sind, ein neues Kennwort auszuwählen, können Sie Ring beenden und die Migration später fortsetzen.";
+"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" = "Kontomigrationsfehler";
diff --git a/ui/de.lproj/PreferencesWindow.strings b/ui/de.lproj/PreferencesWindow.strings
index 3435461d516448aebddbec2544c5f8ec8b634273..acf47c3f6357962f71b87b07a4379a15061a6150 100644
--- a/ui/de.lproj/PreferencesWindow.strings
+++ b/ui/de.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Einstellungen";
+/* 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" = "Allgemein";
diff --git a/ui/de.lproj/RegisterNameWindow.strings b/ui/de.lproj/RegisterNameWindow.strings
index d6fdff6ba941a551e57f0598b57d5c8bc42f1c5e..d6f7fa72e17c6fc98978958687f986a21a15d728 100644
--- a/ui/de.lproj/RegisterNameWindow.strings
+++ b/ui/de.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatorisch*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andere Benutzer können dies statt Ihrer RingID benutzen.";
+/* 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" = "Während der Registrierung Ihres Benutzernamens ist ein Fehler aufgetreten";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Geben Sie Ihr Ring-Kontopasswort ein";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Geben Sie Ihr Passwort ein";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Fenster";
diff --git a/ui/de.lproj/RingWindow.strings b/ui/de.lproj/RingWindow.strings
index 65a09885f214e8ad8267598dd9741323fd27ac5a..192a7564a4a24689eef2c880fc005a3e6f37f997 100644
--- a/ui/de.lproj/RingWindow.strings
+++ b/ui/de.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "Details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontaktmethode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Verlauf";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dies is ihre Ring-ID. Teilen sie sie mit ihren Freunden!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakte";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorie";
diff --git a/ui/de.lproj/RingWizardChoose.strings b/ui/de.lproj/RingWizardChoose.strings
index dc53c58fa05876c43499870c562d0f29ac17e376..d81f75bfcd906dfc1163902bcc6e711c39b27c02 100644
--- a/ui/de.lproj/RingWizardChoose.strings
+++ b/ui/de.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Dieses Gerät mit einem Konto verknüpfen";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Ein Ring-Konto erstellen";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/de.lproj/RingWizardLinkAccount.strings b/ui/de.lproj/RingWizardLinkAccount.strings
index 7385b3e582c3bbd5845d4ff06bfb76557a700baf..1b3489438da0556959324b5df056acca5c1827b2 100644
--- a/ui/de.lproj/RingWizardLinkAccount.strings
+++ b/ui/de.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Abbrechen";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Gehen Sie in die Kontoverwaltung des Geräts. Dort wählen Sie das Ring-Konto, das Sie verwenden wollen und wählen die Option \"Ein weiteres Gerät mit diesem Konto verbinden\" aus.";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Abbrechen";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Geben Sie Ihr Ring-Kontopasswort ein";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Passwort eingeben";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Ich bin bereit.";
diff --git a/ui/de.lproj/RingWizardNewAccount.strings b/ui/de.lproj/RingWizardNewAccount.strings
index 39de672afcc98ca919cf91af72055235cf4c9708..0c97102c2f50484a1b05649f0e9adc63fd300ce2 100644
--- a/ui/de.lproj/RingWizardNewAccount.strings
+++ b/ui/de.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Wenn Sie dies anklicken, melden Sie einen einzigartigen Benutzername auf dem Ring-Netzwerk an. Damit können andere Leute Sie kontaktieren und brauchen nicht Ihre 40 Zeichen lange Ring-ID.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatorisch*";
diff --git a/ui/de_DE.lproj/ExportPasswordWindow.strings b/ui/de_DE.lproj/ExportPasswordWindow.strings
index e949a89f8984e67ee1eff10d5300f869d2289aff..7aa5f35c10039129fc1512af9c7f4878b7570706 100644
--- a/ui/de_DE.lproj/ExportPasswordWindow.strings
+++ b/ui/de_DE.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Kennwort...";
 
-/* 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" = "Fenster";
diff --git a/ui/de_DE.lproj/GeneralPrefs.strings b/ui/de_DE.lproj/GeneralPrefs.strings
index a1084a41817170356df9a11777c525fbfa8e9008..82b376bea56d530649ddd3fc8e8567dc69f3cc19 100644
--- a/ui/de_DE.lproj/GeneralPrefs.strings
+++ b/ui/de_DE.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Aktualisieren";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/de_DE.lproj/Localizable.strings b/ui/de_DE.lproj/Localizable.strings
index 04a1ba15885b1f48adcac2579846c152bcea013c..43c3bf32c1723af30ad5a2754d3290bab1e863a8 100644
--- a/ui/de_DE.lproj/Localizable.strings
+++ b/ui/de_DE.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Nummer kopieren";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Ablehnen";
+"Accept" = "Akzeptieren";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Freigeben";
@@ -149,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" = "Unbekannt";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Willkommen bei 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!";
diff --git a/ui/de_DE.lproj/MainMenu.strings b/ui/de_DE.lproj/MainMenu.strings
index 393a94569463038dcc5df9de42d51f13acf3a9f6..589ae3634566c87c702e909a70c2fb132303e8b5 100644
--- a/ui/de_DE.lproj/MainMenu.strings
+++ b/ui/de_DE.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" = "Über Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Einstellungen...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Dienste";
 
-/* 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" = "Ring beenden";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Andere ausblenden";
@@ -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…";
diff --git a/ui/de_DE.lproj/MigrateRingAccountsWindow.strings b/ui/de_DE.lproj/MigrateRingAccountsWindow.strings
index 3135e8b5481982e68a7de4a2c48ced976cea8599..d3ca84f578ec40c65970b81677a0dd2195b4606c 100644
--- a/ui/de_DE.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/de_DE.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";
diff --git a/ui/de_DE.lproj/PreferencesWindow.strings b/ui/de_DE.lproj/PreferencesWindow.strings
index 45401e6477877ee1eaf36f2d1d0d273a2a8e38f1..421b919c05a758ec94df36fb9005e89b14aafe7e 100644
--- a/ui/de_DE.lproj/PreferencesWindow.strings
+++ b/ui/de_DE.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Einstellungen";
+/* 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" = "Allgemein";
diff --git a/ui/de_DE.lproj/RegisterNameWindow.strings b/ui/de_DE.lproj/RegisterNameWindow.strings
index 28dc69ec2b2448ddf6ee9996ffb2533334351cc0..eb5185414fe547ca12ce53554c5767247626b71c 100644
--- a/ui/de_DE.lproj/RegisterNameWindow.strings
+++ b/ui/de_DE.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" = "Fenster";
diff --git a/ui/de_DE.lproj/RingWindow.strings b/ui/de_DE.lproj/RingWindow.strings
index 452140ce8387ab9f807c4849ce5fcdcc5b5e55c3..0b76a81b723abf59ab81f5674df0d28b5d192391 100644
--- a/ui/de_DE.lproj/RingWindow.strings
+++ b/ui/de_DE.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "Details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontaktmethode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Verlauf";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakte";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorie";
diff --git a/ui/de_DE.lproj/RingWizardChoose.strings b/ui/de_DE.lproj/RingWizardChoose.strings
index 98aaf887183b82172dbce786e2f9ecda03e57d83..e289d67cdf93b80e62fc2ae5011bdc8eaf190719 100644
--- a/ui/de_DE.lproj/RingWizardChoose.strings
+++ b/ui/de_DE.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Dieses Gerät mit einem Ring-Konto verknüpfen";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Erstellen einen Ring Konto";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/de_DE.lproj/RingWizardLinkAccount.strings b/ui/de_DE.lproj/RingWizardLinkAccount.strings
index 5501ad92fac98b575861fbc99a6a5d76ad246ccb..6b46ff0641c3c19217ec9a2a96933cbe992e5f38 100644
--- a/ui/de_DE.lproj/RingWizardLinkAccount.strings
+++ b/ui/de_DE.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Abbrechen";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Abbrechen";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Passwort eingeben";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/de_DE.lproj/RingWizardNewAccount.strings b/ui/de_DE.lproj/RingWizardNewAccount.strings
index c725c773e02fff228ff6f85315d8e7952b8ae2c4..3baa6e666440f75513b3115af3a5a79b2b015860 100644
--- a/ui/de_DE.lproj/RingWizardNewAccount.strings
+++ b/ui/de_DE.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/el.lproj/ExportPasswordWindow.strings b/ui/el.lproj/ExportPasswordWindow.strings
index 57a22f1f7d47202d01120993186dcb458602fb84..f7afc0d737a46e73214e3fc5d859e491a438827e 100644
--- a/ui/el.lproj/ExportPasswordWindow.strings
+++ b/ui/el.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Συνθηματικό...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Παρακαλώ εισάγετε το συνθηματικό του λογαριασμού σας Ring";
+/* 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" = "Παράθυρο";
diff --git a/ui/el.lproj/GeneralPrefs.strings b/ui/el.lproj/GeneralPrefs.strings
index 86bd08eb17551acacbbcacc502c2ea0dccffc083..42527bf9e16e4a362a8464ddf530d8adc54fc6c4 100644
--- a/ui/el.lproj/GeneralPrefs.strings
+++ b/ui/el.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/el.lproj/Localizable.strings b/ui/el.lproj/Localizable.strings
index 8cc43b2334c74a63043f34170218014f871b9925..26a79088ffbd72630a82b74ec0693f9a62974ef3 100644
--- a/ui/el.lproj/Localizable.strings
+++ b/ui/el.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Άρνηση";
+"Accept" = "Αποδοχή";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,16 +153,16 @@
 "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" = "Άγνωστοι";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Καλώς ήλθατε στο 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!";
diff --git a/ui/el.lproj/MainMenu.strings b/ui/el.lproj/MainMenu.strings
index 79c57caecce77ba0ee069ccbec6a0204910fe246..af4dac53a77909c4835f1028d2f5b983e9a40094 100644
--- a/ui/el.lproj/MainMenu.strings
+++ b/ui/el.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" = "Σχετικά";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Προτιμήσεις";
@@ -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" = "Απόκρυψη άλλων";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Βοήθεια";
 
-/* 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…";
diff --git a/ui/el.lproj/MigrateRingAccountsWindow.strings b/ui/el.lproj/MigrateRingAccountsWindow.strings
index 9178037ad3ed65ef4826aec351111e32011d00b8..78ef3316c9ff27569bfdfc823ca52f27d024c319 100644
--- a/ui/el.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/el.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Η ενοποίηση του λογαριασμού ολοκληρώθηκε";
 
-/* 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" = "Σφάλμα ενοποίησης λογαριασμού";
diff --git a/ui/el.lproj/PreferencesWindow.strings b/ui/el.lproj/PreferencesWindow.strings
index 8419eaf9314572d8834d8c672b25b7ddffd76e93..19cee66f81bb4c1171c0968e410c30991b0d763a 100644
--- a/ui/el.lproj/PreferencesWindow.strings
+++ b/ui/el.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Γενικά";
diff --git a/ui/el.lproj/RegisterNameWindow.strings b/ui/el.lproj/RegisterNameWindow.strings
index 46fd82e4c77668156ee57ef1797266d5afb7aa78..380a42a08c28e40449283d98bf489fae1cdfbb2e 100644
--- a/ui/el.lproj/RegisterNameWindow.strings
+++ b/ui/el.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Υποχρεωτικό*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Άλλοι χρήστες μπορούν να το χρησιμοποιούν αντί του 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" = "Ένα σφάλμα συνέβη κατά τη διάρκεια της εγγραφής του ονόματος χρήστη ";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Εισάγετε το συνθηματικό του λογαριασμού σας Ring";
+/* 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" = "Παράθυρο";
diff --git a/ui/el.lproj/RingWindow.strings b/ui/el.lproj/RingWindow.strings
index 16b73d0067a8e401b51da586c2a2d6c0da9f0d4d..dda7822421b4f572cae9cf0fb1fdd330e9e17299 100644
--- a/ui/el.lproj/RingWindow.strings
+++ b/ui/el.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "λεπτομέρειες";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Μέθοδος επαφής";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Ιστορικό";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Επαφές";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Το Ring είναι ελεύθερο λογισμικό για παγκόσμια επικοινωνία που σέβεται τις ελευθερίες και την ιδιωτικότητα των χρηστών του.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/el.lproj/RingWizardChoose.strings b/ui/el.lproj/RingWizardChoose.strings
index 19a5cbd389994b845a0590ebc56c42220a57343d..d970400695c6964cd7d16f7886dcdad9d64ff031 100644
--- a/ui/el.lproj/RingWizardChoose.strings
+++ b/ui/el.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Σύνδεση αυτής της συσκευής με ένα λογαριασμό";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Δημιουργία λογαριασμού Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/el.lproj/RingWizardLinkAccount.strings b/ui/el.lproj/RingWizardLinkAccount.strings
index 1712dbfe7c711af418dc75517c28a86011e9162f..b47e82589bf738ab1b82f70ceaff3b8b4a20a6aa 100644
--- a/ui/el.lproj/RingWizardLinkAccount.strings
+++ b/ui/el.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Ακύρωση";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Σύνδεσμος";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Ακύρωση";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Εισάγετε το συνθηματικό του λογαριασμού σας Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/el.lproj/RingWizardNewAccount.strings b/ui/el.lproj/RingWizardNewAccount.strings
index 175043c03f72b9bf38105e144c8f372e22ec88d9..2184c048ce59a47e9acbf49ffdce67a2a0f4597e 100644
--- a/ui/el.lproj/RingWizardNewAccount.strings
+++ b/ui/el.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Υποχρεωτικό*";
diff --git a/ui/en_GB.lproj/Localizable.strings b/ui/en_GB.lproj/Localizable.strings
index 3b20c44e6a70c631c45984198728347018e92c03..47ddd4865c2b9370fcc6fec46fe337ef21d57f10 100644
--- a/ui/en_GB.lproj/Localizable.strings
+++ b/ui/en_GB.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/en_GB.lproj/PreferencesWindow.strings b/ui/en_GB.lproj/PreferencesWindow.strings
index 70cfcddef7732dd7769c8f9f925472daf83f6050..1e0bb88afe00477423c850d12652304a40397640 100644
--- a/ui/en_GB.lproj/PreferencesWindow.strings
+++ b/ui/en_GB.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/en_GB.lproj/RingWindow.strings b/ui/en_GB.lproj/RingWindow.strings
index 7ac52b23aa44effb0bf32a854298489865e5a7a4..adced88a14216c87bbaa1dedc411ace42ce4a09b 100644
--- a/ui/en_GB.lproj/RingWindow.strings
+++ b/ui/en_GB.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/en_US.lproj/PreferencesWindow.strings b/ui/en_US.lproj/PreferencesWindow.strings
index 70cfcddef7732dd7769c8f9f925472daf83f6050..1e0bb88afe00477423c850d12652304a40397640 100644
--- a/ui/en_US.lproj/PreferencesWindow.strings
+++ b/ui/en_US.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/eo.lproj/ExportPasswordWindow.strings b/ui/eo.lproj/ExportPasswordWindow.strings
index 97e0908ea8e0c7bd0e117d792470e6e0c76719dd..3c2967bcc35f88801aae6a70f970bf5e981a88c7 100644
--- a/ui/eo.lproj/ExportPasswordWindow.strings
+++ b/ui/eo.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Pasvorto...";
 
-/* 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" = "Fenestro";
diff --git a/ui/eo.lproj/GeneralPrefs.strings b/ui/eo.lproj/GeneralPrefs.strings
index d2566f1effc703794308c7c4629e1952ecc52eec..5b4103eb0974a6e629302f108912299616490ff7 100644
--- a/ui/eo.lproj/GeneralPrefs.strings
+++ b/ui/eo.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Ĝisdatigi";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "Superigu Ring pro envanaj vokoj";
+/* 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 ";
diff --git a/ui/eo.lproj/Localizable.strings b/ui/eo.lproj/Localizable.strings
index 5d8e8668d69085c38ae0233036aff463cb11af52..890b68679f215038e9c12be3d6418fddf6e914da 100644
--- a/ui/eo.lproj/Localizable.strings
+++ b/ui/eo.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopii numeron";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Envenanta voko de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Mesaĝo de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Rifuzi";
+"Accept" = "Akcepti";
 
 /* Contextual menu entry */
 "Remove value" = "Forigi valoron";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Kunhavi";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "La enigita uzantnomo estas nehavebla";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "La sekvanta konto bezonas migrigon en la novan formaton de Ring kontoj:";
+"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." = "Por progresigi la migrigon, vi elektu pasvorton por via konto. Tiu ĉi pasvorto uzatos por ĉifrado de via ĉefa ŝlosilo. Ĝi bezonatos aldonante novajn aparatojn al via Ring konto. Se vi ne pretas elekti pasvorton, vi povas fermi Ring kaj daŭrigi la mirgigon poste.";
+"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" = "Nekonata";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bonvenu al 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!";
diff --git a/ui/eo.lproj/MainMenu.strings b/ui/eo.lproj/MainMenu.strings
index a20e2108200ab0de53b89902ef5352acde93ec10..237eb36a1b41de38367121fadb21178121d92741 100644
--- a/ui/eo.lproj/MainMenu.strings
+++ b/ui/eo.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "ĈefaMenuo";
 
-/* 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" = "Pri Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Agordoj…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servoj";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Kaŝi Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ĉesigi Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Kaŝi Aliulojn";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Helpo";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Helpo";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Trovi kaj Anstataŭigi…";
diff --git a/ui/eo.lproj/MigrateRingAccountsWindow.strings b/ui/eo.lproj/MigrateRingAccountsWindow.strings
index 1d2cc93ca5bf9189e343c5c6e31ef258b1ac3630..8e3e36a9932552020a3e3725e1307d6ca83b64d3 100644
--- a/ui/eo.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/eo.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" = "Identigaĵo";
 
 /* 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";
diff --git a/ui/eo.lproj/PreferencesWindow.strings b/ui/eo.lproj/PreferencesWindow.strings
index d9ed4539fff4fd3b2c4d7851894d0836b0edf315..8e65bf6be1a5b7f524fcb99feb8b4afa3cd59304 100644
--- a/ui/eo.lproj/PreferencesWindow.strings
+++ b/ui/eo.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Agordoj";
+/* 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" = "Ĝeneralaj";
diff --git a/ui/eo.lproj/RegisterNameWindow.strings b/ui/eo.lproj/RegisterNameWindow.strings
index c5d52d99fda28e684858e1aed6aae5ff4b57e390..dff86645e59fff5b5c5c6f507846cc2e4045ab34 100644
--- a/ui/eo.lproj/RegisterNameWindow.strings
+++ b/ui/eo.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" = "Fenestro";
diff --git a/ui/eo.lproj/RingWindow.strings b/ui/eo.lproj/RingWindow.strings
index 08691480e01f2122744f5e9cafed66e366e86852..efd69637da54a5e727506fd68601b33939f8a4bc 100644
--- a/ui/eo.lproj/RingWindow.strings
+++ b/ui/eo.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detaloj";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontakta Metodo";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historio";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Tio ĉi estas via RingID. Kopiu kaj kunhavu ĝin kun viaj amikoj!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontaktoj";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorio";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorio";
diff --git a/ui/eo.lproj/RingWizardChoose.strings b/ui/eo.lproj/RingWizardChoose.strings
index d46aa1ce02b07ffaff4cd2ed784ec4c208959aeb..aca5cd97c44b1dd8aab92ea4844e4fb657537a85 100644
--- a/ui/eo.lproj/RingWizardChoose.strings
+++ b/ui/eo.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Krei Ring konton";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/eo.lproj/RingWizardLinkAccount.strings b/ui/eo.lproj/RingWizardLinkAccount.strings
index 807cea0b539c4cbd471d4814d7b813709af014c3..1b6f29d0755b7181cde9c942d91172aa6d40be23 100644
--- a/ui/eo.lproj/RingWizardLinkAccount.strings
+++ b/ui/eo.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Rezigni";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Rezigni";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/eo.lproj/RingWizardNewAccount.strings b/ui/eo.lproj/RingWizardNewAccount.strings
index 71f843531168b811b8343d8c77e56062c1d6cc14..c062976fcd3c1ca54189bf886b43748838cb67f6 100644
--- a/ui/eo.lproj/RingWizardNewAccount.strings
+++ b/ui/eo.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/es.lproj/ExportPasswordWindow.strings b/ui/es.lproj/ExportPasswordWindow.strings
index 74db9250b67c5d16900e67ba5b4be56e3d096fba..4b093eb020051f32fdc6b2b93c2390321fded1bd 100644
--- a/ui/es.lproj/ExportPasswordWindow.strings
+++ b/ui/es.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Por favor ingresa la contraseña de tu cuenta de Ring para comenzar";
+/* 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" = "Ventana";
diff --git a/ui/es.lproj/GeneralPrefs.strings b/ui/es.lproj/GeneralPrefs.strings
index 8593018fd77485ab2d57f79222e43ae04194e103..2a66c5dcb7501cb93202ee356f9c11ee6075c103 100644
--- a/ui/es.lproj/GeneralPrefs.strings
+++ b/ui/es.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Actualizar";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Habilitar notificaciones de escritorio";
+/* 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" = "Mostrar Ring en llamadas entrantes";
+/* 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" = "Esto se comparte con tus contactos";
diff --git a/ui/es.lproj/Localizable.strings b/ui/es.lproj/Localizable.strings
index 0d1be6bfc20b05adf50c1a518a20d4f46d5ce904..1e7fb41b1253c26441c2358aa654a64ca59d68d3 100644
--- a/ui/es.lproj/Localizable.strings
+++ b/ui/es.lproj/Localizable.strings
@@ -17,7 +17,7 @@
 "Clear conversation" = "Clear conversation";
 
 /* Contextual menu action */
-"Block contact" = "Block contact";
+"Block contact" = "Bloquear contacto";
 
 /* Text shown to the user */
 "Alias : " = "Alias:";
@@ -68,7 +68,7 @@
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Crear una cuenta Ring";
+"Create Jami Account" = "Crear Cuenta Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Crear cuenta SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Llamada entrante de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Mensaje de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "No aceptar";
+"Accept" = "Aceptar";
 
 /* Contextual menu entry */
 "Remove value" = "Remover dato";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revisar entrada";
 
 /* Text shown to the user */
-"RingID : " = "RingID:";
+"ID : " = "ID:";
 
 /* No comment provided by engineer. */
 "Share" = "Compartir";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "El nombre de usuario tecleado no está disponible";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "La siguiente cuenta debe migrar al nuevo formato de cuenta Ring:";
+"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" = "La contraseña ingresada no puede desbloquear esta cuenta";
 
 /* 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." = "Para completar el proceso, necesitas abrir Ring en el nuevo dispositivo y escoger la opción \"Conectar un dispositivo a esta cuenta\". El PIN es válido por 10 minutos.";
+"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." = "Para comenzar la migración debes escoger una contraseña para tu cuenta. Esta contraseña cifrará tu clave principal y será necesaria para añadir dispositivos a tu cuenta Ring. Si no estás listo para escoger una contraseña puedes cerrar el programa y retomarlo más adelante.";
+"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" = "Desconocido";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenido a Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Crear una cuenta";
 "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!";
diff --git a/ui/es.lproj/MainMenu.strings b/ui/es.lproj/MainMenu.strings
index d3b62e3a6f035947d89662cd7c0f0711c8d95fd9..430589ae00c941336d63eeafbf9ac638d24845b5 100644
--- a/ui/es.lproj/MainMenu.strings
+++ b/ui/es.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "UnMenúPrincipal";
 
-/* 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" = "Acerca de Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferencias...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servicios";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Esconder Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Salir de Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Ocultar";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Ayuda";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ayuda de Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Buscar y Reemplazar...";
diff --git a/ui/es.lproj/MigrateRingAccountsWindow.strings b/ui/es.lproj/MigrateRingAccountsWindow.strings
index 9c776d0bab47344c5502191c6fc8a40dcfe7fa36..641d77a53ce078705e88da5f78c433c892a14751 100644
--- a/ui/es.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/es.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "La migración de la cuenta ha sido completada";
 
-/* 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" = "La siguiente cuenta debe migrarse al nuevo formato de cuentas de Ring:\nAlias:\nID:\nPara proseguir con la migración, debes escoger una contraseña para la cuenta. Esta contraseña se usará para cifrar tu llave maestra. Será requerida para agregar nuevos dispositivos a la cuenta de Ring. Si no estás listo para agregar una contraseña, puedes cerrar Ring y continuar la migración más tarde.";
+"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" = "Error al migrar la cuenta";
diff --git a/ui/es.lproj/PreferencesWindow.strings b/ui/es.lproj/PreferencesWindow.strings
index c79c6cd3fe7ebfb512878ca12603adae1b76488d..120638edd18536b4cd44a291b1d420958503f413 100644
--- a/ui/es.lproj/PreferencesWindow.strings
+++ b/ui/es.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Preferencias de Ring";
+/* 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";
diff --git a/ui/es.lproj/RegisterNameWindow.strings b/ui/es.lproj/RegisterNameWindow.strings
index 5cccb69c3ce3d3525917a16337d0f8d8f65d91b2..3f8c938f2707ac287b46f8a5389a9c20b58b21e8 100644
--- a/ui/es.lproj/RegisterNameWindow.strings
+++ b/ui/es.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Requerido*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Otros usuarios pueden utilizarlo en lugar de tu 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" = "Se ha producido un error al registrar el nombre de usuario";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Ingresa la contraseña de tu cuenta de Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Ingresa tu contraseña";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Ventana";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Registrar";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username";
+"tje-EZ-ZPI.title" = "Registrar nombre de usuario público";
diff --git a/ui/es.lproj/RingWindow.strings b/ui/es.lproj/RingWindow.strings
index b8f4c809cf3425d0f961f87caa1e7b0014b1fd37..3b000625d824d0c85daeb9616948a7a824cc7ff6 100644
--- a/ui/es.lproj/RingWindow.strings
+++ b/ui/es.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalles";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Método de contacto";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historial";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Este es tu RingID. ¡Cópialo y compártelo con tus amigos!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactos";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categoría";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring es software libre de comunicaciones que respeta las libertades y privacidad de sus usuarios.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoría";
diff --git a/ui/es.lproj/RingWizardChoose.strings b/ui/es.lproj/RingWizardChoose.strings
index 5f33ebc8bf12e8e4e749d8850b0e44ea2a2a5970..d25aba5e7d13a61440d58773d1d0b1e9fe9face3 100644
--- a/ui/es.lproj/RingWizardChoose.strings
+++ b/ui/es.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Conectar este dispositivo a una cuenta";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Crear una cuenta en Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Crear una cuenta en Jami";
diff --git a/ui/es.lproj/RingWizardLinkAccount.strings b/ui/es.lproj/RingWizardLinkAccount.strings
index 1089f4d30f986400b0e31f4f698e99af6880540f..8b694255ad43d392045603ebce31dabe84741a8d 100644
--- a/ui/es.lproj/RingWizardLinkAccount.strings
+++ b/ui/es.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Vaya a los ajustes de administración de cuenta del dispositivo,  escoja la cuenta que desea utilizar y seleccione \"Conectar otro dispostivio a esta cuenta\" ↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Conexión";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Ingresa la contraseña de tu cuenta de Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ingresa la contraseña";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Estoy preparado";
diff --git a/ui/es.lproj/RingWizardNewAccount.strings b/ui/es.lproj/RingWizardNewAccount.strings
index 85978aedc7a83981f1e47adc538ef38fa4d22229..f85fa5fcce1ae4bbc610d764b71278f21b8d949c 100644
--- a/ui/es.lproj/RingWizardNewAccount.strings
+++ b/ui/es.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Al marcar aquí, estarás registrando un nombre de usuario único en la red de Ring. Otras personas podrán utilizarlo para llamarte sin tener que utilizar tu identificador en Ring, RingID, de 40 caracteres.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Requerido*";
diff --git a/ui/es_AR.lproj/ExportPasswordWindow.strings b/ui/es_AR.lproj/ExportPasswordWindow.strings
index 1ebdc1bfab95cad488169484966d9b1ebf1c7f07..dc560f0df92818a27b0b2d7961957edebcc6f98d 100644
--- a/ui/es_AR.lproj/ExportPasswordWindow.strings
+++ b/ui/es_AR.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Contraseña...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Por favor ingresá tu cuenta Ring para iniciar";
+/* 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" = "Ventana";
diff --git a/ui/es_AR.lproj/GeneralPrefs.strings b/ui/es_AR.lproj/GeneralPrefs.strings
index 756d9f1d52d1ea691e7f81a3328606baaea35c39..cc4d0456fed7f3efb27a32c1f811d7cb61d644ef 100644
--- a/ui/es_AR.lproj/GeneralPrefs.strings
+++ b/ui/es_AR.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Habilitar Notificaciones de Escritorio";
+/* 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" = "Esto es compartido con tus contactos";
diff --git a/ui/es_AR.lproj/Localizable.strings b/ui/es_AR.lproj/Localizable.strings
index 9bce0cd00a8ee466730ba21ec4c010f8ca1743c4..d13c4d1a819ca0497dec15c641b73b1dec8de17c 100644
--- a/ui/es_AR.lproj/Localizable.strings
+++ b/ui/es_AR.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Rechazar";
+"Accept" = "Aceptar";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Compartir";
@@ -149,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" = "La contraseña ingresada no es válida";
 
 /* 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" = "Desconocido";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenido a 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!";
diff --git a/ui/es_AR.lproj/MainMenu.strings b/ui/es_AR.lproj/MainMenu.strings
index fffeb6f7930e4ae56db987975b88f53c93bda291..6aaf12022cdd5a0112462f613c5568c0372a2f49 100644
--- a/ui/es_AR.lproj/MainMenu.strings
+++ b/ui/es_AR.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" = "Acerca de Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferencias...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servicios";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ocultar Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Cerrar 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…";
diff --git a/ui/es_AR.lproj/MigrateRingAccountsWindow.strings b/ui/es_AR.lproj/MigrateRingAccountsWindow.strings
index f9ff360272d06d356fb252822bfa7a9546bb03a5..b433cb6cd50377dcd706af9b155d33c591f21be2 100644
--- a/ui/es_AR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/es_AR.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migración de cuenta completada";
 
-/* 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" = "Esta cuenta debe ser migrada al nuevo formato de cuentas Ring:\\n Alias : \\nID:\\n Para proceder con la migración, debes elegir una contraseña para tu cuenta. Esta contraseña sera usada para encriptar tu llave maestra. Se te será solicitada para añadir nuevos dispositivos a tu cuenta Ring. Si no estás listo para elegir una contraseña, puedes cerrar Ring y continuar con la migración más tarde.";
+"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" = "Error al migrar la cuenta";
diff --git a/ui/es_AR.lproj/PreferencesWindow.strings b/ui/es_AR.lproj/PreferencesWindow.strings
index 56ee011384b105159b7c79508ea80cfba2b4fddb..1351b9f8e298ea88ce4c5a56bded6b8bcc5133b1 100644
--- a/ui/es_AR.lproj/PreferencesWindow.strings
+++ b/ui/es_AR.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Preferencias de Ring";
+/* 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";
diff --git a/ui/es_AR.lproj/RegisterNameWindow.strings b/ui/es_AR.lproj/RegisterNameWindow.strings
index 2e132aa4d0af7a6394902d83d95c5cad5e0619ef..428c245f3dd952519580981ef065be1287badb62 100644
--- a/ui/es_AR.lproj/RegisterNameWindow.strings
+++ b/ui/es_AR.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatorio*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Otros pueden usarlo en lugar de tu 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" = "Ocurrió un error al registrar tu usuario";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Ingresá la contraseña de tu cuenta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Ingresá tu contraseña";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Ventana";
diff --git a/ui/es_AR.lproj/RingWindow.strings b/ui/es_AR.lproj/RingWindow.strings
index 0cd82ddaf18e0e63d98a7ec7b62bbb98965f123d..a3ffa01e4eab3a93d18aeaaba171733d073a1baf 100644
--- a/ui/es_AR.lproj/RingWindow.strings
+++ b/ui/es_AR.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalles";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historial";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Wste es tu RingID. ¡Copialo y compartilo con tus amigos!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactos";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categoría";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring es software libre para comunicación universal que respeta las libertades y privacidad de sus usuarios.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoría";
diff --git a/ui/es_AR.lproj/RingWizardChoose.strings b/ui/es_AR.lproj/RingWizardChoose.strings
index 3aed12912f5592cd5c6d542f7525093fa306c872..b0d1365c63ea83d801e4b025c0635188039995ae 100644
--- a/ui/es_AR.lproj/RingWizardChoose.strings
+++ b/ui/es_AR.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Vincular este dispositivo a una cuenta";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Crear cuenta Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/es_AR.lproj/RingWizardLinkAccount.strings b/ui/es_AR.lproj/RingWizardLinkAccount.strings
index c08ecee8b26f1dbf2e285e4eab7c9288068648aa..212e57039b0158d9397611a99dbdb8b014483506 100644
--- a/ui/es_AR.lproj/RingWizardLinkAccount.strings
+++ b/ui/es_AR.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Entrá en la configuración de gestión de cuentas del dispositivo, elegí la cuenta Ring que vas a usar y seleccioná \"Vincular otro dispositivo a esta cuenta\". ↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Vincular";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Ingresá la contraseña de tu cuenta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ingresar contraseña";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Estoy listo";
diff --git a/ui/es_AR.lproj/RingWizardNewAccount.strings b/ui/es_AR.lproj/RingWizardNewAccount.strings
index 6b3a2014f1512ac901323e5cae767f72d5c8adff..01671268d803c560af175cc4dfe77a95580c636e 100644
--- a/ui/es_AR.lproj/RingWizardNewAccount.strings
+++ b/ui/es_AR.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Si marcás esto, vas a registrar un usuario único en la red Ring. Las personas pueden usarlo en lugar de tu RingID de 40 caracteres.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatorio*";
diff --git a/ui/et_EE.lproj/Localizable.strings b/ui/et_EE.lproj/Localizable.strings
index 38a034d658c5a86766fe20ccc6b80e196e7e2eb3..efae317abc3c1730022da3a7363b6f8702708c6e 100644
--- a/ui/et_EE.lproj/Localizable.strings
+++ b/ui/et_EE.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/et_EE.lproj/PreferencesWindow.strings b/ui/et_EE.lproj/PreferencesWindow.strings
index 70cfcddef7732dd7769c8f9f925472daf83f6050..1e0bb88afe00477423c850d12652304a40397640 100644
--- a/ui/et_EE.lproj/PreferencesWindow.strings
+++ b/ui/et_EE.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/et_EE.lproj/RingWindow.strings b/ui/et_EE.lproj/RingWindow.strings
index ee2c1878de7867cca100ed8f8eecab6c5e03f2d6..41893cecfb03e4135c2f5b6549cb2e3d66b0d0e6 100644
--- a/ui/et_EE.lproj/RingWindow.strings
+++ b/ui/et_EE.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/eu.lproj/ExportPasswordWindow.strings b/ui/eu.lproj/ExportPasswordWindow.strings
index 30780dfebbf4350025f0f5443ffb57a93a020a98..78e6aa5c1ff182243905eb0160720e04df2f13f9 100644
--- a/ui/eu.lproj/ExportPasswordWindow.strings
+++ b/ui/eu.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Pasahitza...";
 
-/* 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";
diff --git a/ui/eu.lproj/GeneralPrefs.strings b/ui/eu.lproj/GeneralPrefs.strings
index fdaeca891f8c48d601884bb55652eedd54848244..3ad277bd2babe03951ceef26b70849481b37c0aa 100644
--- a/ui/eu.lproj/GeneralPrefs.strings
+++ b/ui/eu.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/eu.lproj/Localizable.strings b/ui/eu.lproj/Localizable.strings
index 2634d532829faa5ab43e83e7833a8498080ca6e2..4b059d7b82a1fdd35b79ffb50c2b753f7c30f46c 100644
--- a/ui/eu.lproj/Localizable.strings
+++ b/ui/eu.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Ongi etorri Ring-era";
+"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!";
diff --git a/ui/eu.lproj/MainMenu.strings b/ui/eu.lproj/MainMenu.strings
index 7fbf3b7c8c4853d0568845105a084012d06b9003..12130e0556d41d28ffb9d4e914a82b78969c169b 100644
--- a/ui/eu.lproj/MainMenu.strings
+++ b/ui/eu.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…";
diff --git a/ui/eu.lproj/MigrateRingAccountsWindow.strings b/ui/eu.lproj/MigrateRingAccountsWindow.strings
index 77620d7664149391d55d185e84e5df06e4e328a6..0db8d320b8cf486a56afb667445c2e3a3ef8cc70 100644
--- a/ui/eu.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/eu.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Kontuaren migrazioa osatu da";
 
-/* 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";
diff --git a/ui/eu.lproj/PreferencesWindow.strings b/ui/eu.lproj/PreferencesWindow.strings
index e6c753232e1a1edd374f5f2c3a73770cbfb655e6..06821aaf2bbcd16b018fa53a3ca9272d11b24866 100644
--- a/ui/eu.lproj/PreferencesWindow.strings
+++ b/ui/eu.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Orokorra";
diff --git a/ui/eu.lproj/RegisterNameWindow.strings b/ui/eu.lproj/RegisterNameWindow.strings
index 65eca149099708b4144aedf4c28f66ea4f2b7b8a..988507240cf25a2c653180247c70fc92a4ac614e 100644
--- a/ui/eu.lproj/RegisterNameWindow.strings
+++ b/ui/eu.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";
diff --git a/ui/eu.lproj/RingWindow.strings b/ui/eu.lproj/RingWindow.strings
index aac1dabeed4aaa7c57f3be81d01e2b73ab6204c0..2a0ceeb480148d68cc85a7431da9c6bc0b646863 100644
--- a/ui/eu.lproj/RingWindow.strings
+++ b/ui/eu.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontaktuak";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/eu.lproj/RingWizardChoose.strings b/ui/eu.lproj/RingWizardChoose.strings
index 929fc6a8a531cd6e2bbf53015e812fd668b2631e..565f33a63bce9016d1abffc70900c29de3e6f7c4 100644
--- a/ui/eu.lproj/RingWizardChoose.strings
+++ b/ui/eu.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Estekatu gailua kontu batekin";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/eu.lproj/RingWizardLinkAccount.strings b/ui/eu.lproj/RingWizardLinkAccount.strings
index b9accde6e6a83a8bf7add905ee4b2f2069519afd..205041c318275f08fcf45969db39bcbb1a8ece6d 100644
--- a/ui/eu.lproj/RingWizardLinkAccount.strings
+++ b/ui/eu.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Ezeztatu";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Ezeztatu";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/eu.lproj/RingWizardNewAccount.strings b/ui/eu.lproj/RingWizardNewAccount.strings
index 94c7a54f8ae3bea03da2eda21f57143928099848..8bcee83001e7b6e9f56b6c86a28250a5b168d3d7 100644
--- a/ui/eu.lproj/RingWizardNewAccount.strings
+++ b/ui/eu.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/fa_IR.lproj/ExportPasswordWindow.strings b/ui/fa_IR.lproj/ExportPasswordWindow.strings
index 8abcec9a57ebaee12f160d9952a9c32f683208ce..0c7183e595460e75068286b5cf26d243871a9671 100644
--- a/ui/fa_IR.lproj/ExportPasswordWindow.strings
+++ b/ui/fa_IR.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "گذرواژه...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "برای شروع، لطفا گذرواژه حساب رینگ خود را وارد کنید";
+/* 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" = "پنجره";
diff --git a/ui/fa_IR.lproj/GeneralPrefs.strings b/ui/fa_IR.lproj/GeneralPrefs.strings
index c98fe99e07b1d25696af9a83e3ab0023a5c1d649..5a39681c976d0cf0bee2b24eebd40ffcab93908a 100644
--- a/ui/fa_IR.lproj/GeneralPrefs.strings
+++ b/ui/fa_IR.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "بروزرسانی";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "اعلان دستکتاپ را فعال کن";
+/* 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" = "هنگام تماس ورودی رینگ را به روی صفحه بیار";
+/* 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" = "این با مخاطبان‌تان به اشتراک گذاشته شده است.";
diff --git a/ui/fa_IR.lproj/Localizable.strings b/ui/fa_IR.lproj/Localizable.strings
index 702c8fd516443000fcf0a8c33696bfe845c6a757..0f80fd813998b1853cec6bec84f43afe4aa8d8cc 100644
--- a/ui/fa_IR.lproj/Localizable.strings
+++ b/ui/fa_IR.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "رونوشت از شماره";
 
 /* Contextual menu entry */
-"Create RING Account" = "ساخت حساب رینگ";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "ساخت حساب کاربری سیپ";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "تماس دریافتی از %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "پیام از طرف %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "رد";
+"Accept" = "پذیرش";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "آی‌دی رینگ :";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "هم‌رسانی";
@@ -149,16 +153,16 @@
 "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 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" = "گذرواژه‌ای که وارد کردید قفل این حساب کاربری را باز نمی‌کند";
 
 /* 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" = "ناشناخته";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "به رینگ خوش آمدید";
+"Welcome to Ring" = "Welcome to Jami";
 "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!";
diff --git a/ui/fa_IR.lproj/MainMenu.strings b/ui/fa_IR.lproj/MainMenu.strings
index 4ea4336d3a50ef85e906e2b96a55c10e167682b9..6342b441058c4b7ddd912ccf3af84f3ec000e9be 100644
--- a/ui/fa_IR.lproj/MainMenu.strings
+++ b/ui/fa_IR.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "رینگ";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "رینگ";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "درباره‌ی رینگ";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "تنظیمات...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "خدمات";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "رینگ را مخفی کن";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "خروج از رینگ";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "بقیه را مخفی کن";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "راهنما";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "راهنمای رینگ";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "یافتن و جایگزینی...";
diff --git a/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings b/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
index 5e04f91287c112f5f0aee9074b823de7c03ed102..1fabf2b7a9e1be108c49415bf20eabfe230e0068 100644
--- a/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fa_IR.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "انتقال حساب کاربری کامل شد";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "آی‌دی رینگ";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "شناسه";
 
 /* 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" = "خطای انتقال حساب کاربری";
diff --git a/ui/fa_IR.lproj/PreferencesWindow.strings b/ui/fa_IR.lproj/PreferencesWindow.strings
index 87ce25f8d1d3fe78d86c96fc698052daf2aab96a..2dfae89102c2f920b8e79178b3577a1bb3849e6d 100644
--- a/ui/fa_IR.lproj/PreferencesWindow.strings
+++ b/ui/fa_IR.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "تنظیمات رینگ";
+/* 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" = "همگانی";
diff --git a/ui/fa_IR.lproj/RegisterNameWindow.strings b/ui/fa_IR.lproj/RegisterNameWindow.strings
index bea23717bfff354bf9e92a058b65de0b7fb1dcd8..91ffc4ecf4afc5564d0677b64e0cf6b2ff50e742 100644
--- a/ui/fa_IR.lproj/RegisterNameWindow.strings
+++ b/ui/fa_IR.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "الزامی*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "کاربران دیگر می‌توانند از این به‌جای آی‌دی رینگ شما استفاده کنند";
+/* 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" = "در زمان ثبت نام کاربری شما خطایی رخ داد است";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "گذرواژه حساب رینگ خود را وارد کنید";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "گذرواژه‌تان را وارد کنید";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "پنجره";
diff --git a/ui/fa_IR.lproj/RingWindow.strings b/ui/fa_IR.lproj/RingWindow.strings
index ddf277cf8598468ada068bd688c723a13c6c51d4..bf4f0885bfe7320b2c8234ce8dceb69ddacd92f6 100644
--- a/ui/fa_IR.lproj/RingWindow.strings
+++ b/ui/fa_IR.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "جزییات";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "رینگ";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "روش ارتباط";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "تاریخچه";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "این آی‌دی رینگ شماست. کپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "مخاطبین";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "دسته‌بندی";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "رینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "دسته‌بندی";
diff --git a/ui/fa_IR.lproj/RingWizardChoose.strings b/ui/fa_IR.lproj/RingWizardChoose.strings
index 718503c9092478d6c645f36c2d2ca87c3653b8b8..2458be34546d55b99f09353b9a697d737e9a6e4e 100644
--- a/ui/fa_IR.lproj/RingWizardChoose.strings
+++ b/ui/fa_IR.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "پیوند این افزاره به یک حساب";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "ساخت یک حساب رینگ";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/fa_IR.lproj/RingWizardLinkAccount.strings b/ui/fa_IR.lproj/RingWizardLinkAccount.strings
index 7f10e54fcbc151410ed3b147dc5c7b8b8078f27f..06f3725869910a2ed7f79d61be4ed00a6e269ce0 100644
--- a/ui/fa_IR.lproj/RingWizardLinkAccount.strings
+++ b/ui/fa_IR.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "لغو";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "به تنظیمات مدیریت حساب روی دستگاه بروید، حساب رینگ را برای استفاده انتخاب کنید و «پیوند دستگاهی‌ دیگر به این حساب» را برگزینید.↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "پیوند";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "لغو";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "گذرواژه حساب رینگ خود را وارد کنید";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "گذرواژه را وارد کنید";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "من آماده‌ام";
diff --git a/ui/fa_IR.lproj/RingWizardNewAccount.strings b/ui/fa_IR.lproj/RingWizardNewAccount.strings
index caefea3417970869fc8b0cc45b0c4038cea6f091..761839b1c9ea1d7c5131731ff79a5c74884b7a76 100644
--- a/ui/fa_IR.lproj/RingWizardNewAccount.strings
+++ b/ui/fa_IR.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "با انتخاب این گزینه، شما یک نام کاربری یکتا روی شبکه رینگ خواهید ساخت. افراد می‌توانند از این نام‌کاربری به‌جای آی‌دی رینگ شما که 40 کاراکتر طول دارد استفاده کنند.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "الزامی*";
diff --git a/ui/fi.lproj/ExportPasswordWindow.strings b/ui/fi.lproj/ExportPasswordWindow.strings
index 0edd2db0a2eae7c0b1ad44f7dbb6d5349088ae6e..2466bd012fac1e82849fb0a7ba9e5751811d477a 100644
--- a/ui/fi.lproj/ExportPasswordWindow.strings
+++ b/ui/fi.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Salasana...";
 
-/* 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" = "Ikkuna";
diff --git a/ui/fi.lproj/GeneralPrefs.strings b/ui/fi.lproj/GeneralPrefs.strings
index 7d1683be90c29e0eda28992814bf3477341335f0..17a3dd820fd863335d0abab1c3af2ff5dd74c30e 100644
--- a/ui/fi.lproj/GeneralPrefs.strings
+++ b/ui/fi.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Päivitä";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "Tuo Ring eteen puhelun saapuessa";
+/* 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 ";
diff --git a/ui/fi.lproj/Localizable.strings b/ui/fi.lproj/Localizable.strings
index 892885f4337622ff932a77956d97d0af27b59eb5..959c02ee9da75f3d9943cd1effd1e5c5f0fdbfee 100644
--- a/ui/fi.lproj/Localizable.strings
+++ b/ui/fi.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopioi numero";
 
 /* Contextual menu entry */
-"Create RING Account" = "Luo RING tunnus";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Luo SIP Tunnus";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Saapuva puhelu %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Viesti %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Kieltäydy";
+"Accept" = "Hyväksy";
 
 /* Contextual menu entry */
 "Remove value" = "Poista arvo";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "Ring tunnus:";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Jako";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Käyttäjänimi ei ole käytettävissä";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Tämä tunnus tulee siirtää uuteen Ring-tunnuksen muotoon:";
+"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" = "Antamasi salasana ei avaa tämän tunnuksen salaisuuksia";
 
 /* 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." = "Jatkaaksesi tunnuksensiirtoa sinun tulee valita salasana tunnuksellesi. Tätä salasanaa käytetään pääavaimesi kryptaamiseen. Sitä tarvitaan uusien laitteiden yhdistämiseen Ring-tunnuksesi kanssa. Jos et nyt halua valita salasanaa, voit sulkea ohjelman ja jatkaa siirtoa myöhemmin. ";
+"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" = "Tuntematon";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Tervetuloa Ringiin";
+"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!";
diff --git a/ui/fi.lproj/MainMenu.strings b/ui/fi.lproj/MainMenu.strings
index ee5db5a9551da01501ba55f17cefc15f14fac3ad..559435e7e5db9d46ab1908d51574cd29e0ef6b5a 100644
--- a/ui/fi.lproj/MainMenu.strings
+++ b/ui/fi.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Päävalikko";
 
-/* 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" = "Tietoa Ringistä";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Asetukset...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Palvelut";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Piilota Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Lopeta Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Piilota muut";
@@ -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" = "Etsi ja Korvaa";
diff --git a/ui/fi.lproj/MigrateRingAccountsWindow.strings b/ui/fi.lproj/MigrateRingAccountsWindow.strings
index ddbc37d271866244ea96c9041d98d0453501efc3..70f189eabbccfb9ae2577f9a66cefc2939d584e5 100644
--- a/ui/fi.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fi.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Tunnuksen siirto valmistunut";
 
-/* 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" = "Tunnuksen siirtovirhe";
diff --git a/ui/fi.lproj/PreferencesWindow.strings b/ui/fi.lproj/PreferencesWindow.strings
index a1ac387098aafcb824ae5df0b81829b2ef74c612..fecb0cdb5aba91d2ff9a78fff7440ad40981afa4 100644
--- a/ui/fi.lproj/PreferencesWindow.strings
+++ b/ui/fi.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Yleiset";
diff --git a/ui/fi.lproj/RegisterNameWindow.strings b/ui/fi.lproj/RegisterNameWindow.strings
index 9dfc9e69b5d3c584936fafc9cb575d17171ec2eb..d89320b4e0354fac42fc7caf1de146af803753c8 100644
--- a/ui/fi.lproj/RegisterNameWindow.strings
+++ b/ui/fi.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Pakollinen*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Muut voivat käyttää sitä RingID:n sijaan";
+/* 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" = "Käyttäjänimen rekisteröinnissä tapahtui virhe";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Syötä Ring- käyttäjätunnuksen salasana";
+/* 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" = "Ikkuna";
diff --git a/ui/fi.lproj/RingWindow.strings b/ui/fi.lproj/RingWindow.strings
index 4a0d02c1c938f968a937f7b615ced51ece67b62e..1a01fad9050e9a9162ccf9b05fd87027f4831d3c 100644
--- a/ui/fi.lproj/RingWindow.strings
+++ b/ui/fi.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "yksityiskohdat";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Yhteydenottomenetelmä";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historia";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Tämä on RingID:si. Kopioi ja jaa se ystävillesi!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Yhteystiedot";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategoria";
diff --git a/ui/fi.lproj/RingWizardChoose.strings b/ui/fi.lproj/RingWizardChoose.strings
index f16bb6de815bb3a2d8bced340d9342ecb63f6d6d..2262310ee536028f269e26a8d6312edbd24b703f 100644
--- a/ui/fi.lproj/RingWizardChoose.strings
+++ b/ui/fi.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Luo Ring tunnus";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/fi.lproj/RingWizardLinkAccount.strings b/ui/fi.lproj/RingWizardLinkAccount.strings
index fa0eeaac21ad346697a24ee534ea2feaf7e7685c..6759829eb1664f5b263b2141e0bae9a08b9a03df 100644
--- a/ui/fi.lproj/RingWizardLinkAccount.strings
+++ b/ui/fi.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Peru";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Peru";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Syötä Ring- käyttäjätunnuksen salasana. ";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/fi.lproj/RingWizardNewAccount.strings b/ui/fi.lproj/RingWizardNewAccount.strings
index 97198e179739ba3c9d45398157512c42633c1253..b234fd67624a3501734c417baff3ce0369209457 100644
--- a/ui/fi.lproj/RingWizardNewAccount.strings
+++ b/ui/fi.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Pakollinen*";
diff --git a/ui/fr.lproj/ExportPasswordWindow.strings b/ui/fr.lproj/ExportPasswordWindow.strings
index 1f1dc57657d67df0b604f74416620ef096fba1b0..51d0b8617db968edab17a20c497c2c311c6a4df4 100644
--- a/ui/fr.lproj/ExportPasswordWindow.strings
+++ b/ui/fr.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Mot de passe...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Indiquer votre mot de passe Ring pour démarrer";
+/* 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" = "Fenêtre";
diff --git a/ui/fr.lproj/GeneralPrefs.strings b/ui/fr.lproj/GeneralPrefs.strings
index cd43007d59ebbeb03af768654ea4e790b06807f3..167b3d4f1ed28377628a5658a203a6fb947a06fd 100644
--- a/ui/fr.lproj/GeneralPrefs.strings
+++ b/ui/fr.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Mise à jour";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Activer les notifications";
+/* 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" = "Mettre Ring au premier plan lors d'un appel entrant";
+/* 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" = "Ceci est partagé avec vos contacts";
diff --git a/ui/fr.lproj/Localizable.strings b/ui/fr.lproj/Localizable.strings
index 404b799cbf75c350ace575243e4efa9b021b59d3..c993cb82426ed3279fdc1f311602df7bda9961eb 100644
--- a/ui/fr.lproj/Localizable.strings
+++ b/ui/fr.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copier le numéro ou identifiant Ring";
 
 /* Contextual menu entry */
-"Create RING Account" = "Créer un compte RING";
+"Create Jami Account" = "Créer un compte Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Créer un compte SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Appel entrant de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuser";
+"Accept" = "Accepter";
 
 /* Contextual menu entry */
 "Remove value" = "Supprimer la valeur";
@@ -128,7 +132,7 @@
 "Revise Input" = "Modifier l'entrée";
 
 /* Text shown to the user */
-"RingID : " = "Identifiant Ring";
+"ID : " = "Identifiant :";
 
 /* No comment provided by engineer. */
 "Share" = "Partager";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Le nom choisi n'est pas disponible";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Le compte suivant doit être migré vers le nouveau format Ring";
+"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" = "Le mot de passe fourni ne déverouille pas ce compte";
 
 /* 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." = "Pour compléter le processus, ouvrer Ring sur le nouvel appareil, et choisir l'option \"Lier cet appareil à un compte\". Le NIP est valide pendant 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." = "Pour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Ring.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Ring et reprendre la migration plus tard.";
+"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" = "Inconnu";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenue sur Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Créer un nouveau compte";
 "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!";
diff --git a/ui/fr.lproj/MainMenu.strings b/ui/fr.lproj/MainMenu.strings
index eead3037ed303e54088f8129dbae58c1c35ba6b9..1b8ca3a0fa14f81bab3e53cd4c814c4a4b128fbd 100644
--- a/ui/fr.lproj/MainMenu.strings
+++ b/ui/fr.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Coller et faire correspondre les styles";
 
-/* 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" = "À propos de Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "À propos de Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Préférences ...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Cacher Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Quitter Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Cacher les autres";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Aide";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Aide Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Rechercher et remplacer…";
diff --git a/ui/fr.lproj/MigrateRingAccountsWindow.strings b/ui/fr.lproj/MigrateRingAccountsWindow.strings
index c61883d5c2462b7a1bfeb606520ba66f1eae8713..f359a8e673057ba1821b37f0cb1657646b1c6c95 100644
--- a/ui/fr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migration du compte terminée";
 
-/* 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" = "Le compte suivant doit être migré vers le nouveau format de compte Ring :\nIdentifiant :\nRingID :\nPour continuer, choisissez un mot de passe pour ce compte. Ce mot de passe sera utilisé pour encrypter votre compte. Il sera requis pour lier de nouveaux appareils à ce compte Ring.\nSi vous n'êtes pas prêt à choisir un mot de passe, vous pouvez fermer Ring et reprendre la migration plus tard.";
+"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" = "Erreur durant la migration du compte";
diff --git a/ui/fr.lproj/PreferencesWindow.strings b/ui/fr.lproj/PreferencesWindow.strings
index 9588085eb55ffb6871c3120cb0694d8ccccf0b94..8f147ddaea84b24488aef172066d9a798d6e5217 100644
--- a/ui/fr.lproj/PreferencesWindow.strings
+++ b/ui/fr.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Préférences Ring";
+/* 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" = "Général";
diff --git a/ui/fr.lproj/RegisterNameWindow.strings b/ui/fr.lproj/RegisterNameWindow.strings
index 9b27081244133d8b765533d3600b703b42e85632..d7ca7541b29e2f47a794c820a02b94be3285fe72 100644
--- a/ui/fr.lproj/RegisterNameWindow.strings
+++ b/ui/fr.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoire*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Les autres utilisateurs peuvent l'utiliser au lieu de votre 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" = "Une erreur est survenue pendant l'enregistrement de votre nom d'utilisateur ";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Entrer le mot de passe de votre compte Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Entrer votre mot de passe";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Fenêtre";
diff --git a/ui/fr.lproj/RingWindow.strings b/ui/fr.lproj/RingWindow.strings
index d5b5143a8fbcaab61d26f44b5072e28b3639c19b..a6f9225d45a411b5ac409cd8fb6bc30f0de48670 100644
--- a/ui/fr.lproj/RingWindow.strings
+++ b/ui/fr.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "détails";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Méthode de contact";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historique";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Voici votre RingID. Copiez-le et partagez-le avec vos amis!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Catégorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring est un logiciel libre de communication universelle qui respecte les libertés et la vie privée de ses utilisateurs.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Catégorie";
diff --git a/ui/fr.lproj/RingWizardChoose.strings b/ui/fr.lproj/RingWizardChoose.strings
index 72f2057faf2ab0a5a2a0cc8257676bcbcd734aa0..dfb99b9ca3a27932e3b8fad18e97d53f3bb8eca1 100644
--- a/ui/fr.lproj/RingWizardChoose.strings
+++ b/ui/fr.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Lier cet appareil à un compte";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Créer un compte Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Créer un compte Jami";
diff --git a/ui/fr.lproj/RingWizardLinkAccount.strings b/ui/fr.lproj/RingWizardLinkAccount.strings
index bf65340c0a9db3b9fe862dec14e73b81c1bdbfe8..d0a911b9ac5d3f34a746b6028d5897e2e366aff2 100644
--- a/ui/fr.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Aller dans les paramètres de gestion de compte de votre appareil, choisir le compte Ring à utiliser et sélectionner \"Connecter un autre appareil à ce compte\".";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Lier";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Entrer le mot de passe de votre compte Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Entrez votre mot de passe";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Je suis prêt";
diff --git a/ui/fr.lproj/RingWizardNewAccount.strings b/ui/fr.lproj/RingWizardNewAccount.strings
index 1dfe2aa496c61f6b3315bc01f14d43b52e808bb5..9f691b282e42c4e9f8a56a78da1d63f61ee3f163 100644
--- a/ui/fr.lproj/RingWizardNewAccount.strings
+++ b/ui/fr.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Ring. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre RingID de 40 caractères.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoire*";
diff --git a/ui/fr_BE.lproj/ExportPasswordWindow.strings b/ui/fr_BE.lproj/ExportPasswordWindow.strings
index 5c4427a1c856f2ada910d970cb7408fe75a7471b..1c257ccea2e3ad0a943244adb03cf724dbec9584 100644
--- a/ui/fr_BE.lproj/ExportPasswordWindow.strings
+++ b/ui/fr_BE.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "mot de passe...";
 
-/* 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";
diff --git a/ui/fr_BE.lproj/MigrateRingAccountsWindow.strings b/ui/fr_BE.lproj/MigrateRingAccountsWindow.strings
index 98e17c64d4c7e6399e1103634ec0f697da3ac223..d51aa748c8749846728676ac5c92896c48a5c6e7 100644
--- a/ui/fr_BE.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr_BE.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";
diff --git a/ui/fr_BE.lproj/RingWizardLinkAccount.strings b/ui/fr_BE.lproj/RingWizardLinkAccount.strings
index ae01ec4c7a54dc8ec0f030fb01bae8408719fe9d..6139833d20f833561f9825b850ab79c451f0a8bf 100644
--- a/ui/fr_BE.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr_BE.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/fr_CA.lproj/ExportPasswordWindow.strings b/ui/fr_CA.lproj/ExportPasswordWindow.strings
index 825a97d0e7dc04020a502d980ca82b83436f6e6c..aa1b6d6cb9a0a50ff3507160cf1d216bbb11b054 100644
--- a/ui/fr_CA.lproj/ExportPasswordWindow.strings
+++ b/ui/fr_CA.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "mot de passe";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Pour commencez, veuillez fournir le mot de passe de votre compte Ring";
+/* 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" = "Fenêtre";
diff --git a/ui/fr_CA.lproj/GeneralPrefs.strings b/ui/fr_CA.lproj/GeneralPrefs.strings
index 5365deff7c2af89ee384bcb90dca5d20268e1e66..0cf3f0c83b34966f65fdb8608ef528dc737f2585 100644
--- a/ui/fr_CA.lproj/GeneralPrefs.strings
+++ b/ui/fr_CA.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/fr_CA.lproj/Localizable.strings b/ui/fr_CA.lproj/Localizable.strings
index d995a74627302b29c82d372bf7467889d21f50d4..ba58e2a26938c533e8e21013bc61f76d0505e527 100644
--- a/ui/fr_CA.lproj/Localizable.strings
+++ b/ui/fr_CA.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copier le numéro";
 
 /* Contextual menu entry */
-"Create RING Account" = "Créer un compte RING";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Creer un compte SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Appel entrant de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Un message de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuser";
+"Accept" = "Accepter";
 
 /* Contextual menu entry */
 "Remove value" = "Enlever la valeur";
@@ -128,7 +132,7 @@
 "Revise Input" = "Réviser l'entrée";
 
 /* Text shown to the user */
-"RingID : " = "RingID :";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Partage";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Le nom d'utilisateur entré n'est pas disponible";
 
 /* 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" = "Inconnu";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenue sur 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!";
diff --git a/ui/fr_CA.lproj/MainMenu.strings b/ui/fr_CA.lproj/MainMenu.strings
index 2c338b9c1d37f891e1316cfd9f6601fbe49526a6..0004e6591fd7e481034833f518ece69ebd864391 100644
--- a/ui/fr_CA.lproj/MainMenu.strings
+++ b/ui/fr_CA.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" = "A propos de 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…";
diff --git a/ui/fr_CA.lproj/MigrateRingAccountsWindow.strings b/ui/fr_CA.lproj/MigrateRingAccountsWindow.strings
index b228e13bc4ac7aadddac0eaa3cadb874afbf0b8e..6cadc8b331219503436011e1e2de07546f58744f 100644
--- a/ui/fr_CA.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr_CA.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" = "Identifiant Ring";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "Identifiant";
 
 /* 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";
diff --git a/ui/fr_CA.lproj/PreferencesWindow.strings b/ui/fr_CA.lproj/PreferencesWindow.strings
index df56ee03ea3054e2a4d0303efabd265e7cf74e57..a52559667a092b452d891700a9d5b6bc782563e8 100644
--- a/ui/fr_CA.lproj/PreferencesWindow.strings
+++ b/ui/fr_CA.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Général";
diff --git a/ui/fr_CA.lproj/RegisterNameWindow.strings b/ui/fr_CA.lproj/RegisterNameWindow.strings
index dedf4c4d4f8adb12d8afdccb40d05e1b554ef56e..cc6e5d8f39eb175badfe12531e5790eb716db5bb 100644
--- a/ui/fr_CA.lproj/RegisterNameWindow.strings
+++ b/ui/fr_CA.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" = "Fenêtre";
diff --git a/ui/fr_CA.lproj/RingWindow.strings b/ui/fr_CA.lproj/RingWindow.strings
index d18164fe99acdc6d30a55d45dcb81916791d0217..30a9615e6cdad7b55a908c12498499a52afdde86 100644
--- a/ui/fr_CA.lproj/RingWindow.strings
+++ b/ui/fr_CA.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "détails";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Méthode de contact";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "historique";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Ceci est votre RingID. Copiez le et partagez le avec vos amis!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "catégorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring est un logiciel libre de communication universel qui respecte la liberté et vie privée de ses utilisateurs.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "catégorie";
diff --git a/ui/fr_CA.lproj/RingWizardChoose.strings b/ui/fr_CA.lproj/RingWizardChoose.strings
index 72f2057faf2ab0a5a2a0cc8257676bcbcd734aa0..ed17656a78e974013576ecef574d23ef24369e51 100644
--- a/ui/fr_CA.lproj/RingWizardChoose.strings
+++ b/ui/fr_CA.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Lier cet appareil à un compte";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Créer un compte Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/fr_CA.lproj/RingWizardLinkAccount.strings b/ui/fr_CA.lproj/RingWizardLinkAccount.strings
index 614af2868f87dc721acdee478235f3ca74040cde..4f8f43fc35469ad5527f31aa50a92e2b9fb8ff98 100644
--- a/ui/fr_CA.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr_CA.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Entrer le mot de passe";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/fr_CA.lproj/RingWizardNewAccount.strings b/ui/fr_CA.lproj/RingWizardNewAccount.strings
index 9f2fd0f7fb3d21db57df66dff23e36a2c7d0ee74..d015fc12c421acc765e30410897d03c0d1a6c097 100644
--- a/ui/fr_CA.lproj/RingWizardNewAccount.strings
+++ b/ui/fr_CA.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/fr_CH.lproj/ExportPasswordWindow.strings b/ui/fr_CH.lproj/ExportPasswordWindow.strings
index ef3742e87da2453141b733a7508f5a8d360a9ff9..7a714b21b792a5ecc159635bfafca339ab023f59 100644
--- a/ui/fr_CH.lproj/ExportPasswordWindow.strings
+++ b/ui/fr_CH.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "mot de passe...";
 
-/* 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";
diff --git a/ui/fr_CH.lproj/MigrateRingAccountsWindow.strings b/ui/fr_CH.lproj/MigrateRingAccountsWindow.strings
index ba3c4a4b558b984008657cd2e6a0e2564b2e634a..307ce15484e54a94ab88343956253e39acf6374b 100644
--- a/ui/fr_CH.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr_CH.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";
diff --git a/ui/fr_CH.lproj/RingWindow.strings b/ui/fr_CH.lproj/RingWindow.strings
index 6fcc10c1f0bc583b67ec45c61474de14ab745c22..d74e19a412f4bf934af99ff45237ffbc96657be0 100644
--- a/ui/fr_CH.lproj/RingWindow.strings
+++ b/ui/fr_CH.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/fr_FR.lproj/ExportPasswordWindow.strings b/ui/fr_FR.lproj/ExportPasswordWindow.strings
index cf7fe9e5f13bc7b699e9c207e483430fbb4bb7f9..aaf11de148c12697adaa2598995988d599f2c44d 100644
--- a/ui/fr_FR.lproj/ExportPasswordWindow.strings
+++ b/ui/fr_FR.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Mot de passe";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Merci de fournir le mot de passe de votre compte Ring pour commencer";
+/* 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" = "fenêtre";
diff --git a/ui/fr_FR.lproj/GeneralPrefs.strings b/ui/fr_FR.lproj/GeneralPrefs.strings
index 681c2ee6239528302f641c48c9a6d4f4b18fbfcb..6f9f0b5a1e637a3c2de3b581285198374d193f58 100644
--- a/ui/fr_FR.lproj/GeneralPrefs.strings
+++ b/ui/fr_FR.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/fr_FR.lproj/Localizable.strings b/ui/fr_FR.lproj/Localizable.strings
index a304f04e47d439ed90dd6f113bd90bf9c7d25795..bf288a8ec4056093762921b986b692fd051e7543 100644
--- a/ui/fr_FR.lproj/Localizable.strings
+++ b/ui/fr_FR.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copier le numéro de téléphone";
 
 /* Contextual menu entry */
-"Create RING Account" = "Créer un compte Ring";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Créer un compte SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Appel entrant de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuser";
+"Accept" = "Accepter";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "identifiant Ring";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Inconnu";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bienvenue sur 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!";
diff --git a/ui/fr_FR.lproj/MainMenu.strings b/ui/fr_FR.lproj/MainMenu.strings
index a9d8f5727c12d03dd577e9fb282a051924400ef1..f4b7fe5c4948034b360229b39709b504a5cc1bb4 100644
--- a/ui/fr_FR.lproj/MainMenu.strings
+++ b/ui/fr_FR.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" = "A propos de 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…";
diff --git a/ui/fr_FR.lproj/MigrateRingAccountsWindow.strings b/ui/fr_FR.lproj/MigrateRingAccountsWindow.strings
index 22480c9f5919a309a938478fedc49255b72aa324..8f88f656c18c8ff40adbf20afee67a66deff5526 100644
--- a/ui/fr_FR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/fr_FR.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";
diff --git a/ui/fr_FR.lproj/PreferencesWindow.strings b/ui/fr_FR.lproj/PreferencesWindow.strings
index 0c5a9d6f9e18708fd17051954076c7cee1a069c4..c3262f9cd79d4e0e80a2e3b6fafa9d774afcdd42 100644
--- a/ui/fr_FR.lproj/PreferencesWindow.strings
+++ b/ui/fr_FR.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/fr_FR.lproj/RegisterNameWindow.strings b/ui/fr_FR.lproj/RegisterNameWindow.strings
index 8fcea01518eed5c2ad6512c69f98eb9e4de753fc..6333df75f59562d17fae1ea55b9135697a64e4bb 100644
--- a/ui/fr_FR.lproj/RegisterNameWindow.strings
+++ b/ui/fr_FR.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" = "fenêtre";
diff --git a/ui/fr_FR.lproj/RingWindow.strings b/ui/fr_FR.lproj/RingWindow.strings
index 14ecbbe1c0a315163c1844df6e6559be7ef1b142..40cdbe8eb04c9ff7c79c523f737817cdce4768e7 100644
--- a/ui/fr_FR.lproj/RingWindow.strings
+++ b/ui/fr_FR.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "détails";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/fr_FR.lproj/RingWizardChoose.strings b/ui/fr_FR.lproj/RingWizardChoose.strings
index 840c02a360daca08bd2211c536af81b1a9a5e935..90dd2d2df76ea97d60a32167a34e7d42f54fffb7 100644
--- a/ui/fr_FR.lproj/RingWizardChoose.strings
+++ b/ui/fr_FR.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Créer un compte Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/fr_FR.lproj/RingWizardLinkAccount.strings b/ui/fr_FR.lproj/RingWizardLinkAccount.strings
index 3769acd841029fd952938895e2b511878f1b4d1a..186fc3a9fd4b54cf6eb96b806daf5ce5a9dd3cde 100644
--- a/ui/fr_FR.lproj/RingWizardLinkAccount.strings
+++ b/ui/fr_FR.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuler";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/fr_FR.lproj/RingWizardNewAccount.strings b/ui/fr_FR.lproj/RingWizardNewAccount.strings
index 270a73092e60a612c9f0ff1b3044bd952554fa36..b10c5aafe17e69397ecb3477f3b996a2d0dea765 100644
--- a/ui/fr_FR.lproj/RingWizardNewAccount.strings
+++ b/ui/fr_FR.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/he.lproj/ExportPasswordWindow.strings b/ui/he.lproj/ExportPasswordWindow.strings
index ace8ffc9160b35c1b48a76dea68bbeba4c281019..3e661c001dddfa8296723e961d58e2f03626cf1c 100644
--- a/ui/he.lproj/ExportPasswordWindow.strings
+++ b/ui/he.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";
diff --git a/ui/he.lproj/GeneralPrefs.strings b/ui/he.lproj/GeneralPrefs.strings
index 2a022a8cc80dca25a9b525aac3e856b4d5e76968..3d9eb7c1bf2f82578284d45260cf7e4e152518de 100644
--- a/ui/he.lproj/GeneralPrefs.strings
+++ b/ui/he.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/he.lproj/Localizable.strings b/ui/he.lproj/Localizable.strings
index d3246331dcfe15e0f281622fe7d28027ba7a6a81..1b474dfa39ab88cf2e58bb6993164fb6b26fc842 100644
--- a/ui/he.lproj/Localizable.strings
+++ b/ui/he.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "קבל";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "לא מוכר";
@@ -179,7 +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!";
diff --git a/ui/he.lproj/MainMenu.strings b/ui/he.lproj/MainMenu.strings
index b523b82a2d1ab614dfa281f2ced9cbe4c07620f6..d4e34b19467e0919f9f0e40ace1e15323a278d5a 100644
--- a/ui/he.lproj/MainMenu.strings
+++ b/ui/he.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" = "אודות 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…";
diff --git a/ui/he.lproj/MigrateRingAccountsWindow.strings b/ui/he.lproj/MigrateRingAccountsWindow.strings
index 491d8866881532d63ad2e94492c151ba313f5e97..60999cecb1c5629e5787ac9b3657109bca6e83e4 100644
--- a/ui/he.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/he.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" = "מזהה";
 
 /* 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";
diff --git a/ui/he.lproj/PreferencesWindow.strings b/ui/he.lproj/PreferencesWindow.strings
index 5ca88b91ff81cf5a65bcfeac65f4541c9f76414f..6cfaf2e43613a5b200a383a096f5d64871aa3137 100644
--- a/ui/he.lproj/PreferencesWindow.strings
+++ b/ui/he.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "העדפות Ring";
+/* 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" = "כלליות";
diff --git a/ui/he.lproj/RegisterNameWindow.strings b/ui/he.lproj/RegisterNameWindow.strings
index 56eef9430101a55c2dd1ea64d6c174337bd16d12..6ad8a881c0110130e10a2526d3633032b084d863 100644
--- a/ui/he.lproj/RegisterNameWindow.strings
+++ b/ui/he.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";
diff --git a/ui/he.lproj/RingWindow.strings b/ui/he.lproj/RingWindow.strings
index 6122af8dfc7c7159d25b318391e88928945a48c7..041ba06e8739c51fde3e601f98007b9fae70aed7 100644
--- a/ui/he.lproj/RingWindow.strings
+++ b/ui/he.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "היסטוריה";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "אנשי קשר";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/he.lproj/RingWizardChoose.strings b/ui/he.lproj/RingWizardChoose.strings
index 1e7a0c7c8188b6f472937e3a3dc4309c61f0924c..af2e3fbb0bf7cdfa97077cc49cd8e2bcd3056c68 100644
--- a/ui/he.lproj/RingWizardChoose.strings
+++ b/ui/he.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/he.lproj/RingWizardLinkAccount.strings b/ui/he.lproj/RingWizardLinkAccount.strings
index a4a56139f0acc20bec2209c27c0b60e07d3b4b11..1ac52d9468586d60caa89df0f421b3a78c68e431 100644
--- a/ui/he.lproj/RingWizardLinkAccount.strings
+++ b/ui/he.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "ביטול";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "ביטול";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/he.lproj/RingWizardNewAccount.strings b/ui/he.lproj/RingWizardNewAccount.strings
index 42cd76488a5ca1db6374a09411b0908c7132cb5c..2894f00d7263c583969b0323af827ec78213c0e7 100644
--- a/ui/he.lproj/RingWizardNewAccount.strings
+++ b/ui/he.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/hi_IN.lproj/Localizable.strings b/ui/hi_IN.lproj/Localizable.strings
index 9609eb311bc7ccdba56b244b2c377f292a69ac46..07c82816b3da45f23ad939d2c84354b89e85917b 100644
--- a/ui/hi_IN.lproj/Localizable.strings
+++ b/ui/hi_IN.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/hi_IN.lproj/PreferencesWindow.strings b/ui/hi_IN.lproj/PreferencesWindow.strings
index 843fe9bcdb4d9199e6ffebf65f16c97e8954c0eb..e657a3bad5dd501a5743f362e8d849739eef0f06 100644
--- a/ui/hi_IN.lproj/PreferencesWindow.strings
+++ b/ui/hi_IN.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/hi_IN.lproj/RingWindow.strings b/ui/hi_IN.lproj/RingWindow.strings
index 42cc8db875c646cb8962be3ac909cc6687732d82..968c09c3000220a04a52dd0f9ee37d0350d2d8e9 100644
--- a/ui/hi_IN.lproj/RingWindow.strings
+++ b/ui/hi_IN.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "विस्तृत सूचना";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "रिंग";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "रिंग हर तरह के संविद के लिये एक मुक्त/स्विधीन साॅफ्टवेयर है, जो अपने उपभोक्ताओं की स्वाधीनता व गोपनीयता का सम्मान करता है";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/hr.lproj/ExportPasswordWindow.strings b/ui/hr.lproj/ExportPasswordWindow.strings
index dfb149e0320f90cf20ba616b3a006e94e51983ec..15fc97ad3a7227db524f4ec478992d5123ff1d38 100644
--- a/ui/hr.lproj/ExportPasswordWindow.strings
+++ b/ui/hr.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Lozinka...";
 
-/* 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" = "Prozor";
diff --git a/ui/hr.lproj/GeneralPrefs.strings b/ui/hr.lproj/GeneralPrefs.strings
index 685fab9518c3e6f630018a1aed9fa1cba14eb4a6..de10e710da697da0a882699ea18bd4c189a2db21 100644
--- a/ui/hr.lproj/GeneralPrefs.strings
+++ b/ui/hr.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Ažuriraj";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "Prikaži Ring kod dolaznih poziva";
+/* 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 ";
diff --git a/ui/hr.lproj/Localizable.strings b/ui/hr.lproj/Localizable.strings
index fd289e537e0f41c33df6ec4f07a9586eaee0e420..66e4423ab62eaf1d0f0c135ad8049c8716431bf8 100644
--- a/ui/hr.lproj/Localizable.strings
+++ b/ui/hr.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopiraj broj";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Dolazni poziv od %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Poruka od %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Odbij";
+"Accept" = "Prihvati";
 
 /* Contextual menu entry */
 "Remove value" = "Ukloni vrijednost";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Podijeli";
@@ -149,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" = "Nepoznato";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Dobrodošli u 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!";
diff --git a/ui/hr.lproj/MainMenu.strings b/ui/hr.lproj/MainMenu.strings
index 3628dd743a90afa06b91b5d0df0b2b1e89ff291c..7ddd9ec086ee44b4506a965b43cc1365810bab96 100644
--- a/ui/hr.lproj/MainMenu.strings
+++ b/ui/hr.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Glavni meni";
 
-/* 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" = "O Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Postavke...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servisi";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Sakrij Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Zatvori Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Sakrij ostale";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Pomoć";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring pomoć";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Pronađi i zamijeni...";
diff --git a/ui/hr.lproj/MigrateRingAccountsWindow.strings b/ui/hr.lproj/MigrateRingAccountsWindow.strings
index 3d46471031b5a7e35af6698df08e3bb9f413ae53..a45b6510a635e43628bbc3c3c074f17e05266ad5 100644
--- a/ui/hr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/hr.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";
diff --git a/ui/hr.lproj/PreferencesWindow.strings b/ui/hr.lproj/PreferencesWindow.strings
index c30044a025f9ee7878ded03eb2c871ae37f2e853..c9a930622a6e854fdf0e7dc313ce64ac278ba9f9 100644
--- a/ui/hr.lproj/PreferencesWindow.strings
+++ b/ui/hr.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring postavke";
+/* 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" = "Opće";
diff --git a/ui/hr.lproj/RegisterNameWindow.strings b/ui/hr.lproj/RegisterNameWindow.strings
index 92aa5980fa0142a57f55f76ab62ddbe722632f63..c0c109765eb5bb2a4666ba76d0b4efb05eb0bb69 100644
--- a/ui/hr.lproj/RegisterNameWindow.strings
+++ b/ui/hr.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" = "Prozor";
diff --git a/ui/hr.lproj/RingWindow.strings b/ui/hr.lproj/RingWindow.strings
index aa146b98b2c1d01390c59fcf105b74e97dbb961f..0ae6c6b8f8bdc796dedc091d63b50a98f2071feb 100644
--- a/ui/hr.lproj/RingWindow.strings
+++ b/ui/hr.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "pojedinosti";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Povijest";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakti";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorija";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorija";
diff --git a/ui/hr.lproj/RingWizardChoose.strings b/ui/hr.lproj/RingWizardChoose.strings
index e86d713969039c946f559fadc382b783d3b8814e..aad72ba211bb7da4e47e9a72fdb0320b3f1e999c 100644
--- a/ui/hr.lproj/RingWizardChoose.strings
+++ b/ui/hr.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Napravite Ring račun";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/hr.lproj/RingWizardLinkAccount.strings b/ui/hr.lproj/RingWizardLinkAccount.strings
index cdf55350e75504c0ace33a9e237c69c32ff7b740..a81d838b499e8716ce7ab44433331e4cc9311b97 100644
--- a/ui/hr.lproj/RingWizardLinkAccount.strings
+++ b/ui/hr.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Poništi";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Poništi";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Unesite lozinku";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/hr.lproj/RingWizardNewAccount.strings b/ui/hr.lproj/RingWizardNewAccount.strings
index f5b3157e0cc3c798ce37d6df6619697ca3c1473a..6e640aa733f4db32f61b6d9b767754637516c889 100644
--- a/ui/hr.lproj/RingWizardNewAccount.strings
+++ b/ui/hr.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/hu.lproj/ExportPasswordWindow.strings b/ui/hu.lproj/ExportPasswordWindow.strings
index 518af29e3577f64b2fc819ca5054193bc74c6aea..4b7ce9b73eb3771ccfb4b1ea24f7460bdc40ed50 100644
--- a/ui/hu.lproj/ExportPasswordWindow.strings
+++ b/ui/hu.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Jelszó…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Kérjük, adja meg Jami fiók jelszavát";
+/* 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" = "Ablak";
diff --git a/ui/hu.lproj/GeneralPrefs.strings b/ui/hu.lproj/GeneralPrefs.strings
index 34f3a87776ada158cfb8c2ddf6ab0af7527dd666..6957ccd95cb7103afe1edfc8279d476663b9ac91 100644
--- a/ui/hu.lproj/GeneralPrefs.strings
+++ b/ui/hu.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Frissítés";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Az asztali értesítések engedélyezése";
+/* 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" = "A Jami előtérbe hozása bejövő hívások esetén.";
+/* 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" = "Ez meg van osztva a partnereivel";
diff --git a/ui/hu.lproj/Localizable.strings b/ui/hu.lproj/Localizable.strings
index c51bffe4eba5ccd6ec41eff2551ad0de6ad0ae9c..37afe6ff984be5551d98797304999e145dcba22a 100644
--- a/ui/hu.lproj/Localizable.strings
+++ b/ui/hu.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Szám másolása";
 
 /* Contextual menu entry */
-"Create RING Account" = "Ringfiók létrehozása";
+"Create Jami Account" = "Jami fiók létrehozása";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SIP fiók létrehozása";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Üzenet a következőtől: %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Elutasítás";
+"Accept" = "Elfogadás";
 
 /* Contextual menu entry */
 "Remove value" = "Érték eltávolítása";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "Ring azonosító:";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Megosztás ";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "A beírt felhasználónév nem érhető el";
 
 /* 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" = "A megadott jelszó nem oldja fel ezt a fiókot";
 
 /* 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" = "Ismeretlen";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Isten hozott!";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Új fiók létrehozása";
 "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!";
diff --git a/ui/hu.lproj/MainMenu.strings b/ui/hu.lproj/MainMenu.strings
index bdf198ab9404065eeeb5e6e78714fd2713dd4203..8f85abe9831c5607b016dbb8f6ee2260abd5ca22 100644
--- a/ui/hu.lproj/MainMenu.strings
+++ b/ui/hu.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AFőmenü";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
 "56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
 "57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "A Jami névjegye";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Beállítások…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Szolgáltatások";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Jami elrejtése";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Kilépés";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Mások elrejtése";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Súgó";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Súgó";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Keresés és csere…";
diff --git a/ui/hu.lproj/MigrateRingAccountsWindow.strings b/ui/hu.lproj/MigrateRingAccountsWindow.strings
index 2378a3c22ef3631d126b8639e42e485c37517f92..109c00ccdd6e2c2be0830ecb54f7516c8e4714bf 100644
--- a/ui/hu.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/hu.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Fiókátvitel befejeződött";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Jami azonosító";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "Azonosító";
 
 /* 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" = "A következő fiókot át kell telepíteni az új Jami fiókformátumra:\\nÁlnév: \\nAzonosító: \\nAz áttelepítés folytatásához ki kell választania a fiókhoz tartozó jelszót. Ezt a jelszót fogja használni a fő kulcs titkosításához. Szükséges, hogy új eszközöket adjon hozzá a Jami fiókjához. Ha nem áll készen a jelszó kiválasztására, akkor bezárhatja a Jami-t és később folytathatja az áttelepítést.";
+"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" = "Fiók átvitel hiba";
diff --git a/ui/hu.lproj/PreferencesWindow.strings b/ui/hu.lproj/PreferencesWindow.strings
index bc941be75dae69fda1fee001ff6584a0e0e9ec29..24d0c0a69f1a4e20f610fed64fc892946624f2fc 100644
--- a/ui/hu.lproj/PreferencesWindow.strings
+++ b/ui/hu.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Beállítások";
+/* 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" = "Általános";
diff --git a/ui/hu.lproj/RegisterNameWindow.strings b/ui/hu.lproj/RegisterNameWindow.strings
index 0f5721e466c8d77738ae437bad5694babd59781f..db5eb1fcd10b3e2cbd481f45f29b9d321616dedd 100644
--- a/ui/hu.lproj/RegisterNameWindow.strings
+++ b/ui/hu.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Kötelező*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Más felhasználók használhatják a Jami azonosító helyett";
+/* 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" = "Hiba történt a felhasználónév bejegyzés során";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Adja meg a Jami fiókja jelszavát";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Adja meg a jelszót";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Ablak";
diff --git a/ui/hu.lproj/RingWindow.strings b/ui/hu.lproj/RingWindow.strings
index 2efcf6ec9882cb6f852b40af1c2edfb9ffd0930f..9ad938c9d126d684012c2929baa2da9ace234e41 100644
--- a/ui/hu.lproj/RingWindow.strings
+++ b/ui/hu.lproj/RingWindow.strings
@@ -11,7 +11,7 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "Részletek";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
 "F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Előzmények";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Ez az Ön Jami azonosítója. Másolja és ossza meg a barátaival!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Partnerek";
@@ -44,7 +44,7 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategória";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
 "eln-Vm-t0d.title" = "Jami a szabad szoftver az egyetemes közléshez, amely tiszteletben tartja a felhasználók szabadságát és magánéletét.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
diff --git a/ui/hu.lproj/RingWizardChoose.strings b/ui/hu.lproj/RingWizardChoose.strings
index 941a89b59f51aab3b02faf1ae571b0d3938fcfbc..61f96258b9c82be5916effb61d0c14ad10bb59e5 100644
--- a/ui/hu.lproj/RingWizardChoose.strings
+++ b/ui/hu.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Ezen eszköz fiókhoz kapcsolása";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Egy Jami fiók létrehozása";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Jami fiók létrehozása";
diff --git a/ui/hu.lproj/RingWizardLinkAccount.strings b/ui/hu.lproj/RingWizardLinkAccount.strings
index ded46a49b4eb4dc733fde3d385bbb3c5905f7d8b..ee678baccbf891b371b18e3a3a3c7bfc0e09f2c1 100644
--- a/ui/hu.lproj/RingWizardLinkAccount.strings
+++ b/ui/hu.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Mégse";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Menjen a készülék fiókkezelő beállításához, válassza ki a használni kívánt Jami fiókot és válassza a „Egy másik eszköz összekapcsolása ehhez a fiókhoz” lehetőséget.↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Kapcsolat";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Mégse";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Adja meg a Jami fiókja jelszavát";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Jelszó megadása";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Készen áll";
diff --git a/ui/hu.lproj/RingWizardNewAccount.strings b/ui/hu.lproj/RingWizardNewAccount.strings
index 6dadcaa635f24da6beece1f7996e247fb90d9c61..e0f15594336da169aeb7e96ec1b451d49b8dc719 100644
--- a/ui/hu.lproj/RingWizardNewAccount.strings
+++ b/ui/hu.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Ezt bejelölve, regisztrál egy egyedi felhasználónevet a Jami hálózaton. Az emberek ezt a Jami azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Kötelező*";
diff --git a/ui/id.lproj/GeneralPrefs.strings b/ui/id.lproj/GeneralPrefs.strings
index 681c2ee6239528302f641c48c9a6d4f4b18fbfcb..6f9f0b5a1e637a3c2de3b581285198374d193f58 100644
--- a/ui/id.lproj/GeneralPrefs.strings
+++ b/ui/id.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/id.lproj/Localizable.strings b/ui/id.lproj/Localizable.strings
index 30bbcfd56fbb24ef0238754bdbfe0ab0ea4ce6d7..df1a7945474e96ecb1eb0e9e30bf609e520d2b10 100644
--- a/ui/id.lproj/Localizable.strings
+++ b/ui/id.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Salin nomor";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Tolak";
+"Accept" = "Terima";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Tidak diketahui";
@@ -179,7 +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!";
diff --git a/ui/id.lproj/RingWindow.strings b/ui/id.lproj/RingWindow.strings
index 2c587319a52cc48daf81286a1365bc213159f725..058c4834fc5e0bdf43c8139af12bedccab7fb5ac 100644
--- a/ui/id.lproj/RingWindow.strings
+++ b/ui/id.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Riwayat";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontak";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/it.lproj/ExportPasswordWindow.strings b/ui/it.lproj/ExportPasswordWindow.strings
index 948462bb66b7b9546965790f648c280f871f501c..87671f345072694b6505b84b11b7d43ce3bc33b4 100644
--- a/ui/it.lproj/ExportPasswordWindow.strings
+++ b/ui/it.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" = "Finestra";
diff --git a/ui/it.lproj/GeneralPrefs.strings b/ui/it.lproj/GeneralPrefs.strings
index e6d1e30c42ebbc835950d75d6bdd9d048232f006..24e64604c340b46713b31649012c30153102626e 100644
--- a/ui/it.lproj/GeneralPrefs.strings
+++ b/ui/it.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/it.lproj/Localizable.strings b/ui/it.lproj/Localizable.strings
index d04dd3271f353e208f046b3ce54079832e745f1b..24d434b038ccc8dd4293a904397bd9dcce2bda61 100644
--- a/ui/it.lproj/Localizable.strings
+++ b/ui/it.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copia il numero";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Rifiuta";
+"Accept" = "Accettare";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Sconosciuto";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Benvenuto in 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!";
diff --git a/ui/it.lproj/MainMenu.strings b/ui/it.lproj/MainMenu.strings
index cd7b58030f2d241ab9d9fe242259b3b4a0fcaabc..18f5b6b79be2c989f16e8fec29e14b61dfd2f217 100644
--- a/ui/it.lproj/MainMenu.strings
+++ b/ui/it.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Suona";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Suona";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "Info su Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferenze";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servizi";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Nascondi Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Chiudi Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Nascondi gli altri";
@@ -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…";
diff --git a/ui/it.lproj/MigrateRingAccountsWindow.strings b/ui/it.lproj/MigrateRingAccountsWindow.strings
index ce58c457f37f4cfe0a5f24c2a1ec3ee7f1c31fe1..5dcf1950aac9aa6582182a3455ba0c9ce1dd3fc1 100644
--- a/ui/it.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/it.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";
diff --git a/ui/it.lproj/PreferencesWindow.strings b/ui/it.lproj/PreferencesWindow.strings
index 91363dbc90917be45921680e0da947bfb339ac5a..216c670f0dd6e77061d2db625c9148e260caa590 100644
--- a/ui/it.lproj/PreferencesWindow.strings
+++ b/ui/it.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Generale";
diff --git a/ui/it.lproj/RegisterNameWindow.strings b/ui/it.lproj/RegisterNameWindow.strings
index ae0f5662366916f06b7ea6aeacbfa587309190dc..7418459ae09c02d0cb7c13eba6210a7fbd6c6523 100644
--- a/ui/it.lproj/RegisterNameWindow.strings
+++ b/ui/it.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" = "Finestra";
diff --git a/ui/it.lproj/RingWindow.strings b/ui/it.lproj/RingWindow.strings
index 9716407db22a1932eee5c2329509df55557b4547..f1f1b50f7107e186d61adfe1001ce911b9d39b75 100644
--- a/ui/it.lproj/RingWindow.strings
+++ b/ui/it.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "dettagli";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Suona";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Metodo di contatto";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Cronologia";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contatti";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring è un software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/it.lproj/RingWizardChoose.strings b/ui/it.lproj/RingWizardChoose.strings
index b130dd839642fd0220d106ac3f0f7bd1490f44fd..78ce7b33eca7bca9141e71c08af7b765b13c4a66 100644
--- a/ui/it.lproj/RingWizardChoose.strings
+++ b/ui/it.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Creare un account Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/it.lproj/RingWizardLinkAccount.strings b/ui/it.lproj/RingWizardLinkAccount.strings
index 0211a698131f29813c89351f9f45b8d4efdc2c7e..23027dd286c6f85e8fa017b532839af8f310d2ff 100644
--- a/ui/it.lproj/RingWizardLinkAccount.strings
+++ b/ui/it.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancella";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancella";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/it.lproj/RingWizardNewAccount.strings b/ui/it.lproj/RingWizardNewAccount.strings
index 0d7bc92d8dc1fa4f6531e244a0db594005dd7df1..2afdeed9bbc3458fa04efd81cb0e17560ef4e183 100644
--- a/ui/it.lproj/RingWizardNewAccount.strings
+++ b/ui/it.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/it_IT.lproj/ExportPasswordWindow.strings b/ui/it_IT.lproj/ExportPasswordWindow.strings
index d02f95b3d7fcbcb0e65b8145c6717aebb0c8104c..81114fb9fe5c81aed9c83540a3a07f513333f99a 100644
--- a/ui/it_IT.lproj/ExportPasswordWindow.strings
+++ b/ui/it_IT.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" = "Perfavore fornisci la tua password dell'account Ring per cominciare";
+/* 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" = "Finestra";
diff --git a/ui/it_IT.lproj/GeneralPrefs.strings b/ui/it_IT.lproj/GeneralPrefs.strings
index 16eac80355f98c16dcb0d2683bfaa1cd9aa3facb..54b1e96c844c1f72558caf34645d6a34695288ac 100644
--- a/ui/it_IT.lproj/GeneralPrefs.strings
+++ b/ui/it_IT.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Aggiornamento";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Abilita notifiche desktop";
+/* 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" = "Mettere Ring davanti alle chiamate in arrivo";
+/* 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" = "Questo è condiviso con i tuoi contatti";
diff --git a/ui/it_IT.lproj/Localizable.strings b/ui/it_IT.lproj/Localizable.strings
index 91cf983f37e48fdee31d4ea8783c0afa4a458fff..d80c9c6da1e9b5fda8bb0b86f8a06c3931c81f27 100644
--- a/ui/it_IT.lproj/Localizable.strings
+++ b/ui/it_IT.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copia numero";
 
 /* Contextual menu entry */
-"Create RING Account" = "Crea Account RING";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Crea account SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Chiamati in arrivo da %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Messaggio da %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Rifiuto";
+"Accept" = "Accetta";
 
 /* Contextual menu entry */
 "Remove value" = "Rimuovi valore";
@@ -128,7 +132,7 @@
 "Revise Input" = "Rivedi ingresso";
 
 /* Text shown to the user */
-"RingID : " = "RingID :";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Condividi";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Il nome utente inserito non è disponibile";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Il seguente account ha bisogno di essere migrato al nuovo formato di account Ring:";
+"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" = "La password che hai inserito non sblocca questo 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." = "Per completare la procedura, devi aprire Ring nel nuovo dispositivo e scegli l'opzione \"Collega questo dispositivo con un account\". Il tuo pin è valido per 10 minuti.";
+"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." = "Per continuare la migrazione, devi scegliere una password per il tuo account. Questa password verrà usata per cifrare la tua master key. Verrà richiesta per aggiungere nuovi dispositivi al tuo account Ring. Se non sei pronto a scegliere una password, dovresti chiudere Ring e riprendere la migrazione più tardi.";
+"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" = "Sconosciuto";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Benvenuto su 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!";
diff --git a/ui/it_IT.lproj/MainMenu.strings b/ui/it_IT.lproj/MainMenu.strings
index 2db30dcf29d3391c796551ac58705123b43c7afc..0088dbbf197eccd6be34bea9ebbf9b8b2c7a9a46 100644
--- a/ui/it_IT.lproj/MainMenu.strings
+++ b/ui/it_IT.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Squilla";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Squilla";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "Informazioni su Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferenze...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Servizi";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Nascondi Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Lascia Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Nascondi Altri";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Aiuto";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Aiuto Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Trova e Sostituisci...";
diff --git a/ui/it_IT.lproj/MigrateRingAccountsWindow.strings b/ui/it_IT.lproj/MigrateRingAccountsWindow.strings
index b74356abde71f46b042f128af804ddb0a847ed12..0bd8722066b2ff48a9e6fca9de1b94c70d60817d 100644
--- a/ui/it_IT.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/it_IT.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migrazione account completata";
 
-/* 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" = "Il seguente account ha bisogno di essere migrato al nuovo formato di account Ring:\\nAlias:\\nID:\\nPer continuare la migrazione, devi scegliere una password per il tuo account. Questa password verrà usata per cifrare la tua master key. Verrà richiesta per aggiungere nuovi dispositivi al tuo account Ring. Se non sei pronto a scegliere una password, dovresti chiudere Ring e riprendere la migrazione più tardi.";
+"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" = "Errore migrazione account";
diff --git a/ui/it_IT.lproj/PreferencesWindow.strings b/ui/it_IT.lproj/PreferencesWindow.strings
index 2d689b2de5d6166a76cfe90864763492a44da0cf..216c670f0dd6e77061d2db625c9148e260caa590 100644
--- a/ui/it_IT.lproj/PreferencesWindow.strings
+++ b/ui/it_IT.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Impostazioni tono";
+/* 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" = "Generale";
diff --git a/ui/it_IT.lproj/RegisterNameWindow.strings b/ui/it_IT.lproj/RegisterNameWindow.strings
index e4a7163b1f64415efdddb62d062fe09ab5863869..c7d4f9e80b04a9054040d6ea0bcd592640dc3292 100644
--- a/ui/it_IT.lproj/RegisterNameWindow.strings
+++ b/ui/it_IT.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obbligatorio*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Gli altri utentu possono usarlo al posto del tuo 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" = "Si è verificato un errore durante la registrazione del tuo nome utente";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Inserisci la password del tuo account Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Inserisci la tua password";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Finestra";
diff --git a/ui/it_IT.lproj/RingWindow.strings b/ui/it_IT.lproj/RingWindow.strings
index f8cea754f013896a1f269a39d60694f227b1166a..e396fb5893d9c21932209621f89c957d0ede5424 100644
--- a/ui/it_IT.lproj/RingWindow.strings
+++ b/ui/it_IT.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "dettagli";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Squilla";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Metodo di Contatto";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Cronologia";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Questo è il tuo RingID.\nCopialo e condividilo con i tuoi amici!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contatti";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoria";
diff --git a/ui/it_IT.lproj/RingWizardChoose.strings b/ui/it_IT.lproj/RingWizardChoose.strings
index ddf92769146c6cc3a6b565966220c3be003aa59b..2b200eba15c5d2d0187830fa1503d4692733bc81 100644
--- a/ui/it_IT.lproj/RingWizardChoose.strings
+++ b/ui/it_IT.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Collega questo dispositivo ad un account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Crea un account Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/it_IT.lproj/RingWizardLinkAccount.strings b/ui/it_IT.lproj/RingWizardLinkAccount.strings
index 0a3475733ec2f40e2e45c77abc918ff2be80e270..ae087504dff0dbb8b11a552e679e89520b22f045 100644
--- a/ui/it_IT.lproj/RingWizardLinkAccount.strings
+++ b/ui/it_IT.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annulla";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Vai sulle impostazioni dell'account del dispositivo, scegli l'account Ring da utilizzare e scegl8 \"Collega un altro dispositivo a questo account\"";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Collega";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annulla";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Inserisci la password del tuo account Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Inserire password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Sono pronto";
diff --git a/ui/it_IT.lproj/RingWizardNewAccount.strings b/ui/it_IT.lproj/RingWizardNewAccount.strings
index c32c64b08c42667b409c7d3c5ed6caed75e219cb..a0cd48401fc3f9254fdabb570d887c6424c9c61c 100644
--- a/ui/it_IT.lproj/RingWizardNewAccount.strings
+++ b/ui/it_IT.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Accettando questo, registrerai un unico nome utente nella rete Ring. Le persone possono usarlo per contattarti invece di usare il tuo RingID che è lungo 40 caratteri.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obbligatorio*";
diff --git a/ui/ja.lproj/ExportPasswordWindow.strings b/ui/ja.lproj/ExportPasswordWindow.strings
index 8bd579b117975db0a39609a88aada7a22e84c3d4..2781550895d93fbc1063b21bf755bc92ca00eb14 100644
--- a/ui/ja.lproj/ExportPasswordWindow.strings
+++ b/ui/ja.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "パスワード...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "開始するにはRingアカウントのパスワードを入力してください";
+/* 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" = "ウィンドウ";
diff --git a/ui/ja.lproj/GeneralPrefs.strings b/ui/ja.lproj/GeneralPrefs.strings
index af5b761f49563d2a195e403eb9af9f883d789d9f..4c8ffdde38f36794000ad4826a33cfd5d04eb8a4 100644
--- a/ui/ja.lproj/GeneralPrefs.strings
+++ b/ui/ja.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "更新";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "デスクトップ通知を有効化";
+/* 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" = "着信時にRingを最前面に表示する";
+/* 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 ";
diff --git a/ui/ja.lproj/Localizable.strings b/ui/ja.lproj/Localizable.strings
index 9494ecd021f743683f806efbf83673ae02200555..016f7efbb27587d3e7014f65279ffc9301503a33 100644
--- a/ui/ja.lproj/Localizable.strings
+++ b/ui/ja.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "番号をコピー";
 
 /* Contextual menu entry */
-"Create RING Account" = "RINGアカウントを作成";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SIPアカウントを作成";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "拒否";
+"Accept" = "受け入れ";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "共有";
@@ -149,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" = "不明";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "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!";
diff --git a/ui/ja.lproj/MainMenu.strings b/ui/ja.lproj/MainMenu.strings
index 7e0b706b36f5b626e4d44a305cca7ef2455bc345..bbf62e7b001c2d26dd883abd8ac95bdc709b2164 100644
--- a/ui/ja.lproj/MainMenu.strings
+++ b/ui/ja.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" = "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…";
diff --git a/ui/ja.lproj/MigrateRingAccountsWindow.strings b/ui/ja.lproj/MigrateRingAccountsWindow.strings
index 4b456267857bc5603996ee81e64dab3e1e0eda23..21a137b0d28b2df96aa5c89fa2b7b3aeaa99824a 100644
--- a/ui/ja.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ja.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "アカウントの移行が完了しました";
 
-/* 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" = "アカウントの移行エラー";
diff --git a/ui/ja.lproj/PreferencesWindow.strings b/ui/ja.lproj/PreferencesWindow.strings
index e42ac675f72f1c053058c82699efd27420d40d6c..4bb59716d55f6eeee5f338ad6473e117bd4e057d 100644
--- a/ui/ja.lproj/PreferencesWindow.strings
+++ b/ui/ja.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring設定";
+/* 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" = "全般";
diff --git a/ui/ja.lproj/RegisterNameWindow.strings b/ui/ja.lproj/RegisterNameWindow.strings
index c6871bc2326a07c553740d7e7bd427b1663628b4..acc09f3dd8b31bfd7557569836b981e43830b96c 100644
--- a/ui/ja.lproj/RegisterNameWindow.strings
+++ b/ui/ja.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" = "ユーザー名の登録中にエラーが発生しました";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Ring アカウントのパスワードを入力してください";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "パスワードを入力してください";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "ウィンドウ";
diff --git a/ui/ja.lproj/RingWindow.strings b/ui/ja.lproj/RingWindow.strings
index f1c1ce3a21ff32ee6e05f121ed620ea3567fae0d..5cd81e3f162a545a1582a180aa4ca0d6e48fb7b6 100644
--- a/ui/ja.lproj/RingWindow.strings
+++ b/ui/ja.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "詳細";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "問い合わせ方法";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "履歴";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "これはあなたのRingIDです。コピーして友人と共有してください！";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "連絡先";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "カテゴリー";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring は、ユーザーの自由とプライバシーを尊重する普遍的なコミュニケーションのためのフリーソフトウェアです。";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "カテゴリー";
diff --git a/ui/ja.lproj/RingWizardChoose.strings b/ui/ja.lproj/RingWizardChoose.strings
index b02df9d0923e37686ff728027a2cb176b7943e9c..cf1b92e1a859b40af0a98be960a6addc90ccc4fa 100644
--- a/ui/ja.lproj/RingWizardChoose.strings
+++ b/ui/ja.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "この端末をアカウントへリンク";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Ringアカウントを作成";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ja.lproj/RingWizardLinkAccount.strings b/ui/ja.lproj/RingWizardLinkAccount.strings
index 8afcc5942e31047063ca455fb30f33bdce5d32ad..889ee448688e336b0ec1eeabb4c96fefecb2ca08 100644
--- a/ui/ja.lproj/RingWizardLinkAccount.strings
+++ b/ui/ja.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "キャンセル";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "端末のアカウント管理の設定を開き、使用するRingアカウントを選び、「別の端末をこのアカウントにリンクする」を選択してください。";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "リンク";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "キャンセル";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Ring アカウントのパスワードを入力してください";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "パスワードを入力してください";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "準備完了";
diff --git a/ui/ja.lproj/RingWizardNewAccount.strings b/ui/ja.lproj/RingWizardNewAccount.strings
index cc0517c4a28d4b84811a9cc17d7a9ca738072e7a..dc54e10824454f5d48ad8c4c7cedaa2f2d9c1597 100644
--- a/ui/ja.lproj/RingWizardNewAccount.strings
+++ b/ui/ja.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/ko_KR.lproj/ExportPasswordWindow.strings b/ui/ko_KR.lproj/ExportPasswordWindow.strings
index 5d75ab673301160deceb617185a03b80573c7906..a0f7f255b16456310e4d30ea90b14c6aeb9b546e 100644
--- a/ui/ko_KR.lproj/ExportPasswordWindow.strings
+++ b/ui/ko_KR.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";
diff --git a/ui/ko_KR.lproj/GeneralPrefs.strings b/ui/ko_KR.lproj/GeneralPrefs.strings
index da985a4331cab027604272a173f02c79869976f0..d5f0a90889445a190f5a7996a3b40efbb40fa817 100644
--- a/ui/ko_KR.lproj/GeneralPrefs.strings
+++ b/ui/ko_KR.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/ko_KR.lproj/Localizable.strings b/ui/ko_KR.lproj/Localizable.strings
index 37ff0f7b58d340379f6e5529f11cea8cfda45fea..c5a094e0c0aeeb9e4c50d061bfdce5cf594bdac9 100644
--- a/ui/ko_KR.lproj/Localizable.strings
+++ b/ui/ko_KR.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "수락";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/ko_KR.lproj/MainMenu.strings b/ui/ko_KR.lproj/MainMenu.strings
index a37ab913c85861fefbf173bf68e3aeb84fe91045..9adaa369ae1fec5a3fb550a69894e271164519fa 100644
--- a/ui/ko_KR.lproj/MainMenu.strings
+++ b/ui/ko_KR.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…";
diff --git a/ui/ko_KR.lproj/MigrateRingAccountsWindow.strings b/ui/ko_KR.lproj/MigrateRingAccountsWindow.strings
index 291872be4482f2d1be6655e2cfb8880ebf713c04..52cb04cb9a371ba3cfcb405520ab8e00fd4324ed 100644
--- a/ui/ko_KR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ko_KR.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";
diff --git a/ui/ko_KR.lproj/PreferencesWindow.strings b/ui/ko_KR.lproj/PreferencesWindow.strings
index 72e9bd8154ee9c08ce6ddcca9744bf45dc4119cf..3c9e9e3e5a995fdf516042876fa2e07cc771f63d 100644
--- a/ui/ko_KR.lproj/PreferencesWindow.strings
+++ b/ui/ko_KR.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "일반";
diff --git a/ui/ko_KR.lproj/RegisterNameWindow.strings b/ui/ko_KR.lproj/RegisterNameWindow.strings
index 0055c2a0a343ee7f141b52ee06b619b3552d75af..2b2aaf5d13560acd3215c8a058e1a055b57ce1b9 100644
--- a/ui/ko_KR.lproj/RegisterNameWindow.strings
+++ b/ui/ko_KR.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";
diff --git a/ui/ko_KR.lproj/RingWindow.strings b/ui/ko_KR.lproj/RingWindow.strings
index 611a2ffd2c1c393c86c8e5bf538a032a835c6e62..ac4886c9b143260aea28f6a9d8b8b23151bf5ef6 100644
--- a/ui/ko_KR.lproj/RingWindow.strings
+++ b/ui/ko_KR.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/ko_KR.lproj/RingWizardChoose.strings b/ui/ko_KR.lproj/RingWizardChoose.strings
index 430961afd646f5abb0c7f031aec6772af8235c1a..d458f4a91ce022da85c4d83761b19160b74ff801 100644
--- a/ui/ko_KR.lproj/RingWizardChoose.strings
+++ b/ui/ko_KR.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "이 장치를 계정에 연결하기";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ko_KR.lproj/RingWizardLinkAccount.strings b/ui/ko_KR.lproj/RingWizardLinkAccount.strings
index 01f40f953332a0a563000fc51e81b71e4f77e291..ad3a3621a36e40ded3fac7eb6254bd9ce2a5f94d 100644
--- a/ui/ko_KR.lproj/RingWizardLinkAccount.strings
+++ b/ui/ko_KR.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "취소";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "취소";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/ko_KR.lproj/RingWizardNewAccount.strings b/ui/ko_KR.lproj/RingWizardNewAccount.strings
index 7d5a8bd9a683c5f381971fc2325023e7c6013863..57e470e81801dc574e681c23488ac87ac15e9baf 100644
--- a/ui/ko_KR.lproj/RingWizardNewAccount.strings
+++ b/ui/ko_KR.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/lt.lproj/ExportPasswordWindow.strings b/ui/lt.lproj/ExportPasswordWindow.strings
index 934d1563d7410c206b86f9d0482c0960caa4da97..77e33caf434bc3e76e16599d51a2735aa5726033 100644
--- a/ui/lt.lproj/ExportPasswordWindow.strings
+++ b/ui/lt.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Slaptažodis...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Norėdami pradėti, pateikite savo Ring paskyros slaptažodį";
+/* 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" = "Langas";
diff --git a/ui/lt.lproj/GeneralPrefs.strings b/ui/lt.lproj/GeneralPrefs.strings
index 903db7e8ccf0b297bde1e0db524c45e9eaf3f7cc..fe4ca35e74cfeaa9831f7195af2634450a76b78f 100644
--- a/ui/lt.lproj/GeneralPrefs.strings
+++ b/ui/lt.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Įjungti darbalaukio pranešimus";
+/* 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" = "Esant gaunamiesiems skambučiams, rodyti Ring priekiniame plane";
+/* 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" = "Tai yra bendrinama su jūsų kontaktais ";
diff --git a/ui/lt.lproj/Localizable.strings b/ui/lt.lproj/Localizable.strings
index bf8868d93add392c7a5d7ae5565ef8869cde23ab..c4366089731fbfec979c04dc3cada7147ebab9c9 100644
--- a/ui/lt.lproj/Localizable.strings
+++ b/ui/lt.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopijuoti numerį";
 
 /* Contextual menu entry */
-"Create RING Account" = "Sukurti RING paskyrą";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Sukurti SIP paskyrą";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Gaunamasis skambutis nuo %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Žinutė nuo %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Atmesti";
+"Accept" = "Priimti";
 
 /* Contextual menu entry */
 "Remove value" = "Šalinti reikšmę";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Įvestas naudotojo vardas yra neprieinamas";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Ši paskyra turi būti perkelta į naująjį Ring paskyros 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" = "Slaptažodis, kurį įrašėte, neatrakina šios paskyros";
 
 /* 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." = "Norėdami užbaigti procesą, jūs turite atverti Ring naujame įrenginyje ir pasirinkti parinktį \"Susieti šį įrenginį su paskyra\". Jūsų pin galioja 10 minučių.";
+"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." = "Norėdami tęsti perkėlimą, privalote pasirinkti savo paskyrai slaptažodį. Šis slaptažodis bus naudojamas jūsų pagrindiniam raktui užšifruoti. Taip pat jis bus reikalingas pridedant naujus įrenginius į jūsų Ring paskyrą. Jeigu jūs nesate pasiruošę pasirinkti slaptažodį, tuomet galite užverti Ring ir pratęsti perkėlimą vėliau.";
+"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" = "Nežinomas";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Sveiki atvykę į 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!";
diff --git a/ui/lt.lproj/MainMenu.strings b/ui/lt.lproj/MainMenu.strings
index f71a291b6d9a836649ede74ba0ffa213eb9b4557..e50a12e7db6896acc8b8a5fff6ee92cdcba84cc5 100644
--- a/ui/lt.lproj/MainMenu.strings
+++ b/ui/lt.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Pagrindinis meniu";
 
-/* 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" = "Apie Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Nuostatos...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Slėpti Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Išeiti iš Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Slėpti kitus";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Pagalba";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring pagalba";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Rasti ir pakeisti...";
diff --git a/ui/lt.lproj/MigrateRingAccountsWindow.strings b/ui/lt.lproj/MigrateRingAccountsWindow.strings
index 855c7d265329ce2b832b2be95076c922e59d89ba..86cf55d81dc5069ef475c1c8ab1c04f434fb8304 100644
--- a/ui/lt.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/lt.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Paskyros perkėlimas užbaigtas";
 
-/* 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" = "Ši paskyra turi būti perkelta į naująjį Ring paskyros formatą:\\nSlapyvardis : \\nID:\\nNorėdami tęsti perkėlimą, privalote pasirinkti savo paskyrai slaptažodį. Šis slaptažodis bus naudojamas jūsų pagrindiniam raktui užšifruoti. Taip pat jis bus reikalingas pridedant naujus įrenginius į jūsų Ring paskyrą. Jeigu jūs nesate pasiruošę pasirinkti slaptažodį, tuomet galite užverti Ring ir pratęsti perkėlimą vėliau.";
+"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" = "Paskyros perkėlimo klaida";
diff --git a/ui/lt.lproj/PreferencesWindow.strings b/ui/lt.lproj/PreferencesWindow.strings
index bcf039d0bcfcebeb25a8b230a6bd32bcbd3531ad..87aa7a5ba1cb359242856250a610395c0422bcf2 100644
--- a/ui/lt.lproj/PreferencesWindow.strings
+++ b/ui/lt.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring nuostatos";
+/* 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" = "Bendra";
diff --git a/ui/lt.lproj/RegisterNameWindow.strings b/ui/lt.lproj/RegisterNameWindow.strings
index 5c65436ee99be1d260d0d579b741ed128cf2c838..254a1dee875a790f069675bb21f6bf42871c8faf 100644
--- a/ui/lt.lproj/RegisterNameWindow.strings
+++ b/ui/lt.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Privaloma*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Kiti naudotojai gali jį naudoti vietoj jūsų 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" = "Jūsų naudotojo vardo registravimo metu įvyko klaida";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Įrašykite savo Ring paskyros slaptažodį";
+/* 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" = "Langas";
diff --git a/ui/lt.lproj/RingWindow.strings b/ui/lt.lproj/RingWindow.strings
index d6890bce29f53f4b127b937d85f290c2298bee71..1caedcce442d94a5669c2127ab8b21e8638ede56 100644
--- a/ui/lt.lproj/RingWindow.strings
+++ b/ui/lt.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "išsamiau";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Istorija";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Tai yra jūsų RingID. Nukopijuokite ir dalinkitės juo su savo draugais!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontaktai";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategorija";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategorija";
diff --git a/ui/lt.lproj/RingWizardChoose.strings b/ui/lt.lproj/RingWizardChoose.strings
index 360007f7d820c78a3c3f02a46d3ac0f90b087324..3d87d145bf51e1f2fd16f45e93f85443b5e89b16 100644
--- a/ui/lt.lproj/RingWizardChoose.strings
+++ b/ui/lt.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Susieti šį įrenginį su paskyra";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Sukurti Ring paskyrą";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/lt.lproj/RingWizardLinkAccount.strings b/ui/lt.lproj/RingWizardLinkAccount.strings
index 50050681ea42ceb3a38728866c23c57f496bcdaa..3f2bd800bc14fdaefda684442d8385671f05d67c 100644
--- a/ui/lt.lproj/RingWizardLinkAccount.strings
+++ b/ui/lt.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Atsisakyti";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Pereikite į įrenginio paskyros tvarkymo nustatymą, pasirinkite norimą naudoti Ring paskyrą ir pasirinkite \"Susieti kitą įrenginį su šia paskyra\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Susieti";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Atsisakyti";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Įrašykite savo Ring paskyros slaptažodį";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Įveskite slaptažodį";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Aš pasiruošęs";
diff --git a/ui/lt.lproj/RingWizardNewAccount.strings b/ui/lt.lproj/RingWizardNewAccount.strings
index 286274a899bb311f74a2a3e05a3b13c6e32b7d77..2fed5e5cbcbb10d339d1c3109312d7a0da394ef0 100644
--- a/ui/lt.lproj/RingWizardNewAccount.strings
+++ b/ui/lt.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Tai pažymėję, jūs Ring tinkle užregistruosite unikalų naudotojo vardą. Norėdami su jumis susisiekti, žmonės galės jį naudoti vietoj jūsų RingID, kuris yra 40 simbolių ilgio.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Privaloma*";
diff --git a/ui/ms.lproj/ExportPasswordWindow.strings b/ui/ms.lproj/ExportPasswordWindow.strings
index 59731ac5a605609c776f2a8d8160de57347e560c..ab73af712fbf00ee75adc60528f036173ae62da3 100644
--- a/ui/ms.lproj/ExportPasswordWindow.strings
+++ b/ui/ms.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";
diff --git a/ui/ms.lproj/Localizable.strings b/ui/ms.lproj/Localizable.strings
index ec6216c53582255dbc4a07e5f2dfb24528422392..a684e338ff866ffd9d20e4a6a501730aa309293a 100644
--- a/ui/ms.lproj/Localizable.strings
+++ b/ui/ms.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Salin nombor";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Terima";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Tidak diketahui";
@@ -179,7 +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!";
diff --git a/ui/ms.lproj/MainMenu.strings b/ui/ms.lproj/MainMenu.strings
index 269c012a1b0532067455c93f8cb078bab3229394..fc3e191aac0f5edacfb923ca4ea15fc10d289fb1 100644
--- a/ui/ms.lproj/MainMenu.strings
+++ b/ui/ms.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" = "Mengenai 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…";
diff --git a/ui/ms.lproj/MigrateRingAccountsWindow.strings b/ui/ms.lproj/MigrateRingAccountsWindow.strings
index 7418c984bb0fb270aa5eb1276104023d944e96b9..ee3bbaf1c6b9d3d3dbc85df8a7043d9bc5e262fe 100644
--- a/ui/ms.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ms.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";
diff --git a/ui/ms.lproj/PreferencesWindow.strings b/ui/ms.lproj/PreferencesWindow.strings
index be1516c46f9037edf3a20c6a4ef8dc2783728bc5..00d1fce9275bf7ca5f6db1e4630ea6bdca9eb452 100644
--- a/ui/ms.lproj/PreferencesWindow.strings
+++ b/ui/ms.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Utama";
diff --git a/ui/ms.lproj/RegisterNameWindow.strings b/ui/ms.lproj/RegisterNameWindow.strings
index 62127b6873732d3d18006edf65a49e3da367589e..dc0849ea2d4211e4abc0f99c0f28890b688c0efc 100644
--- a/ui/ms.lproj/RegisterNameWindow.strings
+++ b/ui/ms.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" = "Masukkan kata laluan anda";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Window";
diff --git a/ui/ms.lproj/RingWindow.strings b/ui/ms.lproj/RingWindow.strings
index d1495f498a408ef8a1b2de98b16c105110dfbd96..bfc19372c212c6b1953541dfe10987daa089b682 100644
--- a/ui/ms.lproj/RingWindow.strings
+++ b/ui/ms.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "maklumat";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Sejarah";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kenalan";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/ms.lproj/RingWizardChoose.strings b/ui/ms.lproj/RingWizardChoose.strings
index 2206e6b81acae2d3614c672524c719340ffa9645..78b65033cbb1bb6c0a3801407e2bf86c0d9bb3c7 100644
--- a/ui/ms.lproj/RingWizardChoose.strings
+++ b/ui/ms.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Sambungkan perangkat ini dengan akaun yang telah sedia ada";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Cipta akaun Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ms.lproj/RingWizardLinkAccount.strings b/ui/ms.lproj/RingWizardLinkAccount.strings
index 0ff170ec5353a9df8cf3850899602c8052dad55a..2bd5ec15fb697236e1f98aa00e495d2f075a3aa3 100644
--- a/ui/ms.lproj/RingWizardLinkAccount.strings
+++ b/ui/ms.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Batal";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Batal";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Masukkan kata laluan";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/ms.lproj/RingWizardNewAccount.strings b/ui/ms.lproj/RingWizardNewAccount.strings
index 55e35ca6e32f4ec326ace447113a60568005ec68..5a5f07cf9d78a5350229a1d2e833c5b443d37e21 100644
--- a/ui/ms.lproj/RingWizardNewAccount.strings
+++ b/ui/ms.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/nb.lproj/ExportPasswordWindow.strings b/ui/nb.lproj/ExportPasswordWindow.strings
index f9bfd99af72fdcbf97aa8bd22c2d5da5338255c4..a2881d420c7b224504e26867ccef54ace6b8b7b8 100644
--- a/ui/nb.lproj/ExportPasswordWindow.strings
+++ b/ui/nb.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Passord…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Skriv inn ditt Ring-kontopassord for å starte";
+/* 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" = "vindu";
diff --git a/ui/nb.lproj/GeneralPrefs.strings b/ui/nb.lproj/GeneralPrefs.strings
index da45fc9adb443702a80630a926710957db28c47b..087eb8e72ba73597bfd7f73b982848eba94de0f3 100644
--- a/ui/nb.lproj/GeneralPrefs.strings
+++ b/ui/nb.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Oppdater";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Skru på skrivebordsvarsler";
+/* 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 i forgrunnen ved innkommende samtaler";
+/* 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" = "Dette deles med dine kontakter";
diff --git a/ui/nb.lproj/Localizable.strings b/ui/nb.lproj/Localizable.strings
index 9c4f02098d8bbe78d74045b5d8c1c5b52fd38a93..6bec561a2b10bd7efa33db264f95facc68a0dec1 100644
--- a/ui/nb.lproj/Localizable.strings
+++ b/ui/nb.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopier nummer";
 
 /* Contextual menu entry */
-"Create RING Account" = "Opprett RING-konto";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Opprett SIP-konto";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Innkommende samtale fra %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Melding fra %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Avslå";
+"Accept" = "Aksepter";
 
 /* Contextual menu entry */
 "Remove value" = "Fjern verdi";
@@ -128,7 +132,7 @@
 "Revise Input" = "Se over inntasting";
 
 /* Text shown to the user */
-"RingID : " = "RingID:";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Del";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Innskrevet brukernavn er ikke tilgjengelig";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Følgende konto må flyttes til det nye Ringkonto-formatet:";
+"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" = "Passordet du skrev inn låser ikke opp denne kontoen";
 
 /* 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." = "For å fullføre prosessen, må du åpne Ring på en ny enhet og velge \"Lenk denne enheten til en konto\". Din PIN-kode er gyldig i 10 minutter.";
+"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." = "For å fortsette flyttingen, må du velge passord for din konto. Dette passordet vil bli brukt til å kryptere din hovednøkkel. Den vil være nødvendig for å legge til nye enheter til din Ring-konto. Hvis du ikke er klar til å velge et passord, kan du lukke Ring og fortsette flyttingen seinere.";
+"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" = "Ukjent";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Velkommen til Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Opprett ny konto";
 "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!";
diff --git a/ui/nb.lproj/MainMenu.strings b/ui/nb.lproj/MainMenu.strings
index 4017da6e2f438e7a806eb8ee7bdf6142b4c86f19..7c2c18ca9d2646d14a84e6e6dde654361a148bec 100644
--- a/ui/nb.lproj/MainMenu.strings
+++ b/ui/nb.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AHovedMeny";
 
-/* 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" = "Om Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Innstillinger…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Tjenester";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Skjul Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Avslutt Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Skjul andre";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Hjelp";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Hjelp for Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Søk og erstatt…";
diff --git a/ui/nb.lproj/MigrateRingAccountsWindow.strings b/ui/nb.lproj/MigrateRingAccountsWindow.strings
index 5d0728e10eb8aa8fb80cbf33fc614c7a37f98515..0087a1dc1418e5ebafc5f297cd73c2e97d9bedf6 100644
--- a/ui/nb.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/nb.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Flytting av konto fullført";
 
-/* 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" = "Følgende konto må flyttes til den nye Ring-kontoformatet:\\nAlias:\nID:\nFor å fortsette flyttingen, må du velge passord for din konto. Dette passordet vil bli brukt til å kryptere din hovednøkkel. Den vil være nødvendig for å legge til nye enheter til din Ring-konto. Hvis du ikke er klar til å velge et passord, kan du lukke Ring og fortsette flyttingen senere.";
+"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" = "Feil ved flytting av konto";
diff --git a/ui/nb.lproj/PreferencesWindow.strings b/ui/nb.lproj/PreferencesWindow.strings
index 9d6fc837fa90ae7cde9536c992a609b238ca6f2c..260663777a439a41e85b75c60f327e3c5381d6da 100644
--- a/ui/nb.lproj/PreferencesWindow.strings
+++ b/ui/nb.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring-innstillinger";
+/* 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" = "Generell";
diff --git a/ui/nb.lproj/RegisterNameWindow.strings b/ui/nb.lproj/RegisterNameWindow.strings
index 667f28557f4b89b8d6955cecda2f8ac610fa7e83..d5fcce5bf868175d21aeae33cb18c76223bc4177 100644
--- a/ui/nb.lproj/RegisterNameWindow.strings
+++ b/ui/nb.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Kreves*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andre brukere kan bruke den, istedenfor din 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" = "En feil inntraff under registrering av brukernavn";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Skriv inn ditt passord for din Ring-konto";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Skriv inn ditt passord";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "vindu";
diff --git a/ui/nb.lproj/RingWindow.strings b/ui/nb.lproj/RingWindow.strings
index 8d20d6c715c2da888dd1a3256dec674e6da0c90d..0eca76ef95b516a79f823371ffa05774c7a20270 100644
--- a/ui/nb.lproj/RingWindow.strings
+++ b/ui/nb.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detaljer";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontaktmetode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historie";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dette er Ring-ID-en din.  Kopier og del den med dine venner!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakter";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategori";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring er fri programvare for universell kommunikasjon som respekteret privatlivets fred for dets brukere.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategori";
diff --git a/ui/nb.lproj/RingWizardChoose.strings b/ui/nb.lproj/RingWizardChoose.strings
index 27ff0d77cc5f73134ee3c5c73af76a47459a52a6..f0d4053e935842aa0866ebf9f9ba07605dc8e76b 100644
--- a/ui/nb.lproj/RingWizardChoose.strings
+++ b/ui/nb.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Lenk denne enheten til en konto";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Opprett en Ring-konto";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/nb.lproj/RingWizardLinkAccount.strings b/ui/nb.lproj/RingWizardLinkAccount.strings
index 2a88aad7c973a0245f6d8fcb4fb8181621e41ec8..1b7a246a9bb88e1740170d127f08ad5664b1be73 100644
--- a/ui/nb.lproj/RingWizardLinkAccount.strings
+++ b/ui/nb.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Avbryt";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Gå til \"Kontoadministrasjon\" under \"Innstillinger\" på din enhet, velg Ring-kontoen som skal brukes og velg \"Lenk en annen enhet til denne kontoen\". ↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Lenk";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Avbryt";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Skriv inn ditt passord for din Ring-konto";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Skriv inn passord";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Jeg er klar";
diff --git a/ui/nb.lproj/RingWizardNewAccount.strings b/ui/nb.lproj/RingWizardNewAccount.strings
index c076168de1e8f7da554f9bcb0076b297feb87ff3..a7c2e216d6e3e9c40711d631e3911dca3b58af71 100644
--- a/ui/nb.lproj/RingWizardNewAccount.strings
+++ b/ui/nb.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Ved utkryssing her, vil du registrere et unikt brukernavn på Ring-nettverket. Mennesker kan bruke det til å kontakte deg istedet for å bruke din RingID som er 40 tegn lang.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Kreves*";
diff --git a/ui/nl.lproj/ExportPasswordWindow.strings b/ui/nl.lproj/ExportPasswordWindow.strings
index d506d1b3d24f5912167b50a78ece2ffa08f7d335..f7f6e6df2d97d6e864a62ee16f0788c1898e680c 100644
--- a/ui/nl.lproj/ExportPasswordWindow.strings
+++ b/ui/nl.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Wachtwoord…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Voer je Ring-accountwachtwoord in om te beginnen";
+/* 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" = "Venster";
diff --git a/ui/nl.lproj/GeneralPrefs.strings b/ui/nl.lproj/GeneralPrefs.strings
index afeb12789e5128137ae9754b9c473992b136ee87..abcccba66e728bb963ef3d3e7d3a46f0eff69a53 100644
--- a/ui/nl.lproj/GeneralPrefs.strings
+++ b/ui/nl.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Bureaubladmeldingen inschakelen";
+/* 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" = "Ring naar voorgrond brengen bij inkomende oproepen";
+/* 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" = "Dit wordt gedeeld met je contacten";
diff --git a/ui/nl.lproj/Localizable.strings b/ui/nl.lproj/Localizable.strings
index b15cc08687cfad6757feb047fe92369d9165aa7c..9015576d234af7886b9667a5f062c2245c38f23a 100644
--- a/ui/nl.lproj/Localizable.strings
+++ b/ui/nl.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Nummer kopiëren";
 
 /* Contextual menu entry */
-"Create RING Account" = "Ring-account aanmaken";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SIP-account aanmaken";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Inkomende oproep van %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Bericht van %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Afwijzen";
+"Accept" = "Aanvaarden";
 
 /* Contextual menu entry */
 "Remove value" = "Waarde verwijderen";
@@ -128,7 +132,7 @@
 "Revise Input" = "Invoer herzien";
 
 /* Text shown to the user */
-"RingID : " = "Ring-ID:";
+"ID : " = "ID:";
 
 /* No comment provided by engineer. */
 "Share" = "Delen";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "De ingevoerde gebruikersnaam is niet beschikbaar";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "De volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:";
+"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" = "Het wachtwoord dat je hebt ingevoerd ontgrendelt deze account niet";
 
 /* 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." = "Om het proces te voltooien open je Ring op het nieuwe apparaat en kies je de optie \"Dit apparaat aan een account koppelen\". Je pincode is 10 minuten geldig.";
+"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." = "Om door te gaan met de migratie moet je een wachtwoord voor je account kiezen. Dit wachtwoord zal gebruikt worden om je hoofdsleutel te versleutelen. Het wachtwoord wordt vereist om nieuwe apparaten aan je Ring-account toe te voegen. Als je nog niet klaar bent om een wachtwoord te kiezen kan je Ring sluiten en de migratie later verderzetten.";
+"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" = "Onbekend";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welkom bij Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Nieuwe account aanmaken";
 "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!";
diff --git a/ui/nl.lproj/MainMenu.strings b/ui/nl.lproj/MainMenu.strings
index 9e7a4dfab3ca1497efa8a75a4604ff0d1cf43321..90279931139900af738ddc1847f677fc2cf45dba 100644
--- a/ui/nl.lproj/MainMenu.strings
+++ b/ui/nl.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AHoofdMenu";
 
-/* 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" = "Over Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Voorkeuren…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Diensten";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ring verbergen";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ring afsluiten";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Anderen verbergen";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Help";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring-hulp";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Zoeken en vervangen…";
diff --git a/ui/nl.lproj/MigrateRingAccountsWindow.strings b/ui/nl.lproj/MigrateRingAccountsWindow.strings
index 78cc96753e079c6ef61cb32b728532419571374b..3ad510c0dcb1815ab0d3dd2ac827c1fc32cdb7ef 100644
--- a/ui/nl.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/nl.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Accountmigratie voltooid";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Ring-ID";
+/* 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" = "De volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:\\nAlias:\\nID:\\nOm door te gaan met de migratie moet je een wachtwoord voor je account kiezen. Dit wachtwoord zal gebruikt worden om je hoofdsleutel te versleutelen. Het wachtwoord wordt vereist om nieuwe apparaten aan je Ring-account toe te voegen. Als je nog niet klaar bent om een wachtwoord te kiezen kan je Ring sluiten en de migratie later verderzetten.";
+"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" = "Accountmigratiefout";
diff --git a/ui/nl.lproj/PreferencesWindow.strings b/ui/nl.lproj/PreferencesWindow.strings
index 9a95d2be423fa7e3ea71d25c0cf49eb9f4440ee0..6d990d9124b85b9496a0d2eebf5497298ee9eedd 100644
--- a/ui/nl.lproj/PreferencesWindow.strings
+++ b/ui/nl.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Voorkeuren";
+/* 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" = "Algemeen";
diff --git a/ui/nl.lproj/RegisterNameWindow.strings b/ui/nl.lproj/RegisterNameWindow.strings
index b7769f6801f6c93352469472d222e5ec8f4d146a..6b71e010d443b7f08efbc1eefc5be1fb8f7a797c 100644
--- a/ui/nl.lproj/RegisterNameWindow.strings
+++ b/ui/nl.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Vereist*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andere gebruikers kunnen dit in plaats van je Ring-ID gebruiken";
+/* 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" = "Er is een fout opgetreden bij de registratie van je gebruikersnaam";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Voer je Ring-accountwachtwoord in";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Voer je wachtwoord in";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Venster";
diff --git a/ui/nl.lproj/RingWindow.strings b/ui/nl.lproj/RingWindow.strings
index b7ce2146c097494542ab644c81c86ba7ed6e9c80..c51cc12a0cea26b403738271364b0fae8a76707e 100644
--- a/ui/nl.lproj/RingWindow.strings
+++ b/ui/nl.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contactmethode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Geschiedenis";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dit is je Ring-ID. Deel hem met je vrienden!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacten";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categorie";
diff --git a/ui/nl.lproj/RingWizardChoose.strings b/ui/nl.lproj/RingWizardChoose.strings
index be053d3078f59d428b861129470bf7184148cddf..55144a691fc4bac686012a75f657c743d3bc1f25 100644
--- a/ui/nl.lproj/RingWizardChoose.strings
+++ b/ui/nl.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Dit apparaat aan een account koppelen";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Een Ring-account aanmaken";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/nl.lproj/RingWizardLinkAccount.strings b/ui/nl.lproj/RingWizardLinkAccount.strings
index f1489d8b6a77bd79e8aea37d988bdd9865f11ba1..cddf4459e09710845fca8ca57b31e631b6597cc9 100644
--- a/ui/nl.lproj/RingWizardLinkAccount.strings
+++ b/ui/nl.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuleren";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Ga naar de accountbeheerinstellingen van het apparaat, kies de Ring-account die je wil gebruiken en selecteer ‘Een ander apparaat aan deze account koppelen’.";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Koppelen";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuleren";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Voer je Ring-accountwachtwoord in";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Voer wachtwoord in";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Ik ben klaar";
diff --git a/ui/nl.lproj/RingWizardNewAccount.strings b/ui/nl.lproj/RingWizardNewAccount.strings
index 6b52c2ecdfc07d13a8c6ca5dc8a4e42dc6d3d973..141b6d4c1c27ea516284cd415781c238f2ae89a2 100644
--- a/ui/nl.lproj/RingWizardNewAccount.strings
+++ b/ui/nl.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Als je dit aanvinkt zal je een unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om je te bellen, ipv je 40 tekens lange Ring-ID.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Vereist*";
diff --git a/ui/nl_BE.lproj/ExportPasswordWindow.strings b/ui/nl_BE.lproj/ExportPasswordWindow.strings
index 323d516cbbaad7e0cfb9a89ae65a22eb8e9b6718..a0d88ccbe04f06dc10ff899e1855610249f150fa 100644
--- a/ui/nl_BE.lproj/ExportPasswordWindow.strings
+++ b/ui/nl_BE.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Paswoord…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Voer uw Ring-accountpaswoord in voor te beginnen";
+/* 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" = "Venster";
diff --git a/ui/nl_BE.lproj/GeneralPrefs.strings b/ui/nl_BE.lproj/GeneralPrefs.strings
index 03942b468233a8225f913b3e1e1e076c73235f3b..5559ca9814488edaa26e727beb9fa1bbfef6417c 100644
--- a/ui/nl_BE.lproj/GeneralPrefs.strings
+++ b/ui/nl_BE.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Bureaubladmeldingen inschakelen";
+/* 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" = "Ring naar voorgrond brengen bij inkomende oproepen";
+/* 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" = "Dit wordt gedeeld met uw contacten";
diff --git a/ui/nl_BE.lproj/Localizable.strings b/ui/nl_BE.lproj/Localizable.strings
index 0889aa38a38fe6c3c1d8ed8c9694d01424928705..459b92b6a59832dda0ef89f9f9dde4510c03aa67 100644
--- a/ui/nl_BE.lproj/Localizable.strings
+++ b/ui/nl_BE.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Nummer kopiëren";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Afwijzen";
+"Accept" = "Aanvaarden";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Delen";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "D’ingevoerde gebruikersnaam is nie beschikbaar";
 
 /* 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" = "Het paswoord dat u hebt ingevoerd ontgrendelt dit account niet";
 
 /* 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" = "Onbekend";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welkom bij Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Nieuwen account aanmaken";
 "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!";
diff --git a/ui/nl_BE.lproj/MainMenu.strings b/ui/nl_BE.lproj/MainMenu.strings
index ce365b9cc622894bd6f78449591e5a699f23a3af..5f0979b7c2a42a4858973fc4765b6b49f42365af 100644
--- a/ui/nl_BE.lproj/MainMenu.strings
+++ b/ui/nl_BE.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AHoofdMenu";
 
-/* 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" = "Over Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Voorkeuren…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Diensten";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ring verbergen";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ring afsluiten";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Anderen verbergen";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Hulp";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring-hulp";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Zoeken en vervangen…";
diff --git a/ui/nl_BE.lproj/MigrateRingAccountsWindow.strings b/ui/nl_BE.lproj/MigrateRingAccountsWindow.strings
index 6683eabcae4834f4fa6b4cf980f38304340e181f..eae8bbc9c7d032ba3d51450ed8ca15734bcfd7db 100644
--- a/ui/nl_BE.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/nl_BE.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Accountmigratie voltooid";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Ring-ID";
+/* 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" = "Het volgende account moet gemigreerd worden naar het nieuwe Ring-accountformaat:\\nAlias:\\nID:\\nOm door te gaan met de migratie kies een paswoord voor uw account. Dit paswoord zal worden gebruikt voor uw hoofdsleutel te versleutelen. Het paswoord wordt vereist om nieuwe apparaten aan uw Ring-account toe te voegen. Als u nog niet klaar bent voor een paswoord te kiezen kunt u Ring sluiten en de migratie later verderzetten.";
+"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" = "Accountmigratiefout";
diff --git a/ui/nl_BE.lproj/PreferencesWindow.strings b/ui/nl_BE.lproj/PreferencesWindow.strings
index 5658612bc303af141b5e298e479c869bf9d686f3..6d990d9124b85b9496a0d2eebf5497298ee9eedd 100644
--- a/ui/nl_BE.lproj/PreferencesWindow.strings
+++ b/ui/nl_BE.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring-voorkeuren";
+/* 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" = "Algemeen";
diff --git a/ui/nl_BE.lproj/RegisterNameWindow.strings b/ui/nl_BE.lproj/RegisterNameWindow.strings
index 7e2d0daa26d52c85a0d5e1895a9f45b9f1bdf321..336d2c2275adfe7aba4970e2a3d4407e1e4e1235 100644
--- a/ui/nl_BE.lproj/RegisterNameWindow.strings
+++ b/ui/nl_BE.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Vereist*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andere gebruikers kunnen dit in plaats van uw Ring-ID gebruiken";
+/* 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" = "Er is een fout opgetreden bij de registratie van uw gebruikersnaam";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Voer uw Ring-accountpaswoord in";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Voerd uw paswoord in";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Venster";
diff --git a/ui/nl_BE.lproj/RingWindow.strings b/ui/nl_BE.lproj/RingWindow.strings
index 78cf662bc289f5dae5d774a5af053707993be24c..9f4376a1f79f6ab6ed003a043ec15893d3ea3248 100644
--- a/ui/nl_BE.lproj/RingWindow.strings
+++ b/ui/nl_BE.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contactmethode";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Geschiedenis";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Dit is uw Ring-ID. Deel hem met uw vrienden!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacten";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categorie";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigd.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categorie";
diff --git a/ui/nl_BE.lproj/RingWizardChoose.strings b/ui/nl_BE.lproj/RingWizardChoose.strings
index 97e3957de2438ea4bcd726312d4c33d741fafa8e..55144a691fc4bac686012a75f657c743d3bc1f25 100644
--- a/ui/nl_BE.lproj/RingWizardChoose.strings
+++ b/ui/nl_BE.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Dit apparaat aan een account koppelen";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Maak een Ring-account aan";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/nl_BE.lproj/RingWizardLinkAccount.strings b/ui/nl_BE.lproj/RingWizardLinkAccount.strings
index 97b79709113857bf581fc859a7a05122488bbe2b..081dc19637396821774a45f0ca176130f9479bae 100644
--- a/ui/nl_BE.lproj/RingWizardLinkAccount.strings
+++ b/ui/nl_BE.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Annuleren";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Ga naar de accountbeheerinstellingen van het apparaat, kies de Ring-account die u wil gebruiken en selecteer ‘Koppel een ander apparaat aan dit account’.";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Koppelen";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Annuleren";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Voer uw Ring-accountpaswoord in";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Voerd uw paswoord in";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Ik ben klaar";
diff --git a/ui/nl_BE.lproj/RingWizardNewAccount.strings b/ui/nl_BE.lproj/RingWizardNewAccount.strings
index d12c6f38bc69a04e575a69db01c4aaced78ddcb0..bc53408d7e9f27f3b146bc7e62cbd19867830c0a 100644
--- a/ui/nl_BE.lproj/RingWizardNewAccount.strings
+++ b/ui/nl_BE.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Als u dit aanvinkt, registreert uw  een unieke gebruikersnaam op het Ring-netwerk. Andere personen kunnen deze gebruikersnaam gebruiken om  u te contacteren, in plaats van uw 40 tekens lange Ring-ID.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Vereist*";
diff --git a/ui/nl_NL.lproj/ExportPasswordWindow.strings b/ui/nl_NL.lproj/ExportPasswordWindow.strings
index d9009cd265e1605ed2ef890807bc7693a1f09de3..dd412d0c3ab50cce0f885a56f3fe63e1988739a9 100644
--- a/ui/nl_NL.lproj/ExportPasswordWindow.strings
+++ b/ui/nl_NL.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";
diff --git a/ui/nl_NL.lproj/Localizable.strings b/ui/nl_NL.lproj/Localizable.strings
index b8e33e36c95b236bae1d1d5c42551e3be590da55..770680c394b8c3083da2446455a7b003a54d43a3 100644
--- a/ui/nl_NL.lproj/Localizable.strings
+++ b/ui/nl_NL.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopieër nummer";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/nl_NL.lproj/MainMenu.strings b/ui/nl_NL.lproj/MainMenu.strings
index 769180272f796fb1e9dca61c0b5f747c994e396a..bb2ee0129d47783bf5530dde10b443892317862e 100644
--- a/ui/nl_NL.lproj/MainMenu.strings
+++ b/ui/nl_NL.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Bellen";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Bellen";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "Over 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…";
diff --git a/ui/nl_NL.lproj/MigrateRingAccountsWindow.strings b/ui/nl_NL.lproj/MigrateRingAccountsWindow.strings
index 7e628abc357233e60438575ad536315931347143..369cf049159e907a3fd34d4137b447922e66c638 100644
--- a/ui/nl_NL.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/nl_NL.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";
diff --git a/ui/nl_NL.lproj/PreferencesWindow.strings b/ui/nl_NL.lproj/PreferencesWindow.strings
index c085a2431eb1066ad81bd4ae1b3e08fc20fb4f98..5567eb4b59820312eb05e2a5e4212735cfbb1e14 100644
--- a/ui/nl_NL.lproj/PreferencesWindow.strings
+++ b/ui/nl_NL.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Bel voorkeuren";
+/* 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" = "Algemeen";
diff --git a/ui/nl_NL.lproj/RegisterNameWindow.strings b/ui/nl_NL.lproj/RegisterNameWindow.strings
index acd6f7fa4b92c4f5b528ec5b2e5ec6a741734160..c59468c51259f5879f6750e66ec23e53ce83c4e0 100644
--- a/ui/nl_NL.lproj/RegisterNameWindow.strings
+++ b/ui/nl_NL.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";
diff --git a/ui/nl_NL.lproj/RingWindow.strings b/ui/nl_NL.lproj/RingWindow.strings
index 2a7210a692d97cf120bd43527d7b8158e9a2f31c..e1f960e1c18d90a554fd6cc5ed04c5f2b2a32ac1 100644
--- a/ui/nl_NL.lproj/RingWindow.strings
+++ b/ui/nl_NL.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "gegevens";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Bellen";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/pa.lproj/GeneralPrefs.strings b/ui/pa.lproj/GeneralPrefs.strings
index 3b69c2fd52d58677d9b94e947529a1cd4e3b54d6..0277d52cb78864505075a466927010914b6d9e4b 100644
--- a/ui/pa.lproj/GeneralPrefs.strings
+++ b/ui/pa.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/pa.lproj/MainMenu.strings b/ui/pa.lproj/MainMenu.strings
index 6142fdf2fc80a702ff9be2c18cea9b58c3729140..5cef375897a2fca93b918cf715b178681743cef7 100644
--- a/ui/pa.lproj/MainMenu.strings
+++ b/ui/pa.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "ਰਿੰਗ";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "ਰਿੰਗ";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "ਰਿੰਗ ਬਾਰੇ";
+/* 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…";
diff --git a/ui/pa.lproj/RingWindow.strings b/ui/pa.lproj/RingWindow.strings
index 093e1af2847706f8c2da09e6f9d81ed6fc8fc5d9..63644697fbde4c64cd1ef48f1aa201a7ba25d7e9 100644
--- a/ui/pa.lproj/RingWindow.strings
+++ b/ui/pa.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "details";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "ਰਿੰਗ";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "ਇਤਿਹਾਸ";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/pl.lproj/ExportPasswordWindow.strings b/ui/pl.lproj/ExportPasswordWindow.strings
index 675af666d268d53dbeab5b41816ddf193665d6d1..28d4dbd7c48fb7f1c088285278d18ac59f8ad0f7 100644
--- a/ui/pl.lproj/ExportPasswordWindow.strings
+++ b/ui/pl.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Hasło...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Podaj hasło Ring aby rozpocząć";
+/* 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" = "Okno";
diff --git a/ui/pl.lproj/GeneralPrefs.strings b/ui/pl.lproj/GeneralPrefs.strings
index 57db8f640112443943c478d256072f016275facb..1b7ffb788924db97ba3ab14479851e6ce34a3086 100644
--- a/ui/pl.lproj/GeneralPrefs.strings
+++ b/ui/pl.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Aktualizacja";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Włącz powiadomienia desktop";
+/* 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" = "Przenieś Ring na pierwszy plan przy połączeniach przychodzących.";
+/* 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" = "To jest udostępnione twoim kontaktom";
diff --git a/ui/pl.lproj/Localizable.strings b/ui/pl.lproj/Localizable.strings
index a52191b4e06a552310153ce805027a7d41f60eca..024237a3b70065ea89f521600a2db64557a275c8 100644
--- a/ui/pl.lproj/Localizable.strings
+++ b/ui/pl.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Skopiuj numer";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Połączenie przychodzące od %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Wiadomość od %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Odmów";
+"Accept" = "Akceptuj";
 
 /* Contextual menu entry */
 "Remove value" = "Usuń zawartość";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Podziel się";
@@ -149,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" = "Hasło, które zostało wpisane, nie odblokowuje tego konta";
 
 /* 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" = "Nieznane";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Witamy w Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Utwórz nowe konto";
 "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!";
diff --git a/ui/pl.lproj/MainMenu.strings b/ui/pl.lproj/MainMenu.strings
index 79212fee57b2a9b29647bfae62a7b39185513e25..8b5e5c6b18da2433f29211163a69ac6561a50b20 100644
--- a/ui/pl.lproj/MainMenu.strings
+++ b/ui/pl.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "MenuGłówne";
 
-/* 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" = "o Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Ustawienia...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Usługi";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ukryj Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Wyjdź z Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Ukryj Inne";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Pomoc";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Pomoc Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Znajdź i Zamień…";
diff --git a/ui/pl.lproj/MigrateRingAccountsWindow.strings b/ui/pl.lproj/MigrateRingAccountsWindow.strings
index ab5480ecb715ce1f72d483f0d90e023a3e3aded7..db58e4266bbe7391b56a3afa73dc07260da170d0 100644
--- a/ui/pl.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pl.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Zakończono przenoszenie konta";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "ID Ring";
+/* 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" = "Następujące konto wymaga przeniesienia do nowego formatu konta Ring account format:\\nAlias:\\nID:\\nAby rozpocząć przenoszenie konta, musisz wybrać hasło dla swojego konta. To hasło będzie używane, by szyfrować twój główny klucz. Będzie ono wymagane, by dodawać nowe urządzenia do twojego konta Ring. Jeżeli nie jesteś gotowy(a), by wybrać hasło, możesz zamknąć Ring i wznowić przenoszenie konta później.";
+"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" = "Błąd przenoszenia konta";
diff --git a/ui/pl.lproj/PreferencesWindow.strings b/ui/pl.lproj/PreferencesWindow.strings
index b86bd8a6532eaf685f57d4517fd85862b4e30378..1af8be62d989942686cb631c04f794aa15124068 100644
--- a/ui/pl.lproj/PreferencesWindow.strings
+++ b/ui/pl.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ustawienia Ring";
+/* 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" = "Generalne";
diff --git a/ui/pl.lproj/RegisterNameWindow.strings b/ui/pl.lproj/RegisterNameWindow.strings
index a5a7b47e3b47c67521b07fef0da9a82b78236c5a..b02b78d1609fa618e470363afa53a6264037ff5c 100644
--- a/ui/pl.lproj/RegisterNameWindow.strings
+++ b/ui/pl.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obowiązkowe*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Inni użytkownicy mogą jej używać, zamiast twojego 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" = "Wystąpił błąd podczas rejestracji nazwy użytkownika";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Wpisz hasło do twojego konta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Wpisz swoje hasło";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Okno";
diff --git a/ui/pl.lproj/RingWindow.strings b/ui/pl.lproj/RingWindow.strings
index ab99189c053cdcc654b592420f69e97b12314512..bbf0ddb98011acec2feafe6ae4f24f674340d196 100644
--- a/ui/pl.lproj/RingWindow.strings
+++ b/ui/pl.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detale";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Metoda skontaktowania";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historia";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "To jest twój RingID. Skopiuj i podziel go ze swoimi przyjaciółmi !";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakty";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategoria";
diff --git a/ui/pl.lproj/RingWizardChoose.strings b/ui/pl.lproj/RingWizardChoose.strings
index 4083e90b1b117e830b67d877391c86752e0f7a42..248b6f20a5a5104dd34b0f43f29d105709f940ec 100644
--- a/ui/pl.lproj/RingWizardChoose.strings
+++ b/ui/pl.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Połącz to urządzenie z kontem";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Stwórz konto Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/pl.lproj/RingWizardLinkAccount.strings b/ui/pl.lproj/RingWizardLinkAccount.strings
index 86dc38c5a9c6719917219f1ef271adf567f6acc9..9ef2c2716b59a6e2d4d72a3df3a1f935c1f9c3fc 100644
--- a/ui/pl.lproj/RingWizardLinkAccount.strings
+++ b/ui/pl.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Anuluj";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Przejdź do ustawień zarządzania kontem na urządzeniu, wybierz konto Ring i zaznacz \"Połącz urządzenie do tego konta\".";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Połącz";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Anuluj";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Wpisz hasło do twojego konta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Wprowadź hasło";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Jestem gotowy(a)";
diff --git a/ui/pl.lproj/RingWizardNewAccount.strings b/ui/pl.lproj/RingWizardNewAccount.strings
index 8cef2c2c413455e5a3015728180a85dcc4af86a1..092f9a15c7a0e7c5063afc2f956f9d0db8e5cb69 100644
--- a/ui/pl.lproj/RingWizardNewAccount.strings
+++ b/ui/pl.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Ring. Ludzie mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego RingID które ma 40 znaków.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obowiązkowe*";
diff --git a/ui/pl_PL.lproj/ExportPasswordWindow.strings b/ui/pl_PL.lproj/ExportPasswordWindow.strings
index 880ac5cc4bf1656c7843ae33a418819ec05cb70f..04edfde418502956bd95750844672b0d44562f16 100644
--- a/ui/pl_PL.lproj/ExportPasswordWindow.strings
+++ b/ui/pl_PL.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" = "Okno";
diff --git a/ui/pl_PL.lproj/Localizable.strings b/ui/pl_PL.lproj/Localizable.strings
index 1b3f83f9603569007b0aa80f7cb7e987b6de1f69..de812fdf7113dfbc2ca3ff1f72031559b0ec7ac9 100644
--- a/ui/pl_PL.lproj/Localizable.strings
+++ b/ui/pl_PL.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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";
@@ -179,7 +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!";
diff --git a/ui/pl_PL.lproj/MainMenu.strings b/ui/pl_PL.lproj/MainMenu.strings
index c88b97615081d04097b8a8acd1d76e4367969403..4222eb5586ad516b77e8043f790f5968cdaf1247 100644
--- a/ui/pl_PL.lproj/MainMenu.strings
+++ b/ui/pl_PL.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Menu glowne";
 
-/* 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" = "O Ringu";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Ustawienia";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ukryj Ringa";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Zamknij Ringa";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Ukryj Inne";
@@ -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…";
diff --git a/ui/pl_PL.lproj/MigrateRingAccountsWindow.strings b/ui/pl_PL.lproj/MigrateRingAccountsWindow.strings
index 7f1717d48ddac026a7e0c38b964993d5aa37686a..1be93a2c058753114bb4dfca7dff07c1617d1d6b 100644
--- a/ui/pl_PL.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pl_PL.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";
diff --git a/ui/pl_PL.lproj/RegisterNameWindow.strings b/ui/pl_PL.lproj/RegisterNameWindow.strings
index bc328c764c3f11a539086b8c91a75daa47b3c502..92b8154b5392c4978fba562abbf902d866538d0a 100644
--- a/ui/pl_PL.lproj/RegisterNameWindow.strings
+++ b/ui/pl_PL.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" = "Okno";
diff --git a/ui/pt.lproj/AccAdvanced.strings b/ui/pt.lproj/AccAdvanced.strings
index 767459743e4d4534ac4617cb27e92e6cb23d1b88..e10e1a475ac7eb73151198de5c62891d9036cab6 100644
--- a/ui/pt.lproj/AccAdvanced.strings
+++ b/ui/pt.lproj/AccAdvanced.strings
@@ -1,9 +1,9 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "0eY-9x-bAr"; */
-"0eY-9x-bAr.placeholderString" = "Server url...";
+"0eY-9x-bAr.placeholderString" = "URL do servidor...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "realm..."; ObjectID = "6u9-cM-ep0"; */
-"6u9-cM-ep0.placeholderString" = "realm...";
+"6u9-cM-ep0.placeholderString" = "domínio...";
 
 /* Class = "NSButtonCell"; title = "Same as local parameters"; ObjectID = "Atv-t7-5YJ"; */
 "Atv-t7-5YJ.title" = "Igual aos parâmetros locais";
@@ -12,28 +12,28 @@
 "FQ4-fp-Pxj.title" = "Min";
 
 /* Class = "NSTextFieldCell"; title = "Audio RTP port Range"; ObjectID = "Jho-hi-Mvg"; */
-"Jho-hi-Mvg.title" = "Audio RTP port Range";
+"Jho-hi-Mvg.title" = "Intervalo de portas RTP de áudio";
 
 /* Class = "NSTextFieldCell"; title = "Network Interface"; ObjectID = "K9I-vh-jeu"; */
-"K9I-vh-jeu.title" = "Network Interface";
+"K9I-vh-jeu.title" = "Interface da Rede";
 
 /* Class = "NSButtonCell"; title = "Set published address and port"; ObjectID = "OL5-DI-aCq"; */
-"OL5-DI-aCq.title" = "Set published address and port";
+"OL5-DI-aCq.title" = "Configurar endereço e portas publicadas";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "password..."; ObjectID = "OR2-la-DUE"; */
-"OR2-la-DUE.placeholderString" = "password...";
+"OR2-la-DUE.placeholderString" = "palavra-chave...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "username..."; ObjectID = "P7k-xH-2mr"; */
-"P7k-xH-2mr.placeholderString" = "username...";
+"P7k-xH-2mr.placeholderString" = "nome de utilizador...";
 
 /* Class = "NSButtonCell"; title = "Using TURN"; ObjectID = "QS0-TJ-NQh"; */
-"QS0-TJ-NQh.title" = "Using TURN";
+"QS0-TJ-NQh.title" = "A usar TURN";
 
 /* Class = "NSTextFieldCell"; title = "Published Address"; ObjectID = "Qf3-E3-5U6"; */
-"Qf3-E3-5U6.title" = "Published Address";
+"Qf3-E3-5U6.title" = "Endereço Publicado";
 
 /* Class = "NSTextFieldCell"; title = "Video RTP port Range"; ObjectID = "XA8-Sy-CYG"; */
-"XA8-Sy-CYG.title" = "Video RTP port Range";
+"XA8-Sy-CYG.title" = "Intervalo de portas RTP de vídeo";
 
 /* Class = "NSTextFieldCell"; title = "Min"; ObjectID = "a6W-wm-OmC"; */
 "a6W-wm-OmC.title" = "Min";
@@ -42,13 +42,13 @@
 "dbq-qU-93x.title" = "Max";
 
 /* Class = "NSButtonCell"; title = "Radio"; ObjectID = "fB0-X8-GXk"; */
-"fB0-X8-GXk.title" = "Radio";
+"fB0-X8-GXk.title" = "Rádio";
 
 /* Class = "NSTextFieldCell"; title = "Registration expire"; ObjectID = "fCd-4d-sP0"; */
-"fCd-4d-sP0.title" = "Registration expire";
+"fCd-4d-sP0.title" = "O registo expirou";
 
 /* Class = "NSButtonCell"; title = "Using STUN"; ObjectID = "gVd-Dw-1B4"; */
-"gVd-Dw-1B4.title" = "Using STUN";
+"gVd-Dw-1B4.title" = "A usar STUN";
 
 /* Class = "NSTextFieldCell"; title = "Max"; ObjectID = "oa2-Pe-6Uw"; */
 "oa2-Pe-6Uw.title" = "Max";
@@ -57,16 +57,16 @@
 "sTk-1C-1KO.title" = "Endereço";
 
 /* Class = "NSTextFieldCell"; title = "Local port"; ObjectID = "shs-Xm-qnY"; */
-"shs-Xm-qnY.title" = "Local port";
+"shs-Xm-qnY.title" = "Porta local";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
-"uzg-09-8vi.placeholderString" = "Server url...";
+"uzg-09-8vi.placeholderString" = "URL do servidor...";
 
 /* Class = "NSTextFieldCell"; title = "Port"; ObjectID = "wl8-YK-M76"; */
 "wl8-YK-M76.title" = "Porta";
 
 /* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "xGw-j0-4ID"; */
-"xGw-j0-4ID.title" = "seconds";
+"xGw-j0-4ID.title" = "segundos";
 
 /* Class = "NSTextFieldCell"; title = "Registration"; ObjectID = "yB5-ET-gBL"; */
-"yB5-ET-gBL.title" = "Registration";
+"yB5-ET-gBL.title" = "Registo";
diff --git a/ui/pt.lproj/AccGeneral.strings b/ui/pt.lproj/AccGeneral.strings
index 54efe623b8c9f68629314b60402c4465225da352..65d3c8f48e2d3c0b11e8d7cc1f5352888ebaa4c5 100644
--- a/ui/pt.lproj/AccGeneral.strings
+++ b/ui/pt.lproj/AccGeneral.strings
@@ -3,31 +3,31 @@
 "0D8-im-2uM.title" = "RTP";
 
 /* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "21g-eQ-0Sc"; */
-"21g-eQ-0Sc.title" = "Try Registration";
+"21g-eQ-0Sc.title" = "Tentar Registo";
 
 /* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "3uy-g0-eCm"; */
-"3uy-g0-eCm.title" = "Server hostname";
+"3uy-g0-eCm.title" = "Nome do servidor hospedeiro";
 
 /* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "4Nm-hw-379"; */
-"4Nm-hw-379.title" = "Usuário";
+"4Nm-hw-379.title" = "Nome de utilizador";
 
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "KSm-ZB-4aj"; */
-"KSm-ZB-4aj.title" = "Use custom user-agent";
+"KSm-ZB-4aj.title" = "Usar agente de utilizador personalizado";
 
 /* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Mxv-Rt-ON6"; */
 "Mxv-Rt-ON6.title" = "Apelido";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "N5h-tI-ZLz"; */
-"N5h-tI-ZLz.title" = "Upnp enabled";
+"N5h-tI-ZLz.title" = "UPnP ativado";
 
 /* Class = "NSTextFieldCell"; title = "DTMF tone type"; ObjectID = "Rg8-qR-h1X"; */
-"Rg8-qR-h1X.title" = "DTMF tone type";
+"Rg8-qR-h1X.title" = "Tipo de tom DTMF";
 
 /* Class = "NSButtonCell"; title = "Show password"; ObjectID = "UXm-73-BNy"; */
-"UXm-73-BNy.title" = "Exibir senha";
+"UXm-73-BNy.title" = "Exibir palavra-chave";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "WCR-30-BX0"; */
-"WCR-30-BX0.title" = "Password:";
+"WCR-30-BX0.title" = "Palavra-chave:";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "YMy-QE-7A3"; */
 "YMy-QE-7A3.title" = "Chamadas respondias automaticamente";
@@ -36,7 +36,7 @@
 "jch-Qt-hTO.title" = "SIP";
 
 /* Class = "NSTextFieldCell"; title = "Parameters"; ObjectID = "mlN-YG-fLS"; */
-"mlN-YG-fLS.title" = "Parameters";
+"mlN-YG-fLS.title" = "Parâmetros";
 
 /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "upU-sL-9i3"; */
 "upU-sL-9i3.title" = "Conta";
diff --git a/ui/pt.lproj/AccMedia.strings b/ui/pt.lproj/AccMedia.strings
index 5984101d184e0a7570fddb1744ef0b5103fc430c..5907a0ec4f81e38ab03cea4a3f7e87e4f7f8275c 100644
--- a/ui/pt.lproj/AccMedia.strings
+++ b/ui/pt.lproj/AccMedia.strings
@@ -6,7 +6,7 @@
 "CO7-VF-04Q.title" = "Ativo";
 
 /* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
-"KkI-i1-mfY.title" = "Enable ringtones";
+"KkI-i1-mfY.title" = "Ativar toques";
 
 /* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
 "MbZ-7X-K5I.title" = "Ativo";
@@ -15,16 +15,16 @@
 "OSC-eG-2kt.title" = "Vídeo";
 
 /* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
-"aMg-uJ-Krx.title" = "Ringtones";
+"aMg-uJ-Krx.title" = "Toques de chamada";
 
 /* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
 "biN-bX-qM1.title" = "Codecs";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
-"dwG-Ro-bIS.placeholderString" = "Frequency";
+"dwG-Ro-bIS.placeholderString" = "Frequência";
 
 /* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
-"dwG-Ro-bIS.title" = "details";
+"dwG-Ro-bIS.title" = "detalhes";
 
 /* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
 "gzX-Wc-S6g.title" = "Áudio";
@@ -33,13 +33,13 @@
 "gza-RF-yKF.title" = "Desligado";
 
 /* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
-"hHf-uc-NlW.title" = "Play";
+"hHf-uc-NlW.title" = "Reproduzir";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
 "pvl-9U-X4l.placeholderString" = "Nome";
 
 /* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
-"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
+"rRr-la-G9L.title" = "Os codecs são usados ao estabelecer uma comunicação com alguém. É possível ativá-los e reordená-los (o primeiro ativado na lista é o preferido)";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
 "rU5-XQ-Ixc.placeholderString" = "Nome";
diff --git a/ui/pt.lproj/AccRing.strings b/ui/pt.lproj/AccRing.strings
index 5f06709e979583c9c3d9e2049108b48cfd562c68..82359b313875b79bc77fefd55cb1d834e8d5d59a 100644
--- a/ui/pt.lproj/AccRing.strings
+++ b/ui/pt.lproj/AccRing.strings
@@ -6,16 +6,16 @@
 "8WI-fC-Due.title" = "RingID";
 
 /* Class = "NSTextFieldCell"; title = "Bootstrap server"; ObjectID = "B6b-iB-REZ"; */
-"B6b-iB-REZ.title" = "Bootstrap server";
+"B6b-iB-REZ.title" = "Servidor de inicialização";
 
 /* Class = "NSTextFieldCell"; title = "Permissions"; ObjectID = "EDd-FX-wcz"; */
-"EDd-FX-wcz.title" = "Permissions";
+"EDd-FX-wcz.title" = "Permissões";
 
 /* Class = "NSButtonCell"; title = "Register name"; ObjectID = "G8M-go-xvD"; */
-"G8M-go-xvD.title" = "Register name";
+"G8M-go-xvD.title" = "Registar nome";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Name or nickname..."; ObjectID = "HN3-i9-zmw"; */
-"HN3-i9-zmw.placeholderString" = "Name or nickname...";
+"HN3-i9-zmw.placeholderString" = "Nome ou alcunha...";
 
 /* Class = "NSButtonCell"; title = "Auto-answer calls"; ObjectID = "OeY-na-0YT"; */
 "OeY-na-0YT.title" = "Chamadas respondias automaticamente";
@@ -27,19 +27,19 @@
 "Wzq-V2-YLU.title" = "Pseudônimo";
 
 /* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
-"ddk-1G-0jU.title" = "Use custom user-agent";
+"ddk-1G-0jU.title" = "Usar agente de utilizador personalizado";
 
 /* Class = "NSTextFieldCell"; title = "Blockchain server"; ObjectID = "fSU-Pc-Y5a"; */
-"fSU-Pc-Y5a.title" = "Blockchain server";
+"fSU-Pc-Y5a.title" = "Servidor da cadeia de blocos";
 
 /* Class = "NSButtonCell"; title = "Allow calls from peers in your contact list"; ObjectID = "fX7-9W-XFl"; */
-"fX7-9W-XFl.title" = "Allow calls from peers in your contact list";
+"fX7-9W-XFl.title" = "Aceitar chamadas de pares na sua lista de contactos";
 
 /* Class = "NSButtonCell"; title = "Allow calls from unknown peers"; ObjectID = "kmI-jb-aal"; */
 "kmI-jb-aal.title" = "Permitir chamadas de desconhecidos";
 
 /* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
-"lHI-bz-ddQ.title" = "Upnp enabled";
+"lHI-bz-ddQ.title" = "UPnP ativado";
 
 /* Class = "NSTextFieldCell"; title = "Registered Name"; ObjectID = "sBB-y7-xhL"; */
-"sBB-y7-xhL.title" = "Registered Name";
+"sBB-y7-xhL.title" = "Nome Registado";
diff --git a/ui/pt.lproj/AccSecurity.strings b/ui/pt.lproj/AccSecurity.strings
index 7b7b7f743ff0c4ccd30f4622d79e9adec746fb65..fefce22f192480510acb28eeb07a0356f41c3eb4 100644
--- a/ui/pt.lproj/AccSecurity.strings
+++ b/ui/pt.lproj/AccSecurity.strings
@@ -1,45 +1,45 @@
 
 /* Class = "NSButtonCell"; title = "Require certificates for incoming TLS connections"; ObjectID = "1f9-X5-ykb"; */
-"1f9-X5-ykb.title" = "Require certificates for incoming TLS connections";
+"1f9-X5-ykb.title" = "Necessita de certificados para conexões TLS recebidas";
 
 /* Class = "NSButtonCell"; title = "Verify certificates, as a client"; ObjectID = "1xi-9G-zOX"; */
-"1xi-9G-zOX.title" = "Verify certificates, as a client";
+"1xi-9G-zOX.title" = "Verificar certificados, como cliente";
 
 /* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
 "2e5-zS-ghg.title" = "Usar lista personalizada de algoritmos de cifragem";
 
 /* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
-"5LC-T6-hpk.placeholderString" = "cipher cell";
+"5LC-T6-hpk.placeholderString" = "célula de cifra";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
-"7c2-kF-dcs.placeholderString" = "Password...";
+"7c2-kF-dcs.placeholderString" = "Palavra-chave...";
 
 /* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
-"9Q3-1W-Lh3.title" = "Negotiation timeout";
+"9Q3-1W-Lh3.title" = "Tempo limite de negociação";
 
 /* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
-"Ig9-B1-7N3.title" = "Fallback on RTP";
+"Ig9-B1-7N3.title" = "Reserva em RTP";
 
 /* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "JHb-iu-ZwI"; */
 "JHb-iu-ZwI.title" = "Chave privada";
 
 /* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
-"Jqz-P0-zAz.title" = "User Certificate";
+"Jqz-P0-zAz.title" = "Certificado do Utilizador";
 
 /* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
-"UxS-et-whJ.title" = "Server name instance for outgoing TLS connection";
+"UxS-et-whJ.title" = "Nome da instância do servidor para conexões de saída TLS";
 
 /* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
-"YtQ-hx-hih.title" = "Use SRTP";
+"YtQ-hx-hih.title" = "Usar SRTP";
 
 /* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
-"oTT-gO-fqM.title" = "Use TLS transport";
+"oTT-gO-fqM.title" = "Usar transporte TLS";
 
 /* Class = "NSTextFieldCell"; title = "TLS protocol method"; ObjectID = "uOE-XA-5gW"; */
 "uOE-XA-5gW.title" = "Método de protocolo TLS";
 
 /* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "vPF-Rp-aR6"; */
-"vPF-Rp-aR6.title" = "Certificate Authority list";
+"vPF-Rp-aR6.title" = "Lista de Autoridades de Certificados";
 
 /* Class = "NSButtonCell"; title = "Verify incoming certificates, as a server"; ObjectID = "x2s-ov-cVQ"; */
-"x2s-ov-cVQ.title" = "Verify incoming certificates, as a server";
+"x2s-ov-cVQ.title" = "Verificar certificados recebidos, como um servidor";
diff --git a/ui/pt.lproj/Accounts.strings b/ui/pt.lproj/Accounts.strings
index c6008fba4b025a9e4b4aba0d02fcf751c730141d..940218b1625148f6d967971c28ea201aa91acc1f 100644
--- a/ui/pt.lproj/Accounts.strings
+++ b/ui/pt.lproj/Accounts.strings
@@ -15,7 +15,7 @@
 "ZDh-Jh-hfW.placeholderString" = "Nome";
 
 /* Class = "NSTabViewItem"; label = "Devices"; ObjectID = "cT1-A5-rbj"; */
-"cT1-A5-rbj.label" = "Devices";
+"cT1-A5-rbj.label" = "Dispositivos";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Status"; ObjectID = "eEz-Lm-SOj"; */
 "eEz-Lm-SOj.placeholderString" = "Status";
diff --git a/ui/pt.lproj/AudioPrefs.strings b/ui/pt.lproj/AudioPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..7330b30ade8e7996e53d85abd7a39eb7a85dd583
--- /dev/null
+++ b/ui/pt.lproj/AudioPrefs.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
+"2gZ-Ab-XHf.title" = "Saída";
+
+/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
+"9HH-Pa-4Aq.title" = "Gravações";
+
+/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
+"B0r-wh-wc3.title" = "Dispositivos de Áudio";
+
+/* Class = "NSButtonCell"; title = "Always recording"; ObjectID = "jeD-Nk-KHA"; */
+"jeD-Nk-KHA.title" = "A gravar sempre";
+
+/* Class = "NSTextFieldCell"; title = "Save in"; ObjectID = "ksV-r2-EVJ"; */
+"ksV-r2-EVJ.title" = "Gravar em";
+
+/* Class = "NSButtonCell"; title = "Mute DTMF"; ObjectID = "pAA-Iv-EmI"; */
+"pAA-Iv-EmI.title" = "Tirar som DTMF";
+
+/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
+"x1o-rT-jy6.title" = "Entrada";
diff --git a/ui/pt.lproj/BackupAccountWindow.strings b/ui/pt.lproj/BackupAccountWindow.strings
index 109e32ccd07819e0f1f8b88fac8f00a946e7796c..7cc20122315de758d38f69dfc783fc4c5ca15a2c 100644
--- a/ui/pt.lproj/BackupAccountWindow.strings
+++ b/ui/pt.lproj/BackupAccountWindow.strings
@@ -1,27 +1,27 @@
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm..."; ObjectID = "5Qf-em-tN4"; */
-"5Qf-em-tN4.placeholderString" = "Confirm...";
+"5Qf-em-tN4.placeholderString" = "Confirmar...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
 /* Class = "NSTextFieldCell"; title = "Where"; ObjectID = "9h8-GU-av4"; */
-"9h8-GU-av4.title" = "Where";
+"9h8-GU-av4.title" = "Onde";
 
 /* Class = "NSTextFieldCell"; title = "Choose where to backup your account."; ObjectID = "KYZ-TW-44Y"; */
-"KYZ-TW-44Y.title" = "Choose where to backup your account.";
+"KYZ-TW-44Y.title" = "Escolha onde quer fazer a cópia de segurança da sua conta.";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Janela";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
@@ -30,25 +30,25 @@
 "cSU-aD-OwX.title" = "Cancelar";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedIsNilPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedMultipleValuesPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNoSelectionPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "ccf-Bx-Qq8"; */
-"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Password...";
+"ccf-Bx-Qq8.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
 /* Class = "NSTextFieldCell"; title = "An error occured during the backup"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.title" = "An error occured during the backup";
+"e7n-Ev-bK7.title" = "Ocorreu um erro ao fazer a cópia de segurança";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
-"vwh-K9-3O9.title" = "Senha";
+"vwh-K9-3O9.title" = "Palavra-chave";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Palavra-chave...";
diff --git a/ui/pt.lproj/CertificateWindow.strings b/ui/pt.lproj/CertificateWindow.strings
index 2f0b2b06822fe4cc330a14755a40c662faa6f229..f11bdb4999f19390b50a0c49e47411f2447a5cd3 100644
--- a/ui/pt.lproj/CertificateWindow.strings
+++ b/ui/pt.lproj/CertificateWindow.strings
@@ -1,21 +1,21 @@
 
 /* Class = "NSTextFieldCell"; title = "Certificate information"; ObjectID = "BrE-Hz-sVE"; */
-"BrE-Hz-sVE.title" = "Certificate information";
+"BrE-Hz-sVE.title" = "Informação do Certificado";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "G7a-wY-fOS"; */
-"G7a-wY-fOS.title" = "Text Cell";
+"G7a-wY-fOS.title" = "Texto da Célula";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "Od1-pH-TGO"; */
-"Od1-pH-TGO.title" = "Table View Cell";
+"Od1-pH-TGO.title" = "Célula de Vista da Tabela";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Janela";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "RMj-fd-OsX"; */
-"RMj-fd-OsX.title" = "Text Cell";
+"RMj-fd-OsX.title" = "Texto da Célula";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "khh-uZ-Keh"; */
-"khh-uZ-Keh.title" = "Table View Cell";
+"khh-uZ-Keh.title" = "Célula de Vista da Tabela";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "x6p-u4-4Ot"; */
 "x6p-u4-4Ot.title" = "OK";
diff --git a/ui/pt.lproj/Conversation.strings b/ui/pt.lproj/Conversation.strings
index 6f9e1b390b193f2570b5afd14ca9addcabcbb4c6..6b20298c93158b0293d414dfd6f90f90fffb7a33 100644
--- a/ui/pt.lproj/Conversation.strings
+++ b/ui/pt.lproj/Conversation.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
-"FgV-iF-gGQ.title" = "Text Cell";
+"FgV-iF-gGQ.title" = "Texto da Célula";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.placeholderString" = "Title";
+"HnC-1N-RmR.placeholderString" = "Título";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
-"Ilz-7v-2fr.placeholderString" = "Send a message";
+"Ilz-7v-2fr.placeholderString" = "Enviar mensagem";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Enviar mensagem";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Enviar mensagem";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
+"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Enviar mensagem";
 
 /* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "Start the conversation!";
+"bsl-nv-Wqq.title" = "Iniciar conversa!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
 "ooq-vs-Xt1.ibShadowedToolTip" = "Gravar";
diff --git a/ui/pt.lproj/CurrentCall.strings b/ui/pt.lproj/CurrentCall.strings
index 9866a19d4b77bcd399efbd0406dcf29d940134cd..dc3041dbe5f4988c9bcef74e95f176c3349e847a 100644
--- a/ui/pt.lproj/CurrentCall.strings
+++ b/ui/pt.lproj/CurrentCall.strings
@@ -3,7 +3,7 @@
 "2cB-dz-KYg.ibShadowedToolTip" = "Desligar";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
-"9e8-ji-QId.ibShadowedToolTip" = "Join call";
+"9e8-ji-QId.ibShadowedToolTip" = "Juntar-me à chamada";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
 "ChW-kg-Sja.ibShadowedToolTip" = "Transferir";
@@ -15,19 +15,19 @@
 "Dqv-um-UUk.title" = "URI";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
-"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
+"EA3-Q5-Dyj.placeholderString" = "Nome Mostrado de Chamada Recebida";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
 "G0w-c3-9pJ.ibShadowedToolTip" = "Gravar";
 
 /* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
-"KPG-pB-gPm.title" = "Answer";
+"KPG-pB-gPm.title" = "Resposta";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
 "Kjq-iM-NBL.ibShadowedToolTip" = "Desligar";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
-"LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
+"LVS-yZ-98V.ibShadowedToolTip" = "Tirar Som ao Vídeo";
 
 /* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
 "TlL-HO-5Ey.title" = "Cancelar";
@@ -36,19 +36,19 @@
 "VVL-A4-r7n.ibShadowedToolTip" = "Gravar";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "wants to talk to you!";
+"X0W-vv-xua.title" = "quer falar consigo!";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
 "anb-Y8-JQi.ibShadowedToolTip" = "Espera";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
-"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
+"fmp-x4-Pef.ibShadowedToolTip" = "Alternar conversa";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "Add participant";
+"kIZ-mf-moM.ibShadowedToolTip" = "Adicionar participante";
 
 /* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
-"kxH-yM-TLd.title" = "Button";
+"kxH-yM-TLd.title" = "Botão";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
 "mc3-HV-hek.ibShadowedToolTip" = "Desligar";
@@ -57,25 +57,25 @@
 "oRa-pS-HN2.ibShadowedToolTip" = "Gravar";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
-"osk-LS-0Qg.placeholderString" = "Person name";
+"osk-LS-0Qg.placeholderString" = "Nome pessoal";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
-"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+"qgD-3D-nD5.ibShadowedToolTip" = "Atender";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
-"tQl-cT-0Lb.ibShadowedToolTip" = "Mute Audio";
+"tQl-cT-0Lb.ibShadowedToolTip" = "Desativar Áudio";
 
 /* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
-"tjM-py-p4V.title" = "Ignore";
+"tjM-py-p4V.title" = "Ignorar";
 
 /* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
-"ugy-uK-901.placeholderString" = "State";
+"ugy-uK-901.placeholderString" = "Estado";
 
 /* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
-"wRO-X4-7IU.title" = "Answer";
+"wRO-X4-7IU.title" = "Resposta";
 
 /* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "wants to talk with you!";
+"yZ6-1A-ZLT.title" = "quer falar consigo!";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
-"zsO-T7-9yi.placeholderString" = "Time";
+"zsO-T7-9yi.placeholderString" = "Tempo";
diff --git a/ui/pt.lproj/ExportPasswordWindow.strings b/ui/pt.lproj/ExportPasswordWindow.strings
index e4b3c70935e0e949f61ef4e6ff02f640e34d8a48..636dcd515ab9fd86deac35359acbb29a6644cc78 100644
--- a/ui/pt.lproj/ExportPasswordWindow.strings
+++ b/ui/pt.lproj/ExportPasswordWindow.strings
@@ -1,21 +1,21 @@
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedIsNilPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedMultipleValuesPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNoSelectionPlaceholder" = "Palavra-chave...";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
-"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Password...";
+"5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
-/* 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";
+"QvC-M9-y7g.title" = "Janela";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
@@ -27,16 +27,16 @@
 "dfD-AK-f3R.title" = "OK";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "rótulo do erro";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "rW5-Il-5YD"; */
 "rW5-Il-5YD.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
-"vwh-K9-3O9.title" = "Senha";
+"vwh-K9-3O9.title" = "Palavra-chave";
 
 /* Class = "NSTextFieldCell"; title = "Link another device to this account"; ObjectID = "wmv-sA-Mlh"; */
-"wmv-sA-Mlh.title" = "Link another device to this account";
+"wmv-sA-Mlh.title" = "Associar outro dispositivo a esta conta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Palavra-chave...";
diff --git a/ui/pt.lproj/GeneralPrefs.strings b/ui/pt.lproj/GeneralPrefs.strings
index 22effce4ad7ee9287d85fb39bcf2ea1849acf17b..74e6ddc83a8cc122782c29d35e24278fe4d3e155 100644
--- a/ui/pt.lproj/GeneralPrefs.strings
+++ b/ui/pt.lproj/GeneralPrefs.strings
@@ -1,12 +1,12 @@
 
 /* Class = "NSButtonCell"; title = "Keep my history for"; ObjectID = "3Pb-Ec-zl5"; */
-"3Pb-Ec-zl5.title" = "Keep my history for";
+"3Pb-Ec-zl5.title" = "Manter o meu histórico para";
 
 /* Class = "NSMenuItem"; title = "Monthly"; ObjectID = "42E-UY-qlP"; */
-"42E-UY-qlP.title" = "Monthly";
+"42E-UY-qlP.title" = "Mensalmente";
 
 /* Class = "NSMenuItem"; title = "Weekly"; ObjectID = "AId-am-73Q"; */
-"AId-am-73Q.title" = "Weekly";
+"AId-am-73Q.title" = "Semanalmente";
 
 /* Class = "NSTextFieldCell"; title = "30"; ObjectID = "JvS-c4-OeT"; */
 "JvS-c4-OeT.title" = "30";
@@ -15,40 +15,40 @@
 "MV1-AC-qE7.ibShadowedToolTip" = "Perfil";
 
 /* Class = "NSButtonCell"; title = "Launch on Startup"; ObjectID = "O2C-xR-mHF"; */
-"O2C-xR-mHF.title" = "Launch on Startup";
+"O2C-xR-mHF.title" = "Iniciar ao ligar";
 
 /* Class = "NSTextFieldCell"; title = "(Applied on application restart)"; ObjectID = "OTl-vx-S43"; */
-"OTl-vx-S43.title" = "(Applied on application restart)";
+"OTl-vx-S43.title" = "(aplicado ao reiniciar a aplicação)";
 
 /* Class = "NSTextFieldCell"; title = "Behaviours"; ObjectID = "Rzy-Gh-3wQ"; */
-"Rzy-Gh-3wQ.title" = "Behaviours";
+"Rzy-Gh-3wQ.title" = "Comportamentos";
 
 /* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "T3a-yx-ZaW"; */
-"T3a-yx-ZaW.title" = "Automatically check for updates";
+"T3a-yx-ZaW.title" = "Verificar automaticamente se há atualizações";
 
 /* Class = "NSTextFieldCell"; title = "Profile"; ObjectID = "Thg-oC-5Qw"; */
 "Thg-oC-5Qw.title" = "Perfil";
 
 /* Class = "NSMenuItem"; title = "Daily"; ObjectID = "cB6-4m-9MU"; */
-"cB6-4m-9MU.title" = "Daily";
+"cB6-4m-9MU.title" = "Diariamente";
 
 /* Class = "NSButtonCell"; title = "Clear History"; ObjectID = "cd5-9L-Bbb"; */
-"cd5-9L-Bbb.title" = "Clear History";
+"cd5-9L-Bbb.title" = "Limpar Histórico";
 
 /* Class = "NSTextFieldCell"; title = "days"; ObjectID = "e5K-l0-Nfw"; */
-"e5K-l0-Nfw.title" = "days";
+"e5K-l0-Nfw.title" = "dias";
 
 /* Class = "NSMenuItem"; title = "Hourly"; ObjectID = "mbu-TH-bs8"; */
-"mbu-TH-bs8.title" = "Hourly";
+"mbu-TH-bs8.title" = "A cada hora";
 
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
-"r4u-t3-gBc.title" = "Update";
+"r4u-t3-gBc.title" = "Atualização";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
+"vbU-2S-O58.title" = "Isto é compartilhado com seus contactos";
diff --git a/ui/pt.lproj/Localizable.strings b/ui/pt.lproj/Localizable.strings
index 0fb1224d2a4eeeeedd2df3f5ee623fcd0d6dc9d8..7ee332cb13bfd4c8d6214fcdbe0ee604c9738609 100644
--- a/ui/pt.lproj/Localizable.strings
+++ b/ui/pt.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 
-"A network error occured during the export" = "A network error occured during the export";
+"A network error occured during the export" = "Ocorreu um erro na rede durante a exportação";
 
 /* No password on this account text field placeholder */
 "Account has no password" = "Account has no password";
@@ -14,16 +14,16 @@
 "Place audio call" = "Place audio call";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "Limpar conversação";
 
 /* Contextual menu action */
-"Block contact" = "Block contact";
+"Block contact" = "Bloquear contacto";
 
 /* Text shown to the user */
 "Alias : " = "Alias : ";
 
 /* Error shown to the user */
-"An error occured during the export" = "An error occured during the export";
+"An error occured during the export" = "Ocorreu um erro durante a exportação";
 
 /* Contextual menu entry */
 "Backup account" = "Backup account";
@@ -32,7 +32,7 @@
 "Call number" = "Call number";
 
 /* File transfer canceled label */
-"Canceled" = "Canceled";
+"Canceled" = "Cancelada";
 
 /* Open panel title */
 "Choose a CA list" = "Choose a CA list";
@@ -59,7 +59,7 @@
 "Share screen" = "Share screen";
 
 /* No comment provided by engineer. */
-"Copy" = "Copy";
+"Copy" = "Copiar";
 
 /* Contextual menu action */
 "Copy name" = "Copy name";
@@ -68,13 +68,13 @@
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Criar Conta Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
 
 /* File transfer failed label */
-"Failed" = "Failed";
+"Failed" = "Falhou";
 
 /* Error message shown to user when it is impossible to migrate account */
 "Failed to migrate your account. You can retry by pressing Ok or delete your account." = "Failed to migrate your account. You can retry by pressing Ok or delete your account.";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -104,16 +107,17 @@
 "Password is too short" = "Password is too short";
 
 /* Indication for user */
-"Passwords don't match" = "As senhas não são iguais";
+"Passwords don't match" = "As palavras-chave não são iguais";
 
 /* Button label */
 "Pause" = "Pause";
 
 /* Button label */
-"Play" = "Play";
+"Play" = "Reproduzir";
 
 /* Button Action */
 "Refuse" = "Recusar";
+"Accept" = "Aceitar";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,13 +132,13 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
-"Share" = "Share";
+"Share" = "Partilhar";
 
 /* File transfer successful label */
-"Success" = "Success";
+"Success" = "Sucesso";
 
 /* No comment provided by engineer. */
 "Text Actions" = "Text Actions";
@@ -149,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";
+"The password you entered does not unlock this account" = "A palavra-chave que introduziu não desbloqueia esta conta";
 
 /* 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" = "Desconhecido";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Welcome to Ring";
-"Create a new account" = "Create a new account";
+"Welcome to Ring" = "Bem-vindo ao Jami";
+"Create a new account" = "Criar nova conta";
 "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!";
diff --git a/ui/pt.lproj/MainMenu.strings b/ui/pt.lproj/MainMenu.strings
index 83f72cbcf08ee68b3718acfc930cd572fe15af9d..4d38351d31489e637d3d60ce95944e3139308505 100644
--- a/ui/pt.lproj/MainMenu.strings
+++ b/ui/pt.lproj/MainMenu.strings
@@ -1,213 +1,213 @@
 
 /* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
-"5.title" = "Bring All to Front";
+"5.title" = "Trazer Tudo para a Frente";
 
 /* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
-"19.title" = "Window";
+"19.title" = "Janela";
 
 /* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
-"23.title" = "Minimize";
+"23.title" = "Minimizar";
 
 /* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
-"24.title" = "Window";
+"24.title" = "Janela";
 
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
-"29.title" = "AMainMenu";
+"29.title" = "Menu Principal";
 
-/* 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" = "Sobre Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "Sobre o Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
-"129.title" = "Preferences…";
+"129.title" = "Preferências...";
 
 /* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
-"130.title" = "Services";
+"130.title" = "Serviços";
 
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
-"131.title" = "Services";
+"131.title" = "Serviços";
 
-/* 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";
+"145.title" = "Esconder Outros";
 
 /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
-"150.title" = "Show All";
+"150.title" = "Mostrar Tudo";
 
 /* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "195"; */
-"195.title" = "Stop Speaking";
+"195.title" = "Parar a Conversa";
 
 /* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "196"; */
-"196.title" = "Start Speaking";
+"196.title" = "Iniciar Conversa";
 
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
-"197.title" = "Copy";
+"197.title" = "Copiar";
 
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
-"198.title" = "Select All";
+"198.title" = "Selecionar Tudo";
 
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
-"199.title" = "Cut";
+"199.title" = "Recortar";
 
 /* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
-"200.title" = "Spelling and Grammar";
+"200.title" = "Ortografia e Gramática";
 
 /* Class = "NSMenuItem"; title = "Check Document Now"; ObjectID = "201"; */
-"201.title" = "Check Document Now";
+"201.title" = "Verificar o Documento Agora";
 
 /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
 "202.title" = "Eliminar";
 
 /* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
-"203.title" = "Paste";
+"203.title" = "Colar";
 
 /* Class = "NSMenuItem"; title = "Show Spelling and Grammar"; ObjectID = "204"; */
-"204.title" = "Show Spelling and Grammar";
+"204.title" = "Mostrar Ortografia e Gramática";
 
 /* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
-"205.title" = "Edit";
+"205.title" = "Editar";
 
 /* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */
-"207.title" = "Undo";
+"207.title" = "Desfazer";
 
 /* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "208"; */
-"208.title" = "Find Next";
+"208.title" = "Procurar Próximo";
 
 /* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
-"209.title" = "Find…";
+"209.title" = "Pesquisar...";
 
 /* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "210"; */
-"210.title" = "Jump to Selection";
+"210.title" = "Ir para a Seleção";
 
 /* Class = "NSMenuItem"; title = "Speech"; ObjectID = "211"; */
-"211.title" = "Speech";
+"211.title" = "Discurso";
 
 /* Class = "NSMenu"; title = "Speech"; ObjectID = "212"; */
-"212.title" = "Speech";
+"212.title" = "Discurso";
 
 /* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "213"; */
-"213.title" = "Find Previous";
+"213.title" = "Procurar Anterior";
 
 /* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
-"215.title" = "Redo";
+"215.title" = "Refazer";
 
 /* Class = "NSMenuItem"; title = "Spelling and Grammar"; ObjectID = "216"; */
-"216.title" = "Spelling and Grammar";
+"216.title" = "Ortografia e Gramática";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
-"217.title" = "Edit";
+"217.title" = "Editar";
 
 /* Class = "NSMenuItem"; title = "Find"; ObjectID = "218"; */
-"218.title" = "Find";
+"218.title" = "Pesquisar";
 
 /* Class = "NSMenuItem"; title = "Check Spelling While Typing"; ObjectID = "219"; */
-"219.title" = "Check Spelling While Typing";
+"219.title" = "Verificar Ortografia Enquanto Digita";
 
 /* Class = "NSMenu"; title = "Find"; ObjectID = "220"; */
-"220.title" = "Find";
+"220.title" = "Pesquisar";
 
 /* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "221"; */
-"221.title" = "Use Selection for Find";
+"221.title" = "Usar Seleção para Pesquisar";
 
 /* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
-"239.title" = "Zoom";
+"239.title" = "Ampliar";
 
 /* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
-"295.title" = "View";
+"295.title" = "Visualizar";
 
 /* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
-"296.title" = "View";
+"296.title" = "Visualizar";
 
 /* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
-"297.title" = "Show Toolbar";
+"297.title" = "Mostrar Barra de Ferramentas";
 
 /* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
-"298.title" = "Customize Toolbar…";
+"298.title" = "Personalizar Barra de Ferramentas…";
 
 /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "346"; */
-"346.title" = "Check Grammar With Spelling";
+"346.title" = "Verificar Gramática com Ortografia";
 
 /* Class = "NSMenuItem"; title = "Substitutions"; ObjectID = "348"; */
-"348.title" = "Substitutions";
+"348.title" = "Substituições";
 
 /* Class = "NSMenu"; title = "Substitutions"; ObjectID = "349"; */
-"349.title" = "Substitutions";
+"349.title" = "Substituições";
 
 /* Class = "NSMenuItem"; title = "Smart Copy/Paste"; ObjectID = "350"; */
-"350.title" = "Smart Copy/Paste";
+"350.title" = "Copiar/Colar Inteligente";
 
 /* Class = "NSMenuItem"; title = "Smart Quotes"; ObjectID = "351"; */
-"351.title" = "Smart Quotes";
+"351.title" = "Citações Inteligentes";
 
 /* Class = "NSMenuItem"; title = "Smart Links"; ObjectID = "354"; */
-"354.title" = "Smart Links";
+"354.title" = "Links Inteligentes";
 
 /* Class = "NSMenuItem"; title = "Transformations"; ObjectID = "450"; */
-"450.title" = "Transformations";
+"450.title" = "Transformações";
 
 /* Class = "NSMenu"; title = "Transformations"; ObjectID = "451"; */
-"451.title" = "Transformations";
+"451.title" = "Transformações";
 
 /* Class = "NSMenuItem"; title = "Make Upper Case"; ObjectID = "452"; */
-"452.title" = "Make Upper Case";
+"452.title" = "Aplicar Maiúsculas";
 
 /* Class = "NSMenuItem"; title = "Correct Spelling Automatically"; ObjectID = "454"; */
-"454.title" = "Correct Spelling Automatically";
+"454.title" = "Corrigir Ortografia Automaticamente";
 
 /* Class = "NSMenuItem"; title = "Show Substitutions"; ObjectID = "457"; */
-"457.title" = "Show Substitutions";
+"457.title" = "Mostrar Substituições";
 
 /* Class = "NSMenuItem"; title = "Smart Dashes"; ObjectID = "460"; */
-"460.title" = "Smart Dashes";
+"460.title" = "Traços Inteligentes";
 
 /* Class = "NSMenuItem"; title = "Text Replacement"; ObjectID = "462"; */
-"462.title" = "Text Replacement";
+"462.title" = "Substituição de Texto";
 
 /* Class = "NSMenuItem"; title = "Make Lower Case"; ObjectID = "465"; */
-"465.title" = "Make Lower Case";
+"465.title" = "Aplicar Minúsculas";
 
 /* Class = "NSMenuItem"; title = "Capitalize"; ObjectID = "466"; */
-"466.title" = "Capitalize";
+"466.title" = "Letras Maiúsculas";
 
 /* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "485"; */
-"485.title" = "Paste and Match Style";
+"485.title" = "Estilo de Colar e Correspondência";
 
 /* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
-"490.title" = "Help";
+"490.title" = "Ajuda";
 
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
-"491.title" = "Help";
+"491.title" = "Ajuda";
 
-/* 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…";
+"534.title" = "Pesquisar e Substituir...";
 
 /* Class = "NSMenuItem"; title = "Check for Update..."; ObjectID = "593"; */
-"593.title" = "Check for Update...";
+"593.title" = "Verificar Atualizações...";
 
 /* Class = "NSMenuItem"; title = "Show"; ObjectID = "12w-Fz-Scs"; */
-"12w-Fz-Scs.title" = "Show";
+"12w-Fz-Scs.title" = "Mostrar";
 
 /* Class = "NSMenu"; title = "Show"; ObjectID = "1fJ-em-1ww"; */
-"1fJ-em-1ww.title" = "Show";
+"1fJ-em-1ww.title" = "Mostrar";
 
 /* Class = "NSMenuItem"; title = "Show recent"; ObjectID = "GTY-d8-NBf"; */
-"GTY-d8-NBf.title" = "Show recent";
+"GTY-d8-NBf.title" = "Mostrar recente";
 
 /* Class = "NSMenuItem"; title = "Show contacts"; ObjectID = "GU3-tt-2de"; */
-"GU3-tt-2de.title" = "Show contacts";
+"GU3-tt-2de.title" = "Mostrar contactos";
 
 /* Class = "NSMenuItem"; title = "Show call history"; ObjectID = "Oco-m7-LtS"; */
-"Oco-m7-LtS.title" = "Show call history";
+"Oco-m7-LtS.title" = "Mostrar histórico de chamadas";
diff --git a/ui/pt.lproj/MigrateRingAccountsWindow.strings b/ui/pt.lproj/MigrateRingAccountsWindow.strings
index 6f733ab55c94ed528f4ccf58eefae7fd53b080c3..dac04bfeaf05da158cd84cf849769d50482fb416 100644
--- a/ui/pt.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt.lproj/MigrateRingAccountsWindow.strings
@@ -1,48 +1,48 @@
 
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
-"1ob-x1-u74.title" = "Account migration completed";
+"1ob-x1-u74.title" = "Terminada a migração da conta";
 
-/* 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";
+"8K3-9Z-MKH.title" = "Erro de migração de conta";
 
 /* Class = "NSTextFieldCell"; title = "Congratulations, your account has been migrated with Success."; ObjectID = "C2l-rz-Gqt"; */
-"C2l-rz-Gqt.title" = "Congratulations, your account has been migrated with Success.";
+"C2l-rz-Gqt.title" = "Parabéns, a sua nova conta foi migrada com sucesso.";
 
 /* Class = "NSButtonCell"; title = "Delete this account"; ObjectID = "ITE-yD-CTb"; */
-"ITE-yD-CTb.title" = "Delete this account";
+"ITE-yD-CTb.title" = "Eliminar esta conta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Confirm your new password..."; ObjectID = "KuO-oT-zhY"; */
-"KuO-oT-zhY.placeholderString" = "Confirm your new password...";
+"KuO-oT-zhY.placeholderString" = "Confirme a sua nova palavra-chave...";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "PT7-XI-WDR"; */
 "PT7-XI-WDR.title" = "OK";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
+"QvC-M9-y7g.title" = "Janela";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "VN1-A3-RIh"; */
 "VN1-A3-RIh.title" = "OK";
 
 /* Class = "NSTextFieldCell"; title = "Confirmation"; ObjectID = "aOa-1q-AZe"; */
-"aOa-1q-AZe.title" = "Confirmation";
+"aOa-1q-AZe.title" = "Confirmação";
 
 /* Class = "NSTextFieldCell"; placeholderString = "error label"; ObjectID = "e7n-Ev-bK7"; */
-"e7n-Ev-bK7.placeholderString" = "error label";
+"e7n-Ev-bK7.placeholderString" = "rótulo do erro";
 
 /* Class = "NSButtonCell"; title = "Migrate"; ObjectID = "rW5-Il-5YD"; */
-"rW5-Il-5YD.title" = "Migrate";
+"rW5-Il-5YD.title" = "Migrar";
 
 /* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "vwh-K9-3O9"; */
-"vwh-K9-3O9.title" = "Senha";
+"vwh-K9-3O9.title" = "Palavra-chave";
 
 /* Class = "NSTextFieldCell"; title = "Account migration required"; ObjectID = "wmv-sA-Mlh"; */
 "wmv-sA-Mlh.title" = "Necessária migração de conta";
 
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "xqz-Uz-hqU"; */
-"xqz-Uz-hqU.placeholderString" = "Password...";
+"xqz-Uz-hqU.placeholderString" = "Palavra-chave...";
diff --git a/ui/pt.lproj/PersonLinker.strings b/ui/pt.lproj/PersonLinker.strings
new file mode 100644
index 0000000000000000000000000000000000000000..754bb62950ed893f7edc05d0ddc28360c740b367
--- /dev/null
+++ b/ui/pt.lproj/PersonLinker.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Jcn-cg-rbR"; */
+"Jcn-cg-rbR.placeholderString" = "Mostrar Regra";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "M4f-N4-msh"; */
+"M4f-N4-msh.title" = "Texto da Célula";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "a9R-r5-K3w"; */
+"a9R-r5-K3w.placeholderString" = "Método de Contacto";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Last name..."; ObjectID = "cGT-nu-sPa"; */
+"cGT-nu-sPa.placeholderString" = "Último nome...";
+
+/* Class = "NSButtonCell"; title = "Add new contact"; ObjectID = "had-9Y-eza"; */
+"had-9Y-eza.title" = "Adicionar novo contacto";
+
+/* Class = "NSButtonCell"; title = "Create"; ObjectID = "qZc-Z2-TpP"; */
+"qZc-Z2-TpP.title" = "Criar";
+
+/* Class = "NSTextFieldCell"; title = "New Contact"; ObjectID = "v7b-de-MVd"; */
+"v7b-de-MVd.title" = "Novo Contacto";
+
+/* Class = "NSTextFieldCell"; placeholderString = "First name..."; ObjectID = "vyb-95-XaF"; */
+"vyb-95-XaF.placeholderString" = "Primeiro nome...";
diff --git a/ui/pt.lproj/PreferencesWindow.strings b/ui/pt.lproj/PreferencesWindow.strings
index aa1761510b3e5d9ece5cd65d6e8f2a55557a0312..e1e83c9c55693776b2e45367a3f0ee40bdf6f501 100644
--- a/ui/pt.lproj/PreferencesWindow.strings
+++ b/ui/pt.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Geral";
diff --git a/ui/pt.lproj/RegisterNameWindow.strings b/ui/pt.lproj/RegisterNameWindow.strings
index 7390e00848bd406944fb0d17d745458d14139e87..65c7aeaa9abb9c2961fa083178a3161ad54cae26 100644
--- a/ui/pt.lproj/RegisterNameWindow.strings
+++ b/ui/pt.lproj/RegisterNameWindow.strings
@@ -1,24 +1,24 @@
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
-/* 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";
+"Aeh-tK-RjX.title" = "Ocorreu um erro durante o registo do seu nome de utilizador";
 
-/* 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" = "Introduza a sua palavra-chave";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
-"JWw-7m-ywL.title" = "Window";
+"JWw-7m-ywL.title" = "Janela";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Just a moment...";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Username..."; ObjectID = "bdC-Uc-Qhs"; */
-"bdC-Uc-Qhs.placeholderString" = "Username...";
+"bdC-Uc-Qhs.placeholderString" = "Nome de utilizador...";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "cbA-c2-LlV"; */
 "cbA-c2-LlV.title" = "Cancelar";
@@ -27,10 +27,10 @@
 "eoS-s7-b3w.title" = "Cancelar";
 
 /* Class = "NSButtonCell"; title = "Ok"; ObjectID = "fOn-FV-2x8"; */
-"fOn-FV-2x8.title" = "Ok";
+"fOn-FV-2x8.title" = "OK";
 
 /* Class = "NSButtonCell"; title = "Register"; ObjectID = "lT3-Bh-MnL"; */
-"lT3-Bh-MnL.title" = "Register";
+"lT3-Bh-MnL.title" = "Registar";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username";
+"tje-EZ-ZPI.title" = "Registar um nome de utilizador público";
diff --git a/ui/pt.lproj/RingWindow.strings b/ui/pt.lproj/RingWindow.strings
index 0292bb457a2c7320b753bc77fd86ded2154650c1..b28ea42d86b8501ea246dae2494b4eab4a334196 100644
--- a/ui/pt.lproj/RingWindow.strings
+++ b/ui/pt.lproj/RingWindow.strings
@@ -1,39 +1,39 @@
 
 /* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
-"0MO-4e-8mo.label" = "SmartView";
+"0MO-4e-8mo.label" = "Visualização Inteligente";
 
 /* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
-"3Bh-xR-4Vn.title" = "Text";
+"3Bh-xR-4Vn.title" = "Texto";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
-"Ap7-26-S6b.title" = "Text Cell";
+"Ap7-26-S6b.title" = "Texto da Célula";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
-"BfK-c5-B1l.placeholderString" = "details";
+"BfK-c5-B1l.placeholderString" = "detalhes";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.placeholderString" = "Contact Method";
+"FlQ-Th-nfO.placeholderString" = "Método de Contacto";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
-"GAa-pQ-t4g.title" = "Text Cell";
+"GAa-pQ-t4g.title" = "Texto da Célula";
 
 /* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Title";
+"Pav-Bw-GgK.title" = "Título";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "Display Role";
+"Q1F-xo-N3e.placeholderString" = "Mostrar Regra";
 
 /* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "date";
+"UKP-Et-CT0.placeholderString" = "data";
 
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Histórico";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contatos";
@@ -42,28 +42,28 @@
 "bgk-oz-u7n.placeholderString" = "Nome";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
-"d5o-nL-fRP.placeholderString" = "Category";
+"d5o-nL-fRP.placeholderString" = "Categoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
-"gaf-Za-tuc.placeholderString" = "Category";
+"gaf-Za-tuc.placeholderString" = "Categoria";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.placeholderString" = "details";
+"isD-c6-X5Q.placeholderString" = "detalhes";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
-"j0J-Xd-uth.placeholderString" = "Call name";
+"j0J-Xd-uth.placeholderString" = "Nome do chamador";
 
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
-"mK5-kV-YOO.placeholderString" = "details";
+"mK5-kV-YOO.placeholderString" = "detalhes";
 
 /* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
 "sGB-x7-gig.placeholderString" = "n";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.placeholderString" = "Display Role";
+"uSw-g5-kte.placeholderString" = "Mostrar Regra";
 
 /* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
-"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+"vvE-nM-kSl.placeholderString" = "Pesquisar contactos novos ou existentes";
diff --git a/ui/pt.lproj/RingWizard.strings b/ui/pt.lproj/RingWizard.strings
index 2fc614af87e7e05bc5c078113f8f33b7dc487fa6..0c12a888bf0260ffe97365b1a0706945f1932d69 100644
--- a/ui/pt.lproj/RingWizard.strings
+++ b/ui/pt.lproj/RingWizard.strings
@@ -1,36 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Choose your own certificates"; ObjectID = "4ls-Yq-mDp"; */
-"4ls-Yq-mDp.title" = "Choose your own certificates";
-
-/* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "5Z7-Wi-530"; */
-"5Z7-Wi-530.placeholderString" = "'Unknown' if empty...";
-
-/* Class = "NSTextFieldCell"; title = "Advanced security (optional)"; ObjectID = "Gnn-K9-PTH"; */
-"Gnn-K9-PTH.title" = "Advanced security (optional)";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "Hsc-U9-2RV"; */
-"Hsc-U9-2RV.placeholderString" = "Password...";
-
-/* Class = "NSButtonCell"; title = "Share"; ObjectID = "Kwr-LJ-K8C"; */
-"Kwr-LJ-K8C.title" = "Share";
-
-/* Class = "NSTextFieldCell"; title = "Certificate Authority list"; ObjectID = "SpA-zX-ytE"; */
-"SpA-zX-ytE.title" = "Certificate Authority list";
-
-/* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "V1U-ew-Ge2"; */
-"V1U-ew-Ge2.title" = "User Certificate";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Choose custom certificates"; ObjectID = "aZl-bU-psB"; */
-"aZl-bU-psB.ibShadowedToolTip" = "Choose custom certificates";
-
-/* Class = "NSTextFieldCell"; title = "Choose your username"; ObjectID = "meL-TZ-VQO"; */
-"meL-TZ-VQO.title" = "Choose your username";
-
-/* Class = "NSTextFieldCell"; title = "Private key"; ObjectID = "poP-JD-MDa"; */
-"poP-JD-MDa.title" = "Chave privada";
-
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "uqu-uh-Wao"; */
-"uqu-uh-Wao.title" = "Welcome to Ring";
-
-/* Class = "NSButtonCell"; title = "Next"; ObjectID = "wDw-Ut-RUm"; */
-"wDw-Ut-RUm.title" = "Próximo";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Bem-vindo ao Jami";
diff --git a/ui/pt.lproj/RingWizardChoose.strings b/ui/pt.lproj/RingWizardChoose.strings
index c3f5e09963becb3ead9f81ab8471c110b7c5622a..42b06738d1f7e2ea4ad93b3d8f50de831bc8f28d 100644
--- a/ui/pt.lproj/RingWizardChoose.strings
+++ b/ui/pt.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Ligar este dispositivo a uma conta";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Criar uma conta Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Criar uma conta Jami";
diff --git a/ui/pt.lproj/RingWizardLinkAccount.strings b/ui/pt.lproj/RingWizardLinkAccount.strings
index e2098bd05f4a28c60b934c8b9970040bf479b608..0442cad995028acb220ebe3dcf496fe9ad64376d 100644
--- a/ui/pt.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt.lproj/RingWizardLinkAccount.strings
@@ -1,27 +1,27 @@
 
 /* Class = "NSTextFieldCell"; title = "Follow the process on the device.
The PIN is only valid for 10 minutes."; ObjectID = "2n6-m3-fbj"; */
-"2n6-m3-fbj.title" = "Follow the process on the device.
The PIN is only valid for 10 minutes.";
+"2n6-m3-fbj.title" = "Siga o processo no seu dispositivo.\nO seu PIN só será válido por 10 minutos.";
 
 /* Class = "NSTextFieldCell"; title = "Enter your PIN"; ObjectID = "3ik-rY-Gig"; */
-"3ik-rY-Gig.title" = "Enter your PIN";
+"3ik-rY-Gig.title" = "Introduza o seu PIN";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
-"8b8-bt-eAj.title" = "Link";
+"8b8-bt-eAj.title" = "Associar";
 
 /* Class = "NSTextFieldCell"; title = "An error occured, please check your password and pin."; ObjectID = "DyG-SJ-U1Q"; */
-"DyG-SJ-U1Q.title" = "An error occured, please check your password and pin.";
+"DyG-SJ-U1Q.title" = "Ocorreu um erro. Por favor verifique a sua palavra-chave e o PIN.";
 
 /* Class = "NSTextFieldCell"; title = "2. Generate a PIN code"; ObjectID = "GfW-ah-8U1"; */
-"GfW-ah-8U1.title" = "2. Generate a PIN code";
+"GfW-ah-8U1.title" = "2. Gerar um Código PIN";
 
 /* Class = "NSTextFieldCell"; title = "1. Grab a device with the account you want to use"; ObjectID = "HcT-yD-KVo"; */
-"HcT-yD-KVo.title" = "1. Grab a device with the account you want to use";
+"HcT-yD-KVo.title" = "1. Pegue num dispositivo com a conta que deseja usar";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "M4C-GY-B6t"; */
 "M4C-GY-B6t.title" = "Just a moment...";
@@ -29,11 +29,11 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "introduza a palavra-chave";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
-"XN4-uc-BSt.title" = "I'm ready";
+"XN4-uc-BSt.title" = "Estou pronto";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "t12-O0-kcf"; */
 "t12-O0-kcf.title" = "OK";
diff --git a/ui/pt.lproj/RingWizardNewAccount.strings b/ui/pt.lproj/RingWizardNewAccount.strings
index d4aa252613491f38fad261bd2bb28db96a7f9848..a6eb4fe9bc683c8d6c3149d2ebaaf7de67c612e9 100644
--- a/ui/pt.lproj/RingWizardNewAccount.strings
+++ b/ui/pt.lproj/RingWizardNewAccount.strings
@@ -1,42 +1,42 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
-"1TO-Ov-S8j.placeholderString" = "Mandatory*";
+"1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
 /* Class = "NSButtonCell"; title = "Register public username"; ObjectID = "AG5-GR-bii"; */
-"AG5-GR-bii.title" = "Register public username";
+"AG5-GR-bii.title" = "Registar nome de utilizador público";
 
 /* Class = "NSTextFieldCell"; title = "Choose your password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Choose your password";
+"B6x-jj-48R.title" = "Escolha a sua palavra-chave";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "BCg-5V-Ek4"; */
-"BCg-5V-Ek4.placeholderString" = "Mandatory*";
+"BCg-5V-Ek4.placeholderString" = "Obrigatório*";
 
 /* Class = "NSTextFieldCell"; title = "Just a moment..."; ObjectID = "YIN-YL-JBs"; */
 "YIN-YL-JBs.title" = "Just a moment...";
 
 /* Class = "NSTextFieldCell"; title = "Repeat your password"; ObjectID = "fEY-eO-HwI"; */
-"fEY-eO-HwI.title" = "Repeat your password";
+"fEY-eO-HwI.title" = "Repita a sua palavra-chave";
 
 /* Class = "NSTextFieldCell"; placeholderString = "'Unknown' if empty..."; ObjectID = "gEy-ak-Cgq"; */
-"gEy-ak-Cgq.placeholderString" = "Enter name";
+"gEy-ak-Cgq.placeholderString" = "Introduza o nome";
 
 /* Class = "NSTextFieldCell"; title = "Create your profile"; ObjectID = "gki-BR-jc3"; */
-"gki-BR-jc3.title" = "Create your profile";
+"gki-BR-jc3.title" = "Criar o seu perfil";
 
 /* Class = "NSTextFieldCell"; title = "Create your account"; ObjectID = "qQl-Xn-c88"; */
-"qQl-Xn-c88.title" = "Create your account";
+"qQl-Xn-c88.title" = "Criar a sua conta";
 
 /* Class = "NSTextFieldCell"; title = "Enter your full name"; ObjectID = "tzf-88-Yn5"; */
-"tzf-88-Yn5.title" = "Enter your full name";
+"tzf-88-Yn5.title" = "Introduza o seu nome completo";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "v7f-52-GJA"; */
 "v7f-52-GJA.title" = "Cancelar";
 
 /* Class = "NSTextFieldCell"; title = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account."; ObjectID = "zUH-kc-cik"; */
-"zUH-kc-cik.title" = "Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.";
+"zUH-kc-cik.title" = "A sua palavra-chave deve ter pelo menos 6 caracteres. Ela será utilizada para criptografar os dados da sua conta e associar novos dispositivos à sua conta.";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "zfA-n9-V4X"; */
-"zfA-n9-V4X.title" = "Create";
+"zfA-n9-V4X.title" = "Criar";
diff --git a/ui/pt.lproj/VideoPrefs.strings b/ui/pt.lproj/VideoPrefs.strings
new file mode 100644
index 0000000000000000000000000000000000000000..8be609d34e90081f5d0ce46d8e62051aeeac4c9f
--- /dev/null
+++ b/ui/pt.lproj/VideoPrefs.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSTextFieldCell"; title = "Device"; ObjectID = "170-NP-CSP"; */
+"170-NP-CSP.title" = "Dispositivo";
+
+/* Class = "NSTextFieldCell"; title = "Size"; ObjectID = "4bq-ls-mCp"; */
+"4bq-ls-mCp.title" = "Tamanho";
+
+/* Class = "NSTextFieldCell"; title = "Rate"; ObjectID = "5Im-df-jdd"; */
+"5Im-df-jdd.title" = "Taxa";
+
+/* Class = "NSTextFieldCell"; title = "Selection"; ObjectID = "VqO-Gm-CbB"; */
+"VqO-Gm-CbB.title" = "Seleção";
+
+/* Class = "NSTextFieldCell"; title = "Camera"; ObjectID = "YCM-JC-jin"; */
+"YCM-JC-jin.title" = "Câmara";
diff --git a/ui/pt_BR.lproj/ExportPasswordWindow.strings b/ui/pt_BR.lproj/ExportPasswordWindow.strings
index f6fbb98d03d6c8a0fd036dba569b51fe8c7c7e67..4034822d0dab7b7b28f195824b2c829ec804972a 100644
--- a/ui/pt_BR.lproj/ExportPasswordWindow.strings
+++ b/ui/pt_BR.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Senha...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Por favor, informe a senha da conta Ring para iniciar";
+/* 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" = "Janela";
diff --git a/ui/pt_BR.lproj/GeneralPrefs.strings b/ui/pt_BR.lproj/GeneralPrefs.strings
index a2ff5822cdfd0b5aa560c628a4aa7d8cb6d6fb4f..e9b54e5851b25ffd11d020835e355360d537e647 100644
--- a/ui/pt_BR.lproj/GeneralPrefs.strings
+++ b/ui/pt_BR.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Atualização";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Habilitar notificações de área de trabalho";
+/* 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" = "Trazer Ring para o primeiro plano ao receber chamadas";
+/* 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" = "Isto é compartilhado com seus contatos";
diff --git a/ui/pt_BR.lproj/Localizable.strings b/ui/pt_BR.lproj/Localizable.strings
index 229f7fa5c7786a29b8ee969a3c85140182c5cac9..11d315476bdbe719e1bdf6a9807394c912868780 100644
--- a/ui/pt_BR.lproj/Localizable.strings
+++ b/ui/pt_BR.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Criar conta RING";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Criar conta SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Chamada de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Mensagem de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Recusar";
+"Accept" = "Aceitar";
 
 /* Contextual menu entry */
 "Remove value" = "Remover valor";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revisar dados";
 
 /* Text shown to the user */
-"RingID : " = "ID Ring";
+"ID : " = "ID :";
 
 /* No comment provided by engineer. */
 "Share" = "Compartilhar";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "O nome de usuário entrado não está disponível.";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "A seguinte conta precisa ser migrada para o novo formato de contas do Ring:";
+"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" = "A senha informada não desbloqueia esta conta";
 
 /* 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." = "Para concluir este processo, você deve iniciar o Ring em um novo dispositivo e escolher a opção \"Vincular este dispositivo a uma conta\". Seu PIN é válido por 10 minutos.";
+"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." = "Para continuar a migração, você deve escolher uma senha para a sua conta. Essa senha senha utilizada para encriptar sua senha mestre. Ela será necessária para adicionar novos dispositivos à sua conta Ring. Se você não estiver pronto para escolher uma senha, deve fechar o Ring e continuar a migração depois.";
+"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" = "Desconhecido";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bem-vindo ao Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Criar nova conta";
 "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!";
diff --git a/ui/pt_BR.lproj/MainMenu.strings b/ui/pt_BR.lproj/MainMenu.strings
index 1ca6a19d2429af5e06f611b0115cf7486518c54e..293bde2a26fe3b1d73e0b31c3ea1b8dadf58f309 100644
--- a/ui/pt_BR.lproj/MainMenu.strings
+++ b/ui/pt_BR.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Menu principal";
 
-/* 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" = "Sobre o Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferências...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Serviços";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Esconder o Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Sair do Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Esconder Outros";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Ajuda";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ajuda Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Procurar e substituir...";
diff --git a/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings b/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
index 75e8052717ce2f3f0fb967a2d2a3317ce960606e..25f525b6e403ae92f54f96787de95d2e55844c61 100644
--- a/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt_BR.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migração da conta completa";
 
-/* 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" = "A seguinte conta precisa ser migrada para o formato da nova conta Ring:\\nApelido: \\nID:\\nPara continuar a migração, você deverá escolher uma senha para sua conta. Esta senha será utilizada para criptografar sua senha mestre. Ela será solicitada quando forem adicionados novos dispositivos na sua conta Ring. Caso não decida criar uma senha agora, você poderá fechar o Ring e continuar com a migração mais tarde.";
+"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" = "Erro de migração de conta";
diff --git a/ui/pt_BR.lproj/PreferencesWindow.strings b/ui/pt_BR.lproj/PreferencesWindow.strings
index ff31d992e01d7786b87dbddb49074c2d3d0b480e..e1e83c9c55693776b2e45367a3f0ee40bdf6f501 100644
--- a/ui/pt_BR.lproj/PreferencesWindow.strings
+++ b/ui/pt_BR.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Preferências de Toque";
+/* 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" = "Geral";
diff --git a/ui/pt_BR.lproj/RegisterNameWindow.strings b/ui/pt_BR.lproj/RegisterNameWindow.strings
index 33e2025e9ac6e980d9e7a37bfc79b6a546648b3d..b907c87cd2d78fae2ccc6257422347bd3e5a851a 100644
--- a/ui/pt_BR.lproj/RegisterNameWindow.strings
+++ b/ui/pt_BR.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Outros usuários podem utilizar isso ao invés do seu Ring ID";
+/* 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" = "Ocorreu um erro durante o registro do seu usuário";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Entre com a senha da sua conta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Entre sua senha";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Janela";
diff --git a/ui/pt_BR.lproj/RingWindow.strings b/ui/pt_BR.lproj/RingWindow.strings
index 8ea65d37155a789d5857371d9c261fe1a96e56bc..3df5f80d86e6d3e438158c18c7d8f26607bbac05 100644
--- a/ui/pt_BR.lproj/RingWindow.strings
+++ b/ui/pt_BR.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalhes";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Método de Contato";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Histórico";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Esta é sua RingID. Copie e compartilhe-a com seus amigos!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contatos";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoria";
diff --git a/ui/pt_BR.lproj/RingWizardChoose.strings b/ui/pt_BR.lproj/RingWizardChoose.strings
index a468bd4317a67f95df97b10a6a3c783b02dd75f8..2d6f2d53d23d0c82334538714f55b5ea83370b91 100644
--- a/ui/pt_BR.lproj/RingWizardChoose.strings
+++ b/ui/pt_BR.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Associar este dispositivo a uma conta";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Criar uma conta no Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/pt_BR.lproj/RingWizardLinkAccount.strings b/ui/pt_BR.lproj/RingWizardLinkAccount.strings
index 3fc95555bf4f129c1574656f90bcf0b6f9561ce8..5354c854475178a7164752d305816ac5108430b2 100644
--- a/ui/pt_BR.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt_BR.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Vá para as configurações de gerenciamento de conta, escolha a conta Ring a usar e selecione \"Associar outro dispositivo à esta conta\". ↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Entre com a senha da sua conta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Entre a senha";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Estou pronto";
diff --git a/ui/pt_BR.lproj/RingWizardNewAccount.strings b/ui/pt_BR.lproj/RingWizardNewAccount.strings
index c1f1e496f568e3a613fb41ede9b05a121464b4a1..a66c7dc525278a98a6f1bffdf7e9deecb08cff23 100644
--- a/ui/pt_BR.lproj/RingWizardNewAccount.strings
+++ b/ui/pt_BR.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Marcando isto, você irá registrar um usuário único na rede Ring. Pessoas pode o usar para contatá-lo ao invés de usar deu ID Ring, que contém 40 caracteres.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
diff --git a/ui/pt_PT.lproj/AccSecurity.strings b/ui/pt_PT.lproj/AccSecurity.strings
index 40de78ab05da5394097dc8c52ba30da40ce85bce..502b52089dd63baef64ed4143cf958137d201c38 100644
--- a/ui/pt_PT.lproj/AccSecurity.strings
+++ b/ui/pt_PT.lproj/AccSecurity.strings
@@ -24,7 +24,7 @@
 "JHb-iu-ZwI.title" = "Chave privada";
 
 /* Class = "NSTextFieldCell"; title = "User Certificate"; ObjectID = "Jqz-P0-zAz"; */
-"Jqz-P0-zAz.title" = "Certificado do Usuário";
+"Jqz-P0-zAz.title" = "Certificado do Utilizador";
 
 /* Class = "NSTextFieldCell"; title = "Server name instance for outgoing TLS connection"; ObjectID = "UxS-et-whJ"; */
 "UxS-et-whJ.title" = "Nome da instância do servidor para conexões de saída TLS";
diff --git a/ui/pt_PT.lproj/ExportPasswordWindow.strings b/ui/pt_PT.lproj/ExportPasswordWindow.strings
index ad1883d909db9edb2fa18c8aeea8699f685b3bc6..636dcd515ab9fd86deac35359acbb29a6644cc78 100644
--- a/ui/pt_PT.lproj/ExportPasswordWindow.strings
+++ b/ui/pt_PT.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Palavra-chave...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Por favor forneça a palavra-chave da sua conta Ring para iniciar";
+/* 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" = "Janela";
diff --git a/ui/pt_PT.lproj/GeneralPrefs.strings b/ui/pt_PT.lproj/GeneralPrefs.strings
index c0def1440e68eb75b75e44500748f8b7a3218a01..74e6ddc83a8cc122782c29d35e24278fe4d3e155 100644
--- a/ui/pt_PT.lproj/GeneralPrefs.strings
+++ b/ui/pt_PT.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Atualização";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Ativar Notificações na Área de Trabalho";
+/* 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" = "Trazer Ring para o primeiro plano ao receber chamadas";
+/* 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" = "Isto é compartilhado com seus contactos";
diff --git a/ui/pt_PT.lproj/Localizable.strings b/ui/pt_PT.lproj/Localizable.strings
index fb5b71d2af7a0c46b37a0c5d73a9fbb6c5de92a4..79c6f061cd54b725c4431c2dbf2ea9fd9a94ebf2 100644
--- a/ui/pt_PT.lproj/Localizable.strings
+++ b/ui/pt_PT.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Copiar número";
 
 /* Contextual menu entry */
-"Create RING Account" = "Criar Conta RING";
+"Create Jami Account" = "Criar Conta Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Criar conta SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "A receber chamada de %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Mensagem de %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Recusar";
+"Accept" = "Aceitar";
 
 /* Contextual menu entry */
 "Remove value" = "Remover valor";
@@ -128,7 +132,7 @@
 "Revise Input" = "Rever o introduzido";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Partilhar";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "O nome de utilizador introduzido não está disponível";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "A seguinte conta tem de ser migrada para o novo formato de conta do Ring:";
+"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" = "A palavra-chave que introduziu não desbloqueia esta conta";
 
 /* 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." = "Para terminar o processo, tem de abrir o Ring no novo dispositivo e escolher a opção \"Associar este dispositivo a uma conta\". O seu PIN é válido por 10 minutos.";
+"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." = "Para continuar com a migração, tem de escolher uma palavra-chave para a sua conta. Esta palavra-chave será utilizada para encriptar a sua chave-mestra. Será necessária para adicionar novos dispositivos à sua conta Ring. Se não está pronto a escolher uma palavra-chave, pode fechar o Ring e continuar a migração mais tarde.";
+"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" = "Desconhecido";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Bem-vindo(a) ao Ring";
+"Welcome to Ring" = "Bem-vindo ao Jami";
 "Create a new account" = "Criar nova conta";
 "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!";
diff --git a/ui/pt_PT.lproj/MainMenu.strings b/ui/pt_PT.lproj/MainMenu.strings
index b7bbf265c11eb2aedcb46fc7ee2146894a35b112..4d38351d31489e637d3d60ce95944e3139308505 100644
--- a/ui/pt_PT.lproj/MainMenu.strings
+++ b/ui/pt_PT.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Menu Principal";
 
-/* 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" = "Sobre o Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "Sobre o Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Preferências...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Serviços";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Esconder o Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Sair do Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Esconder Outros";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Ajuda";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ajuda Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Pesquisar e Substituir...";
diff --git a/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings b/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
index c63c795b623b7f65e8869890f915f09b43e5c366..1ced896b7d18337c5f25395281a8ca2463a9bc83 100644
--- a/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/pt_PT.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Terminada a migração da conta";
 
-/* 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" = "A seguinte conta tem de ser migrada para o novo formato da conta Ring:\\nApelido: \\nID:\\nPara continuar a migração, tem de escolher uma palavra-chave para a sua conta. Esta palavra-chave será utilizada para criptografar a sua palavra-chave mestre. Ela será solicitada quando forem adicionados novos dispositivos na sua conta Ring. Caso não decida criar uma palavra-chave agora, pode fechar o Ring e continuar com a migração mais tarde.";
+"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" = "Erro de migração de conta";
diff --git a/ui/pt_PT.lproj/PreferencesWindow.strings b/ui/pt_PT.lproj/PreferencesWindow.strings
index 697de81e863693d4a44b8a04b6e52fe01a2332c0..556484d4e51f00d4dbeab3b46636b19cee075f70 100644
--- a/ui/pt_PT.lproj/PreferencesWindow.strings
+++ b/ui/pt_PT.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Preferências Ring";
+/* 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" = "Geral";
diff --git a/ui/pt_PT.lproj/RegisterNameWindow.strings b/ui/pt_PT.lproj/RegisterNameWindow.strings
index 908f6f7881731a0ab2101842ff5d2529405b3213..121363972af4700e9a857cf4ffd38144f8494ca1 100644
--- a/ui/pt_PT.lproj/RegisterNameWindow.strings
+++ b/ui/pt_PT.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Os outros utilizadores podem utilizar em vez do seu 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" = "Ocorreu um erro durante o registo do seu nome de utilizador";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Introduza a palavra-chave da sua conta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Introduza a sua palavra-chave";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Janela";
diff --git a/ui/pt_PT.lproj/RingWindow.strings b/ui/pt_PT.lproj/RingWindow.strings
index 79a0b26ea08e97b4a38e3aad50697430b01dc9dd..059a80a39d17ee93fc8f10b4db8b380e20304c0f 100644
--- a/ui/pt_PT.lproj/RingWindow.strings
+++ b/ui/pt_PT.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalhes";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Método de Contacto";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Histórico";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Este é o seu RingID. Copie e compartilhe-o com os seus amigos!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contactos";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Categoria";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "O Ring é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Categoria";
diff --git a/ui/pt_PT.lproj/RingWizard.strings b/ui/pt_PT.lproj/RingWizard.strings
index 8419bb08818fedad04b6c3aee2a1a917fe3182f1..0c12a888bf0260ffe97365b1a0706945f1932d69 100644
--- a/ui/pt_PT.lproj/RingWizard.strings
+++ b/ui/pt_PT.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Bem-vindo(a) ao Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Bem-vindo ao Jami";
diff --git a/ui/pt_PT.lproj/RingWizardChoose.strings b/ui/pt_PT.lproj/RingWizardChoose.strings
index a468bd4317a67f95df97b10a6a3c783b02dd75f8..fbb4d3935112621c7d0f0644e1a8112fee042009 100644
--- a/ui/pt_PT.lproj/RingWizardChoose.strings
+++ b/ui/pt_PT.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Associar este dispositivo a uma conta";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Criar uma conta no Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Criar uma conta Jami";
diff --git a/ui/pt_PT.lproj/RingWizardLinkAccount.strings b/ui/pt_PT.lproj/RingWizardLinkAccount.strings
index fe0ef192f74b39157caba883824eb80a23b2f6e9..c610e411b2a30fa49562bb386762fd0cf81afbcc 100644
--- a/ui/pt_PT.lproj/RingWizardLinkAccount.strings
+++ b/ui/pt_PT.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Aceda às configurações de gestão de conta no dispositivo, escolha a \nconta Ring a usar e selecione \"Associar outro dispositivo a esta conta\". ↵";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Associar";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Cancelar";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Introduza a palavra-chave da sua conta Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Introduza a palavra-chave";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Estou pronto";
diff --git a/ui/pt_PT.lproj/RingWizardNewAccount.strings b/ui/pt_PT.lproj/RingWizardNewAccount.strings
index 537f0246cfa01017108667bd9baf6f3a1d61812a..186d2aadf76fc13e1a48397e45678108bf727d5d 100644
--- a/ui/pt_PT.lproj/RingWizardNewAccount.strings
+++ b/ui/pt_PT.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Marcando isto, irá registar um nome de utilizador único na rede Ring. As pessoas podem usá-lo para o contactar em vez de usarem o seu RingID, que contém 40 caracteres.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obrigatório*";
diff --git a/ui/ro.lproj/ExportPasswordWindow.strings b/ui/ro.lproj/ExportPasswordWindow.strings
index 39774e5e14c822ba49e55c0743c23e2669195299..db91eae8d1c3cb365d70e2e482c39ba409681551 100644
--- a/ui/ro.lproj/ExportPasswordWindow.strings
+++ b/ui/ro.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";
diff --git a/ui/ro.lproj/Localizable.strings b/ui/ro.lproj/Localizable.strings
index 4d4616ec0ae8b9266cb7b80f5a7a4d52f9a6dff8..9db4558c98081e747e688b449f2bb8bd99e8331e 100644
--- a/ui/ro.lproj/Localizable.strings
+++ b/ui/ro.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Necunoscut";
@@ -179,7 +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!";
diff --git a/ui/ro.lproj/MainMenu.strings b/ui/ro.lproj/MainMenu.strings
index bdd75b47fecebf69469c69d9c1c4d7fc4391712d..b82c88afba7e51a765499ebe5378e936520664fd 100644
--- a/ui/ro.lproj/MainMenu.strings
+++ b/ui/ro.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "AMainMenu";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Suna";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Suna";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "Despre 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…";
diff --git a/ui/ro.lproj/MigrateRingAccountsWindow.strings b/ui/ro.lproj/MigrateRingAccountsWindow.strings
index 8bba9a0651c8397ec471be097e82be6b78faa84d..5d70e51ec47145128c3f4d5b4f87e7b4d5ec3054 100644
--- a/ui/ro.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ro.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";
diff --git a/ui/ro.lproj/PreferencesWindow.strings b/ui/ro.lproj/PreferencesWindow.strings
index 3a03ad7d778b2cefda64fcdd3f97a2befb31ce96..721687054960679426387d1bb0d164bdf1c0e7c1 100644
--- a/ui/ro.lproj/PreferencesWindow.strings
+++ b/ui/ro.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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";
diff --git a/ui/ro.lproj/RegisterNameWindow.strings b/ui/ro.lproj/RegisterNameWindow.strings
index 8a000c407b223a26cee3f7eeb3d0c45d8110b7d4..57df27d9243a94a7493cda653e2a175ddb1be42c 100644
--- a/ui/ro.lproj/RegisterNameWindow.strings
+++ b/ui/ro.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";
diff --git a/ui/ro.lproj/RingWindow.strings b/ui/ro.lproj/RingWindow.strings
index 337e62001a9a4b8e4169b25662d97afeb7b7c43c..9d6a0250a5fec0dc3d6b61426e5cc1465e61e00f 100644
--- a/ui/ro.lproj/RingWindow.strings
+++ b/ui/ro.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detalii";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Suna";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "History";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Contacts";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring este un software gratuit pentru comunicații universale care respectă libertățile individuale și dorința de anonimitate a utilizatorilor.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/ru.lproj/ExportPasswordWindow.strings b/ui/ru.lproj/ExportPasswordWindow.strings
index d74362ac088dff4fe57251eb10d6e26e9a5d62f5..5fe8fa5ba49e49d3bfb1cd9b846d90ae54890a80 100644
--- a/ui/ru.lproj/ExportPasswordWindow.strings
+++ b/ui/ru.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Пожалуйста, укажите пароль от вашего аккаунта Ring, чтобы начать";
+/* 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" = "Окно";
diff --git a/ui/ru.lproj/GeneralPrefs.strings b/ui/ru.lproj/GeneralPrefs.strings
index bcb3e2262e21ffec15c8772610d5bf0313d31906..633ac696d193560ea7a615bab82d70f1a8d99f71 100644
--- a/ui/ru.lproj/GeneralPrefs.strings
+++ b/ui/ru.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Обновить";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Включить Уведомления на Рабочем Столе";
+/* 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" = "Выводить Ring на передний план при входящих звонках";
+/* 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" = "К этому имеют доступ ваши контакты";
diff --git a/ui/ru.lproj/Localizable.strings b/ui/ru.lproj/Localizable.strings
index 05f208822e7342025a32e20bd76029dc018cf53f..5da530b72ee942eaca1cbc37140703ba8b30c80e 100644
--- a/ui/ru.lproj/Localizable.strings
+++ b/ui/ru.lproj/Localizable.strings
@@ -14,7 +14,7 @@
 "Place audio call" = "Place audio call";
 
 /* Contextual menu action */
-"Clear conversation" = "Clear conversation";
+"Clear conversation" = "Очистить разговор";
 
 /* Contextual menu action */
 "Block contact" = "Заблокировать контакт";
@@ -68,7 +68,7 @@
 "Copy number" = "Копировать номер";
 
 /* Contextual menu entry */
-"Create RING Account" = "Создать Аккаунт Ring";
+"Create Jami Account" = "Создать аккаунт Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Создать SIP Аккаунт";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Входящий вызов от %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Сообщение от %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Отказать";
+"Accept" = "Принять";
 
 /* Contextual menu entry */
 "Remove value" = "Удалить значение";
@@ -128,7 +132,7 @@
 "Revise Input" = "Проверить Ввод";
 
 /* Text shown to the user */
-"RingID : " = "RingID: ";
+"ID : " = "ID:";
 
 /* No comment provided by engineer. */
 "Share" = "Поделиться";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Указанное имя пользователя недоступно";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Следующий аккаунт требуется преобразовать в новый формат аккаунта Ring:";
+"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" = "Введенный пароль не подходит к этому аккаунту";
 
 /* 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." = "Для завершения процесса вам нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.";
+"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." = "Чтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Ring. Если вы не готовы выбрать пароль, можете закрыть Ring и продолжить перенос позднее.";
+"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" = "Неизвестно";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Добро пожаловать в Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "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!";
diff --git a/ui/ru.lproj/MainMenu.strings b/ui/ru.lproj/MainMenu.strings
index 5e64f215e187850625988a595567a179f9828d2f..56a01b92ae4670e888782f04b0a84edf0c96e88c 100644
--- a/ui/ru.lproj/MainMenu.strings
+++ b/ui/ru.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Главное меню";
 
-/* 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" = "О программе";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Настройки...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Услуги";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Скрыть Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Выйти из Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Скрыть Остальные";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Помощь";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Помощь";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Найти и заменить...";
diff --git a/ui/ru.lproj/MigrateRingAccountsWindow.strings b/ui/ru.lproj/MigrateRingAccountsWindow.strings
index 9d3883205b272b5fd65fb9d60e609998d1475423..5681d33ed08c710361c1aee016981b636dd5fef3 100644
--- a/ui/ru.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ru.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Перенос аккаунта завершен";
 
-/* 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" = "Следующий аккаунт требуется преобразовать в новый формат аккаунта Ring:\\nПсевдоним:\\nID:\\nЧтобы продолжить перенос, вам нужно выбрать пароль для вашего аккаунта. Этот пароль будет использован для шифрования вашего основного ключа. Он потребуется для добавления новых устройств к вашему аккаунту Ring. Если вы не готовы выбрать пароль, можете закрыть Ring и продолжить перенос позднее.";
+"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" = "Ошибка переноса аккаунта";
diff --git a/ui/ru.lproj/PreferencesWindow.strings b/ui/ru.lproj/PreferencesWindow.strings
index a91664ec574ed1f632bfef358a70b32b26ccb50d..cc8ea277f314ce767b234c9f79c9450f3f4c5332 100644
--- a/ui/ru.lproj/PreferencesWindow.strings
+++ b/ui/ru.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Настройки Ring...";
+/* 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" = "Общее";
diff --git a/ui/ru.lproj/RegisterNameWindow.strings b/ui/ru.lproj/RegisterNameWindow.strings
index 54959304c3df85d2cf9f2f08f475626fa3fb0505..c93d557e4832495ea92c1535c6b6a9fbd428c9d9 100644
--- a/ui/ru.lproj/RegisterNameWindow.strings
+++ b/ui/ru.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Обязательно*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Другие пользователи могут использовать его вместо вашего 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" = "Произошла ошибка во время регистрации вашего имени пользователя";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Введите пароль от вашего аккаунта Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Введите ваш пароль";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Окно";
@@ -33,4 +33,4 @@
 "lT3-Bh-MnL.title" = "Регистрация";
 
 /* Class = "NSTextFieldCell"; title = "Register a public username"; ObjectID = "tje-EZ-ZPI"; */
-"tje-EZ-ZPI.title" = "Register a public username";
+"tje-EZ-ZPI.title" = "Зарегистрировать имя пользователя";
diff --git a/ui/ru.lproj/RingWindow.strings b/ui/ru.lproj/RingWindow.strings
index 6a79d26913ce074a44fdc28925e81f6d6fd40cdc..42a0fffd810a4ac437fe42ee988897b1e0ef8fb8 100644
--- a/ui/ru.lproj/RingWindow.strings
+++ b/ui/ru.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "подробности";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Метод Связи";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "История";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Это ваш RingID. Скопируйте и поделитесь им с Вашими друзьями!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Контакты";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Категория";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring — это свободная программа для всеобщей связи, уважающая свободы и конфиденциальность ее пользователей.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Категория";
diff --git a/ui/ru.lproj/RingWizardChoose.strings b/ui/ru.lproj/RingWizardChoose.strings
index ba9f452a662d7d66e64a0f7c6fd898c4c5cb3cfa..35f115bf8d2ecf39911ba8ded21654aeaa489b54 100644
--- a/ui/ru.lproj/RingWizardChoose.strings
+++ b/ui/ru.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Привязать это устройство к аккаунту";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Создать аккаунт Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ru.lproj/RingWizardLinkAccount.strings b/ui/ru.lproj/RingWizardLinkAccount.strings
index 29e23e0a07764c3e1f179fabf7a0ea7a1969fc18..e162d38823eb8642af2a21f28731e346b79437ff 100644
--- a/ui/ru.lproj/RingWizardLinkAccount.strings
+++ b/ui/ru.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отмена";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Перейдите в настройки аккаунта на этом устройстве, выберите аккаунт Ring, затем \"Привязать другое устройство к этому аккаунту\".\n";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Привязать";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Отмена";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Введите пароль от вашего аккаунта Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Введите пароль";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Я готов";
diff --git a/ui/ru.lproj/RingWizardNewAccount.strings b/ui/ru.lproj/RingWizardNewAccount.strings
index ea83a3a14e18ca6a427bd12be9b31e805a9b3177..5f6fdf698b61489c68cd335e8ec062fa95e5aea3 100644
--- a/ui/ru.lproj/RingWizardNewAccount.strings
+++ b/ui/ru.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Отмечая это, вы зарегистрируете уникальное имя в сети Ring. Другие пользователи смогут использовать его вместо RingID, чтобы связаться с вами.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Обязательно*";
diff --git a/ui/ru_RU.lproj/ExportPasswordWindow.strings b/ui/ru_RU.lproj/ExportPasswordWindow.strings
index 3f6c2349d413ef53d46128842128f25350eac2f1..096d728444033ccb28ac1c8a8ad4c86b8f6ff8c6 100644
--- a/ui/ru_RU.lproj/ExportPasswordWindow.strings
+++ b/ui/ru_RU.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
-/* 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" = "Окно";
diff --git a/ui/ru_RU.lproj/GeneralPrefs.strings b/ui/ru_RU.lproj/GeneralPrefs.strings
index 21ef0d4bc9b45842e5efcfd6f58f57d3703a4979..793e87dad4da1e583efcfd21cb87e0aa757a3280 100644
--- a/ui/ru_RU.lproj/GeneralPrefs.strings
+++ b/ui/ru_RU.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/ru_RU.lproj/Localizable.strings b/ui/ru_RU.lproj/Localizable.strings
index 8cc4626bf8f997a294fedd56e14b8ff284a18941..38273d26a9b4979411fc0bc73b6da3b2e388f2b1 100644
--- a/ui/ru_RU.lproj/Localizable.strings
+++ b/ui/ru_RU.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Принять";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Поделится";
@@ -149,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" = "Неизвестно";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Добро пожаловать в 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!";
diff --git a/ui/ru_RU.lproj/MainMenu.strings b/ui/ru_RU.lproj/MainMenu.strings
index 250b134409f2e48db31411ef7535c8f64d46f802..75913d9bb44ed3f0652b53fbd651771c83430144 100644
--- a/ui/ru_RU.lproj/MainMenu.strings
+++ b/ui/ru_RU.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Основное меню";
 
-/* Class = "NSMenuItem"; title = "Ring"; ObjectID = "56"; */
-"56.title" = "Звонок";
+/* Class = "NSMenuItem"; title = "Jami"; ObjectID = "56"; */
+"56.title" = "Jami";
 
-/* Class = "NSMenu"; title = "Ring"; ObjectID = "57"; */
-"57.title" = "Звонок";
+/* Class = "NSMenu"; title = "Jami"; ObjectID = "57"; */
+"57.title" = "Jami";
 
-/* Class = "NSMenuItem"; title = "About Ring"; ObjectID = "58"; */
-"58.title" = "О Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Предпочтения...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Сервисы";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Скрыть Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Выйти из Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Скрыть остальное";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Справка";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Справка Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Поиск и замена";
diff --git a/ui/ru_RU.lproj/MigrateRingAccountsWindow.strings b/ui/ru_RU.lproj/MigrateRingAccountsWindow.strings
index 825c2209dd40113c2a56ba4ea73c2a18a6e59cb2..e2e657271a90189d497efd30cab5bb9e1af79c51 100644
--- a/ui/ru_RU.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/ru_RU.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";
diff --git a/ui/ru_RU.lproj/PreferencesWindow.strings b/ui/ru_RU.lproj/PreferencesWindow.strings
index 6616e6a6ff59b117e6c06229f088b93b6300b5c8..30651218bc26c4242e801352f855589d4141d113 100644
--- a/ui/ru_RU.lproj/PreferencesWindow.strings
+++ b/ui/ru_RU.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Настройки Ring";
+/* 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" = "Основные";
diff --git a/ui/ru_RU.lproj/RegisterNameWindow.strings b/ui/ru_RU.lproj/RegisterNameWindow.strings
index 8e5cb47c81c2571c3ff365547c301d02967a0fd4..f1d07dd23552b64971e7b267cf062f934ecf0eea 100644
--- a/ui/ru_RU.lproj/RegisterNameWindow.strings
+++ b/ui/ru_RU.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" = "Окно";
diff --git a/ui/ru_RU.lproj/RingWindow.strings b/ui/ru_RU.lproj/RingWindow.strings
index f3f33a4d42f4ada5d3a9b8d943006d9df47cb985..57c37afb4f194fe065bce7e306eb49fdada8b46c 100644
--- a/ui/ru_RU.lproj/RingWindow.strings
+++ b/ui/ru_RU.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "Детали";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Звонок";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Метод контакта";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Журнал";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = " Это ваш RingID. Скопируйте его и поделитесь им с друзьями!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Контакты";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Категория";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Категория";
diff --git a/ui/ru_RU.lproj/RingWizardChoose.strings b/ui/ru_RU.lproj/RingWizardChoose.strings
index 13f8911f7ee5a32288e29a5ae9f3fd03438b13b4..1a1fed33b4ff9fbda3b8ff52d2212573ad265bd1 100644
--- a/ui/ru_RU.lproj/RingWizardChoose.strings
+++ b/ui/ru_RU.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Создать Ring аккаунт";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/ru_RU.lproj/RingWizardLinkAccount.strings b/ui/ru_RU.lproj/RingWizardLinkAccount.strings
index f1550586dd9cb84738a48b3d298eb1b6371af5ee..e3ffad05ebc39bbde315f3b7c0347f08cccb3eba 100644
--- a/ui/ru_RU.lproj/RingWizardLinkAccount.strings
+++ b/ui/ru_RU.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Отмена";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Отмена";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/ru_RU.lproj/RingWizardNewAccount.strings b/ui/ru_RU.lproj/RingWizardNewAccount.strings
index 1b49624c1bffc09bf3449062e6b307bc26950ac4..ee53a27700b81b5d5fc716cc9d04093117fa2abf 100644
--- a/ui/ru_RU.lproj/RingWizardNewAccount.strings
+++ b/ui/ru_RU.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/sk_SK.lproj/ExportPasswordWindow.strings b/ui/sk_SK.lproj/ExportPasswordWindow.strings
index 0af1cceba91241404df8ec9ebd0a8d4084549090..458c01098c613c5de4b015b7575525c90bd18c7b 100644
--- a/ui/sk_SK.lproj/ExportPasswordWindow.strings
+++ b/ui/sk_SK.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Heslo";
 
-/* 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" = "Okno";
diff --git a/ui/sk_SK.lproj/GeneralPrefs.strings b/ui/sk_SK.lproj/GeneralPrefs.strings
index 2cbe850904756927f9f35c8ca5829a629e1ba1cb..0c7c5e9bd61da0644d7aefe641b0c8cf6cef3391 100644
--- a/ui/sk_SK.lproj/GeneralPrefs.strings
+++ b/ui/sk_SK.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/sk_SK.lproj/Localizable.strings b/ui/sk_SK.lproj/Localizable.strings
index 10d54066a24be1ce68961f8ae0d1811b4a276327..0fae82263d091aa04b4b4d19935f0c432d6db374 100644
--- a/ui/sk_SK.lproj/Localizable.strings
+++ b/ui/sk_SK.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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Prichádzajúci hovor od %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Refuse";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Share";
@@ -149,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" = "Neznámy";
@@ -179,7 +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!";
diff --git a/ui/sk_SK.lproj/MainMenu.strings b/ui/sk_SK.lproj/MainMenu.strings
index ef05cce5b707684ee4024136c9d6032bde7186a6..8d6a8d497ce41d4b0c3ee1bfb807a244c28c04c0 100644
--- a/ui/sk_SK.lproj/MainMenu.strings
+++ b/ui/sk_SK.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" = "O programe Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Nastavenia";
@@ -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…";
diff --git a/ui/sk_SK.lproj/MigrateRingAccountsWindow.strings b/ui/sk_SK.lproj/MigrateRingAccountsWindow.strings
index 6ca215b7710f557177ccf0086b9e4c293d6875c2..65463c97bab747fb751eee66373a09b49427b5d6 100644
--- a/ui/sk_SK.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sk_SK.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";
diff --git a/ui/sk_SK.lproj/PreferencesWindow.strings b/ui/sk_SK.lproj/PreferencesWindow.strings
index fcea52c157c8af2e12539c2cf09ea8f0d1cf36e4..5cfda9b6773903bb7ea08262bdc0624858e20703 100644
--- a/ui/sk_SK.lproj/PreferencesWindow.strings
+++ b/ui/sk_SK.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Nastavenia programu Ring";
+/* 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" = "Všeobecné";
diff --git a/ui/sk_SK.lproj/RegisterNameWindow.strings b/ui/sk_SK.lproj/RegisterNameWindow.strings
index 668c6d7d52887bab8fc289ccc6dd0f3c5f881841..bce6e910b48d98012a67273ca246cbf6050bd95d 100644
--- a/ui/sk_SK.lproj/RegisterNameWindow.strings
+++ b/ui/sk_SK.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" = "Okno";
diff --git a/ui/sk_SK.lproj/RingWindow.strings b/ui/sk_SK.lproj/RingWindow.strings
index f6168259cf5a1c4a64f956bd52d9e1b5c77859db..211af72f0918f4f1d5ab97d479267409716bf819 100644
--- a/ui/sk_SK.lproj/RingWindow.strings
+++ b/ui/sk_SK.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detaily";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "História";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakty";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/sk_SK.lproj/RingWizardChoose.strings b/ui/sk_SK.lproj/RingWizardChoose.strings
index 80fe24fa9df3854c7f5c9c8e88a7cc3bad990a10..8e820b506aace6339c3e814710996d4e6ba68d52 100644
--- a/ui/sk_SK.lproj/RingWizardChoose.strings
+++ b/ui/sk_SK.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/sk_SK.lproj/RingWizardLinkAccount.strings b/ui/sk_SK.lproj/RingWizardLinkAccount.strings
index 80400d36f10f3088fbb8f3a25b117c85be66af78..74c488b1c552a6558f723a4922813f7bd6ecad26 100644
--- a/ui/sk_SK.lproj/RingWizardLinkAccount.strings
+++ b/ui/sk_SK.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Zruš";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Zruš";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Zadaj heslo";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/sk_SK.lproj/RingWizardNewAccount.strings b/ui/sk_SK.lproj/RingWizardNewAccount.strings
index 0545aec36659c84a8de064589f27a9ebb4d3e591..5a1218fc9608d001c39150f3039a9d94f59624aa 100644
--- a/ui/sk_SK.lproj/RingWizardNewAccount.strings
+++ b/ui/sk_SK.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/sl.lproj/ExportPasswordWindow.strings b/ui/sl.lproj/ExportPasswordWindow.strings
index 0e301b881fc5d8db358d27a8da205037357c236c..946a29bac2b06f08533e879c6552ff0388f726eb 100644
--- a/ui/sl.lproj/ExportPasswordWindow.strings
+++ b/ui/sl.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";
diff --git a/ui/sl.lproj/GeneralPrefs.strings b/ui/sl.lproj/GeneralPrefs.strings
index 25e62b611cef253f37ab00cec38e08b73dc6a62b..5375665c704edec0ebdfec9ce9cf505a01132a3b 100644
--- a/ui/sl.lproj/GeneralPrefs.strings
+++ b/ui/sl.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Update";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/sl.lproj/Localizable.strings b/ui/sl.lproj/Localizable.strings
index 448bfc8deed78635c4406d7be12a6808be8e2097..72f944be3246c111a4eaa4fd484b1d6423c4ff08 100644
--- a/ui/sl.lproj/Localizable.strings
+++ b/ui/sl.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopiraj številko";
 
 /* Contextual menu entry */
-"Create RING Account" = "Create RING Account";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Create SIP Account";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Message from %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Zavrni";
+"Accept" = "Sprejmi";
 
 /* Contextual menu entry */
 "Remove value" = "Remove value";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Deli";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Vneseni uporabnik ni na voljo";
 
 /* 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" = "Neznano";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Dobrodošli na Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Ustvari nov račun";
 "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!";
diff --git a/ui/sl.lproj/MainMenu.strings b/ui/sl.lproj/MainMenu.strings
index 70279fcdf89792a958bf806409e03970b2fa19c1..9f7b4968ae67744948e15c6561e16ce8f607e191 100644
--- a/ui/sl.lproj/MainMenu.strings
+++ b/ui/sl.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" = "O 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…";
diff --git a/ui/sl.lproj/MigrateRingAccountsWindow.strings b/ui/sl.lproj/MigrateRingAccountsWindow.strings
index b43bb2f163c369bbabf9e6247107b5f81e2884e2..6e315e1f32b0b40022ee61b181976f64ff7d2b3b 100644
--- a/ui/sl.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sl.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";
diff --git a/ui/sl.lproj/PreferencesWindow.strings b/ui/sl.lproj/PreferencesWindow.strings
index d47e297bfc8ca778dd373a6fa2510fa6052f2f1c..6bf1cb744dc3d2de4986b63084f2440ba584629b 100644
--- a/ui/sl.lproj/PreferencesWindow.strings
+++ b/ui/sl.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* 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" = "Splošno";
diff --git a/ui/sl.lproj/RegisterNameWindow.strings b/ui/sl.lproj/RegisterNameWindow.strings
index 87bd18fbd019e7cbac4919ab92f0283381cedc37..92836531f87011defa79a965fa6ed810c7b62958 100644
--- a/ui/sl.lproj/RegisterNameWindow.strings
+++ b/ui/sl.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" = "Vnesi geslo";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Window";
diff --git a/ui/sl.lproj/RingWindow.strings b/ui/sl.lproj/RingWindow.strings
index bef48a5286e0144341e04f69ed3fea54151da803..a330a006f90fa4dda805c8660582073b8e92b278 100644
--- a/ui/sl.lproj/RingWindow.strings
+++ b/ui/sl.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detajli";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Zgodovina";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Stiki";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/sl.lproj/RingWizardChoose.strings b/ui/sl.lproj/RingWizardChoose.strings
index cb07966eb5019e9d7f6e97126da1ffba117840ae..86df8d9f2f30c6a5414c7fee2a81a63519905a7a 100644
--- a/ui/sl.lproj/RingWizardChoose.strings
+++ b/ui/sl.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Poveži to napravo k računu";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Ustvari Ring račun";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/sl.lproj/RingWizardLinkAccount.strings b/ui/sl.lproj/RingWizardLinkAccount.strings
index 5b93af2961bc267e19c00e582e1dbbbe0a61fce3..fe1bd8c8237d392fc8a2325b56a455858da94233 100644
--- a/ui/sl.lproj/RingWizardLinkAccount.strings
+++ b/ui/sl.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Prekliči";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Prekliči";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Vnesi geslo";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/sl.lproj/RingWizardNewAccount.strings b/ui/sl.lproj/RingWizardNewAccount.strings
index 1fe5c58396c6b5d923a1178bac9a0846bd2c4657..8946615472076494219196f9ac29a070b0086958 100644
--- a/ui/sl.lproj/RingWizardNewAccount.strings
+++ b/ui/sl.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/sq_AL.lproj/ExportPasswordWindow.strings b/ui/sq_AL.lproj/ExportPasswordWindow.strings
index 82298db2e6a811a7ec94674c28e55cd75d65f55e..fb06fab5dd9a7326b3a7801d59663d414c6851ee 100644
--- a/ui/sq_AL.lproj/ExportPasswordWindow.strings
+++ b/ui/sq_AL.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Fjalëkalim…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Që t’ia fillohet, ju lutemi, jepni fjalëkalimin tuaj për llogarinë Ring";
+/* 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" = "Dritare";
diff --git a/ui/sq_AL.lproj/GeneralPrefs.strings b/ui/sq_AL.lproj/GeneralPrefs.strings
index ad15b6d684f61f21cd9b2710a6a71bea577cf95e..722bbaba273d9ce3e4b25443966c7089fe06e287 100644
--- a/ui/sq_AL.lproj/GeneralPrefs.strings
+++ b/ui/sq_AL.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Përditësim";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Aktivizo Njoftime Desktopi";
+/* 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" = "Sille Ring-un përpara për thirrje ardhëse";
+/* 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" = "Kjo ndahet me kontaktet tuaja";
diff --git a/ui/sq_AL.lproj/Localizable.strings b/ui/sq_AL.lproj/Localizable.strings
index 2050eb56e8f013a12980b9a77ade544b2bf1b685..3f1cafd00fa713ec4556f4dd398e4c0b7a252866 100644
--- a/ui/sq_AL.lproj/Localizable.strings
+++ b/ui/sq_AL.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopjoje numrin";
 
 /* Contextual menu entry */
-"Create RING Account" = "Krijoni Llogari RING";
+"Create Jami Account" = "Krijoni Llogari Jami";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Krijoni Llogari SIP";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Thirrje ardhëse pre %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Mesazh nga %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Hidhe tej";
+"Accept" = "Pranoje";
 
 /* Contextual menu entry */
 "Remove value" = "Hiqe vlerën";
@@ -128,7 +132,7 @@
 "Revise Input" = "Rishikoni Ç’u Dha";
 
 /* Text shown to the user */
-"RingID : " = "RingID:";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Ndajeni me të tjerë";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Emri i dhënë për përdorues s’është i lirë";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Llogaria vijuese lypset të migrohet nën formatin e llogarisë së re RING";
+"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" = "Fjalëkalimi që dhatë nuk e shkyç këtë llogari";
 
 /* 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." = "Që të plotësohet procesi, lypset të hapni Ring-un në një pajisje të re dhe të zgjidhni mundësinë \"Lidheni këtë pajisje me një llogari\". Pin-i juaj është i vlefshëm vetëm për 10 minuta.";
+"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." = "Që të vazhdohet migrimi, duhet të zgjidhni një fjalëkalim për llogarinë tuaj. Ky fjalëkalim do të përdoret për të fshehtëzuar kyçin tuaj të përgjithshëm. Do të kërkohet për shtim pajisjesh të reja te llogaria juaj Ring. Nëse s’jeni gati të zgjidhni një fjalëkalim, mund ta mbyllni Ring-un dhe t’i riktheheni migrimit më vonë.";
+"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" = "I panjohur";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Mirë se vini te Ring";
+"Welcome to Ring" = "Mirë se vini te Jami";
 "Create a new account" = "Krijoni një llogari të re";
 "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!";
diff --git a/ui/sq_AL.lproj/MainMenu.strings b/ui/sq_AL.lproj/MainMenu.strings
index 153ef5c65665642da201196bc11550a0b42c87a0..9a2ad09db8a3354fcd03d2a28169b6825c4aacf5 100644
--- a/ui/sq_AL.lproj/MainMenu.strings
+++ b/ui/sq_AL.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" = "Mbi Ring-un";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "Mbi Jami-n";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Parapëlqime…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Shërbime";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Fshihe Ring-un";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Dil nga Ring-u";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Fshihi të Tjerët";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Ndihmë";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ndihmë Ring-u";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Gjeni dhe Zëvendësoni…";
diff --git a/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings b/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
index 01d06a7b55c21b904336a183b976a42a0aaa164d..bf47ab0e5adc35f8f665311aea41c87a01739937 100644
--- a/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sq_AL.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Migrimi i llogarisë u plotësua";
 
-/* 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" = "Llogaria vijuese lypset të migrohet nën formatin e llogarisë së re Ring:\\n Alias : \\nID:\\n Që të vazhdohet me migrimin, duhet të zgjidhni për llogarinë tuaj një fjalëkalim. Ky fjalëkalim do të përdoret për të fshehtëzuar kyçin tuaj të përgjithshëm. Do të kërkohet për shtim pajisjesh të reja te llogaria juaj Ring. Nëse s’jeni gati të zgjidhni një fjalëkalim, mund ta mbyllni Ring-un dhe t’i riktheheni migrimin më vonë.";
+"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" = "Gabim migrimi llogarie";
diff --git a/ui/sq_AL.lproj/PreferencesWindow.strings b/ui/sq_AL.lproj/PreferencesWindow.strings
index 88603e657ad7e9a1f3c2e63b42fb66f658778029..88ff765ac38bf0d5c234de8827ca566f012287a6 100644
--- a/ui/sq_AL.lproj/PreferencesWindow.strings
+++ b/ui/sq_AL.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Parapëlqime për Ring-un";
+/* 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" = "Të përgjithshme";
diff --git a/ui/sq_AL.lproj/RegisterNameWindow.strings b/ui/sq_AL.lproj/RegisterNameWindow.strings
index 95c30dc8253420581d233740bc9b64b6c24badc3..2bca0038c5af1af72fc02fbb3756b3c90d3c51ff 100644
--- a/ui/sq_AL.lproj/RegisterNameWindow.strings
+++ b/ui/sq_AL.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "E detyrueshme*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Përdorues të tjerë mund të përdorin këtë, në vend se të RingID tuaj";
+/* 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" = "Ndodhi një gabim gjatë regjistrimit të emrit tuaj të përdoruesit";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Jepni fjalëkalimin e llogarisë tuaj Ring";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Jepni fjalëkalimin tuaj";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Dritare";
diff --git a/ui/sq_AL.lproj/RingWindow.strings b/ui/sq_AL.lproj/RingWindow.strings
index eb10376f8e142c2ad9f233b51536934da9ea3bf9..7418385cc6ba66b581d21344a3ad22beea29be88 100644
--- a/ui/sq_AL.lproj/RingWindow.strings
+++ b/ui/sq_AL.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "hollësi";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Metodë Kontakti";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historik";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Kjo është RingID-ja juaj. Kopjojeni dhe jepuani shokëve!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakte";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategori";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategori";
diff --git a/ui/sq_AL.lproj/RingWizard.strings b/ui/sq_AL.lproj/RingWizard.strings
index 385c64d18340432af427e23766e4fd5a940bd6b6..ed205de30f4326dc479efc6ed04bd5cd76ff8b79 100644
--- a/ui/sq_AL.lproj/RingWizard.strings
+++ b/ui/sq_AL.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Mirë se vini te Ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Mirë se vini te Jami";
diff --git a/ui/sq_AL.lproj/RingWizardChoose.strings b/ui/sq_AL.lproj/RingWizardChoose.strings
index c33d43ac1b96c2b258f18ae44b083642b80dd850..4a4755fab8f202b2545cd7efaead80ff39a4b660 100644
--- a/ui/sq_AL.lproj/RingWizardChoose.strings
+++ b/ui/sq_AL.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Lidheni këtë pajisje me një llogari";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Krijoni një llogari Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Krijoni një llogari Jami";
diff --git a/ui/sq_AL.lproj/RingWizardLinkAccount.strings b/ui/sq_AL.lproj/RingWizardLinkAccount.strings
index 0f5af1d879b890fc8ee23a44ece69dba02ba265d..6b47bc777ab898e61e5a68a4c51dda5f508b8013 100644
--- a/ui/sq_AL.lproj/RingWizardLinkAccount.strings
+++ b/ui/sq_AL.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Anuloje";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Shkoni te rregullimet e pajisjes për administrim llogarish, zgjidhni llogarinë Ring që do përdorur dhe përzgjidhni \"Lidhni një tjetër pajisje te kjo llogari\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Lidhje";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Anuloje";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Jepni fjalëkalimin e llogarisë tuaj Ring";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Jepni fjalëkalimin";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Jam gati";
diff --git a/ui/sq_AL.lproj/RingWizardNewAccount.strings b/ui/sq_AL.lproj/RingWizardNewAccount.strings
index dc2f7d237017a254154e0c1e2dbd83fbab60db7d..5e37dbc99314d1d25f4886223136eb4be0ce6c87 100644
--- a/ui/sq_AL.lproj/RingWizardNewAccount.strings
+++ b/ui/sq_AL.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Duke i vënë shenjë kësaj, do të regjistroni një emër unik përdoruesi në rrjetin Ring. Njerëzit mund ta përdorin atë për t’u lidhur me ju, në vend që të përdorin RingID-në tuaj që është 40 shenja i gjatë.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "E detyrueshme*";
diff --git a/ui/sv.lproj/ExportPasswordWindow.strings b/ui/sv.lproj/ExportPasswordWindow.strings
index ee6681e1c14f0d1a3c0d2f92510abf269043ba1b..a0dc2e23a6586bff7d853a7e6d69c1d31e7bea99 100644
--- a/ui/sv.lproj/ExportPasswordWindow.strings
+++ b/ui/sv.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Lösenord...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Ange ditt Ring-kontos lösenord för att börja";
+/* 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" = "Fönster";
diff --git a/ui/sv.lproj/GeneralPrefs.strings b/ui/sv.lproj/GeneralPrefs.strings
index 9c2a278322a55bee57019196a59c8dff02bce5db..14de712026aa88e3b9ca647f1be3832b41eae80d 100644
--- a/ui/sv.lproj/GeneralPrefs.strings
+++ b/ui/sv.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Uppdatera";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Aktivera skrivbordsaviseringar";
+/* 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" = "Visa Ring i förgrunden vid inkommande samtal";
+/* 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" = "Detta delas med dina kontakter";
diff --git a/ui/sv.lproj/Localizable.strings b/ui/sv.lproj/Localizable.strings
index 5ff77d7cc37add6486b453786666c053495b0b66..818e79ce4d1aa06e8a0c9ebbef28e5e13cdebda8 100644
--- a/ui/sv.lproj/Localizable.strings
+++ b/ui/sv.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Kopiera nummer";
 
 /* Contextual menu entry */
-"Create RING Account" = "Skapa Ring-konto";
+"Create Jami Account" = "Skapa Jami-konto";
 
 /* Contextual menu entry */
 "Create SIP Account" = "Skapa SIP-konto";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Inkommande samtal från %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Meddelande från %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Neka";
+"Accept" = "Acceptera";
 
 /* Contextual menu entry */
 "Remove value" = "Ta bort värde";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revidera indata";
 
 /* Text shown to the user */
-"RingID : " = "Ring-ID : ";
+"ID : " = "ID: ";
 
 /* No comment provided by engineer. */
 "Share" = "Dela";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Lösenordet är inte tillgängligt";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Följande konto behöver migreras till det nya Ring-kontoformatet:";
+"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" = "Det angivna lösenordet låser inte upp detta konto";
 
 /* 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." = "För att slutföra åtgärden, måste du nu öppna Ring på den nya enheten och välja alternativet \"Koppla den här enheten till ett konto\". PIN-koden är giltig i 10 minuter.";
+"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." = "För att gå vidare med migreringen, måste du välja ett lösenord för ditt konto. Detta lösenord kommer att användas för att kryptera din huvudnyckel. Huvudnyckeln krävs för att lägga till nya enheter till ditt Ring-konto. Om du inte är redo att välja ett lösenord, kan du stänga ner Ring och återuppta migreringen senare.";
+"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" = "Okänd";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Välkommen till ring";
+"Welcome to Ring" = "Välkommen till Jami!";
 "Create a new account" = "Skapa ett nytt konto";
 "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!";
diff --git a/ui/sv.lproj/MainMenu.strings b/ui/sv.lproj/MainMenu.strings
index 09d99eaf41c5c4eb8cbb69617e679da33c5a1463..4f8132c5fe22ef73d8e48812a404d1c7d88c44da 100644
--- a/ui/sv.lproj/MainMenu.strings
+++ b/ui/sv.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "EnHuvudmeny";
 
-/* 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" = "Om Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "Om Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Inställningar…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Tjänster";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Dölj Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Avsluta Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Dölj annat";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Hjälp";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring-hjälp";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Sök och ersätt…";
diff --git a/ui/sv.lproj/MigrateRingAccountsWindow.strings b/ui/sv.lproj/MigrateRingAccountsWindow.strings
index 4b63b5231c3a6927e0cb1e01b6f6ca5b74d0428d..28e40d700967f90558dd665e43af72042ff9588e 100644
--- a/ui/sv.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/sv.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Kontomigrering slutförd";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Ring-ID";
+/* 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" = "Följande konto behöver migreras till det nya Ring-kontoformatet:\\nAlias:\\nID:\\nFör att fortsätta migreringen måste du välja ett lösenord för kontot. Lösenordet kommer att användas för att kryptera din \"huvudnyckel\". Det kommer också att krävas för att lägga till nya enheter till ditt Ring-konto. Om du inte är redo att välja ett lösenord, kan du stänga Ring och återuppta migreringen senare.";
+"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" = "Kontomigreringsfel";
diff --git a/ui/sv.lproj/PreferencesWindow.strings b/ui/sv.lproj/PreferencesWindow.strings
index 5d6eca1927166bda640f19b440a8b186f26d6154..f155442aac1cf30d9c75306a80cac91b769d2826 100644
--- a/ui/sv.lproj/PreferencesWindow.strings
+++ b/ui/sv.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring-inställningar";
+/* 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" = "Allmänt";
diff --git a/ui/sv.lproj/RegisterNameWindow.strings b/ui/sv.lproj/RegisterNameWindow.strings
index 9dea6d2528df07e09686516af2903daabe282d5a..f62a73024d406f3234d3d278bd9ef99ecb082e36 100644
--- a/ui/sv.lproj/RegisterNameWindow.strings
+++ b/ui/sv.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoriskt*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Andra användare kan använda det istället för ditt Ring-ID";
+/* 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" = "Ett fel inträffade under registreringen av användarnamnet";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Ange Ring-kontots lösenord";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Ange ditt lösenord";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Fönster";
diff --git a/ui/sv.lproj/RingWindow.strings b/ui/sv.lproj/RingWindow.strings
index b4e93faedc18bf33c72f0d4c9d915e4dc21be5e4..11ccde949bb53bb9d4a9d3ba2f0674a57935f72e 100644
--- a/ui/sv.lproj/RingWindow.strings
+++ b/ui/sv.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "detaljer";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Kontaktmetod";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Historik";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Detta är ditt Ring-ID. Kopiera och dela det med dina vänner!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kontakter";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Kategori";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Kategori";
diff --git a/ui/sv.lproj/RingWizard.strings b/ui/sv.lproj/RingWizard.strings
index 51b2782774c5e83e237cbb31a057a776581c16ba..d8d470a4ab2428974120dbcb84cecedcb17786bd 100644
--- a/ui/sv.lproj/RingWizard.strings
+++ b/ui/sv.lproj/RingWizard.strings
@@ -1,3 +1,3 @@
 
-/* Class = "NSTextFieldCell"; title = "Welcome to Ring"; ObjectID = "2mM-yx-BfM"; */
-"2mM-yx-BfM.title" = "Välkommen till ring";
+/* Class = "NSTextFieldCell"; title = "Welcome to Jami"; ObjectID = "2mM-yx-BfM"; */
+"2mM-yx-BfM.title" = "Välkommen till Jami!";
diff --git a/ui/sv.lproj/RingWizardChoose.strings b/ui/sv.lproj/RingWizardChoose.strings
index d74f59d249687eb19cdbca0b800fbc355d2a76ff..2904f9b24ebb1ea1dd21cf34512344a0295cd6e6 100644
--- a/ui/sv.lproj/RingWizardChoose.strings
+++ b/ui/sv.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Koppla denna enhet till ett konto";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Skapa ett Ring-konto";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Skapa ett Jami-konto";
diff --git a/ui/sv.lproj/RingWizardLinkAccount.strings b/ui/sv.lproj/RingWizardLinkAccount.strings
index 7d59f2283ee3522297a047e3bcacc7cb125a88d6..719cad1f3339e291b395846f6c567e1b2016ae4d 100644
--- a/ui/sv.lproj/RingWizardLinkAccount.strings
+++ b/ui/sv.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Avbryt";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Gå till kontohanteringen på enheten, välj önskat Ring-konto och välj \"Länka en annan enhet till detta konto\".";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Länka";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Avbryt";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Ange Ring-kontots lösenord";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Ange lösenord";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Jag är klar";
diff --git a/ui/sv.lproj/RingWizardNewAccount.strings b/ui/sv.lproj/RingWizardNewAccount.strings
index 34d649bae320c486e8517fba045562920ca42896..47f808034c796d0badfa7eabe2c0ebb0cdc1ae95 100644
--- a/ui/sv.lproj/RingWizardNewAccount.strings
+++ b/ui/sv.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Genom att aktivera det här, registrerar du ett unikt namn på Ring-nätverket. Andra människor kan använda det för att kontakta dig, istället för att använda ditt Ring-ID som är 40 tecken långt.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Obligatoriskt*";
diff --git a/ui/tr.lproj/ExportPasswordWindow.strings b/ui/tr.lproj/ExportPasswordWindow.strings
index 874fe788e4219f6957d3a8394e371cbe236f852c..69924bd55cda3c2d010979574425833b8d365a4d 100644
--- a/ui/tr.lproj/ExportPasswordWindow.strings
+++ b/ui/tr.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Parola...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Başlamak için Ring hesap parolanızı sağlayın";
+/* 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" = "Pencere";
diff --git a/ui/tr.lproj/GeneralPrefs.strings b/ui/tr.lproj/GeneralPrefs.strings
index c6911eb9643775d37510da60453768a4c6e7d63c..694ac0bc18137d28b0847dc1dd84850f70988911 100644
--- a/ui/tr.lproj/GeneralPrefs.strings
+++ b/ui/tr.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Güncelle";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Masaüstü Bildirimlerini Etkinleştir";
+/* 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" = "Gelen aramalarda Ring'i ön plana çıkar";
+/* 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" = "Bu, kişileriniz ile paylaşıldı";
diff --git a/ui/tr.lproj/Localizable.strings b/ui/tr.lproj/Localizable.strings
index b2fb132a02d125add2e14cf10deadab9460fd38a..fae08ed8833c2665e18e84a8637125fdb3dba47c 100644
--- a/ui/tr.lproj/Localizable.strings
+++ b/ui/tr.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "Numarayı kopyala";
 
 /* Contextual menu entry */
-"Create RING Account" = "Ring Hesabı Oluştur";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "SİP Hesabı Oluştur";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "%@'den gelen arama";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "%@'den ileti";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Geri Çevir";
+"Accept" = "Kabul et";
 
 /* Contextual menu entry */
 "Remove value" = "Değeri kaldır";
@@ -128,7 +132,7 @@
 "Revise Input" = "Girdiyi Gözden Geçirin";
 
 /* Text shown to the user */
-"RingID : " = "Ring Kimliği :";
+"ID : " = "Kimlik :";
 
 /* No comment provided by engineer. */
 "Share" = "Paylaş";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "Girilen kullanıcı adı uygun değil";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "Aşağıdaki hesabın yeni Ring hesabı biçimine göç ettirilmesi gerekir:";
+"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" = "Girdiğiniz parola bu hesabı açmaz";
 
 /* 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." = "Süreci bitirmek için, yeni aygıtta Ring'i açmanız ve \"Bu aygıtı bir hesaba bağla\" seçeneğini seçmeniz gerekiyor. Pin'iniz 10 dakika için geçerlidir.";
+"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." = "Göçü sürdürmek için, hesabınız için bir parola seçmelisiniz. Bu parola ana anahtarınızı şifrelemek için kullanılacak. Bu, yeni aygıtları Ring hesabınıza eklerken gerekecek. Eğer parola seçmek için hazır değilseniz, Ring'i kapatabilir ve göçü daha sonra sürdürebilirsiniz.";
+"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" = "Bilinmeyen";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Ring'e Hoşgeldiniz";
+"Welcome to Ring" = "Welcome to Jami";
 "Create a new account" = "Yeni bir hesap oluştur";
 "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!";
diff --git a/ui/tr.lproj/MainMenu.strings b/ui/tr.lproj/MainMenu.strings
index ce3372ea2efd9d1e4acdb9e0bb8a24529c055fef..a919eaa7e884f40a3b3f20a6dcd3ed9143425d9b 100644
--- a/ui/tr.lproj/MainMenu.strings
+++ b/ui/tr.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Ana Menü";
 
-/* 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" = "Ring Hakkında";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Seçenekler...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Hizmetler";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Ring'i Gizle";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Ring'den Çık";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Diğerlerini Gizle";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Yardım";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring Yardım";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Bul ve Değiştir...";
diff --git a/ui/tr.lproj/MigrateRingAccountsWindow.strings b/ui/tr.lproj/MigrateRingAccountsWindow.strings
index a5634763abda21bcbf7fd343f75aaed348f7931d..9d1e8499c32a6bd69217c1fed1fb1352306280cf 100644
--- a/ui/tr.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/tr.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "Hesap taşıma tamamlandı";
 
-/* Class = "NSTextFieldCell"; placeholderString = "RingID"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.placeholderString" = "Ring Kimliği";
+/* Class = "NSTextFieldCell"; placeholderString = "ID"; ObjectID = "859-10-HEb"; */
+"859-10-HEb.placeholderString" = "Kimlik";
 
 /* 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" = "Belirtilen hesabın yeni Ring hesap biçimine göç etmesi gerekiyor:\\nTakma ad: \\nKimlik: \\nGöçü sürdürmek için, hesabınız için bir parola seçmelisiniz. Bu parola ana anahtarınızı şifrelemek için kullanılacak. Bu, yeni aygıtları Ring hesabınıza eklerken gerekecek. Eğer parola seçmek için hazır değilseniz, Ring'i kapatabilir ve göçü daha sonra sürdürebilirsiniz.";
+"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" = "Hesap taşıma hatası";
diff --git a/ui/tr.lproj/PreferencesWindow.strings b/ui/tr.lproj/PreferencesWindow.strings
index 481d376779afc308ad7d5a2a9a64c2a9f748eed8..14151394ebe39954dd22e0bf65902c280ce31177 100644
--- a/ui/tr.lproj/PreferencesWindow.strings
+++ b/ui/tr.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring Seçenekleri";
+/* 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" = "Genel";
diff --git a/ui/tr.lproj/RegisterNameWindow.strings b/ui/tr.lproj/RegisterNameWindow.strings
index 37bf08d25d52d33e8dfc5f8ca50787f61aebacf4..99eae8f074b4fe6e4d6ac5528e6781093a844ae1 100644
--- a/ui/tr.lproj/RegisterNameWindow.strings
+++ b/ui/tr.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Zorunlu*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "Diğer kullanıcılar Ring Kimliğiniz yerine onu kullanabilir";
+/* 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" = "Kullanıcı adınız kaydedilirken bir hata oluştu";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "Ring hesap parolanızı girin";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "Parolanızı girin";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "Pencere";
diff --git a/ui/tr.lproj/RingWindow.strings b/ui/tr.lproj/RingWindow.strings
index 674314b6741831638ef90a2dbc99e3f504845813..ea035c9905b57dd6dbde79e965e7b0f59744d8aa 100644
--- a/ui/tr.lproj/RingWindow.strings
+++ b/ui/tr.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "ayrıntılar";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "İletişim Yöntemi";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Geçmiş";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Bu senin RingID'in. Kopyala ve arkadaşlarınla paylaş!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Kişiler";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "kategori";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring; kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "kategori";
diff --git a/ui/tr.lproj/RingWizardChoose.strings b/ui/tr.lproj/RingWizardChoose.strings
index 751aa4eb08867ba6652fb5c85b68108126e1586e..2919d80766f41cb5671b8e0a0b45ce0189d60121 100644
--- a/ui/tr.lproj/RingWizardChoose.strings
+++ b/ui/tr.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Bu aygıtı bir hesaba bağla";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Bir Ring hesabı oluştur";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/tr.lproj/RingWizardLinkAccount.strings b/ui/tr.lproj/RingWizardLinkAccount.strings
index 6f1491695a86270f9f5dce9d41b2d8dd5d233903..4346c2d6125ae7671d8a95b9cb042e062fce3c84 100644
--- a/ui/tr.lproj/RingWizardLinkAccount.strings
+++ b/ui/tr.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "İptal";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Aygıtın hesap yönetim ayarına git, kullanılacak Ring hesabını seç ve \"Başka aygıtı bu hesaba bağla\"yı seç.";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Bağla";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "İptal";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Ring hesap parolanızı girin";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Parolayı gir";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "Hazırım";
diff --git a/ui/tr.lproj/RingWizardNewAccount.strings b/ui/tr.lproj/RingWizardNewAccount.strings
index b503bf81ea71ea86feb155357e80b94514ecc396..b1afc1302abc26f83e9a33a87574e71c2c5af1b7 100644
--- a/ui/tr.lproj/RingWizardNewAccount.strings
+++ b/ui/tr.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "Bunu seçerek Ring ağı üzerinde benzersiz bir kullanıcı adı kaydedeceksiniz. İnsanlar 40 karakter uzunluğundaki Ring Kimliğiniz yerine bunu kullanarak sizinle iletişime geçecek.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Zorunlu*";
diff --git a/ui/uk.lproj/ExportPasswordWindow.strings b/ui/uk.lproj/ExportPasswordWindow.strings
index f0c1b2d21b0f8ec224a74e5a606997eecc4fd801..673319b8de3b2f554b27aaba07237a8331397866 100644
--- a/ui/uk.lproj/ExportPasswordWindow.strings
+++ b/ui/uk.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "Пароль...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "Щоб почати введіть пароль вашого облікового запису в Ring";
+/* 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" = "Вікно";
diff --git a/ui/uk.lproj/GeneralPrefs.strings b/ui/uk.lproj/GeneralPrefs.strings
index 2da29f31c2e30ca3f159809420a931b6a57d35af..8aea01b45c21cf2501ecb65bbcefd7459fc9618c 100644
--- a/ui/uk.lproj/GeneralPrefs.strings
+++ b/ui/uk.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "Оновити";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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" = "Показати Ring коли мені дзвонять";
+/* 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 ";
diff --git a/ui/uk.lproj/Localizable.strings b/ui/uk.lproj/Localizable.strings
index ca00408cb7901e597182188c222a42d8a9941818..93f2b52a1ef1b9a70857af5f8d3ff80b8a465640 100644
--- a/ui/uk.lproj/Localizable.strings
+++ b/ui/uk.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Вхідний виклик від %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "Повідомлення від %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "Скидання";
+"Accept" = "Прийняти";
 
 /* Contextual menu entry */
 "Remove value" = "Видалити значення";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "Поділитися";
@@ -149,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" = "Невідомий";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "Вітаємо у 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!";
diff --git a/ui/uk.lproj/MainMenu.strings b/ui/uk.lproj/MainMenu.strings
index ca3682529a886b351467a6a46f1eed744b2297a3..5f87ae9b17a227eafab3abb6e1ce5cf0dbac4743 100644
--- a/ui/uk.lproj/MainMenu.strings
+++ b/ui/uk.lproj/MainMenu.strings
@@ -14,14 +14,14 @@
 /* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
 "29.title" = "Головне меню";
 
-/* 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" = "Про Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "Налаштування";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "Сервіси";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "Приховати Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "Війти з Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "Приховати іньших";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "Допомога";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Допомога Ring";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "Пошук та заміна";
diff --git a/ui/uk.lproj/MigrateRingAccountsWindow.strings b/ui/uk.lproj/MigrateRingAccountsWindow.strings
index c5d7f442a82689a0fa38d651bf2f27740634a913..9131a2807d56b0634414154ef86df85113398586 100644
--- a/ui/uk.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/uk.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";
diff --git a/ui/uk.lproj/PreferencesWindow.strings b/ui/uk.lproj/PreferencesWindow.strings
index 0dd34ea7d156044a56e75517e3333745e9838ae0..edf2d28754457066cb1566f20791948a2ed9c1cf 100644
--- a/ui/uk.lproj/PreferencesWindow.strings
+++ b/ui/uk.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Налаштування";
+/* 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" = "Головні";
diff --git a/ui/uk.lproj/RegisterNameWindow.strings b/ui/uk.lproj/RegisterNameWindow.strings
index d4a9586a4e8d9c24207cafedd890de90f5c3accf..4fe78c63d98cc923aeedaa29f78928c36cace150 100644
--- a/ui/uk.lproj/RegisterNameWindow.strings
+++ b/ui/uk.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" = "Вікно";
diff --git a/ui/uk.lproj/RingWindow.strings b/ui/uk.lproj/RingWindow.strings
index 5d89389a70188f8de76fd0307b0661582ef7bb36..d9784f1f265624cc8c100b3d499bed57dd7ce7da 100644
--- a/ui/uk.lproj/RingWindow.strings
+++ b/ui/uk.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "подробиці";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Спосіб контакту";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "Історія";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "Це ваш RingID. Скопіюйте та поширюйте серед друзів.";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "Контакти";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Категорія";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring - це безкоштовне програмне забезпечення для спілкування, яке поважає свободу та конфіденційність своїх користувачів.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Категорія";
diff --git a/ui/uk.lproj/RingWizardChoose.strings b/ui/uk.lproj/RingWizardChoose.strings
index 812275383115905294dd293d97b58ddf7c57f730..8dfc3278003a97a6d4eaee0995951b041fa68f96 100644
--- a/ui/uk.lproj/RingWizardChoose.strings
+++ b/ui/uk.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Створити обліковий запис Ring";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/uk.lproj/RingWizardLinkAccount.strings b/ui/uk.lproj/RingWizardLinkAccount.strings
index 34616446e60afd24288fd7ce3bbd0d4afe77e2d5..6520ffdac8489de951aabb84f731f9ab6f949466 100644
--- a/ui/uk.lproj/RingWizardLinkAccount.strings
+++ b/ui/uk.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "Відміна";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "Відміна";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/uk.lproj/RingWizardNewAccount.strings b/ui/uk.lproj/RingWizardNewAccount.strings
index 5b123e054057a3cbbf9f43173f2545e92c195ca6..cb5c94f8096673f000a3cbba72a076a06545945b 100644
--- a/ui/uk.lproj/RingWizardNewAccount.strings
+++ b/ui/uk.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "Mandatory*";
diff --git a/ui/zh.lproj/ExportPasswordWindow.strings b/ui/zh.lproj/ExportPasswordWindow.strings
index 7eea8319f861dde78d15636b04f46ebfee166411..90f1aefe812a2f2d3d841c2285aae02c7b8a098a 100644
--- a/ui/zh.lproj/ExportPasswordWindow.strings
+++ b/ui/zh.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "密碼...";
 
-/* 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" = "視窗";
diff --git a/ui/zh.lproj/GeneralPrefs.strings b/ui/zh.lproj/GeneralPrefs.strings
index 79aac7ac59da448b38fa41b58639c91d62213f81..8123e3f23b6537221bd081f7563e55c48872a63c 100644
--- a/ui/zh.lproj/GeneralPrefs.strings
+++ b/ui/zh.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "更新";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "Enable Desktop Notifications";
+/* 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 ";
diff --git a/ui/zh.lproj/Localizable.strings b/ui/zh.lproj/Localizable.strings
index 92643e4dffb9196fafda6b8c6ccf9c1a6b85b71c..78a595aa9672b7d2351e64800224056b737ecf0f 100644
--- a/ui/zh.lproj/Localizable.strings
+++ b/ui/zh.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "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";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "Incoming call from %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "訊息來自%@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "拒絕";
+"Accept" = "Accept";
 
 /* Contextual menu entry */
 "Remove value" = "刪除值";
@@ -128,7 +132,7 @@
 "Revise Input" = "Revise Input";
 
 /* Text shown to the user */
-"RingID : " = "RingID : ";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "分享";
@@ -149,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" = "未知";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "歡迎使用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!";
diff --git a/ui/zh.lproj/MainMenu.strings b/ui/zh.lproj/MainMenu.strings
index 4410fdeabbb37471ff09c1f79f8cb9294ffcf43e..e2a324e46c47d7234b87dafb86278f3edc4e9c94 100644
--- a/ui/zh.lproj/MainMenu.strings
+++ b/ui/zh.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" = "關於Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "偏好設定...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "服務";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "隱藏Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "離開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" = "幫助";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring 幫助";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "搜尋並取代";
diff --git a/ui/zh.lproj/MigrateRingAccountsWindow.strings b/ui/zh.lproj/MigrateRingAccountsWindow.strings
index 3541312cb5fb22cfea6b2518addf25add1113bac..bb14a488bb085278107f8c9128036c73fbd31d80 100644
--- a/ui/zh.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/zh.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";
diff --git a/ui/zh.lproj/PreferencesWindow.strings b/ui/zh.lproj/PreferencesWindow.strings
index a2c65442e963bc94c2aba35aeb5cb8c0b4f07c48..edc5532eac12116a75b19a891a5c0605298a8edd 100644
--- a/ui/zh.lproj/PreferencesWindow.strings
+++ b/ui/zh.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring 偏好設定";
+/* 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" = "通用";
diff --git a/ui/zh.lproj/RegisterNameWindow.strings b/ui/zh.lproj/RegisterNameWindow.strings
index c705478e190ab46c94310a88c025cb0113a1f00f..6ae58e79e708d8acb56923abd69edc31b0265a57 100644
--- a/ui/zh.lproj/RegisterNameWindow.strings
+++ b/ui/zh.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "*所示必须填写";
 
-/* 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" = "視窗";
diff --git a/ui/zh.lproj/RingWindow.strings b/ui/zh.lproj/RingWindow.strings
index b7e07ca3bc46d7b597547cba3e0687b2ca81bbe7..da88b1adcabefc5ba8b09013919219704f4af7a2 100644
--- a/ui/zh.lproj/RingWindow.strings
+++ b/ui/zh.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "詳細說明";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "Contact Method";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "歷史記錄";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your RingID. Copy and share it with your friends!";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "聯絡人";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "Category";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "Category";
diff --git a/ui/zh.lproj/RingWizardChoose.strings b/ui/zh.lproj/RingWizardChoose.strings
index e970b671a7e324e7c31f2d83c0faa70b3ed842a1..c5073cdf90d967ca5d377e0b6d175ba270553e63 100644
--- a/ui/zh.lproj/RingWizardChoose.strings
+++ b/ui/zh.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "Link this device to an account";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "Create a Ring account";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/zh.lproj/RingWizardLinkAccount.strings b/ui/zh.lproj/RingWizardLinkAccount.strings
index 1714851b32c9d15ca21f6422a8a80ecb13b23e67..11944dbb1e3b4f0a722feb28cae24f92dc077b03 100644
--- a/ui/zh.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "Link";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "Enter your Ring account password";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "Enter password";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "I'm ready";
diff --git a/ui/zh.lproj/RingWizardNewAccount.strings b/ui/zh.lproj/RingWizardNewAccount.strings
index 1568da859eb107af2487a25927a5ee2f864c42ea..2f366fe4f7faf70914585dfb3c2dc60d7494f701 100644
--- a/ui/zh.lproj/RingWizardNewAccount.strings
+++ b/ui/zh.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "若勾选这个，您将在Ring网络上注册一个唯一的用户名。人们可以不使用40个字符长的RingID，而使用它与您联系。";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "*所示必须填写";
diff --git a/ui/zh_CN.lproj/ExportPasswordWindow.strings b/ui/zh_CN.lproj/ExportPasswordWindow.strings
index de1b31f1b073cfb548a0a2f4806b61504e7b7225..7d8e44949d779682ff355a1f00e11743dee72bc8 100644
--- a/ui/zh_CN.lproj/ExportPasswordWindow.strings
+++ b/ui/zh_CN.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "密码…";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "要开始，请提供您的Ring帐户密码";
+/* 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" = "窗口";
diff --git a/ui/zh_CN.lproj/GeneralPrefs.strings b/ui/zh_CN.lproj/GeneralPrefs.strings
index 2f2c5c334c5c75f07fe5573458c6240cdc10ca0c..a8b6fb5abd005c1cd61f5522abcf93cfc2820d40 100644
--- a/ui/zh_CN.lproj/GeneralPrefs.strings
+++ b/ui/zh_CN.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "更新";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "启用桌面通知";
+/* 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" = "来电时将Ring切换到前台";
+/* 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" = "已与您的通讯录共享";
diff --git a/ui/zh_CN.lproj/Localizable.strings b/ui/zh_CN.lproj/Localizable.strings
index b9330527e54adc0571607f72bc6b484717a6626e..450785724dce055084f6d7d860fb496a75e65843 100644
--- a/ui/zh_CN.lproj/Localizable.strings
+++ b/ui/zh_CN.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "复制号码";
 
 /* Contextual menu entry */
-"Create RING Account" = "创建Ring帐户";
+"Create Jami Account" = "Create Jami Account";
 
 /* Contextual menu entry */
 "Create SIP Account" = "创建SIP帐户";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "来电：%@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "消息来自%@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "拒接";
+"Accept" = "接听";
 
 /* Contextual menu entry */
 "Remove value" = "删除";
@@ -128,7 +132,7 @@
 "Revise Input" = "修改输入";
 
 /* Text shown to the user */
-"RingID : " = "RingID：";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "共享";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "该用户名不可用";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "以下帐户需要迁移至新版Ring数据格式：";
+"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" = "您输入的密码无法解锁该帐户";
 
 /* 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." = "要完成该操作，请在新设备上打开Ring，点击“将此设备与一个帐户进行连接”进行设置。您的PIN在10分钟内有效。";
+"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." = "要进行帐户迁移，您需要为该帐户设置一个密码，用于加密您的主密钥。当您连接该帐户至其他设备时，您需要输入这个密码。如果您尚未确定密码，请关闭Ring并稍后重新进行迁移。";
+"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" = "未知";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "欢迎来到Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "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!";
diff --git a/ui/zh_CN.lproj/MainMenu.strings b/ui/zh_CN.lproj/MainMenu.strings
index 24a93d6cb39990a941e82eb6ca82c18308b0ca8f..d49f2a2db7354c881d47f1aac4a69e6b5c74e3fd 100644
--- a/ui/zh_CN.lproj/MainMenu.strings
+++ b/ui/zh_CN.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" = "关于Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "偏好设置…";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "服务";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "隐藏Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "退出Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "隱藏其他";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "帮助";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring帮助";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "查找与替换…";
diff --git a/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings b/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
index 6041fe655eecac2998b8a22409b2a6220b934615..e44ad7ac722cb6b662733b59411583d75f7cb980 100644
--- a/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/zh_CN.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "帐户迁移完毕";
 
-/* 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" = "下列帐户需要迁移至Ring的新数据格式：\\n别名：\\nID：\\n要进行帐户迁移，首先您需要设置帐户密码，用于加密您的主密钥。当您连接该帐户至其他设备时，您需要重新输入该密码。如果您尚未确定密码，请关闭Ring并稍后重新开始迁移。";
+"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" = "帐户迁移发生错误";
diff --git a/ui/zh_CN.lproj/PreferencesWindow.strings b/ui/zh_CN.lproj/PreferencesWindow.strings
index 3e15881485dd8a44ae5d5d62e28addb9a6e5f1a8..88432ced3818c31d953d73eefa23584526195a27 100644
--- a/ui/zh_CN.lproj/PreferencesWindow.strings
+++ b/ui/zh_CN.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring偏好设置";
+/* 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" = "通用";
diff --git a/ui/zh_CN.lproj/RegisterNameWindow.strings b/ui/zh_CN.lproj/RegisterNameWindow.strings
index 03efa52dc933342570f14ad9a672b40aa310bbbf..9e812d8748c79b3ef1890e50929fbac032c578d7 100644
--- a/ui/zh_CN.lproj/RegisterNameWindow.strings
+++ b/ui/zh_CN.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "必填*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "其他用户可以使用它，不再需要您的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" = "用户名注册时发生错误";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "输入您的Ring帐户密码";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "输入您的密码";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "窗口";
diff --git a/ui/zh_CN.lproj/RingWindow.strings b/ui/zh_CN.lproj/RingWindow.strings
index 93a4a0072d19d2105e9c1bb5346f1f825e287272..9d4f21734988fed1617d4d7766f741ff32741bf6 100644
--- a/ui/zh_CN.lproj/RingWindow.strings
+++ b/ui/zh_CN.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "详细信息";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "联系方式";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "历史记录";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "这是您的RingID。复制并发送给您的朋友！";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "通讯录";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "分类";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring是自由软件，尊重用户的通讯自由与隐私。";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "分类";
diff --git a/ui/zh_CN.lproj/RingWizardChoose.strings b/ui/zh_CN.lproj/RingWizardChoose.strings
index 446dbb7801c5d1676868b090b443e0e4cc6e5887..daff7fa63a114b4dae4231c38aca87377a750a8f 100644
--- a/ui/zh_CN.lproj/RingWizardChoose.strings
+++ b/ui/zh_CN.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "将此设备与一个帐户进行连接";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "创建Ring帐户";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "Create a Jami account";
diff --git a/ui/zh_CN.lproj/RingWizardLinkAccount.strings b/ui/zh_CN.lproj/RingWizardLinkAccount.strings
index b1dc06ab92f141246fc49c5a71972d6d2236ce31..d4905464fd6f8ff9039621446dff471cb54e7783 100644
--- a/ui/zh_CN.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh_CN.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "前往帐户管理，选择要使用的Ring帐户，再选择“将另一设备与该帐户进行连接”。";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "连接";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "输入您的Ring帐户密码";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "输入密码";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "准备好了";
diff --git a/ui/zh_CN.lproj/RingWizardNewAccount.strings b/ui/zh_CN.lproj/RingWizardNewAccount.strings
index 4e3d815c3ab9ea4aff217445664cffeea25ded4f..ca426ce7503b86efa290bcb7423eb05864199823 100644
--- a/ui/zh_CN.lproj/RingWizardNewAccount.strings
+++ b/ui/zh_CN.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "勾选这项以注册您在Ring网络上的唯一用户名。其他用户可通过该用户名联系您，不再需要提供40字符的RingID。";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "必填*";
diff --git a/ui/zh_TW.lproj/ExportPasswordWindow.strings b/ui/zh_TW.lproj/ExportPasswordWindow.strings
index 2f6a820f9c903078104608260d05624bba443850..2e9f45b4cab0a1e8091da88a06dab7fc2462c7c8 100644
--- a/ui/zh_TW.lproj/ExportPasswordWindow.strings
+++ b/ui/zh_TW.lproj/ExportPasswordWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Password..."; ObjectID = "5cX-yS-4Sl"; */
 "5cX-yS-4Sl.ibShadowedNotApplicablePlaceholder" = "密碼...";
 
-/* Class = "NSTextFieldCell"; title = "Please provide your Ring account password to start"; ObjectID = "859-10-HEb"; */
-"859-10-HEb.title" = "請提供您的 Ring 帳號密碼以開始";
+/* 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" = "視窗";
diff --git a/ui/zh_TW.lproj/GeneralPrefs.strings b/ui/zh_TW.lproj/GeneralPrefs.strings
index b2c0536c63d25ab7a73cca2f76be7ff0082c9629..ab36f7902e1bc1cf12c187cd59a799ef05d0f5eb 100644
--- a/ui/zh_TW.lproj/GeneralPrefs.strings
+++ b/ui/zh_TW.lproj/GeneralPrefs.strings
@@ -44,11 +44,11 @@
 /* Class = "NSTextFieldCell"; title = "Update"; ObjectID = "r4u-t3-gBc"; */
 "r4u-t3-gBc.title" = "更新";
 
-/* Class = "NSButtonCell"; title = "Enable Desktop Notifications"; ObjectID = "uCL-ye-tsv"; */
-"uCL-ye-tsv.title" = "啟用桌面通知";
+/* 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" = "有來電時將 Ring 帶到前景";
+/* 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" = "這會與您的聯絡人分享";
diff --git a/ui/zh_TW.lproj/Localizable.strings b/ui/zh_TW.lproj/Localizable.strings
index 5d588be8c4a04253fd7ecaff9de030cf15156adf..cab58903be3a78cfcf5fffa1e4bda76a19c3f5d2 100644
--- a/ui/zh_TW.lproj/Localizable.strings
+++ b/ui/zh_TW.lproj/Localizable.strings
@@ -68,7 +68,7 @@
 "Copy number" = "複製號碼";
 
 /* Contextual menu entry */
-"Create RING Account" = "建立 RING 帳號";
+"Create Jami Account" = "建立 Jami 帳號";
 
 /* Contextual menu entry */
 "Create SIP Account" = "建立 SIP 帳號";
@@ -85,6 +85,9 @@
 /* Incoming call from {Name} */
 "Incoming call from %@" = "來電從 %@";
 
+/* Incoming message from {Name} */
+"Incoming message from %@" = "Incoming message from %@";
+
 /* Message from {Name} */
 "Message from %@" = "訊息從 %@";
 
@@ -114,6 +117,7 @@
 
 /* Button Action */
 "Refuse" = "拒絕";
+"Accept" = "接聽";
 
 /* Contextual menu entry */
 "Remove value" = "移除值";
@@ -128,7 +132,7 @@
 "Revise Input" = "修改輸入";
 
 /* Text shown to the user */
-"RingID : " = "RingID：";
+"ID : " = "ID : ";
 
 /* No comment provided by engineer. */
 "Share" = "分享";
@@ -149,16 +153,16 @@
 "The entered username is not available" = "輸入的使用者名稱不可用";
 
 /* Text shown to the user */
-"The following account needs to be migrated to the new Ring account format:" = "後面的帳號需要導入到新的 Ring 帳號格式：";
+"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" = "您輸入的密碼無法解鎖這個帳號";
 
 /* 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." = "要完成這個過程，您需要在新的裝置上開啟 Ring 並選擇「連結這個裝置到一個帳號」。您的 PIN 碼在 10 分鐘內有效。";
+"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." = "要繼續導入，您必須為您的帳號選擇密碼。這個密碼會用於加密的您的主金鑰。您在加入新裝置到您的 Ring 帳號時會需要它。若您還沒準備好選擇密碼，您可以關掉 Ring 並稍後再繼續導入。";
+"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" = "未知";
@@ -179,7 +183,15 @@
 "Link to an account" = "Link to an account";
 
 /* Welcome title */
-"Welcome to Ring" = "歡迎來到 Ring";
+"Welcome to Ring" = "Welcome to Jami";
 "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!";
diff --git a/ui/zh_TW.lproj/MainMenu.strings b/ui/zh_TW.lproj/MainMenu.strings
index c343e9cd7d64b9101f96cb8e35143796b0490876..7c0c5bc0ced96d452d0fcd224d2d7f17b63195fe 100644
--- a/ui/zh_TW.lproj/MainMenu.strings
+++ b/ui/zh_TW.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" = "關於 Ring";
+/* Class = "NSMenuItem"; title = "About Jami"; ObjectID = "58"; */
+"58.title" = "About Jami";
 
 /* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
 "129.title" = "偏好設定...";
@@ -32,11 +32,11 @@
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
 "131.title" = "服務";
 
-/* Class = "NSMenuItem"; title = "Hide Ring"; ObjectID = "134"; */
-"134.title" = "隱藏 Ring";
+/* Class = "NSMenuItem"; title = "Hide Jami"; ObjectID = "134"; */
+"134.title" = "Hide Jami";
 
-/* Class = "NSMenuItem"; title = "Quit Ring"; ObjectID = "136"; */
-"136.title" = "結束 Ring";
+/* Class = "NSMenuItem"; title = "Quit Jami"; ObjectID = "136"; */
+"136.title" = "Quit Jami";
 
 /* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
 "145.title" = "隱藏其他";
@@ -188,8 +188,8 @@
 /* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
 "491.title" = "說明";
 
-/* Class = "NSMenuItem"; title = "Ring Help"; ObjectID = "492"; */
-"492.title" = "Ring 說明";
+/* Class = "NSMenuItem"; title = "Jami Help"; ObjectID = "492"; */
+"492.title" = "Jami Help";
 
 /* Class = "NSMenuItem"; title = "Find and Replace…"; ObjectID = "534"; */
 "534.title" = "尋找與取代...";
diff --git a/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings b/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
index 1a298eb6bcaf979ae3423900cb98c24748d49f79..46c34e968ee728643c5899c3f96a028e678197f6 100644
--- a/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
+++ b/ui/zh_TW.lproj/MigrateRingAccountsWindow.strings
@@ -2,11 +2,11 @@
 /* Class = "NSTextFieldCell"; title = "Account migration completed"; ObjectID = "1ob-x1-u74"; */
 "1ob-x1-u74.title" = "帳號遷移完成";
 
-/* 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" = "下列帳號需要遷移到新的 Ring 帳號格式：\\n 別名：\\nID:\\n 要進行遷移，你需要為你的帳號選擇密碼。這個密碼將會被用來加密你的主要金鑰。加入新裝置到你的 Ring 帳號時需要密碼。如果你還沒準備好要選擇密碼，你可以關閉 Ring 並且稍候再繼續遷移。";
+"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" = "帳號遷移錯誤";
diff --git a/ui/zh_TW.lproj/PreferencesWindow.strings b/ui/zh_TW.lproj/PreferencesWindow.strings
index 5af51ae2bb9acb18a04e89d8887a4f4e7d0c9db2..335c47af6060fecfe50a59ff54a4c79346535bd8 100644
--- a/ui/zh_TW.lproj/PreferencesWindow.strings
+++ b/ui/zh_TW.lproj/PreferencesWindow.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSWindow"; title = "Ring Preferences"; ObjectID = "C1T-wE-wxb"; */
-"C1T-wE-wxb.title" = "Ring 偏好設定";
+/* 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" = "一般";
diff --git a/ui/zh_TW.lproj/RegisterNameWindow.strings b/ui/zh_TW.lproj/RegisterNameWindow.strings
index 0fcac0fe36b2bbe20ae48d492428ba1ca784a665..c68c59205fd6b3e05b44ce52baf3b748d4977c5a 100644
--- a/ui/zh_TW.lproj/RegisterNameWindow.strings
+++ b/ui/zh_TW.lproj/RegisterNameWindow.strings
@@ -2,14 +2,14 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "強制*";
 
-/* Class = "NSTextFieldCell"; title = "Other users can use it instead of your RingID"; ObjectID = "9gi-0u-67t"; */
-"9gi-0u-67t.title" = "其他使用者可以使用它而不是你的 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" = "你的使用者名稱註冊時發生錯誤";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "B6x-jj-48R"; */
-"B6x-jj-48R.title" = "輸入你的 Ring 帳號密碼";
+/* Class = "NSTextFieldCell"; title = "Enter your password"; ObjectID = "B6x-jj-48R"; */
+"B6x-jj-48R.title" = "輸入你的密碼";
 
 /* Class = "NSWindow"; title = "Window"; ObjectID = "JWw-7m-ywL"; */
 "JWw-7m-ywL.title" = "視窗";
diff --git a/ui/zh_TW.lproj/RingWindow.strings b/ui/zh_TW.lproj/RingWindow.strings
index 846884ad71cca1ca0205fc8a08527822c82ab750..b55f76f30df89454d6a211111dbb5ecda8d4ca7a 100644
--- a/ui/zh_TW.lproj/RingWindow.strings
+++ b/ui/zh_TW.lproj/RingWindow.strings
@@ -11,8 +11,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
 "BfK-c5-B1l.placeholderString" = "詳細資料";
 
-/* Class = "NSWindow"; title = "Ring"; ObjectID = "F0z-JX-Cv5"; */
-"F0z-JX-Cv5.title" = "Ring";
+/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Jami";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
 "FlQ-Th-nfO.placeholderString" = "聯絡方式";
@@ -32,8 +32,8 @@
 /* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
 "Wi9-Zd-O1N.label" = "歷史記錄";
 
-/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "這是你的 RingID。複製並與您的朋友分享！";
+/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
 
 /* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
 "Zbi-X6-DLT.label" = "聯絡人";
@@ -44,8 +44,8 @@
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
 "d5o-nL-fRP.placeholderString" = "分類";
 
-/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
-"eln-Vm-t0d.title" = "Ring 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。";
+/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
+"eln-Vm-t0d.title" = "Jami 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
 "gaf-Za-tuc.placeholderString" = "分類";
diff --git a/ui/zh_TW.lproj/RingWizardChoose.strings b/ui/zh_TW.lproj/RingWizardChoose.strings
index ed6db1b7535e12c2e38dfde45655a2d38ccc8eca..6ec9cf640ac028c39b55f4dcee944ae613edcdaf 100644
--- a/ui/zh_TW.lproj/RingWizardChoose.strings
+++ b/ui/zh_TW.lproj/RingWizardChoose.strings
@@ -5,5 +5,5 @@
 /* Class = "NSButtonCell"; title = "Link this device to an account"; ObjectID = "Z9K-mD-ucr"; */
 "Z9K-mD-ucr.title" = "連結這個裝置到一個帳號";
 
-/* Class = "NSButtonCell"; title = "Create a Ring account"; ObjectID = "k1T-a7-yZD"; */
-"k1T-a7-yZD.title" = "建立一個 Ring 帳號";
+/* Class = "NSButtonCell"; title = "Create a Jami account"; ObjectID = "k1T-a7-yZD"; */
+"k1T-a7-yZD.title" = "建立 Jami 帳號";
diff --git a/ui/zh_TW.lproj/RingWizardLinkAccount.strings b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
index 5d3e1bdcb16ead163c82ab025faf302b51d15bb1..9951c9b80aa40237b2857252b4a18cc36963e09d 100644
--- a/ui/zh_TW.lproj/RingWizardLinkAccount.strings
+++ b/ui/zh_TW.lproj/RingWizardLinkAccount.strings
@@ -8,8 +8,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "4ev-TK-8Yt"; */
 "4ev-TK-8Yt.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Ring account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
-"4me-D9-6GK.title" = "到裝置的帳號管理設定頁面，選擇使用 Ring 帳號並選取「連結其他裝置到此帳號」。\n";
+/* Class = "NSTextFieldCell"; title = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
"; ObjectID = "4me-D9-6GK"; */
+"4me-D9-6GK.title" = "Go to the account management setting of the device, choose the Jami account to use and select \"Link another device to this account\". 
";
 
 /* Class = "NSButtonCell"; title = "Link"; ObjectID = "8b8-bt-eAj"; */
 "8b8-bt-eAj.title" = "連結";
@@ -29,8 +29,8 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Pcj-BY-tou"; */
 "Pcj-BY-tou.title" = "取消";
 
-/* Class = "NSTextFieldCell"; title = "Enter your Ring account password"; ObjectID = "U2K-fu-INc"; */
-"U2K-fu-INc.title" = "輸入你的 Ring 帳號密碼";
+/* Class = "NSTextFieldCell"; title = "Enter password"; ObjectID = "U2K-fu-INc"; */
+"U2K-fu-INc.title" = "輸入密碼";
 
 /* Class = "NSButtonCell"; title = "I'm ready"; ObjectID = "XN4-uc-BSt"; */
 "XN4-uc-BSt.title" = "我準備好了";
diff --git a/ui/zh_TW.lproj/RingWizardNewAccount.strings b/ui/zh_TW.lproj/RingWizardNewAccount.strings
index 474cde3e1920b896a411af0054717c3bd4848e31..149d406070b151721259ff0557532af288418598 100644
--- a/ui/zh_TW.lproj/RingWizardNewAccount.strings
+++ b/ui/zh_TW.lproj/RingWizardNewAccount.strings
@@ -1,6 +1,6 @@
 
-/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
-"0qE-Sz-hdc.title" = "透過勾選這個，您將會在 Ring 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您，而不必使用長達 40 個字元的您的 RingID。";
+/* Class = "NSTextFieldCell"; title = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long."; ObjectID = "0qE-Sz-hdc"; */
+"0qE-Sz-hdc.title" = "By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your ID which is 40 characters long.";
 
 /* Class = "NSTextFieldCell"; placeholderString = "Mandatory*"; ObjectID = "1TO-Ov-S8j"; */
 "1TO-Ov-S8j.placeholderString" = "強制*";