Merge

Change-Id: Ic9b2ccc47431764df8248f64d3e72b0f32ac5488
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b779100..41384a1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -73,7 +73,7 @@
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Funga"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"Sawa"</string>
     <string name="unknown_file" msgid="6092727753965095366">"Faili isiyojulikana"</string>
-    <string name="unknown_file_desc" msgid="480434281415453287">"Hakuna prog ya kushughulikia aina hii ya faili. "\n</string>
+    <string name="unknown_file_desc" msgid="480434281415453287">"Hakuna programu ya kushughulikia aina hii ya faili. "\n</string>
     <string name="not_exist_file" msgid="3489434189599716133">"Hakuna faili."</string>
     <string name="not_exist_file_desc" msgid="4059531573790529229">"Faili haipo. "\n</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"Tafadhali subiri…"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 13f9776..400d5a5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -77,7 +77,7 @@
     <string name="not_exist_file" msgid="3489434189599716133">"沒有檔案"</string>
     <string name="not_exist_file_desc" msgid="4059531573790529229">"檔案不存在。"\n</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"請稍候…"</string>
-    <string name="enabling_progress_content" msgid="4601542238119927904">"正在開啟藍牙..."</string>
+    <string name="enabling_progress_content" msgid="4601542238119927904">"正在開啟藍牙…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"即將接收檔案,請在通知面板中查看進度。"</string>
     <string name="bt_toast_2" msgid="8602553334099066582">"無法接收檔案。"</string>
     <string name="bt_toast_3" msgid="6707884165086862518">"已停止接收來自「<xliff:g id="SENDER">%1$s</xliff:g>」的檔案"</string>