From 5b3f3a59db0daf24103e2152f447993c08137393 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Fri, 18 Sep 2015 17:29:50 +0200
Subject: [PATCH] Map simplified Chinese zh-Hans to zh_rCN (transfex to
 android), updated translations.

---
 .tx/config                        | 12 ++++++------
 res/values-ca/strings.xml         |  2 --
 res/values-de/strings.xml         |  9 +++++++--
 res/values-el/strings.xml         |  2 --
 res/values-es/strings.xml         |  2 --
 res/values-fr/strings.xml         |  2 --
 res/values-hr/strings.xml         |  2 --
 res/values-is/strings.xml         |  2 --
 res/values-it/strings.xml         |  2 --
 res/values-ja/strings.xml         |  2 --
 res/values-pt-rBR/strings.xml     |  2 --
 res/values-pt/strings.xml         |  2 --
 res/values-ru/strings.xml         |  9 +++++++--
 res/values-tr/strings.xml         |  2 --
 res/values-uk/strings.xml         |  2 --
 res/values-vi/strings.xml         |  2 --
 res/values-zh-rTW/strings.xml     |  2 --
 res/values-zh/strings.xml         |  2 --
 res/values-zh_rCN/addresstags.xml | 21 +++++++++++++++++++++
 19 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 res/values-zh_rCN/addresstags.xml

diff --git a/.tx/config b/.tx/config
index 21542b6a77..b1e1b3356a 100644
--- a/.tx/config
+++ b/.tx/config
@@ -3,35 +3,35 @@ host = https://www.transifex.com
 
 [vespucci.main]
 file_filter = res/values-<lang>/strings.xml
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR, zh-Hans: zh_rCN 
 source_file = res/values/strings.xml
 source_lang = en
 minimum_perc = 5
 
 [vespucci.addresstagsxml]
 file_filter = res/values-<lang>/addresstags.xml
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR, zh-Hans: zh_rCN
 source_file = res/values/addresstags.xml
 source_lang = en
 minimum_perc = 100
 
 [vespucci.bugfilterxml]
 file_filter = res/values-<lang>/bugfilter.xml
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR, zh-Hans: zh_rCN
 source_file = res/values/bugfilter.xml
 source_lang = en
 minimum_perc = 100
 
 [vespucci.scalexml]
 file_filter = res/values-<lang>/scale.xml
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR, zh-Hans: zh_rCN
 source_file = res/values/scale.xml
 source_lang = en
 minimum_perc = 100
 
 [vespucci.introductionmd]
 file_filter = markdown/<lang>/Introduction.md
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR,zh-Hans: zh_rCN
 source_file = markdown/en/Introduction.md
 source_lang = en
 minimum_perc = 5
@@ -39,6 +39,6 @@ minimum_perc = 5
 [presets.presetpot]
 type = PO
 file_filter = assets/preset_<lang>.po
-lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR
+lang_map = cs: cs-rCZ, zh_TW: zh-rTW, pt_BR: pt-rBR, zh-Hans: zh_rCN
 source_lang = en
 minimum_perc = 5
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8fbf709321..cbebe9dedc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -9,8 +9,6 @@
   <string name="upload_problem_title">S\'ha produït un problema amb la pujada</string>
   <string name="upload_conflict_message_version">%1$s \nté un versió local %2$s \ni al servidor %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s \nté una versió local %2$s \ni s\'ha suprimit del servidor</string>
-  <string name="use_local_version">Usa la versió local</string>
-  <string name="use_server_version">Usa la versió del servidor</string>
   <string name="no_login_data_title">L\'autenticació ha fallat</string>
   <string name="no_connection_title">No hi ha connexió amb el servidor</string>
   <string name="wrong_login_data_title">L\'autenticació ha fallat</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 21c4853cb1..6ae52b38c2 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -12,8 +12,8 @@
   <string name="upload_conflict_message_version">%1$s \nhat lokale Version %2$s \nund auf dem Server %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s \nhat lokale Version %2$s \nund ist auf dem Server gelöscht</string>
   <string name="upload_conflict_message_referential">%1$s \nwurde lokal gelöscht \naber hat noch aktive Bezüge auf dem Server </string>
