diff --git a/.tx/config b/.tx/config
index 7c4b5d562..cf79ceeeb 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,5 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,sv_SE:sv-rSE,kn_IN:kn-rIN,nl_NL:nl-rNL,en_NL:en-rNL
 minimum_perc = 1
 
 [linphone-ios.localizablestrings]
diff --git a/Classes/Base.lproj/ChatRoomViewController.strings b/Classes/Base.lproj/ChatRoomViewController.strings
index a05025f33..e43729de3 100644
Binary files a/Classes/Base.lproj/ChatRoomViewController.strings and b/Classes/Base.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.strings b/Classes/Base.lproj/HistoryDetailsViewController.strings
index 2954ead48..9ea355e8d 100644
Binary files a/Classes/Base.lproj/HistoryDetailsViewController.strings and b/Classes/Base.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/Base.lproj/IncomingCallViewController.strings b/Classes/Base.lproj/IncomingCallViewController.strings
index c3aa723a5..1ea6da905 100644
Binary files a/Classes/Base.lproj/IncomingCallViewController.strings and b/Classes/Base.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.strings b/Classes/Base.lproj/IncomingCallViewController~ipad.strings
index db1fb0f94..c82d0111a 100644
Binary files a/Classes/Base.lproj/IncomingCallViewController~ipad.strings and b/Classes/Base.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/Base.lproj/WizardViews.strings b/Classes/Base.lproj/WizardViews.strings
index 1f22b0423..8083292b3 100644
Binary files a/Classes/Base.lproj/WizardViews.strings and b/Classes/Base.lproj/WizardViews.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.strings b/Classes/LinphoneUI/Base.lproj/UICallCell.strings
index 92138347c..9d9551217 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UICallCell.strings and b/Classes/LinphoneUI/Base.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings
index 9ca9f1ae8..91f270f45 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings
index 9da4ee791..55ec8b262 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/ar.lproj/UICallCell.strings b/Classes/LinphoneUI/ar.lproj/UICallCell.strings
index 1ddefac3e..5867d40e5 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UICallCell.strings and b/Classes/LinphoneUI/ar.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings
index 268a5488f..77b8494d0 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings
index 17004dd72..bd8aa1e2b 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UICallCell.strings b/Classes/LinphoneUI/de.lproj/UICallCell.strings
index 1747f9328..114e59720 100644
Binary files a/Classes/LinphoneUI/de.lproj/UICallCell.strings and b/Classes/LinphoneUI/de.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings
index e7201be63..9c4254d7b 100644
Binary files a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings
index 790695a1c..2d8554414 100644
Binary files a/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UICallCell.strings b/Classes/LinphoneUI/fr.lproj/UICallCell.strings
index dd352ca36..94dbc6b13 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UICallCell.strings and b/Classes/LinphoneUI/fr.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings
index a54d1be29..35daf8f29 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings
index b85ee2376..6c1d42070 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UICallCell.strings b/Classes/LinphoneUI/ja.lproj/UICallCell.strings
index 70769c2ce..1d9525a61 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UICallCell.strings and b/Classes/LinphoneUI/ja.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings
index bf9c680d6..317551c24 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings
index bd3e929d9..101df1338 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/ru.lproj/UICallCell.strings b/Classes/LinphoneUI/ru.lproj/UICallCell.strings
index 6fff0fad0..8dad3a8a4 100644
Binary files a/Classes/LinphoneUI/ru.lproj/UICallCell.strings and b/Classes/LinphoneUI/ru.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings
index dc67832a3..793dfe07b 100644
Binary files a/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings
new file mode 100644
index 000000000..4b627577c
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings
new file mode 100644
index 000000000..7bda03e1b
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings
new file mode 100644
index 000000000..7fb608a6d
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings b/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings
new file mode 100644
index 000000000..c16425967
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings
new file mode 100644
index 000000000..20b1a62e9
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/ar.lproj/ChatRoomViewController.strings b/Classes/ar.lproj/ChatRoomViewController.strings
index 4aa68bd62..c54b6c10d 100644
Binary files a/Classes/ar.lproj/ChatRoomViewController.strings and b/Classes/ar.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ar.lproj/HistoryDetailsViewController.strings b/Classes/ar.lproj/HistoryDetailsViewController.strings
index ef989cd93..1398242f7 100644
Binary files a/Classes/ar.lproj/HistoryDetailsViewController.strings and b/Classes/ar.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ar.lproj/IncomingCallViewController.strings b/Classes/ar.lproj/IncomingCallViewController.strings
index 07226ba9d..d90c464f6 100644
Binary files a/Classes/ar.lproj/IncomingCallViewController.strings and b/Classes/ar.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ar.lproj/IncomingCallViewController~ipad.strings b/Classes/ar.lproj/IncomingCallViewController~ipad.strings
index 755032cab..123065a5d 100644
Binary files a/Classes/ar.lproj/IncomingCallViewController~ipad.strings and b/Classes/ar.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ar.lproj/WizardViews.strings b/Classes/ar.lproj/WizardViews.strings
index 5077a9fc8..743a14dfd 100644
Binary files a/Classes/ar.lproj/WizardViews.strings and b/Classes/ar.lproj/WizardViews.strings differ
diff --git a/Classes/de.lproj/ChatRoomViewController.strings b/Classes/de.lproj/ChatRoomViewController.strings
index 2756503dc..b116222de 100644
Binary files a/Classes/de.lproj/ChatRoomViewController.strings and b/Classes/de.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/de.lproj/HistoryDetailsViewController.strings b/Classes/de.lproj/HistoryDetailsViewController.strings
index f47924f05..fe90e3995 100644
Binary files a/Classes/de.lproj/HistoryDetailsViewController.strings and b/Classes/de.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/de.lproj/IncomingCallViewController.strings b/Classes/de.lproj/IncomingCallViewController.strings
index 6c230b92f..6d9f4da81 100644
Binary files a/Classes/de.lproj/IncomingCallViewController.strings and b/Classes/de.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/de.lproj/IncomingCallViewController~ipad.strings b/Classes/de.lproj/IncomingCallViewController~ipad.strings
index 2af2d6c37..951ad9721 100644
Binary files a/Classes/de.lproj/IncomingCallViewController~ipad.strings and b/Classes/de.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/de.lproj/WizardViews.strings b/Classes/de.lproj/WizardViews.strings
index cc90ca31a..4ff99898a 100644
Binary files a/Classes/de.lproj/WizardViews.strings and b/Classes/de.lproj/WizardViews.strings differ
diff --git a/Classes/fr.lproj/ChatRoomViewController.strings b/Classes/fr.lproj/ChatRoomViewController.strings
index 96b177a8b..852063d13 100644
Binary files a/Classes/fr.lproj/ChatRoomViewController.strings and b/Classes/fr.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/fr.lproj/HistoryDetailsViewController.strings b/Classes/fr.lproj/HistoryDetailsViewController.strings
index 517667cf5..d1a6c5589 100644
Binary files a/Classes/fr.lproj/HistoryDetailsViewController.strings and b/Classes/fr.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/fr.lproj/IncomingCallViewController.strings b/Classes/fr.lproj/IncomingCallViewController.strings
index 2559620d9..fd68b1fc5 100644
Binary files a/Classes/fr.lproj/IncomingCallViewController.strings and b/Classes/fr.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/fr.lproj/IncomingCallViewController~ipad.strings b/Classes/fr.lproj/IncomingCallViewController~ipad.strings
index af277919b..bdb7ff117 100644
Binary files a/Classes/fr.lproj/IncomingCallViewController~ipad.strings and b/Classes/fr.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/fr.lproj/WizardViews.strings b/Classes/fr.lproj/WizardViews.strings
index 8759e5071..a8665594e 100644
Binary files a/Classes/fr.lproj/WizardViews.strings and b/Classes/fr.lproj/WizardViews.strings differ
diff --git a/Classes/ja.lproj/ChatRoomViewController.strings b/Classes/ja.lproj/ChatRoomViewController.strings
index 90a808097..221a03340 100644
Binary files a/Classes/ja.lproj/ChatRoomViewController.strings and b/Classes/ja.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ja.lproj/HistoryDetailsViewController.strings b/Classes/ja.lproj/HistoryDetailsViewController.strings
index 621b57ddc..f56503b10 100644
Binary files a/Classes/ja.lproj/HistoryDetailsViewController.strings and b/Classes/ja.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ja.lproj/IncomingCallViewController.strings b/Classes/ja.lproj/IncomingCallViewController.strings
index 3f5f6aeb3..ff9f3ee3c 100644
Binary files a/Classes/ja.lproj/IncomingCallViewController.strings and b/Classes/ja.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ja.lproj/IncomingCallViewController~ipad.strings b/Classes/ja.lproj/IncomingCallViewController~ipad.strings
index 882beb05b..0f32ebaae 100644
Binary files a/Classes/ja.lproj/IncomingCallViewController~ipad.strings and b/Classes/ja.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ja.lproj/WizardViews.strings b/Classes/ja.lproj/WizardViews.strings
index a48859525..eb781b5ef 100644
Binary files a/Classes/ja.lproj/WizardViews.strings and b/Classes/ja.lproj/WizardViews.strings differ
diff --git a/Classes/ru.lproj/ChatRoomViewController.strings b/Classes/ru.lproj/ChatRoomViewController.strings
index 22c828084..48cf472e0 100644
Binary files a/Classes/ru.lproj/ChatRoomViewController.strings and b/Classes/ru.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ru.lproj/HistoryDetailsViewController.strings b/Classes/ru.lproj/HistoryDetailsViewController.strings
index 4a8846768..fcd2c47c6 100644
Binary files a/Classes/ru.lproj/HistoryDetailsViewController.strings and b/Classes/ru.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ru.lproj/IncomingCallViewController.strings b/Classes/ru.lproj/IncomingCallViewController.strings
index 23908fb3e..c13b84710 100644
Binary files a/Classes/ru.lproj/IncomingCallViewController.strings and b/Classes/ru.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ru.lproj/IncomingCallViewController~ipad.strings b/Classes/ru.lproj/IncomingCallViewController~ipad.strings
index 879a6f1dd..8aaca9606 100644
Binary files a/Classes/ru.lproj/IncomingCallViewController~ipad.strings and b/Classes/ru.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ru.lproj/WizardViews.strings b/Classes/ru.lproj/WizardViews.strings
index 903b5365b..8d2de1a47 100644
Binary files a/Classes/ru.lproj/WizardViews.strings and b/Classes/ru.lproj/WizardViews.strings differ
diff --git a/Classes/zh_TW.lproj/AboutViewController.strings b/Classes/zh_TW.lproj/AboutViewController.strings
new file mode 100644
index 000000000..cacfb5460
Binary files /dev/null and b/Classes/zh_TW.lproj/AboutViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ChatRoomViewController.strings b/Classes/zh_TW.lproj/ChatRoomViewController.strings
new file mode 100644
index 000000000..23f2ad76d
Binary files /dev/null and b/Classes/zh_TW.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ChatViewController.strings b/Classes/zh_TW.lproj/ChatViewController.strings
new file mode 100644
index 000000000..9e74e9187
Binary files /dev/null and b/Classes/zh_TW.lproj/ChatViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings b/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings
new file mode 100644
index 000000000..cd678ed1e
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactDetailsViewController.strings b/Classes/zh_TW.lproj/ContactDetailsViewController.strings
new file mode 100644
index 000000000..5b94a6f7f
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactDetailsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactsViewController.strings b/Classes/zh_TW.lproj/ContactsViewController.strings
new file mode 100644
index 000000000..633b2eb51
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/DialerViewController.strings b/Classes/zh_TW.lproj/DialerViewController.strings
new file mode 100644
index 000000000..6af0b616c
Binary files /dev/null and b/Classes/zh_TW.lproj/DialerViewController.strings differ
diff --git a/Classes/zh_TW.lproj/DialerViewController~ipad.strings b/Classes/zh_TW.lproj/DialerViewController~ipad.strings
new file mode 100644
index 000000000..f47328c1d
Binary files /dev/null and b/Classes/zh_TW.lproj/DialerViewController~ipad.strings differ
diff --git a/Classes/zh_TW.lproj/HistoryDetailsViewController.strings b/Classes/zh_TW.lproj/HistoryDetailsViewController.strings
new file mode 100644
index 000000000..d29ff8f24
Binary files /dev/null and b/Classes/zh_TW.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/HistoryViewController.strings b/Classes/zh_TW.lproj/HistoryViewController.strings
new file mode 100644
index 000000000..0367a06c1
Binary files /dev/null and b/Classes/zh_TW.lproj/HistoryViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ImageViewController.strings b/Classes/zh_TW.lproj/ImageViewController.strings
new file mode 100644
index 000000000..907b630ae
Binary files /dev/null and b/Classes/zh_TW.lproj/ImageViewController.strings differ
diff --git a/Classes/zh_TW.lproj/IncomingCallViewController.strings b/Classes/zh_TW.lproj/IncomingCallViewController.strings
new file mode 100644
index 000000000..4771c71db
Binary files /dev/null and b/Classes/zh_TW.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings b/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings
new file mode 100644
index 000000000..af166daa8
Binary files /dev/null and b/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/zh_TW.lproj/WizardViewController.strings b/Classes/zh_TW.lproj/WizardViewController.strings
new file mode 100644
index 000000000..c7cebc6d0
Binary files /dev/null and b/Classes/zh_TW.lproj/WizardViewController.strings differ
diff --git a/Classes/zh_TW.lproj/WizardViewController~ipad.strings b/Classes/zh_TW.lproj/WizardViewController~ipad.strings
new file mode 100644
index 000000000..9e0f0eb25
Binary files /dev/null and b/Classes/zh_TW.lproj/WizardViewController~ipad.strings differ
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 8b34acaac..4f874d8c2 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index cb4167fd8..1259548b0 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 22f46c686..81e470851 100644
--- a/Resources/en.lproj/Localizable.strings
+++ b/Resources/en.lproj/Localizable.strings
@@ -43,6 +43,9 @@
 /* No comment provided by engineer. */
 "Answer" = "Answer";
 
