diff --git a/ui/zh_TW.lproj/ExportPasswordWindow.strings b/ui/zh_TW.lproj/ExportPasswordWindow.strings
index 2f6a820..2e9f45b 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 b2c0536..ab36f79 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 5d588be..cab5890 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 c343e9c..7c0c5bc 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 1a298eb..46c34e9 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 5af51ae..335c47a 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 0fcac0f..c68c592 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 846884a..b55f76f 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 ed6db1b..6ec9cf6 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 5d3e1bd..9951c9b 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 474cde3..149d406 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" = "強制*";