-  <string name="use_local_version">Lokale Version verwenden</string>
-  <string name="use_server_version">Version auf dem Server verwenden</string>
+  <string name="use_local_version">Lokale \nVersion \nverwenden</string>
+  <string name="use_server_version">Version auf \ndem Server \nverwenden</string>
   <string name="no_login_data_title">Authentifizierung fehlgeschlagen</string>
   <string name="no_login_data_message">Falls OAuth verwendet wird ist dies wahrscheinliche ein Fehler der gemeldet werden sollte, falls Login und Passwort verwendet werden (nicht empfohlen) sollte überprüft werden ob sie korrekt konfiguriert wurden. </string>
   <string name="no_connection_title">Keine Verbindung zum Server</string>
@@ -140,6 +140,7 @@
   <string name="toast_outside_of_download">Du editierst ausserhalb des heruntergeladenen Bereiches</string>
   <string name="toast_file_not_found">%1$s nicht gefunden.</string>
   <string name="toast_imported_track_points">%1$s Trackpunkte importiert.</string>
+  <string name="toast_unknown_voice_command">\"%1$s\" wird im Augenblick nicht unterstüzt</string>
   <string name="toast_inconsistent_state">Inkonsistenter Zustand entdeckt.. Bitte senden Sie einen Fehlerreport.</string>
   <string name="toast_camera_error">Fehler beim Starten der Kamera App: %1$s</string>
   <string name="toast_no_voice">Keine Spracherkennung vorhanden</string>
@@ -311,6 +312,8 @@
   <string name="config_showCameraAction_summary">Kamera Icon in Menuleiste anzeigen</string>
   <string name="config_generateAlerts_title">Alarme generieren</string>
   <string name="config_generateAlerts_summary">Alarme für Daten mit Problemen oder für Notes generieren.</string>
+  <string name="config_voiceCommandsEnabled_title">Sprachbefehle unterstützen</string>
+  <string name="config_voiceCommandsEnabled_summary">Experimentelle Sprachunterstützung einschalten</string>
   <string name="config_maxAlertDistance_title">Max. Distanz für Alarme</string>
   <string name="config_maxAlertDistance_summary">Max. Distanz zu einem Fehler oder Notiz bei dem noch ein Alarm generiert wird</string>
   <string name="config_maxStrokeWidth_title">Maximale Liniendicke</string>
@@ -391,6 +394,8 @@
   <string name="config_gps_source_summary">Quelle für GPS-Daten </string>
   <string name="config_gps_source_tcp_title">NMEA Netzwerkquelle</string>
   <string name="config_gps_source_tcp_summary">Adresse der TCP NMEA-Quelle als host:port</string>
+  <string name="config_leaveGpsDisabled_title">GPS abgeschaltet lassen</string>
+  <string name="config_leaveGpsDisabled_summary">Nicht nachfragen wenn GPS ausgeschaltet ist</string>
   <string name="config_enableLightTheme_title">Helles Thema verwenden</string>
   <string name="config_enableLightTheme_summary">Helles Thema mit weissen Hintergrund</string>
   <string name="config_category_misc">Verschiedenes</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8b4a1966b2..bec35fcd42 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \nπροκειμένου να ενταχθούν στη τοπική έκδοση %2$s \nστο διακομιστή %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s \nπροκειμένου να ενταχθούν στη τοπική έκδοση%2$s \nκαι διαγράφτηκε στο διακομιστή</string>
   <string name="upload_conflict_message_referential">%1$s \nwas διεγράφη τοπικά\nbut έχει αναφορές στο διακομιστή</string>
