diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-23 13:02:37 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-23 13:02:37 +0100 |
| commit | 0c22f68aef5dd44caebf930b684979ecac0a35d2 (patch) | |
| tree | 0184c2b2bb05f813a28834f1b2f99f31e8fa4dab | |
| parent | c5e60b43b8e107702445e834bce8a3c77f676eb8 (diff) | |
merged string resources
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-gl/strings.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values-zh-rTW/strings.xml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 54079f4e..3abda855 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -57,12 +57,9 @@ <string name="pref_xmpp_resource">Recurso</string> <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string> <string name="pref_accept_files">Aceptar arquivos</string> -<<<<<<< HEAD <string name="pref_accept_files_size_summary">De forma automática aceptar arquivos menores de…</string> <string name="pref_notification_settings">Axustes de notificación</string> -======= <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string> ->>>>>>> 1.10.0 <string name="pref_notifications">Notificacións</string> <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string> <string name="pref_vibrate">Tremer</string> diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 4d831111..9a59cfe6 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -76,12 +76,9 @@ <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> |