+/* No comment provided by engineer. */
+"Are you sure to want to clear your proxy setup?" = "Are you sure to want to clear your proxy setup?";
+
 /* No comment provided by engineer. */
 "Average" = "Average";
 
@@ -250,6 +253,9 @@
 /* No comment provided by engineer. */
 "No codec" = "No codec";
 
+/* No comment provided by engineer. */
+"No connectivity" = "No connectivity";
+
 /* No comment provided by engineer. */
 "No microphone" = "No microphone";
 
@@ -283,6 +289,9 @@
 /* No comment provided by engineer. */
 "Please enter a valid domain.\n" = "Please enter a valid domain.\n";
 
+/* No comment provided by engineer. */
+"Please enter a valid username" = "Please enter a valid username";
+
 /* No comment provided by engineer. */
 "Please enter a valid username.\n" = "Please enter a valid username.\n";
 
@@ -346,6 +355,9 @@
 /* No comment provided by engineer. */
 "SIP addresses" = "SIP addresses";
 
+/* No comment provided by engineer. */
+"Stay here" = "Stay here";
+
 /* No comment provided by engineer. */
 "Stop video" = "Stop video";
 
@@ -397,6 +409,9 @@
 /* No comment provided by engineer. */
 "Yes" = "Yes";
 
+/* No comment provided by engineer. */
+"You can either skip verification or connect to the Internet first." = "You can either skip verification or connect to the Internet first.";
+
 /* No comment provided by engineer. */
 "You missed a call from %@" = "You missed a call from %@";
 
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index b38bdeda6..5b7ba9cfe 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 18c87b3db..e8274a38f 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index ed548e5fd..0a9e737e4 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
new file mode 100644
index 000000000..f51670b73
Binary files /dev/null and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Tools/generate_strings_files.sh b/Tools/generate_strings_files.sh
index f0d0f5ab6..9619883c6 100755
--- a/Tools/generate_strings_files.sh
+++ b/Tools/generate_strings_files.sh
@@ -2,6 +2,8 @@
 
 root_directory=$(cd "$(dirname $0)" && pwd)/../
 