-  <string name="use_local_version">Χρήση της τοπικής έκδοσης</string>
-  <string name="use_server_version">Χρήση έκδοση για το διακομιστή</string>
   <string name="no_login_data_title">Πιστοποίηση απέτυχε</string>
   <string name="no_login_data_message">Εάν χρησιμοποιείτετο το OAuth αυτό είναι πιθανό ένα bug, παρακαλούμε να στείλετε μια αναφορά προβλήματος, εάν χρησιμοποιείτε το όνομα χρήστη και τον κωδικό πρόσβασης (δεν συνιστάται) ελέγξτε ότι έχετε πληκτρολογήσει σωστά.</string>
   <string name="no_connection_title">Χωρίς σύνδεση στον διακομιστή</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1a5228a74f..d1e13a3e2e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \ntiene la versión local %2$s \ny en el servidor %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s \ntiene la versión local %2$s \ny fue eliminado en el servidor</string>
   <string name="upload_conflict_message_referential">%1$s \nfue eliminado localmente \npero tiene referencias en el servidor</string>
-  <string name="use_local_version">Utilizar la versión local</string>
-  <string name="use_server_version">Utilizar la versión en el servidor</string>
   <string name="no_login_data_title">Fallo de autenticación</string>
   <string name="no_login_data_message">Si está usando OAuth, esto es posiblemente un error, envíe un informe del problema. Si está usando usuario y contraseña (no recomendado), compruebe que se hayan introducido correctamente.</string>
   <string name="no_connection_title">Sin conexión con el servidor</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ff58dea15a..d040880d67 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,8 +14,6 @@ la version locale est %2$s
 contre %3$s sur le serveur</string>
   <string name="upload_conflict_message_deleted">%1$s \nla version locale est %2$s \net a été supprimé du serveur</string>
   <string name="upload_conflict_message_referential">%1$s \na été supprimé localement \nmais existe toujours sur le serveur</string>
-  <string name="use_local_version">Utiliser la version locale</string>
-  <string name="use_server_version">Utiliser la version du serveur</string>
   <string name="no_login_data_title">Authentification échouée</string>
   <string name="no_login_data_message">Si vous utilisez OAuth, ceci est probablement un bogue, merci de rapporter le problème. Si vous utilisez un login et un mot de passe (non recommandé) vérifiez que vous les avez renseigné correctement.</string>
   <string name="no_connection_title">Pas de connexion au serveur</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1f5e249373..664e2152fc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -9,8 +9,6 @@
   <string name="upload_problem_title">Problemi sa slanjem</string>
   <string name="upload_problem_message">Svi ili dio podataka nije poslan. Pokušajte poslati kasnije ako je ovo privremeni problem.</string>
   <string name="upload_conflict_title">Konflikt u podacima</string>
-  <string name="use_local_version">Koristi lokalnu verziju</string>
-  <string name="use_server_version">Koristi verziju sa poslužitelja</string>
   <string name="no_login_data_title">Prijava nije uspjela</string>
   <string name="no_connection_title">Poslužitelj nedostupan</string>
   <string name="no_connection_message">OSM poslužitelj je nedostupan. Molim provjerite spoj na internet ili probajte opet kasnije.</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c89fe1b56e..2c4e62508f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \ner með útgáfu %2$s \nog á þjóninum er %3$s</string>
   <string name="upload_conflict_message_deleted">%1$s \nhefur útgáfu %2$s \nog var eytt á þjóninum</string>
   <string name="upload_conflict_message_referential">%1$s \nvar eytt á tæki \nen er með tilvísanir á þjóninum</string>
-  <string name="use_local_version">Nota útgáfu tækis</string>
-  <string name="use_server_version">Nota útgáfu á þjóni</string>
   <string name="no_login_data_title">Auðkenning mistókst</string>
   <string name="no_login_data_message">Ef þú ert að auðkenna þig með OAuth þá er þetta líklega villa, vinsamlegast sendu villuskýrslu, ef þú ert að nota notandanafn og lykilorð (ekki mælt með því) athugaðu þá að þau séu rétt skrifuð.</string>
   <string name="no_connection_title">Engin tenging við netþjón</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c06b82474f..f4393fb926 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \nha la versione locale %2$s \nmentre sul server è %3$s</string>
   <string name="upload_conflict_message_deleted">%1$s \nha la versione locale %2$s \nmentre sul server risulta eliminata</string>
   <string name="upload_conflict_message_referential">%1$s \nè stata eliminata localamente \nmentre sul server ha dei riferimenti</string>
