diff options
Diffstat (limited to 'src/main/res/values-zh-rTW/strings.xml')
| -rw-r--r-- | src/main/res/values-zh-rTW/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index ce80073b..4d831111 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -76,7 +76,12 @@ <string name="pref_xmpp_resource">XMPP 資源</string> <string name="pref_xmpp_resource_summary">客戶端標示名稱</string> <string name="pref_accept_files">接收文件</string> +<<<<<<< HEAD + <string name="pref_accept_files_size_summary">自動接收小於 … 的文件</string> + <string name="pref_notification_settings">通知設定</string> +======= <string name="pref_accept_files_summary">自動接收小於 … 的文件</string> +>>>>>>> 1.10.0 <string name="pref_notifications">通知</string> <string name="pref_notifications_summary">收到新訊息時通知</string> <string name="pref_vibrate">震動</string> |