+set -e
+
 # The 2 only specific cases of the application: since we are length limited for push
 # notifications, the ID is not matching the English translation... so we must keep
 # the translations!
@@ -17,31 +19,32 @@ sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en
 rm $localizable_en.bak
 
 to_utf8=$(mktemp -t linphone)
-for xibfile in $(find $(find $root_directory/Classes -name Base.lproj) -name '*.xib'); do
-	stringsfile=${xibfile/.xib/.strings}
 
-	ibtool --generate-strings-file $stringsfile $xibfile
+find $root_directory/Classes -not -path "$root_directory/Classes/KIF/*" -name Base.lproj -exec find {} -name '*.xib' \; | while read -r xibfile; do
+	stringsfile="${xibfile/.xib/.strings}"
 
-    # remove if empty
-    iconv -f utf-16 -t utf-8 $stringsfile > $to_utf8
-    if [ ! -s $to_utf8 ]; then
-    	echo "$(basename $stringsfile) is empty, removing"
-    	rm $stringsfile
-    else
-		echo "$(basename $xibfile)->$(basename $stringsfile)"
+	ibtool --generate-strings-file "$stringsfile" "$xibfile"
 
-		res_name=$(basename $stringsfile | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
-		dir_name=$(echo $(dirname $stringsfile) | sed -E "s|$root_directory/||")
+	# remove if empty
+	iconv -f utf-16 -t utf-8 "$stringsfile" > "$to_utf8"
+	if [ ! -s "$to_utf8" ]; then
+		echo "$(basename "$stringsfile") is empty, removing"
+		rm "$stringsfile"
+	else
+		echo "$(basename "$xibfile")->$(basename "$stringsfile")"
+
+		res_name=$(basename "$stringsfile" | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
+		dir_name=$(echo $(dirname "$stringsfile") | sed -E "s|$root_directory/||")
 		# if not registered in transifex config file, register it
 		if ! grep -q $res_name $root_directory/.tx/config; then
 			echo "not found in .tx/config, adding it"
 			echo "
 [linphone-ios.$res_name]
-file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename $stringsfile)
-source_file = $dir_name/$(basename $stringsfile)
+file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename "$stringsfile")
+source_file = $dir_name/$(basename "$stringsfile")
 source_lang = en
 " >> $root_directory/.tx/config
 		fi