-  <string name="use_local_version">Usa la versione locale</string>
-  <string name="use_server_version">Usa la versione sul server</string>
   <string name="no_login_data_title">Autenticazione fallita</string>
   <string name="no_login_data_message">Se stai usando OAuth si tratta probabilmente di un bug,  inviaci un rapporto del problema, se stai usando login e password (non consigliato) verifica che li hai inseriti correttamente.</string>
   <string name="no_connection_title">Nessuna connessione al server</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a2bfc0f986..eb87e90058 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,8 +18,6 @@
   <string name="upload_conflict_message_referential">%1$s
 についてローカルでは削除されていますが
 サーバー上にはまだ存在しています。 </string>
-  <string name="use_local_version">ローカルにあるバージョンを使用する</string>
-  <string name="use_server_version">サーバー上にあるバージョンを使用する</string>
   <string name="no_login_data_title">認証失敗</string>
   <string name="no_login_data_message">OAuthを利用している場合、これはバグです。発生した事象のレポートを送ってください。ログイン名とパスワードを利用 (非推奨) している場合、入力した文字列が正しいかどうか確認してください。</string>
   <string name="no_connection_title">サーバに接続していません</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b80832105b..4e4b7b5832 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -8,8 +8,6 @@
   <string name="transfer_download_current_back">Voltar (não fazer nada)</string>
   <string name="upload_problem_title">Problema com o Upload</string>
   <string name="upload_conflict_title">Conflito no upload</string>
-  <string name="use_local_version">Usar versão local</string>
-  <string name="use_server_version">Usar versão no servidor</string>
   <string name="no_login_data_title">Falha de autenticação</string>
   <string name="no_connection_title">Sem conexão ao servidor</string>
   <string name="no_connection_message">Não foi possível conectar ao servidor OSM. Por favor verifique sua conexão de internet ou tente novamente mais tarde.</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 527803c6c0..6d15cafa54 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \nhá versão local %2$s \ne no servidor %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s /nhas versão local %2$s /nand foi apagada no servidor</string>
   <string name="upload_conflict_message_referential">%1$s \nfoi apagado localmente \nmas há referências no servidor</string>
-  <string name="use_local_version">Usar a versão local</string>
-  <string name="use_server_version">Usar a versão no servidor</string>
   <string name="no_login_data_title">Autenticação falhou</string>
   <string name="no_login_data_message">Se está a usar OAuth há provavelmente um bug, por favor envie um relatório de problema, se está a usar um login com palavra-chave (não recomendado) por favor verifique que estão correctos.</string>
   <string name="no_connection_title">Sem Conexão ao Servidor</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index eac52624a9..6f75995b90 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,8 +15,7 @@
   <string name="upload_conflict_message_referential">%1$s
 было удалено локально
 но имеет ссылки на сервере</string>
-  <string name="use_local_version">Использовать локальную версию</string>
-  <string name="use_server_version">Использовать версию на сервере</string>
+  <string name="use_local_version">Использовать \nлокальную \nверсию</string>
   <string name="no_login_data_title">Ошибка аутентификации</string>
   <string name="no_login_data_message">Если вы используете OAuth, то это вероятно ошибка, пожалуйста отправьте отчёт. Если вы используете логин и пароль (не рекомендуется), проверьте, что они введены корректно.</string>
   <string name="no_connection_title">Нет соединения с сервером</string>
@@ -24,7 +23,9 @@
   <string name="wrong_login_data_title">Ошибка аутентификации</string>
   <string name="wrong_login_data_re_authenticate">Войти заново</string>
   <string name="data_conflict_title">Конфликт версий</string>
