diff --git a/ui/bg.lproj/ExportPasswordWindow.strings b/ui/bg.lproj/ExportPasswordWindow.strings
index 3c0ae97..70c43bf 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 057ae23..f628f14 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 313254f..2371dcf 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 1516b4d..a0651eb 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 c25225b..ae88e8f 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 2256037..46e7c77 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 703d671..f3b7851 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 3adcae3..f91e7aa 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 e836988..6755b77 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 e15fbd8..852af7a 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 ed8a18a..4d630f1 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" = "Задължително*";