-    fi
+	fi
 done
 rm $to_utf8
diff --git a/Tools/update_localization.sh b/Tools/update_localization.sh
deleted file mode 100755
index fffb57f3d..000000000
--- a/Tools/update_localization.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-root_directory=$(cd "$(dirname $0)" && pwd)/../
-
-rm $root_directory/Resources/en.lproj/Localizable.strings
-find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $root_directory/Resources/en.lproj/
-
-to_utf8=$(mktemp -t linphone)
-for xibfile in $(find $(find $root_directory/Classes -name Base.lproj) -name '*.xib'); do
-	stringsfile=${xibfile/.xib/.strings}
-
-	ibtool --generate-strings-file $stringsfile $xibfile
-
-    # remove if empty
-    iconv -f utf-16 -t utf-8 $stringsfile > $to_utf8
-    if [ ! -s $to_utf8 ]; then
-    	echo "$(basename $stringsfile) is empty, removing"
-    	rm $stringsfile
-    else
-		echo "$(basename $xibfile)->$(basename $stringsfile)"
-
-		res_name=$(basename $stringsfile | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
-		dir_name=$(echo $(dirname $stringsfile) | sed -E "s|$root_directory/||")
-		# if not registered in transifex config file, register it
-		if ! grep -q $res_name $root_directory/.tx/config; then
-			echo "not found in .tx/config, adding it"
-			echo "
-[linphone-ios.$res_name]
-file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename $stringsfile)
-source_file = $dir_name/$(basename $stringsfile)
-source_lang = en
-" >> $root_directory/.tx/config
-		fi
-    fi
-done
-rm $to_utf8
diff --git a/submodules/build/Makefile b/submodules/build/Makefile
index 62e0509df..37ce9eb82 100644
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@@ -110,12 +110,12 @@ broadcast_%:
 	@echo "Broadcasting target '$*' to all sub-architectures"
 	make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $* \
 	&& make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $* \
-	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $* 
+	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $*
 
 build-% clean-% veryclean-%:
 	make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $@ \
 	&& make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $@ \
-	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $@ 
+	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $@
 
 sdk:
 	make -f builder-iphone-os.mk delivery-sdk
@@ -137,6 +137,11 @@ veryclean: broadcast_veryclean
 list-packages:
 	@make -f builder-iphone-os.mk list-packages
 
+pull-transifex:
+	cd ../../ && tx pull -af
+
+push-transifex:
+	cd ../../ && ./Tools/generate_strings_files.sh && tx push -s -t -f --no-interactive
 
 zipres:
 	@tar  -C ../.. -czf ../../ios_assets.tar.gz Resources iTunesArtwork