+  <string name="data_conflict_message">Данные, которые вы пытаетесь загрузить, содержат конфликты с вашими правками. Попробуйте загрузить ваши правки на сервер, а затем повторите попытку.</string>
   <string name="api_offline_title">API в оффлайне</string>
+  <string name="api_offline_message">Нет связи с API, передача данных невозможна.</string>
   <string name="out_of_memory_title">Недостаточно памяти</string>
   <string name="out_of_memory_message">Vespucci не хватило памяти для загрузки запрашиваемых данных. Пожалуйста начните снова и загрузите меньшую область</string>
   <string name="out_of_memory_dirty_message">Vespucci не хватило памяти для загрузки запрашиваемых данных. Пожалуйста попробуйте сохранить ваши правки, перезапустите программу и попробуйте загрузить меньшую область</string>
@@ -84,8 +85,10 @@
   <string name="length_m">Длина (м)</string>
   <string name="not_downloaded">Не скачано</string>
   <string name="empty_role">пустая роль</string>
+  <string name="error">ошибка</string>
   <!--Toaster-->
   <string name="toast_no_changes">Вы ничего не изменили…</string>
+  <string name="toast_unsaved_changes">У вас есть несохраненные изменения, пожалуйста, сначала загрузите их на сервер.</string>
   <string name="toast_upload_success">Передача на сервер OSM завершена.</string>
   <string name="toast_not_in_edit_range">Пожалуйста, увеличьте масштаб для редактирования  (Громкость +/- или Движок масштаба)</string>
   <string name="toast_unlock_to_edit">Разблокируйте для правки</string>
@@ -216,9 +219,11 @@
   <string name="menu_transfer_download_other">Скачать другое место</string>
   <string name="menu_transfer_upload">Передача данных на сервер OSM</string>
   <string name="menu_transfer_close_changeset">Закрыть текущий пакет правок</string>
+  <string name="menu_transfer_file">Файл...</string>
   <string name="menu_transfer_export">Экспорт изменений</string>
   <string name="menu_transfer_read_file">Прочитать из файла</string>
   <string name="menu_transfer_save_file">Сохранить в файл</string>
+  <string name="menu_transfer_bugs_clear">Очистить</string>
   <string name="menu_save">Сохранить в файл</string>
   <string name="menu_join">Объединить</string>
   <string name="menu_unjoin">Разъединить</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 66137e7527..ba4de8c7d4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s\n yerel versiyon %2$s \nsunucudaki %3$s</string>
   <string name="upload_conflict_message_deleted">%1$s \nyerel versiyon %2$s \nve sunucudan silinen.</string>
   <string name="upload_conflict_message_referential">%1$s \nyerelden silindi \nfakat sunucuda referansı var</string>
-  <string name="use_local_version">Yerel versiyonu kullan</string>
-  <string name="use_server_version">Sunucudaki versiyonu kullan</string>
   <string name="no_login_data_title">Doğrulama başarısız</string>
   <string name="no_login_data_message">Eğer OAuth kullanıyorsan bu bir böcek olabilir, lütfen bir hata bildiriminde bulunun. Fakat giriş ve parola kullanıyorsanız (tavsiye edilmez) lütfen doğru girdiğinizden emin olun.</string>
   <string name="no_connection_title">Sunucu Bağlantısı Yok</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fc6023dc05..fc68ed56d4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_referential">%1$s
  було вилучено локально
  але має посилання на сервері</string>
-  <string name="use_local_version">Використовувати локальну версію</string>
-  <string name="use_server_version">Використовувати версію на сервері</string>
   <string name="no_login_data_title">Помилка автентифікації</string>
   <string name="no_login_data_message">Якщо Ви використовуєте OAuth, то це ймовірно помилка, будь ласка відправте звіт.  Якщо Ви використовуєте логін і пароль (не рекомендується), перевірте, що вони введені коректно.</string>
   <string name="no_connection_title">Немає з’єднання з сервером</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a7e6e5f080..07d180b3ef 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \nđiện thoại có phiên bản %2$s \ntrong khi máy chủ có %3$s </string>
   <string name="upload_conflict_message_deleted">%1$s \ncó phiên bản địa phương %2$s \ntrong khi nó đã bị xóa trên máy chủ</string>
   <string name="upload_conflict_message_referential">%1$s \nđã bị xóa trong điện thoại trong khi còn có tham chiếu trên máy chủ </string>
