diff --git a/ui/sk_SK.lproj/ExportPasswordWindow.strings b/ui/sk_SK.lproj/ExportPasswordWindow.strings
index 0af1cce..458c010 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 2cbe850..0c7c5e9 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 10d5406..0fae822 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 ef05cce..8d6a8d4 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 6ca215b..65463c9 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 fcea52c..5cfda9b 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 668c6d7..bce6e91 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 f616825..211af72 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 80fe24f..8e820b5 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 80400d3..74c488b 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 0545aec..5a1218f 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*";