-  <string name="use_local_version">Dùng phiên bản trong điện thoại</string>
-  <string name="use_server_version">Dùng phiên bản trên máy chủ</string>
   <string name="no_login_data_title">Thất bại khi xác thực</string>
   <string name="no_login_data_message">Nếu bạn đăng nhập qua OAuth (được khuyến khích), có lẽ bạn đã gặp lỗi; xin vui lòng báo cáo vấn đề cho chúng tôi. Nếu không, xin vui lòng kiểm tra tên đăng nhập và mật khẩu.</string>
   <string name="no_connection_title">Không thể Kết nối với Máy chủ</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3cc47995f4..8413c9ff87 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \n擁有的本機版本 %2$s \n和在伺服器上的 %3$s</string>
   <string name="upload_conflict_message_deleted">%1$s \n持有的本機版本 %2$s \n且在伺服器上已被刪除</string>
   <string name="upload_conflict_message_referential">%1$s \n本機的已被刪除，\n但是在伺服器上可取得參考</string>
-  <string name="use_local_version">使用本機版本</string>
-  <string name="use_server_version">使用伺服器上的版本</string>
   <string name="no_login_data_title">驗證失敗</string>
   <string name="no_login_data_message">如果您正在使用 OAuth 這可能是一個錯誤，請發送錯誤問題報告，如果您正在使用登入和密碼(不推薦)，請檢查它們是否輸入正確。</string>
   <string name="no_connection_title">未連接到伺服器</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index dcce57905d..3e69ec6c46 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -12,8 +12,6 @@
   <string name="upload_conflict_message_version">%1$s \n本地版本为 %2$s \n而服务器上的版本为 %3$s</string>
   <string name="upload_conflict_message_deleted">%1$s \n本地版本为 %2$s \n而在服务器上已被删除</string>
   <string name="upload_conflict_message_referential">%1$s \n在本地已被上传 \n但在服务器上被引用</string>
-  <string name="use_local_version">使用本地版本</string>
-  <string name="use_server_version">使用服务器上的版本</string>
   <string name="no_login_data_title">身份验证失败</string>
   <string name="no_login_data_message">如果您正在使用OAuth 这可能是一个错误，请发送错误问题报告，如果您正在使用登入和密码(不推荐)，请检查它们是否输入正确。</string>
   <string name="no_connection_title">没有连接到服务器</string>
diff --git a/res/values-zh_rCN/addresstags.xml b/res/values-zh_rCN/addresstags.xml
new file mode 100644
index 0000000000..7dbc1c6aac
--- /dev/null
+++ b/res/values-zh_rCN/addresstags.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string-array name="address_tags_entries">
+    <item>门牌号 (addr:housenumber)</item>
+    <item>街道 (addr:street)</item>
+    <item>邮政编码 (addr:postcode)</item>
+    <item>市/镇/村/.. (addr:city)</item>
+    <item>国家 (addr:country)</item>
+    <item>完整地址 (addr:full)</item>
+    <item>地方 (addr:place)</item>
+    <item>Hamlet (addr:hamlet)</item>
+    <item>郊区 (addr:suburb)</item>
+    <item>街道 (addr:subdistrict)</item>
+    <item>区 (addr:district)</item>
+    <item>省 (addr:province)</item>
+    <item>州 (addr:state)</item>
+    <item>公寓 (addr:flats)</item>
+    <item>门 (addr:door)</item>
+    <item>单元 (addr:unit)</item>
+  </string-array>
+</resources>