From c3393a2c4611d469f23a8e620760fb0061125ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Guti=C3=A9rrez=20Alfaro?= <jaime.cr@gmail.com>
Date: Tue, 9 Jul 2024 11:01:54 -0600
Subject: [PATCH] Translations in regional format

---
 .../accessibility.xml                         |   0
 .../strings-preferences.xml                   |   0
 .../strings-tags.xml                          |   0
 .../strings.xml                               |   0
 .../waypoints.xml                             |   0
 .../main/res/values-cs_CZ/accessibility.xml   |  14 --
 .../res/values-cs_CZ/strings-preferences.xml  |  98 ----------
 .../main/res/values-cs_CZ/strings-tags.xml    | 103 ----------
 app/src/main/res/values-cs_CZ/strings.xml     | 184 -----------------
 app/src/main/res/values-cs_CZ/waypoints.xml   |   5 -
 app/src/main/res/values-fa-rIR/strings.xml    |  12 +-
 app/src/main/res/values-fa-rIR/waypoints.xml  |   2 +-
 .../main/res/values-fa_IR/accessibility.xml   |  14 --
 .../res/values-fa_IR/strings-preferences.xml  |  90 ---------
 .../main/res/values-fa_IR/strings-tags.xml    | 103 ----------
 app/src/main/res/values-fa_IR/strings.xml     | 183 -----------------
 app/src/main/res/values-fa_IR/waypoints.xml   |   5 -
 .../main/res/values-fr-rFR/accessibility.xml  |   7 +
 .../res/values-fr-rFR/strings-preferences.xml |  32 ---
 .../main/res/values-fr-rFR/strings-tags.xml   |   2 -
 app/src/main/res/values-fr-rFR/strings.xml    |  46 -----
 app/src/main/res/values-fr-rFR/waypoints.xml  |   5 +-
 .../main/res/values-fr_FR/accessibility.xml   |  14 --
 app/src/main/res/values-fr_FR/waypoints.xml   |   5 -
 .../main/res/values-pt-rBR/accessibility.xml  |   2 +-
 .../main/res/values-pt-rBR/strings-tags.xml   |   3 +
 app/src/main/res/values-pt-rBR/waypoints.xml  |   2 +-
 .../res/values-pt-rPT/strings-preferences.xml |   8 +
 .../main/res/values-pt-rPT/strings-tags.xml   |  20 +-
 app/src/main/res/values-pt-rPT/strings.xml    |  63 +++---
 app/src/main/res/values-pt-rPT/waypoints.xml  |   3 +-
 .../main/res/values-pt_BR/accessibility.xml   |  14 --
 .../res/values-pt_BR/strings-preferences.xml  |  98 ----------
 .../main/res/values-pt_BR/strings-tags.xml    | 103 ----------
 app/src/main/res/values-pt_BR/strings.xml     | 185 ------------------
 app/src/main/res/values-pt_BR/waypoints.xml   |   5 -
 .../main/res/values-pt_PT/accessibility.xml   |  14 --
 .../res/values-pt_PT/strings-preferences.xml  |  98 ----------
 .../main/res/values-pt_PT/strings-tags.xml    | 103 ----------
 app/src/main/res/values-pt_PT/strings.xml     | 185 ------------------
 app/src/main/res/values-pt_PT/waypoints.xml   |   5 -
 .../main/res/values-tr-rTR/accessibility.xml  |   2 +-
 .../res/values-tr-rTR/strings-preferences.xml |  17 --
 app/src/main/res/values-tr-rTR/strings.xml    | 109 -----------
 app/src/main/res/values-tr-rTR/waypoints.xml  |   2 +-
 .../main/res/values-tr_TR/accessibility.xml   |  14 --
 .../main/res/values-tr_TR/strings-tags.xml    | 100 ----------
 app/src/main/res/values-tr_TR/waypoints.xml   |   5 -
 .../main/res/values-zh-rCN/accessibility.xml  |   2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   3 +
 app/src/main/res/values-zh-rCN/waypoints.xml  |   3 +-
 .../main/res/values-zh-rTW/accessibility.xml  |   2 +-
 .../main/res/values-zh-rTW/strings-tags.xml   |  38 ++++
 app/src/main/res/values-zh-rTW/strings.xml    |  11 +-
 app/src/main/res/values-zh-rTW/waypoints.xml  |   2 +-
 .../main/res/values-zh_CN/accessibility.xml   |  14 --
 .../res/values-zh_CN/strings-preferences.xml  |  90 ---------
 .../main/res/values-zh_CN/strings-tags.xml    |  80 --------
 app/src/main/res/values-zh_CN/strings.xml     | 146 --------------
 app/src/main/res/values-zh_CN/waypoints.xml   |   5 -
 .../main/res/values-zh_TW/accessibility.xml   |  14 --
 .../res/values-zh_TW/strings-preferences.xml  |  98 ----------
 .../main/res/values-zh_TW/strings-tags.xml    | 103 ----------
 app/src/main/res/values-zh_TW/strings.xml     | 185 ------------------
 app/src/main/res/values-zh_TW/waypoints.xml   |   5 -
 65 files changed, 145 insertions(+), 2740 deletions(-)
 rename app/src/main/res/{values-sr@latin => values-b+sr+Latn}/accessibility.xml (100%)
 rename app/src/main/res/{values-sr@latin => values-b+sr+Latn}/strings-preferences.xml (100%)
 rename app/src/main/res/{values-sr@latin => values-b+sr+Latn}/strings-tags.xml (100%)
 rename app/src/main/res/{values-sr@latin => values-b+sr+Latn}/strings.xml (100%)
 rename app/src/main/res/{values-sr@latin => values-b+sr+Latn}/waypoints.xml (100%)
 delete mode 100644 app/src/main/res/values-cs_CZ/accessibility.xml
 delete mode 100644 app/src/main/res/values-cs_CZ/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-cs_CZ/strings-tags.xml
 delete mode 100644 app/src/main/res/values-cs_CZ/strings.xml
 delete mode 100644 app/src/main/res/values-cs_CZ/waypoints.xml
 delete mode 100644 app/src/main/res/values-fa_IR/accessibility.xml
 delete mode 100644 app/src/main/res/values-fa_IR/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-fa_IR/strings-tags.xml
 delete mode 100644 app/src/main/res/values-fa_IR/strings.xml
 delete mode 100644 app/src/main/res/values-fa_IR/waypoints.xml
 delete mode 100644 app/src/main/res/values-fr-rFR/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-fr-rFR/strings-tags.xml
 delete mode 100644 app/src/main/res/values-fr-rFR/strings.xml
 delete mode 100644 app/src/main/res/values-fr_FR/accessibility.xml
 delete mode 100644 app/src/main/res/values-fr_FR/waypoints.xml
 delete mode 100644 app/src/main/res/values-pt_BR/accessibility.xml
 delete mode 100644 app/src/main/res/values-pt_BR/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-pt_BR/strings-tags.xml
 delete mode 100644 app/src/main/res/values-pt_BR/strings.xml
 delete mode 100644 app/src/main/res/values-pt_BR/waypoints.xml
 delete mode 100644 app/src/main/res/values-pt_PT/accessibility.xml
 delete mode 100644 app/src/main/res/values-pt_PT/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-pt_PT/strings-tags.xml
 delete mode 100644 app/src/main/res/values-pt_PT/strings.xml
 delete mode 100644 app/src/main/res/values-pt_PT/waypoints.xml
 delete mode 100644 app/src/main/res/values-tr-rTR/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-tr-rTR/strings.xml
 delete mode 100644 app/src/main/res/values-tr_TR/accessibility.xml
 delete mode 100644 app/src/main/res/values-tr_TR/strings-tags.xml
 delete mode 100644 app/src/main/res/values-tr_TR/waypoints.xml
 delete mode 100644 app/src/main/res/values-zh_CN/accessibility.xml
 delete mode 100644 app/src/main/res/values-zh_CN/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-zh_CN/strings-tags.xml
 delete mode 100644 app/src/main/res/values-zh_CN/strings.xml
 delete mode 100644 app/src/main/res/values-zh_CN/waypoints.xml
 delete mode 100644 app/src/main/res/values-zh_TW/accessibility.xml
 delete mode 100644 app/src/main/res/values-zh_TW/strings-preferences.xml
 delete mode 100644 app/src/main/res/values-zh_TW/strings-tags.xml
 delete mode 100644 app/src/main/res/values-zh_TW/strings.xml
 delete mode 100644 app/src/main/res/values-zh_TW/waypoints.xml

diff --git a/app/src/main/res/values-sr@latin/accessibility.xml b/app/src/main/res/values-b+sr+Latn/accessibility.xml
similarity index 100%
rename from app/src/main/res/values-sr@latin/accessibility.xml
rename to app/src/main/res/values-b+sr+Latn/accessibility.xml
diff --git a/app/src/main/res/values-sr@latin/strings-preferences.xml b/app/src/main/res/values-b+sr+Latn/strings-preferences.xml
similarity index 100%
rename from app/src/main/res/values-sr@latin/strings-preferences.xml
rename to app/src/main/res/values-b+sr+Latn/strings-preferences.xml
diff --git a/app/src/main/res/values-sr@latin/strings-tags.xml b/app/src/main/res/values-b+sr+Latn/strings-tags.xml
similarity index 100%
rename from app/src/main/res/values-sr@latin/strings-tags.xml
rename to app/src/main/res/values-b+sr+Latn/strings-tags.xml
diff --git a/app/src/main/res/values-sr@latin/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from app/src/main/res/values-sr@latin/strings.xml
rename to app/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/app/src/main/res/values-sr@latin/waypoints.xml b/app/src/main/res/values-b+sr+Latn/waypoints.xml
similarity index 100%
rename from app/src/main/res/values-sr@latin/waypoints.xml
rename to app/src/main/res/values-b+sr+Latn/waypoints.xml
diff --git a/app/src/main/res/values-cs_CZ/accessibility.xml b/app/src/main/res/values-cs_CZ/accessibility.xml
deleted file mode 100644
index c68c834eb..000000000
--- a/app/src/main/res/values-cs_CZ/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">Logo OSMTrackeru</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Přiblížit</string>
-  <string name="acc.zoom_out">Oddálit</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">Indikátor síly satelitního signálu</string>
-  <string name="acc.record_indicator">Indikátor průběhu záznamu</string>
-  <!--Track list-->
-  <string name="acc.track_status">Indikátor stavu stopy</string>
-  <string name="acc.upload_status">Indikátor stavu nahrávání na OpenStreetMap</string>
-</resources>
diff --git a/app/src/main/res/values-cs_CZ/strings-preferences.xml b/app/src/main/res/values-cs_CZ/strings-preferences.xml
deleted file mode 100644
index 5431fc72b..000000000
--- a/app/src/main/res/values-cs_CZ/strings-preferences.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">Nastavení</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">Nastavení GPS</string>
-  <string name="prefs_gps_os_settings_summary">Zobrazí obrazovku nastavení GPS</string>
-  <string name="prefs_check_gps_startup">Kontrola GPS při startu</string>
-  <string name="prefs_check_gps_startup_summary">Zkontrolovat, zda je GPS pro startu zakázán a zobrazit možnost ji povolit</string>
-  <string name="prefs_gps_ignore_clock">Ignorovat hodiny z GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">Ignorovat hodiny z GPS a použít hodiny Androidu pro časové značky</string>
-  <string name="prefs_use_barometer">Zaznamenávat barometrický tlak [hPa]</string>
-  <string name="prefs_use_barometer_summary">Změna se projeví po restartu záznamu</string>
-  <string name="prefs_gps_logging_interval">Interval záznamu GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Použijte 0 pro nejkratší možný (má vliv na spotřebu baterie)</string>
-  <string name="prefs_gps_logging_interval_seconds">sekundy</string>
-  <string name="prefs_gps_logging_min_distance">Vzdálenost záznamu GPS</string>
-  <string name="prefs_gps_logging_min_distance_summary">Min. vzdálenost v metrech mezi body trasy, zvolte 0 pro nejmenší možné.</string>
-  <string name="prefs_gps_logging_min_distance_meters">metrů</string>
-  <string name="prefs_ui">Uživatelské rozhraní</string>
-  <string name="prefs_ui_picture_source">Výchozí zdroj fotografií</string>
-  <string name="prefs_ui_picture_source_summary">Použít fotografie z fotoaparátu, nebo z galerie?</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>Fotoaparát</item>
-    <item>Galerie</item>
-    <item>Vždy se zeptat</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">Nastavení sad tlačítek</string>
-  <string name="prefs_ui_buttons_layout_summary">Vybrat vlastní sadu tlačítek (viz. dokumentace)</string>
-  <string name="prefs_ui_buttons_layout_default_section">VÝCHOZÍ ROZLOŽENÍ</string>
-  <string name="prefs_ui_buttons_layout_defaut">Výchozí</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">STAŽENÁ ROZLOŽENÍ</string>
-  <string name="prefs_ui_buttons_layout_empty_section">Nemáte stažené soubory rozložení</string>
-  <string name="prefs_ui_available_layout">Dostupná rozložení</string>
-  <string name="prefs_ui_github_repository_settings">Nastavení úložiště Github</string>
-  <string name="prefs_ui_orientation">Orientace</string>
-  <string name="prefs_ui_orientation_summary">Preferovaná orientace obrazovky s tlačítky</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>Automaticky</item>
-    <item>Na výšku</item>
-    <item>Na šířku</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">Trvání zvukového záznamu</string>
-  <string name="prefs_voicerec_duration_seconds">sekundy</string>
-  <string name="prefs_theme">Grafické téma hlavní obrazovky</string>
-  <string name="prefs_theme_summary">Aby se změny projevily, je třeba restart aplikace</string>
-  <string-array name="prefs_theme_keys">
-    <item>OS výchozí</item>
-    <item>OS výchozí (tmavý)</item>
-    <item>OS výchozí (světlý)</item>
-    <item>Vysoký kontrast</item>
-  </string-array>
-  <string name="prefs_display_always_on">Obrazovka vždy zapnutá</string>
-  <string name="prefs_display_always_on_summary">Obrazovka stále zapnutá během trasování. Deaktivace uspoří baterii.</string>
-  <string name="prefs_displaytrack_osm">Podkladová mapa</string>
-  <string name="prefs_displaytrack_osm_summary">Zobrazit mapu OpenStreetMap pod trasou. Je třeba datové spojení.</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Vždy zobrazovat pozadí OpenStreetMap? Vyžaduje datové připojení</string>
-  <string name="prefs_output">Nastavení GPX</string>
-  <string name="prefs_storage_dir">Adresář externího úložiště (SD)</string>
-  <string name="prefs_storage_dir_hint">Bude mít vliv pro příští trasu (ne současnou)</string>
-  <string name="prefs_output_one_dir_per_track">Pro každou trasu novou složku</string>
-  <string name="prefs_output_one_dir_per_track_summary">Uložit každou trasu a její přidružené soubory do její vlastní složky</string>
-  <string name="prefs_output_filename">Název souboru pro pojmenované trasy</string>
-  <string name="prefs_output_filename_summary">Šablona pro název souboru, pokud má trasa jméno</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>Název trasy</item>
-    <item>Jméno, datum a čas startu</item>
-    <item>Datum a čas startu</item>
-  </string-array>
-  <string name="prefs_output_accuracy">Přesnost v souboru GPX</string>
-  <string name="prefs_output_accuracy_summary">Přidat informaci o přesnosti do souboru GPX, se jménem bodu na trase nebo v komentáři k bodu na trase</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>Nikde</item>
-    <item>Se jménem bodu na trase</item>
-    <item>V komentáři k bodu na trase</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">Použít aproximaci HDOP</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">Vyplnit HDOP v GPX s přibližnou hodnotou z přesnosti</string>
-  <string name="prefs_sound_enabled">Povolit zvuk</string>
-  <string name="prefs_sound_enabled_summary">Přehrát zvuk při začátku a konci nahrávání zvuku</string>
-  <string name="prefs_osm_clear_oauth_data">Smazat OSM autentizaci</string>
-  <string name="prefs_osm_clear_oauth_data_summary">Zapomenout OSM údaje pro přihlášení a pověření a přiměj OSMTracker, aby se znovu zeptal</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">Je třeba autorizace OSMTrackeru pro opakované nahrání. Jste si jisti?</string>
-  <string name="prefs_map_tile">Poskytovatel mapových dlaždic</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>Nikde</item>
-    <item>V komentáři</item>
-    <item>V příponě</item>
-  </string-array>
-  <string name="prefs_compass_heading">Exportovat směr kompasu</string>
-  <string name="prefs_compass_heading_summary">Nastavuje, zda a jak budou data kompasu exportovány do GPX souboru</string>
-</resources>
diff --git a/app/src/main/res/values-cs_CZ/strings-tags.xml b/app/src/main/res/values-cs_CZ/strings-tags.xml
deleted file mode 100644
index 966ad2220..000000000
--- a/app/src/main/res/values-cs_CZ/strings-tags.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">Různé</string>
-  <string name="tag.restriction">Omezení</string>
-  <string name="tag.car">Auto</string>
-  <string name="tag.tourism">Turistika</string>
-  <string name="tag.amenity">Občanská vybavenost</string>
-  <string name="tag.amenity_more">Občanská vybavenost (+)</string>
-  <string name="tag.way">Cesta</string>
-  <string name="tag.track">Trasa</string>
-  <string name="tag.landuse">Využití krajiny</string>
-  <string name="tag.misc_bus_stop">Zastávka autobusu</string>
-  <string name="tag.misc_railway">Železnice</string>
-  <string name="tag.misc_telephone">Telefon</string>
-  <string name="tag.misc_post_box">Poštovní schránka</string>
-  <string name="tag.misc_atm">Bankomat</string>
-  <string name="tag.misc_bollard">Dopravní sloupek</string>
-  <string name="tag.misc_toilets">Toalety</string>
-  <string name="tag.misc_shelter">Přístřešek</string>
-  <string name="tag.misc_surveillance">Sledovací zařízení</string>
-  <string name="tag.restriction_20">Max 20</string>
-  <string name="tag.restriction_30">Max 30</string>
-  <string name="tag.restriction_40">Max 40</string>
-  <string name="tag.restriction_50">Max 50</string>
-  <string name="tag.restriction_60">Max 60</string>
-  <string name="tag.restriction_70">Max 70</string>
-  <string name="tag.restriction_80">Max 80</string>
-  <string name="tag.restriction_90">Max 90</string>
-  <string name="tag.restriction_100">Max 100</string>
-  <string name="tag.restriction_110">Max 110</string>
-  <string name="tag.restriction_120">Max 120</string>
-  <string name="tag.restriction_130">Max 130</string>
-  <string name="tag.restriction_no_exit">Slepá cesta</string>
-  <string name="tag.restriction_traffic_light">Semafory</string>
-  <string name="tag.restriction_one_way">Jednosměrka</string>
-  <string name="tag.car_fuel_station">Čerpací stanice</string>
-  <string name="tag.car_parking">Parkoviště</string>
-  <string name="tag.car_emergency_phone">Nouzový telefon</string>
-  <string name="tag.car_turning_circle">Obratiště</string>
-  <string name="tag.car_speed_camera">Kamera měření rychlosti</string>
-  <string name="tag.tourism_view_point">Vyhlídka</string>
-  <string name="tag.tourism_information">Informace</string>
-  <string name="tag.tourism_picnic">Místo pro piknik</string>
-  <string name="tag.tourism_attraction">Atrakce</string>
-  <string name="tag.tourism_theme_park">Tématický park</string>
-  <string name="tag.tourism_castle">Hrad</string>
-  <string name="tag.tourism_monument">Památník</string>
-  <string name="tag.tourism_museum">Muzeum</string>
-  <string name="tag.tourism_cinema">Kino</string>
-  <string name="tag.amenity_bench">Lavička</string>
-  <string name="tag.amenity_water">Voda</string>
-  <string name="tag.amenity_pharmacy">Lékárna</string>
-  <string name="tag.amenity_shop">Obchod</string>
-  <string name="tag.amenity_marina">Přístav</string>
-  <string name="tag.amenity_sport">Sport</string>
-  <string name="tag.amenity_taxi">Taxi</string>
-  <string name="tag.amenity_doctors">Nemocnice,\nlékaři</string>
-  <string name="tag.amenity_recycling">Kontejner pro recyklaci</string>
-  <string name="tag.amenity_place_of_worship">Náboženské\nobjekty</string>
-  <string name="tag.amenity_post_office">Pošta</string>
-  <string name="tag.amenity_library">Knihovna</string>
-  <string name="tag.amenitymore_school">Škola</string>
-  <string name="tag.amenitymore_police">Policie</string>
-  <string name="tag.amenitymore_fire_station">Hasičská stanice</string>
-  <string name="tag.amenitymore_bank">Banka</string>
-  <string name="tag.amenitymore_playground">Hřiště</string>
-  <string name="tag.amenitymore_pub">Hospoda</string>
-  <string name="tag.amenitymore_hotel">Hotel</string>
-  <string name="tag.amenitymore_motel">Motel</string>
-  <string name="tag.amenitymore_hostel">Hostel</string>
-  <string name="tag.amenitymore_restaurant">Restaurace</string>
-  <string name="tag.amenitymore_fastfood">Rychlé občerstvení</string>
-  <string name="tag.amenitymore_camp_site">Kemp</string>
-  <string name="tag.way_bridge">Most</string>
-  <string name="tag.way_zebra_crossing">Přechod pro chodce</string>
-  <string name="tag.way_motorway">Dálnice</string>
-  <string name="tag.way_trunk">Silnice pro motorová vozidla</string>
-  <string name="tag.way_primary">Silnice první třídy</string>
-  <string name="tag.way_secondary">Silnice druhé třídy</string>
-  <string name="tag.way_tertiary">Silnice třetí třídy</string>
-  <string name="tag.way_residential">Obydlená</string>
-  <string name="tag.way_service">Účelová komunikace</string>
-  <string name="tag.track_track">Cesta</string>
-  <string name="tag.track_cycleway">Cyklostezka</string>
-  <string name="tag.track_footway">Chodník</string>
-  <string name="tag.track_bridleway">Polní cesta</string>
-  <string name="tag.track_steps">Schody</string>
-  <string name="tag.track_living_street">Ulice</string>
-  <string name="tag.track_pedestrian">Pěší zóna</string>
-  <string name="tag.track_grade1">Stupeň 1</string>
-  <string name="tag.track_grade2">Stupeň 2</string>
-  <string name="tag.track_grade3">Stupeň 3</string>
-  <string name="tag.track_grade4">Stupeň 4</string>
-  <string name="tag.track_grade5">Stupeň 5</string>
-  <string name="tag.landuse_farm">Farma</string>
-  <string name="tag.landuse_landfill">Smetiště</string>
-  <string name="tag.landuse_basin">Vodní nádrž</string>
-  <string name="tag.landuse_reservoir">Umělá\nvodní nádrž</string>
-  <string name="tag.landuse_forest">Les</string>
-  <string name="tag.landuse_allotments">Zahrádkářská kolonie</string>
-  <string name="tag.landuse_cemetery">Hřbitov</string>
-  <string name="tag.landuse_recreation_ground">Rekreační\nplocha</string>
-</resources>
diff --git a/app/src/main/res/values-cs_CZ/strings.xml b/app/src/main/res/values-cs_CZ/strings.xml
deleted file mode 100644
index 138d5e897..000000000
--- a/app/src/main/res/values-cs_CZ/strings.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker pro Android™</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Inspirováno aplikací OSMTracker pro Windows Mobile, který umožňuje trasovat vaše cesty, označit důležité body na cestě (hlasovou poznámku, fotky) a exportovat je v GPX formátu pro pozdější použití s nástroji pro Open Street Map jako je JOSM.</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">Zaznamenávač tras</string>
-  <string name="tracklogger_waiting_gps">Čekám na GPS signál pro odemknutí tlačítek...</string>
-  <string name="tracklogger_voicerec_title">Záznam hlasu</string>
-  <string name="tracklogger_voicerec_text">Zaznamenávám {0}s zvukového klipu.</string>
-  <string name="tracklogger_voicerec_stop">Zastavit</string>
-  <string name="tracklogger_btnBack">Zpět</string>
-  <string name="tracklogger_tracked">Sledované:</string>
-  <string name="tracklogger_gps_disabled">GPS zakázána</string>
-  <string name="tracklogger_gps_disabled_hint">GPS je zakázána. Chcete ji povolit?</string>
-  <string name="tracklogger_choose_gallery_camera">Galerie, nebo fotoaparát?</string>
-  <string name="tracklogger_camera">Pořídit fotografii fotoaparátem?</string>
-  <string name="tracklogger_gallery">Vybrat fotografii z galerie</string>
-  <!--Waypoint List-->
-  <string name="wplist">Seznam bodů na trase</string>
-  <string name="wplist_latitude">Zem. šířka:</string>
-  <string name="wplist_longitude">Zem. délka:</string>
-  <string name="wplist_elevation">Výška:</string>
-  <string name="wplist_accuracy">Přesnost:</string>
-  <string name="wplist_compass">Orient. komp.:</string>
-  <string name="wplist_compass_accuracy">Přesn. komp.:</string>
-  <!--Track Manager-->
-  <string name="trackmgr">Správce tras</string>
-  <string name="trackmgr_tracklist">Seznam tras:</string>
-  <string name="trackmgr_waypoints_count">Body na trase:</string>
-  <string name="trackmgr_trackpoints_count">Body trasy:</string>
-  <string name="trackmgr_empty">Zatím nemáte žádné trasy.</string>
-  <string name="trackmgr_newtrack_hint">Stisknutím nahrajete novou stopu.</string>
-  <string name="trackmgr_newtrack_error">Nelze vytvořit novou trasu: {0}</string>
-  <string name="trackmgr_continuetrack_hint">Právě nahráváte <b>trasu  #{0}</b>\nPro pokračování ji vyberte v seznamu</string>
-  <string name="trackmgr_contextmenu_stop">Zastavit trasování</string>
-  <string name="trackmgr_contextmenu_resume">Obnovit trasování</string>
-  <string name="trackmgr_contextmenu_delete">Smazat</string>
-  <string name="trackmgr_contextmenu_export">Exportovat jako GPX</string>
-  <string name="trackmgr_contextmenu_share">Sdílet GPX</string>
-  <string name="trackmgr_contextmenu_osm_upload">Nahrát na OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">Zobrazit</string>
-  <string name="trackmgr_contextmenu_details">Podrobnosti</string>
-  <string name="trackmgr_contextmenu_title">Trasa #{0}</string>
-  <string name="trackmgr_delete_confirm">Trasa #{0} bude smazána</string>
-  <string name="trackmgr_deleteall_confirm">Všechny trasy budou smazány. Jste si jisti?</string>
-  <string name="trackmgr_exporting">Exportuji trasu #{0}...</string>
-  <string name="trackmgr_exporting_prepare">Přípravuji export...</string>
-  <string name="trackmgr_export_error">Není možné exportovat trasu: {0}</string>
-  <string name="trackmgr_exportall_confirm">Všechny trasy budou exportovány, to může být časově náročné. Jste si jisti?</string>
-  <string name="trackmgr_prepare_for_share_error">Není možné zpracovat trasu: {0}</string>
-  <!--Track Detail-->
-  <string name="trackdetail">Podrobnosti trasy</string>
-  <string name="trackdetail_startdate">Čas začátku:</string>
-  <string name="trackdetail_enddate">Čas konce:</string>
-  <string name="trackdetail_startloc">Začátek v:</string>
-  <string name="trackdetail_endloc">Konec v:</string>
-  <string name="trackdetail_exportdate">Exportováno:</string>
-  <string name="trackdetail_osm_upload_date">Nahráno na OpenStreetMap:</string>
-  <string name="trackdetail_btn_export">Exportovat jako GPX</string>
-  <string name="trackdetail_export_notyet">(ještě není exportováno)</string>
-  <string name="trackdetail_osm_upload_notyet">(ještě není nahráno)</string>
-  <string name="trackdetail_export_display">Zobrazit</string>
-  <string name="trackdetail_description">Popis</string>
-  <string name="trackdetail_tags">Značky (oddělené čárkou)</string>
-  <string name="trackdetail_description_mandatory">Je třeba vložit popis</string>
-  <string name="osm_visibility_private">Soukromé</string>
-  <string name="osm_visibility_public">Veřejné</string>
-  <string name="osm_visibility_trackable">Trasovatelné</string>
-  <string name="osm_visibility_identifiable">Identifikovatelné</string>
-  <!--OSM upload-->
-  <string name="osm_upload">Nahrání na OpenStreetMap</string>
-  <string name="osm_upload_ok">Uložit a nahrát</string>
-  <string name="osm_upload_tmpfile_failed">Není možné exportovat trasu do dočasného souboru</string>
-  <string name="osm_upload_oauth_failed">Není možné se přihlásit do OSM</string>
-  <string name="osm_upload_sending">Posílám trasu #{0}…</string>
-  <string name="osm_upload_waiting_response">Čekám na odpověď od serveru OpenStreetMap</string>
-  <string name="osm_upload_error">Během nahrávání trasy nastala chyba </string>
-  <string name="osm_upload_bad_response">OSM server vrátil chybu: ({0}) zpráva {1}</string>
-  <string name="osm_upload_unauthorized">Chyba autorizace. Chcete smazat uložené údaje o přihlášení k OpenStreetMap?</string>
-  <string name="osm_upload_sucess">Nahrání na OpenStreetMap bylo úspěšné</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">Záznam hlasu</string>
-  <string name="gpsstatus_record_stillimage">Vyfotit</string>
-  <string name="gpsstatus_record_textnote">Textová poznámka</string>
-  <!--Menu-->
-  <string name="menu_settings">Nastavení</string>
-  <string name="menu_waypointlist">Body trasy</string>
-  <string name="menu_about">O aplikaci</string>
-  <string name="menu_displaytrack">Zobrazit trasu</string>
-  <string name="menu_stoptracking">Zastavit a uložit</string>
-  <string name="menu_newtrack">Nová trasa</string>
-  <string name="menu_deletetracks">Smazat všechny trasy</string>
-  <string name="menu_continue">Pokračovat v trase</string>
-  <string name="menu_stopcurrenttrack">Zastavit současnou trasu</string>
-  <string name="menu_save">Uložit</string>
-  <string name="menu_cancel">Zrušit</string>
-  <string name="menu_export">Exportovat jako GPX</string>
-  <string name="menu_osm_upload">Nahrání na OpenStreetMap</string>
-  <string name="menu_center_to_gps">Vystředit dle GPS</string>
-  <string name="menu_exportall">Exportovat vše jako GPX</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">Nelze zapisovat do externího úložiště</string>
-  <string name="error_create_track_dir">Nelze vytvořit složku trasy %s</string>
-  <string name="error_externalstorage_not_writable_hint">Zkontrolujte, prosím, jestli je externí úložiště správně vloženo a připojeno.</string>
-  <string name="error_voicerec_failed">Záznam hlasu selhal</string>
-  <string name="error_userlayout_parsing">Došlo k chybě během zpracování XML souboru pro rozvržení. Přejděte, prosím, k výchozímu rozvržení.</string>
-  <!--GPX-->
-  <string name="gpx_track_name">Trasováno pomocí OSMTracker pro Android™</string>
-  <string name="gpx_hdop_approximation_cmt">Upozornění: hodnoty HDOP nejsou hodnotami HDOP vrácenými zařízením GPS. Hodnoty jsou aproximovány z přesnosti lokace v metrech.</string>
-  <!--About screen-->
-  <string name="about">O aplikaci</string>
-  <string name="about_text">Více informací, dokumentaci a hlášení chyb naleznete na domovské stránce projektu.</string>
-  <string name="about_translate_text">Pomozte přeložit OSMTracker:</string>
-  <string name="about_debug_info">Ladicí informace</string>
-  <string name="about_export_db">Export databáze</string>
-  <string name="about_exporting_db">Exportuji databázi...</string>
-  <string name="about_export_db_result">Výsledek exportu databáze: %s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker nyní trasuje</string>
-  <string name="notification_title">OSMTracker nyní trasuje (#{0})</string>
-  <string name="notification_text">Klepněte zde pro zobrazení hlavní obrazovky</string>
-  <!--Display track-->
-  <string name="displaytrack">Zobrazit trasu</string>
-  <string name="displaytrack_map">Zobrazit podkladovou mapu</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">Uložit</string>
-  <!--Various-->
-  <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">Přesnost</string>
-  <string name="various_accuracy_with_sats">Přesnost {0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">Čekám na GPS signál… ({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">Hledá se sever...</string>
-  <string name="various_heading_unknown">Sever nelze určit</string>
-  <string name="various_export_finished">Proces exportu skončil úspěšně</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">Zobrazení trasy OpenStreetMap</string>
-  <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">Aktualizovat &amp; instalovat</string>
-  <string name="buttons_presets_context_menu_delete">Smazat</string>
-  <string name="buttons_presets_updating_layout">Aktualizuje se…</string>
-  <string name="buttons_presets_successful_update">Rozvržení bylo úspěšně aktualizováno</string>
-  <string name="buttons_presets_unsuccessful_update">Rozvržení nebylo aktualizováno, zkuste to znovu později</string>
-  <string name="buttons_presets_delete_message">Opravdu chcete smazat rozložení {0}?</string>
-  <string name="buttons_presets_delete_positive_confirmation">Vskutku</string>
-  <string name="buttons_presets_successful_delete">Rozvržení bylo úspěšně smazáno</string>
-  <string name="buttons_presets_icon_directory_deleted">Adresář ikon byl úspěšně smazán</string>
-  <string name="buttons_presets_icon_directory_does_not_exist">Tento soubor neměl přidružený žádný adresář ikon</string>
-  <string name="buttons_presets_unsuccessful_delete">Rozvržení nelze odstranit</string>
-  <!--Available Layouts messages-->
-  <string name="available_layouts_connection_error">Chyba: nelze se připojit k Internetu</string>
-  <string name="available_layouts_response_null_exception">Chyba: nelze se připojit k výchozím úložištím vlastních rozvržení</string>
-  <string name="available_layouts_connecting_message">(připojuje se…)</string>
-  <string name="available_layouts_description_dialog_positive_confirmation">Stáhnout</string>
-  <string name="available_layouts_not_available_language">Váš jazyk není k dispozici, vyberte jeden ze seznamu</string>
-  <string name="available_layouts_language_dialog_title">Dostupné jazyky</string>
-  <string name="available_layouts_checking_language_dialog">Kontrola verzí místního jazyka</string>
-  <string name="available_layouts_downloading_dialog">Stahování…</string>
-  <string name="available_layouts_successful_download">Rozvržení bylo úspěšně staženo</string>
-  <string name="available_layouts_unsuccessful_download">Rozvržení nelze stáhnout, zkuste to znovu později</string>
-  <string name="available_layouts_null_response_received">Chyba při načítání dat ze serveru</string>
-  <!--Github Repository Settings-->
-  <string name="github_repository_settings_default_checkbox">Výchozí</string>
-  <string name="github_repository_settings_custom_checkbox">Vlastní</string>
-  <string name="github_repository_settings_username">Github uživatelské jméno:</string>
-  <string name="github_repository_settings_repository_name">Název úložiště:</string>
-  <string name="github_repository_settings_branch_name">Název oddělené větve:</string>
-  <string name="github_repository_settings_valid_server">Úložiště na Github je platné</string>
-  <string name="github_repository_settings_invalid_server">Github úložiště je neplatné</string>
-  <!--App Introduction-->
-  <string name="app_intro">OSMTracker pro Android™ Úvod</string>
-  <!--Intro - slide1-->
-  <string name="app_intro_slide1_title">Vítejte v OSMTracker pro Android™ 👋</string>
-  <string name="app_intro_slide1_description">Tato aplikace je svobodný software, který respektuje vaši svobodu!</string>
-  <!--Intro - slide2-->
-  <string name="app_intro_slide2_title">Šťastné trasování 🗺 😎</string>
-  <string name="app_intro_slide2_description">OSMTracker pro Android použije vaši polohu GPS k záznamu trasových bodů a bodů cest, i když je aplikace spuštěna na pozadí. \nVaše data se nepoužívají k podpoře reklam.</string>
-</resources>
diff --git a/app/src/main/res/values-cs_CZ/waypoints.xml b/app/src/main/res/values-cs_CZ/waypoints.xml
deleted file mode 100644
index f5a6d3889..000000000
--- a/app/src/main/res/values-cs_CZ/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">Záznam hlasu</string>
-  <string name="wpt_stillimage">Fotografie</string>
-</resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index ed9545c31..75b2e73a5 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -31,12 +31,14 @@
   <string name="trackmgr_waypoints_count">نقاط بین‌راهی:</string>
   <string name="trackmgr_trackpoints_count">نقاط مسیر:</string>
   <string name="trackmgr_empty">شما هیچ مسیری ندارید.</string>
+  <string name="trackmgr_newtrack_hint">برای ضبط یک رد تازه لمس کنید</string>
   <string name="trackmgr_newtrack_error">امکان ساخت مسیر جدید وجود ندارد: {0}</string>
   <string name="trackmgr_continuetrack_hint">هم‌اکنون در حال ضبط <b>مسیر#{0}</b> هستید\nبرای ادامه آن را از لیست انتخاب کنید</string>
   <string name="trackmgr_contextmenu_stop">توقف ثبت مسیر</string>
   <string name="trackmgr_contextmenu_resume">ادامهٔ ثبت مسیر</string>
   <string name="trackmgr_contextmenu_delete">حذف</string>
   <string name="trackmgr_contextmenu_export">خروجی در قالب GPX</string>
+  <string name="trackmgr_contextmenu_share">همرسانی GPX</string>
   <string name="trackmgr_contextmenu_osm_upload">بارگذاری در OpenStreetMap</string>
   <string name="trackmgr_contextmenu_display">نمایش</string>
   <string name="trackmgr_contextmenu_details">جزئیات</string>
@@ -47,6 +49,7 @@
   <string name="trackmgr_exporting_prepare">در حال آماده‌سازی فایل خروجی...</string>
   <string name="trackmgr_export_error">امکان تهیهٔ خروجی از مسیر: {0} وجود ندارد</string>
   <string name="trackmgr_exportall_confirm">از تمامی مسیرها خروجی تهیه خواهد شد که امکان دارد زمان زیادی طول بکشد. آیا مطمئن هستید؟</string>
+  <string name="trackmgr_prepare_for_share_error">امکان پردازش رد وجود ندارد: {0}</string>
   <!--Track Detail-->
   <string name="trackdetail">جزئیات مسیر</string>
   <string name="trackdetail_startdate">زمان شروع:</string>
@@ -54,7 +57,7 @@
   <string name="trackdetail_startloc">شروع در:</string>
   <string name="trackdetail_endloc">خاتمه در:</string>
   <string name="trackdetail_exportdate">خروجی:</string>
-  <string name="trackdetail_osm_upload_date">در سایت OpenStreetMap بارگذاری شد</string>
+  <string name="trackdetail_osm_upload_date">در OpenStreetMap بارگذاری شد:</string>
   <string name="trackdetail_btn_export">خروجی در قالب GPX</string>
   <string name="trackdetail_export_notyet">(هنوز خروجی نگرفته‌اید)</string>
   <string name="trackdetail_osm_upload_notyet">(هنوز بارگذاری نشده است)</string>
@@ -135,6 +138,7 @@
   <!--parameters: (heading in degrees)-->
   <string name="various_heading">منتظر جهت حرکت...</string>
   <string name="various_heading_unknown">سیستم قادر به تشخیص جهت حرکت نیست</string>
+  <string name="various_export_finished">فرآیند برون‌برد با موفقیت پایان یافت</string>
   <!--OSM map view-->
   <string name="displaytrackmap">نمایش مسیر اوپن‌استریت‌مپ</string>
   <!--Buttons presets messages-->
@@ -145,8 +149,10 @@
   <string name="buttons_presets_unsuccessful_update">چیدمان به‌روز نشد، بعداً تلاش کنید</string>
   <string name="buttons_presets_delete_message">آیا چیدمان {0} را حذف می‌کنید؟</string>
   <string name="buttons_presets_delete_positive_confirmation">بله</string>
+  <string name="buttons_presets_successful_delete">چیدمان با موفقیت حذف شد</string>
   <string name="buttons_presets_icon_directory_deleted">شاخهٔ icon با موفقیت حذف شد</string>
   <string name="buttons_presets_icon_directory_does_not_exist">هیچ شاخهٔ icon متناظر با این فایل وجود ندارد</string>
+  <string name="buttons_presets_unsuccessful_delete">چیدمان را نمی‌توان حذف کرد</string>
   <!--Available Layouts messages-->
   <string name="available_layouts_connection_error">خطا: نمی‌توان به اینترنت متصل شد</string>
   <string name="available_layouts_response_null_exception">خطا: نمی‌توان به مخزن پیشفرض برای چیدمان‌های سفارشی متصل شد</string>
@@ -168,6 +174,10 @@
   <string name="github_repository_settings_valid_server">مخزن گیت‌هاب معتبر</string>
   <string name="github_repository_settings_invalid_server">مخزن گیت‌هاب نامعتبر</string>
   <!--App Introduction-->
+  <string name="app_intro">مقدمهٔ OSMTracker for Android™‎</string>
   <!--Intro - slide1-->
+  <string name="app_intro_slide1_title">به OSMTracker for Android™‎ خوش آمدید 👋</string>
+  <string name="app_intro_slide1_description">این اپلیکیشن نرم‌افزاری آزاد است و به آزادی شما احترام می‌گذارد!</string>
   <!--Intro - slide2-->
+  <string name="app_intro_slide2_title">با ردگیری خوش بگذرانید 🗺 😎</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/waypoints.xml b/app/src/main/res/values-fa-rIR/waypoints.xml
index 5d32e3413..639b2fe18 100644
--- a/app/src/main/res/values-fa-rIR/waypoints.xml
+++ b/app/src/main/res/values-fa-rIR/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">ضبط صدا</string>
   <string name="wpt_stillimage">تصویر</string>
diff --git a/app/src/main/res/values-fa_IR/accessibility.xml b/app/src/main/res/values-fa_IR/accessibility.xml
deleted file mode 100644
index f5042df6e..000000000
--- a/app/src/main/res/values-fa_IR/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">لوگوی OSMTracker</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">بزرگنمایی</string>
-  <string name="acc.zoom_out">کوچکنمایی</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">نشانگر قدرت سیگنال ماهواره</string>
-  <string name="acc.record_indicator">نشانگر «در حال ضبط»</string>
-  <!--Track list-->
-  <string name="acc.track_status">نشانگر «وضعیت رد»</string>
-  <string name="acc.upload_status">نشانگر «وضعیت بارگذاری در OpenStreetMap»</string>
-</resources>
diff --git a/app/src/main/res/values-fa_IR/strings-preferences.xml b/app/src/main/res/values-fa_IR/strings-preferences.xml
deleted file mode 100644
index 4dbfde9aa..000000000
--- a/app/src/main/res/values-fa_IR/strings-preferences.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">تنظیمات</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">تنظیمات GPS </string>
-  <string name="prefs_gps_os_settings_summary">نمایش صفحهٔ تنظیمات GPS سیستم</string>
-  <string name="prefs_check_gps_startup">بررسی GPS هنگام شروع</string>
-  <string name="prefs_check_gps_startup_summary">بررسی غیرفعال بودن GPS هنگام شروع برنامه و پیشنهاد برای فعال‌سازی آن</string>
-  <string name="prefs_gps_ignore_clock">نادیده‌گرفتن ساعت GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">نادیده‌گرفتن ساعت جی‌پی‌اس و استفاده از ساعت آندروید برای timestamps</string>
-  <string name="prefs_gps_logging_interval">فواصل ثبت GPS</string>
-  <string name="prefs_gps_logging_interval_summary">برای کوتاهترین زمان ممکن از 0 استفاده کنید. (مؤثر در مصرف باتری)</string>
-  <string name="prefs_gps_logging_interval_seconds">ثانیه</string>
-  <string name="prefs_ui">رابط کاربری</string>
-  <string name="prefs_ui_picture_source">منبع پیشفرض برای تصاویر</string>
-  <string name="prefs_ui_picture_source_summary">عکس‌برداری با دوربین یا انتخاب از گالری؟</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>دوربین</item>
-    <item>گالری</item>
-    <item>همیشه بپرس</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">پیش‌تنظیم‌های دکمه‌ها</string>
-  <string name="prefs_ui_buttons_layout_summary">انتخاب مجموعهٔ دلخواه از دکمه‌ها (مستندات را ببینید)</string>
-  <string name="prefs_ui_buttons_layout_default_section">چیدمان پیشفرض</string>
-  <string name="prefs_ui_buttons_layout_defaut">پیشفرض</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">چیدمان دانلودشده</string>
-  <string name="prefs_ui_buttons_layout_empty_section">فایل‌های چیدمان را دانلود نکرده‌اید</string>
-  <string name="prefs_ui_available_layout">چیدمان‌های موجود</string>
-  <string name="prefs_ui_github_repository_settings">تنظیمات مخزن گیت‌هاب</string>
-  <string name="prefs_ui_orientation">جهت</string>
-  <string name="prefs_ui_orientation_summary">جهتی که برای صفحهٔ دکمه‌ها ترجیح می‌دهید</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>خودکار</item>
-    <item>عمودی</item>
-    <item>افقی</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">مدت ضبط صدا</string>
-  <string name="prefs_voicerec_duration_seconds">ثانیه</string>
-  <string name="prefs_theme">قالب گرافیکی صفحهٔ اصلی</string>
-  <string name="prefs_theme_summary">برای اثربخشی تغییرات، لازم است برنامه مجدداً راه‌اندازی شود</string>
-  <string-array name="prefs_theme_keys">
-    <item>پیشفرض سیستم‌عامل</item>
-    <item>پیشفرض سیستم‌عامل (تیره)</item>
-    <item>پیشفرض سیستم‌عامل (روشن)</item>
-    <item>پادنمایی زیاد</item>
-  </string-array>
-  <string name="prefs_display_always_on">صفحه همیشه روشن</string>
-  <string name="prefs_display_always_on_summary">هنگام ثبت رد، صفحه‌نمایش روشن خواهد ماند. برای صرفه‌جویی در مصرف باتری غیرفعال کنید.</string>
-  <string name="prefs_displaytrack_osm">نقشهٔ پس‌زمینه</string>
-  <string name="prefs_displaytrack_osm_summary">نمایش نقشهٔ OpenStreetMap زیر رد. به ارتباط اینترنتی نیاز دارد</string>
-  <string name="prefs_output">تنظیمات GPS</string>
-  <string name="prefs_storage_dir">شاخهٔ حافظهٔ خارجی (SD)</string>
-  <string name="prefs_storage_dir_hint">موثر برای رد بعدی (روی رد فعلی تاثیر نمی‌گذارد)</string>
-  <string name="prefs_output_one_dir_per_track">یک شاخه برای هر رد</string>
-  <string name="prefs_output_one_dir_per_track_summary">هر رد و فایل‌های پیوست آن را در شاخهٔ مجزا ذخیره کن</string>
-  <string name="prefs_output_filename">نام فایل برای ردهای نام‌دار</string>
-  <string name="prefs_output_filename_summary">الگو برای نام فایل، اگر رد نام داشته باشد</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>نام رد</item>
-    <item>نام، تاریخ و ساعت شروع</item>
-    <item>تاریخ و ساعت شروع</item>
-  </string-array>
-  <string name="prefs_output_accuracy">ثبت دقت در فایل GPX</string>
-  <string name="prefs_output_accuracy_summary">اطلاعات دقت را به فایل GPX اضافه می‌کند: در کنار نام نقطهٔ بین‌راهی یا در توضیحات نقطهٔ بین‌راهی</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>خالی</item>
-    <item>کنار نام نقطه</item>
-    <item>در توضیحات نقطه</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">از تقریب HDOP استفاده شود</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">مقدار HDOP در فایل GPX با مقداری تقریبی از دقت دستگاه پر شود.</string>
-  <string name="prefs_sound_enabled">فعال‌سازی صدا</string>
-  <string name="prefs_sound_enabled_summary">هنگام شروع و پایان ضبط صدا هشدار صوتی داده شود</string>
-  <string name="prefs_osm_clear_oauth_data">بازنشانی اطلاعات احراز هویت OSM</string>
-  <string name="prefs_osm_clear_oauth_data_summary">اعتبارنامه‌ها و مجوزهای OSM را فراموش کن و OSMTracker را مجبور به درخواست دوبارهٔ آن‌ها کن</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">باید به OSMTracker مجوز بدهید تا دوباره بتوانید ردها را بارگذاری کنید. مطمئن هستید؟</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>خالی</item>
-    <item>در توضیحات</item>
-    <item>در extension</item>
-  </string-array>
-  <string name="prefs_compass_heading_summary">مشخص می‌کند آیا و چگونه اطلاعات قطب‌نما به فایل GPX وارد شود</string>
-</resources>
diff --git a/app/src/main/res/values-fa_IR/strings-tags.xml b/app/src/main/res/values-fa_IR/strings-tags.xml
deleted file mode 100644
index 56f5918ed..000000000
--- a/app/src/main/res/values-fa_IR/strings-tags.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">متفرقه</string>
-  <string name="tag.restriction">محدودیت</string>
-  <string name="tag.car">خودرو</string>
-  <string name="tag.tourism">گردشگری</string>
-  <string name="tag.amenity">مکان رفاهی</string>
-  <string name="tag.amenity_more">مکان رفاهی (+)</string>
-  <string name="tag.way">جاده</string>
-  <string name="tag.track">مسیر</string>
-  <string name="tag.landuse">کاربری اراضی</string>
-  <string name="tag.misc_bus_stop">ایستگاه اتوبوس</string>
-  <string name="tag.misc_railway">راه‌آهن</string>
-  <string name="tag.misc_telephone">تلفن</string>
-  <string name="tag.misc_post_box">صندوق پست</string>
-  <string name="tag.misc_atm">خودپرداز</string>
-  <string name="tag.misc_bollard">تیرک مهار</string>
-  <string name="tag.misc_toilets">دستشویی</string>
-  <string name="tag.misc_shelter">پناهگاه</string>
-  <string name="tag.misc_surveillance">نظارت</string>
-  <string name="tag.restriction_20">حداکثر ۲۰</string>
-  <string name="tag.restriction_30">حداکثر ۳۰</string>
-  <string name="tag.restriction_40">حداکثر ۴۰</string>
-  <string name="tag.restriction_50">حداکثر ۵۰</string>
-  <string name="tag.restriction_60">حداکثر ۶۰</string>
-  <string name="tag.restriction_70">حداکثر ۷۰</string>
-  <string name="tag.restriction_80">حداکثر ۸۰</string>
-  <string name="tag.restriction_90">حداکثر ۹۰</string>
-  <string name="tag.restriction_100">حداکثر ۱۰۰</string>
-  <string name="tag.restriction_110">حداکثر ۱۱۰</string>
-  <string name="tag.restriction_120">حداکثر ۱۲۰</string>
-  <string name="tag.restriction_130">حداکثر ۱۳۰</string>
-  <string name="tag.restriction_no_exit">بن‌بست</string>
-  <string name="tag.restriction_traffic_light">چراغ راهنمایی‌ورانندگی</string>
-  <string name="tag.restriction_one_way">یکطرفه</string>
-  <string name="tag.car_fuel_station">جایگاه سوخت</string>
-  <string name="tag.car_parking">پارکینگ</string>
-  <string name="tag.car_emergency_phone">تلفن اضطراری</string>
-  <string name="tag.car_turning_circle">محل دورزدن</string>
-  <string name="tag.car_speed_camera">دوربین سرعت</string>
-  <string name="tag.tourism_view_point">مکان دیدنی</string>
-  <string name="tag.tourism_information">اطلاعات</string>
-  <string name="tag.tourism_picnic">محل اردو</string>
-  <string name="tag.tourism_attraction">جاذبه</string>
-  <string name="tag.tourism_theme_park">پارک تفریحی</string>
-  <string name="tag.tourism_castle">قلعه</string>
-  <string name="tag.tourism_monument">یادمان</string>
-  <string name="tag.tourism_museum">موزه</string>
-  <string name="tag.tourism_cinema">سینما</string>
-  <string name="tag.amenity_bench">نمیکت</string>
-  <string name="tag.amenity_water">آب</string>
-  <string name="tag.amenity_pharmacy">داروخانه</string>
-  <string name="tag.amenity_shop">مغازه</string>
-  <string name="tag.amenity_marina">دریایی</string>
-  <string name="tag.amenity_sport">ورزشی</string>
-  <string name="tag.amenity_taxi">تاکسی</string>
-  <string name="tag.amenity_doctors">بیمارستان،\nپزشکان</string>
-  <string name="tag.amenity_recycling">بازیافت</string>
-  <string name="tag.amenity_place_of_worship">مکان/nعبادت</string>
-  <string name="tag.amenity_post_office">ادارهٔ پست</string>
-  <string name="tag.amenity_library">کتابخانه</string>
-  <string name="tag.amenitymore_school">مدرسه</string>
-  <string name="tag.amenitymore_police">پلیس</string>
-  <string name="tag.amenitymore_fire_station">ایستگاه آتش‌نشانی</string>
-  <string name="tag.amenitymore_bank">بانک</string>
-  <string name="tag.amenitymore_playground">زمین بازی</string>
-  <string name="tag.amenitymore_pub">بار</string>
-  <string name="tag.amenitymore_hotel">هتل</string>
-  <string name="tag.amenitymore_motel">متل</string>
-  <string name="tag.amenitymore_hostel">مهمانپذیر</string>
-  <string name="tag.amenitymore_restaurant">رستوران</string>
-  <string name="tag.amenitymore_fastfood">فست‌فود</string>
-  <string name="tag.amenitymore_camp_site">اردوگاه</string>
-  <string name="tag.way_bridge">پل</string>
-  <string name="tag.way_zebra_crossing">خط‌کشی راه‌راه پیاده</string>
-  <string name="tag.way_motorway">آزادراه</string>
-  <string name="tag.way_trunk">بزرگراه</string>
-  <string name="tag.way_primary">شریانی اصلی</string>
-  <string name="tag.way_secondary">شریانی فرعی</string>
-  <string name="tag.way_tertiary">جمع‌وپخش‌کننده</string>
-  <string name="tag.way_residential">مسکونی</string>
-  <string name="tag.way_service">دسترسی</string>
-  <string name="tag.track_track">جاده خاکی\ntrack</string>
-  <string name="tag.track_cycleway">مسیر دوچرخه</string>
-  <string name="tag.track_footway">راه پیاده</string>
-  <string name="tag.track_bridleway">مسیر مال‌رو</string>
-  <string name="tag.track_steps">پله</string>
-  <string name="tag.track_living_street">خیابان محلی\nLiving street</string>
-  <string name="tag.track_pedestrian">پیاده‌راه</string>
-  <string name="tag.track_grade1">درجه ۱</string>
-  <string name="tag.track_grade2">درجه ۲</string>
-  <string name="tag.track_grade3">درجه ۳</string>
-  <string name="tag.track_grade4">درجه ۴</string>
-  <string name="tag.track_grade5">درجه ۵</string>
-  <string name="tag.landuse_farm">مزرعه</string>
-  <string name="tag.landuse_landfill">محل دفن زباله</string>
-  <string name="tag.landuse_basin">حوضچه</string>
-  <string name="tag.landuse_reservoir">مخزن</string>
-  <string name="tag.landuse_forest">جنگل</string>
-  <string name="tag.landuse_allotments">باغ‌های تخصیص‌یافته</string>
-  <string name="tag.landuse_cemetery">گورستان</string>
-  <string name="tag.landuse_recreation_ground">زمین تفریح/nو سرگرمی</string>
-</resources>
diff --git a/app/src/main/res/values-fa_IR/strings.xml b/app/src/main/res/values-fa_IR/strings.xml
deleted file mode 100644
index 75b2e73a5..000000000
--- a/app/src/main/res/values-fa_IR/strings.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker™ برای آندرویید</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">با الهام از OSMTracker در ویندوز موبایل، این نرم‌افزار به شما این امکان را می‌دهد که رد سفرهای خود را ضبط کنید، نقاط بین‌راهی مهم را نشانه‌گذاری کنید (همراه با ضبط صدا و تصاویر) و از آن‌ها در قالب فایل GPX خروجی بگیرید. سپس می‌توانید این خروجی‌ها را در ابزارهای OpenStreetMap، مانند JOSM به‌کار ببرید.</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">واقعه‌نگار مسیر</string>
-  <string name="tracklogger_waiting_gps">در انتظار ثابت‌شدن GPS برای فعال‌سازی دکمه‌ها...</string>
-  <string name="tracklogger_voicerec_title">ضبط صدا</string>
-  <string name="tracklogger_voicerec_text">در حال ضبط (0) ثانیه فایل صوتی</string>
-  <string name="tracklogger_voicerec_stop">توقف</string>
-  <string name="tracklogger_btnBack">عقب</string>
-  <string name="tracklogger_tracked">مسیر ثبت شده:</string>
-  <string name="tracklogger_gps_disabled">GPS غیرفعال</string>
-  <string name="tracklogger_gps_disabled_hint">‏GPS غیرفعال است. آن را فعال می‌کنید؟</string>
-  <string name="tracklogger_choose_gallery_camera">گالری تصاویر یا دوربین؟</string>
-  <string name="tracklogger_camera">با دوربین عکس بگیر</string>
-  <string name="tracklogger_gallery">انتخاب عکس از گالری</string>
-  <!--Waypoint List-->
-  <string name="wplist">لیست نقاط بین‌راهی</string>
-  <string name="wplist_latitude">عرض جغرافیایی:</string>
-  <string name="wplist_longitude">طول جغرافیایی:</string>
-  <string name="wplist_elevation">ارتفاع:</string>
-  <string name="wplist_accuracy">دقت:</string>
-  <string name="wplist_compass">جهت قطب‌نما:</string>
-  <string name="wplist_compass_accuracy">دقت قطب‌نما:</string>
-  <!--Track Manager-->
-  <string name="trackmgr">مدیریت مسیرها</string>
-  <string name="trackmgr_tracklist">لیست مسیرها:</string>
-  <string name="trackmgr_waypoints_count">نقاط بین‌راهی:</string>
-  <string name="trackmgr_trackpoints_count">نقاط مسیر:</string>
-  <string name="trackmgr_empty">شما هیچ مسیری ندارید.</string>
-  <string name="trackmgr_newtrack_hint">برای ضبط یک رد تازه لمس کنید</string>
-  <string name="trackmgr_newtrack_error">امکان ساخت مسیر جدید وجود ندارد: {0}</string>
-  <string name="trackmgr_continuetrack_hint">هم‌اکنون در حال ضبط <b>مسیر#{0}</b> هستید\nبرای ادامه آن را از لیست انتخاب کنید</string>
-  <string name="trackmgr_contextmenu_stop">توقف ثبت مسیر</string>
-  <string name="trackmgr_contextmenu_resume">ادامهٔ ثبت مسیر</string>
-  <string name="trackmgr_contextmenu_delete">حذف</string>
-  <string name="trackmgr_contextmenu_export">خروجی در قالب GPX</string>
-  <string name="trackmgr_contextmenu_share">همرسانی GPX</string>
-  <string name="trackmgr_contextmenu_osm_upload">بارگذاری در OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">نمایش</string>
-  <string name="trackmgr_contextmenu_details">جزئیات</string>
-  <string name="trackmgr_contextmenu_title">مسیر #{0}</string>
-  <string name="trackmgr_delete_confirm">مسیر #{0} پاک خواهد شد</string>
-  <string name="trackmgr_deleteall_confirm">تمامی مسیرها پاک خواهد شد. آیا مطمئن هستید؟</string>
-  <string name="trackmgr_exporting">در حال خروجی‌گرفتن از مسیر #{0}...</string>
-  <string name="trackmgr_exporting_prepare">در حال آماده‌سازی فایل خروجی...</string>
-  <string name="trackmgr_export_error">امکان تهیهٔ خروجی از مسیر: {0} وجود ندارد</string>
-  <string name="trackmgr_exportall_confirm">از تمامی مسیرها خروجی تهیه خواهد شد که امکان دارد زمان زیادی طول بکشد. آیا مطمئن هستید؟</string>
-  <string name="trackmgr_prepare_for_share_error">امکان پردازش رد وجود ندارد: {0}</string>
-  <!--Track Detail-->
-  <string name="trackdetail">جزئیات مسیر</string>
-  <string name="trackdetail_startdate">زمان شروع:</string>
-  <string name="trackdetail_enddate">زمان خاتمه:</string>
-  <string name="trackdetail_startloc">شروع در:</string>
-  <string name="trackdetail_endloc">خاتمه در:</string>
-  <string name="trackdetail_exportdate">خروجی:</string>
-  <string name="trackdetail_osm_upload_date">در OpenStreetMap بارگذاری شد:</string>
-  <string name="trackdetail_btn_export">خروجی در قالب GPX</string>
-  <string name="trackdetail_export_notyet">(هنوز خروجی نگرفته‌اید)</string>
-  <string name="trackdetail_osm_upload_notyet">(هنوز بارگذاری نشده است)</string>
-  <string name="trackdetail_export_display">نمایش</string>
-  <string name="trackdetail_description">توضیح</string>
-  <string name="trackdetail_tags">برچسب (با کاما جدا شوند)</string>
-  <string name="trackdetail_description_mandatory">باید توضیحی بنویسید</string>
-  <string name="osm_visibility_private">خصوصی</string>
-  <string name="osm_visibility_public">عمومی</string>
-  <string name="osm_visibility_trackable">قابل ردیابی</string>
-  <string name="osm_visibility_identifiable">قابل‌شناسایی</string>
-  <!--OSM upload-->
-  <string name="osm_upload">بارگذاری در OpenStreetMap</string>
-  <string name="osm_upload_ok">ذخیره و بارگذاری</string>
-  <string name="osm_upload_tmpfile_failed">تهیهٔ خروجی مسیر بر روی فایل موقت ناموفق بود</string>
-  <string name="osm_upload_oauth_failed">تأیید حساب کاربری در OSM ناموفق بود</string>
-  <string name="osm_upload_sending">در حال ارسال مسیر #{0}...</string>
-  <string name="osm_upload_waiting_response">منتظر پاسخ از سرور OpenStreetMap...</string>
-  <string name="osm_upload_error">بارگذاری مسیر با خطا مواجه گردید</string>
-  <string name="osm_upload_bad_response">سرور OSM یک خطا برگرداند: {(0)} پیغام {1}</string>
-  <string name="osm_upload_unauthorized">خطای دسترسی. مایلید اطلاعات ورود به حساب کاربری OpenStreetMap از روی دستگاه پاک شود؟</string>
-  <string name="osm_upload_sucess">بارگذاری در OpenStreetMap موفقیت‌آمیز بود</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">ضبط صدا</string>
-  <string name="gpsstatus_record_stillimage">گرفتن عکس</string>
-  <string name="gpsstatus_record_textnote">یادداشت متنی</string>
-  <!--Menu-->
-  <string name="menu_settings">تنظیمات</string>
-  <string name="menu_waypointlist">نقاط بین‌راهی</string>
-  <string name="menu_about">دربارهٔ ما</string>
-  <string name="menu_displaytrack">نمایش مسیر</string>
-  <string name="menu_stoptracking">توقف و ذخیره</string>
-  <string name="menu_newtrack">مسیر جدید</string>
-  <string name="menu_deletetracks">پاک کردن تمامی مسیرها</string>
-  <string name="menu_continue">ادامه‌دادن مسیر</string>
-  <string name="menu_stopcurrenttrack">توقف مسیر جاری</string>
-  <string name="menu_save">ذخیره</string>
-  <string name="menu_cancel">لغو</string>
-  <string name="menu_export">خروجی در قالب GPX</string>
-  <string name="menu_osm_upload">بارگذاری در OpenStreetMap</string>
-  <string name="menu_center_to_gps">مرکز به GPS</string>
-  <string name="menu_exportall">همه را در قالب GPX خروجی بگیر</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">نرم‌افزار نمی‌تواند در حافظه خارجی بنویسد.</string>
-  <string name="error_create_track_dir">نرم‌افزار نمی‌تواند پوشهٔ رد %s را بسازد</string>
-  <string name="error_externalstorage_not_writable_hint">لطفاً مطمئن شوید حافظهٔ خارجی دستگاه به‌درستی جاگذاری و سوار (mount) شده باشد.</string>
-  <string name="error_voicerec_failed">ضبط صدا با اشکال مواجه شد</string>
-  <string name="error_userlayout_parsing">خطا هنگام تجزیهٔ فایل چیدمان XML. لطفاً به چیدمان پیشفرض برگردانید.</string>
-  <!--GPX-->
-  <string name="gpx_track_name">با OSM Tracker for Android™‎ ضبط شده است</string>
-  <string name="gpx_hdop_approximation_cmt">هشدار: مقادیر HDOP همان مقادیر HDOP دریافتی از دستگاه GPS نیست؛ بلکه بر اساس دقت مکانی بر حسب متر تقریب زده شده.</string>
-  <!--About screen-->
-  <string name="about">درباره</string>
-  <string name="about_text">برای اطلاعات بیشتر، دیدن مستندات و گزارش مشکل لطفاً از سایت پروژه دیدن فرمایید:</string>
-  <string name="about_translate_text">کمک کنید OSMTracker را ترجمه کنیم:</string>
-  <string name="about_debug_info">اطلاعات debug</string>
-  <string name="about_export_db">خروجی از پایگاه‌داده</string>
-  <string name="about_exporting_db">در حال خروجی‌گرفتن از پایگاه‌داده....</string>
-  <string name="about_export_db_result">نتیجهٔ خروجی پایگاه‌داده: %s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">‏OSMTracker درحال ثبت مسیر است</string>
-  <string name="notification_title">‏OSMTracker درحال ثبت مسیر است (#{0})</string>
-  <string name="notification_text">برای نمایش صفحهٔ اصلی اینجا را لمس کنید</string>
-  <!--Display track-->
-  <string name="displaytrack">نمایش مسیر</string>
-  <string name="displaytrack_map">نمایش نقشهٔ پس‌زمنیه</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">ذخیره</string>
-  <!--Various-->
-  <string name="various_unit_meters">م</string>
-  <string name="various_accuracy">دقت</string>
-  <string name="various_accuracy_with_sats">دقت {0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">در انتظار تثبیت GPS...‏ ({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°‎</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">منتظر جهت حرکت...</string>
-  <string name="various_heading_unknown">سیستم قادر به تشخیص جهت حرکت نیست</string>
-  <string name="various_export_finished">فرآیند برون‌برد با موفقیت پایان یافت</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">نمایش مسیر اوپن‌استریت‌مپ</string>
-  <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">به‌روزرسانی و نصب</string>
-  <string name="buttons_presets_context_menu_delete">حذف</string>
-  <string name="buttons_presets_updating_layout">در حال به‌روزآوری...</string>
-  <string name="buttons_presets_successful_update">به‌روزرسانی چیدمان با موفقیت انجام شد</string>
-  <string name="buttons_presets_unsuccessful_update">چیدمان به‌روز نشد، بعداً تلاش کنید</string>
-  <string name="buttons_presets_delete_message">آیا چیدمان {0} را حذف می‌کنید؟</string>
-  <string name="buttons_presets_delete_positive_confirmation">بله</string>
-  <string name="buttons_presets_successful_delete">چیدمان با موفقیت حذف شد</string>
-  <string name="buttons_presets_icon_directory_deleted">شاخهٔ icon با موفقیت حذف شد</string>
-  <string name="buttons_presets_icon_directory_does_not_exist">هیچ شاخهٔ icon متناظر با این فایل وجود ندارد</string>
-  <string name="buttons_presets_unsuccessful_delete">چیدمان را نمی‌توان حذف کرد</string>
-  <!--Available Layouts messages-->
-  <string name="available_layouts_connection_error">خطا: نمی‌توان به اینترنت متصل شد</string>
-  <string name="available_layouts_response_null_exception">خطا: نمی‌توان به مخزن پیشفرض برای چیدمان‌های سفارشی متصل شد</string>
-  <string name="available_layouts_connecting_message">(در حال اتصال...)</string>
-  <string name="available_layouts_description_dialog_positive_confirmation">بارگیری</string>
-  <string name="available_layouts_not_available_language">زبان شما موجود نیست. یکی را از لیست انتخاب کنید</string>
-  <string name="available_layouts_language_dialog_title">زبان‌های موجود</string>
-  <string name="available_layouts_checking_language_dialog">در حال بررسی نسخه‌های زبان محلی</string>
-  <string name="available_layouts_downloading_dialog">در حال بارگیری...</string>
-  <string name="available_layouts_successful_download">چیدمان با موفقیت بارگیری شد</string>
-  <string name="available_layouts_unsuccessful_download">چیدمان بارگیری نمی‌شود. بعداً تلاش کنید</string>
-  <string name="available_layouts_null_response_received">خطا در بازیابی داده‌ها از سرور</string>
-  <!--Github Repository Settings-->
-  <string name="github_repository_settings_default_checkbox">پیشفرض</string>
-  <string name="github_repository_settings_custom_checkbox">سفارشی</string>
-  <string name="github_repository_settings_username">نام کاربری گیت‌هاب:</string>
-  <string name="github_repository_settings_repository_name">نام مخزن:</string>
-  <string name="github_repository_settings_branch_name">نام شاخه:</string>
-  <string name="github_repository_settings_valid_server">مخزن گیت‌هاب معتبر</string>
-  <string name="github_repository_settings_invalid_server">مخزن گیت‌هاب نامعتبر</string>
-  <!--App Introduction-->
-  <string name="app_intro">مقدمهٔ OSMTracker for Android™‎</string>
-  <!--Intro - slide1-->
-  <string name="app_intro_slide1_title">به OSMTracker for Android™‎ خوش آمدید 👋</string>
-  <string name="app_intro_slide1_description">این اپلیکیشن نرم‌افزاری آزاد است و به آزادی شما احترام می‌گذارد!</string>
-  <!--Intro - slide2-->
-  <string name="app_intro_slide2_title">با ردگیری خوش بگذرانید 🗺 😎</string>
-</resources>
diff --git a/app/src/main/res/values-fa_IR/waypoints.xml b/app/src/main/res/values-fa_IR/waypoints.xml
deleted file mode 100644
index 639b2fe18..000000000
--- a/app/src/main/res/values-fa_IR/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">ضبط صدا</string>
-  <string name="wpt_stillimage">تصویر</string>
-</resources>
diff --git a/app/src/main/res/values-fr-rFR/accessibility.xml b/app/src/main/res/values-fr-rFR/accessibility.xml
index b81e0d2e1..761243f1d 100644
--- a/app/src/main/res/values-fr-rFR/accessibility.xml
+++ b/app/src/main/res/values-fr-rFR/accessibility.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
+  <string name="acc.osmtracker_logo">Logo OSMTracker</string>
   <!--Zoom in/out in map view-->
+  <string name="acc.zoom_in">Zoomer</string>
+  <string name="acc.zoom_out">Dézoomer</string>
   <!--GPS status bar-->
+  <string name="acc.sat_indicator">Indicateur force signal satellite</string>
+  <string name="acc.record_indicator">Indicateur de progression d\'enregistrement</string>
   <!--Track list-->
+  <string name="acc.track_status">Indicateur de l\'état des traces</string>
+  <string name="acc.upload_status">Indicateur d\'état du téléchargement OpenStreetMap</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings-preferences.xml b/app/src/main/res/values-fr-rFR/strings-preferences.xml
deleted file mode 100644
index 457a8a483..000000000
--- a/app/src/main/res/values-fr-rFR/strings-preferences.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">Paramètres</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">Paramètres du GPS</string>
-  <string name="prefs_gps_os_settings_summary">Ecran du système d\'affichage des paramètres GPS</string>
-  <string name="prefs_check_gps_startup">Vérification GPS au démarrage</string>
-  <string name="prefs_check_gps_startup_summary">Vérifiez si le GPS est désactivé au démarrage , et permettre son activation</string>
-  <string name="prefs_gps_ignore_clock">Ignorez l\'horloge GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">Ignorez l\'horloge GPS et utilisez l\'horloge ANdroid pour l\'horodatage </string>
-  <string name="prefs_gps_logging_interval">Intervalle de connection GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Utilisez 0 pour le plus court possible (affecte la durée de vie de la batterie)</string>
-  <string name="prefs_gps_logging_interval_seconds">secondes</string>
-  <string name="prefs_ui">Interface de l\'utilisateur</string>
-  <string name="prefs_ui_picture_source">Source par défaut de la photo</string>
-  <string name="prefs_ui_picture_source_summary">Prendre une photo depuis l\'appareil photo ou dans la galerie</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>Appareil Photo</item>
-    <item>Galerie</item>
-    <item>Toujours demander</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout_defaut">Défaut</string>
-  <string name="prefs_ui_orientation">Orientation</string>
-  <string name="prefs_voicerec_duration_seconds">secondes</string>
-  <string name="prefs_display_always_on">Ecran toujours allumé</string>
-  <string name="prefs_output">Paramètres GPX</string>
-  <string name="prefs_sound_enabled">Activer les sons</string>
-  <string name="prefs_sound_enabled_summary">Jouer les sons lorsque l\'enregistrement vocal commence et se termine</string>
-  <string name="prefs_osm_clear_oauth_data">Réinitialiser l\'authentification OSM</string>
-  <string name="prefs_map_tile_summary"></string>
-</resources>
diff --git a/app/src/main/res/values-fr-rFR/strings-tags.xml b/app/src/main/res/values-fr-rFR/strings-tags.xml
deleted file mode 100644
index c757504ac..000000000
--- a/app/src/main/res/values-fr-rFR/strings-tags.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources/>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
deleted file mode 100644
index d5464cd85..000000000
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <!--TrackLogger-->
-  <string name="tracklogger_voicerec_title">Enregistrement vocal</string>
-  <string name="tracklogger_voicerec_stop">Stop</string>
-  <string name="tracklogger_btnBack">Retour</string>
-  <!--Waypoint List-->
-  <!--Track Manager-->
-  <string name="trackmgr_contextmenu_delete">Effacer</string>
-  <string name="trackmgr_contextmenu_export">Exporter comme GPX</string>
-  <string name="trackmgr_contextmenu_display">Afficher</string>
-  <string name="trackmgr_contextmenu_details">Détails</string>
-  <!--Track Detail-->
-  <string name="trackdetail_btn_export">Exporter comme GPX</string>
-  <string name="trackdetail_export_display">Afficher</string>
-  <!--OSM upload-->
-  <!--GPS Status & record bar-->
-  <!--Menu-->
-  <string name="menu_settings">Paramètres</string>
-  <string name="menu_about">A Propos</string>
-  <string name="menu_save">Sauvegarder</string>
-  <string name="menu_cancel">Annuler</string>
-  <string name="menu_export">Exporter comme GPX</string>
-  <!--Errors-->
-  <!--GPX-->
-  <!--About screen-->
-  <string name="about">A Propos</string>
-  <string name="about_export_db">Exporter la base de données</string>
-  <string name="about_exporting_db">Export en cours de la base de données...</string>
-  <!--Notification-->
-  <!--Display track-->
-  <!--Track detail-->
-  <string name="trackdetail_save">Sauvegarder</string>
-  <!--Various-->
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <!--parameters: (used sats, visible sats)-->
-  <!--parameters: (heading in degrees)-->
-  <!--OSM map view-->
-  <!--Buttons presets messages-->
-  <!--Available Layouts messages-->
-  <!--Github Repository Settings-->
-  <!--App Introduction-->
-  <!--Intro - slide1-->
-  <!--Intro - slide2-->
-</resources>
diff --git a/app/src/main/res/values-fr-rFR/waypoints.xml b/app/src/main/res/values-fr-rFR/waypoints.xml
index c757504ac..265f9dd03 100644
--- a/app/src/main/res/values-fr-rFR/waypoints.xml
+++ b/app/src/main/res/values-fr-rFR/waypoints.xml
@@ -1,2 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="wpt_voicerec">Enregistrement vocal</string>
+  <string name="wpt_stillimage">Photo</string>
+</resources>
diff --git a/app/src/main/res/values-fr_FR/accessibility.xml b/app/src/main/res/values-fr_FR/accessibility.xml
deleted file mode 100644
index 761243f1d..000000000
--- a/app/src/main/res/values-fr_FR/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">Logo OSMTracker</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Zoomer</string>
-  <string name="acc.zoom_out">Dézoomer</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">Indicateur force signal satellite</string>
-  <string name="acc.record_indicator">Indicateur de progression d\'enregistrement</string>
-  <!--Track list-->
-  <string name="acc.track_status">Indicateur de l\'état des traces</string>
-  <string name="acc.upload_status">Indicateur d\'état du téléchargement OpenStreetMap</string>
-</resources>
diff --git a/app/src/main/res/values-fr_FR/waypoints.xml b/app/src/main/res/values-fr_FR/waypoints.xml
deleted file mode 100644
index 265f9dd03..000000000
--- a/app/src/main/res/values-fr_FR/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">Enregistrement vocal</string>
-  <string name="wpt_stillimage">Photo</string>
-</resources>
diff --git a/app/src/main/res/values-pt-rBR/accessibility.xml b/app/src/main/res/values-pt-rBR/accessibility.xml
index 18f64ae67..5a9433723 100644
--- a/app/src/main/res/values-pt-rBR/accessibility.xml
+++ b/app/src/main/res/values-pt-rBR/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">Logo do OSMTracker</string>
diff --git a/app/src/main/res/values-pt-rBR/strings-tags.xml b/app/src/main/res/values-pt-rBR/strings-tags.xml
index 4ad881ad2..973b0831e 100644
--- a/app/src/main/res/values-pt-rBR/strings-tags.xml
+++ b/app/src/main/res/values-pt-rBR/strings-tags.xml
@@ -54,7 +54,9 @@
   <string name="tag.amenity_marina">Marina</string>
   <string name="tag.amenity_sport">Esporte</string>
   <string name="tag.amenity_taxi">Táxi</string>
+  <string name="tag.amenity_doctors">Hospital,\nMédicos</string>
   <string name="tag.amenity_recycling">Reciclagem</string>
+  <string name="tag.amenity_place_of_worship">Lugar de\nadoração</string>
   <string name="tag.amenity_post_office">Correios</string>
   <string name="tag.amenity_library">Livraria</string>
   <string name="tag.amenitymore_school">Escola</string>
@@ -97,4 +99,5 @@
   <string name="tag.landuse_forest">Floresta</string>
   <string name="tag.landuse_allotments">Loteamentos</string>
   <string name="tag.landuse_cemetery">Cemitério</string>
+  <string name="tag.landuse_recreation_ground">Área de\nrecreação</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/waypoints.xml b/app/src/main/res/values-pt-rBR/waypoints.xml
index 58ee486d2..a86d493f8 100644
--- a/app/src/main/res/values-pt-rBR/waypoints.xml
+++ b/app/src/main/res/values-pt-rBR/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">Gravação de voz</string>
   <string name="wpt_stillimage">Foto</string>
diff --git a/app/src/main/res/values-pt-rPT/strings-preferences.xml b/app/src/main/res/values-pt-rPT/strings-preferences.xml
index b0a88d821..a308aa636 100644
--- a/app/src/main/res/values-pt-rPT/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rPT/strings-preferences.xml
@@ -9,9 +9,14 @@
   <string name="prefs_check_gps_startup_summary">Verificar se o GPS está inativo no arranque e perguntar se quero ativá-lo</string>
   <string name="prefs_gps_ignore_clock">Ignorar o relógio do GPS</string>
   <string name="prefs_gps_ignore_clock_summary">Ignorar o relógio do GPS e usar o relógio do Android para registo da hora</string>
+  <string name="prefs_use_barometer">Registar pressão barométrica [hPa]</string>
+  <string name="prefs_use_barometer_summary">A alternância requer o reinício do trilho</string>
   <string name="prefs_gps_logging_interval">Intervalo de registo do GPS</string>
   <string name="prefs_gps_logging_interval_summary">Usar 0 para o valor mais pequeno possível (diminui a duração da bateria)</string>
   <string name="prefs_gps_logging_interval_seconds">segundos</string>
+  <string name="prefs_gps_logging_min_distance">Distância de registo GPS</string>
+  <string name="prefs_gps_logging_min_distance_summary">Distância mínima entre os pontos do trilho em metros; utilizar 0 para a distância mais curta possível</string>
+  <string name="prefs_gps_logging_min_distance_meters">metros</string>
   <string name="prefs_ui">Interface do utilizador</string>
   <string name="prefs_ui_picture_source">Origem das fotografias</string>
   <string name="prefs_ui_picture_source_summary">Tirar fotos com a câmara ou da galeria?</string>
@@ -49,6 +54,7 @@
   <string name="prefs_display_always_on_summary">O ecrã manter-se-á ligado enquanto estiver a registar. Desative para poupar bateria</string>
   <string name="prefs_displaytrack_osm">Mapa de fundo</string>
   <string name="prefs_displaytrack_osm_summary">Mostrar o mapa OpenStreetMap por baixo do trilho. Necessita de ligação de dados</string>
+  <string name="prefs_displaytrack_osm_summary_ask">Mostrar sempre o fundo do OpenStreetMap? Requer uma conexão de dados</string>
   <string name="prefs_output">Configurações de GPX</string>
   <string name="prefs_storage_dir">Pasta de armazenamento externo (SD)</string>
   <string name="prefs_storage_dir_hint">Aplicável apenas no próximo trilho (não ao atual)</string>
@@ -75,6 +81,7 @@
   <string name="prefs_osm_clear_oauth_data">Eliminar a autenticação OSM</string>
   <string name="prefs_osm_clear_oauth_data_summary">Esquecer as credenciais e permissões do OpenStreetMap e forçar o OSMTracker a requisitá-las novamente</string>
   <string name="prefs_osm_clear_oauth_data_dialog">Terá de autorizar novamente o OSMTracker para poder enviar trilhos para o OpenStreetMap. Quer continuar?</string>
+  <string name="prefs_map_tile">Fornecedor de mosaicos de mapas</string>
   <string name="prefs_map_tile_summary"></string>
   <string-array name="prefs_map_tile_keys">
     <item>Mapnik</item>
@@ -86,5 +93,6 @@
     <item>No comentário</item>
     <item>Na extensão</item>
   </string-array>
+  <string name="prefs_compass_heading">Exportar direção da bússola</string>
   <string name="prefs_compass_heading_summary">Define se e como os dados da bússola devem ser exportados para o ficheiro GPX</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings-tags.xml b/app/src/main/res/values-pt-rPT/strings-tags.xml
index 030487112..f1285a69e 100644
--- a/app/src/main/res/values-pt-rPT/strings-tags.xml
+++ b/app/src/main/res/values-pt-rPT/strings-tags.xml
@@ -12,17 +12,17 @@
   <string name="tag.misc_bus_stop">Paragem de autocarro</string>
   <string name="tag.misc_railway">Ferrovia</string>
   <string name="tag.misc_telephone">Telefone</string>
-  <string name="tag.misc_post_box">Caixa de Correio</string>
+  <string name="tag.misc_post_box">Caixa de correio</string>
   <string name="tag.misc_atm">Multibanco</string>
   <string name="tag.misc_bollard">Pilar</string>
-  <string name="tag.misc_toilets">Casa de Banho</string>
+  <string name="tag.misc_toilets">Casa de banho</string>
   <string name="tag.misc_shelter">Abrigo</string>
   <string name="tag.misc_surveillance">Vigilância</string>
-  <string name="tag.restriction_20">Máx. 20</string>
+  <string name="tag.restriction_20">Máx 20</string>
   <string name="tag.restriction_30">Máx 30</string>
-  <string name="tag.restriction_40">Máx. 40</string>
+  <string name="tag.restriction_40">Máx 40</string>
   <string name="tag.restriction_50">Máx 50</string>
-  <string name="tag.restriction_60">Máx. 60</string>
+  <string name="tag.restriction_60">Máx 60</string>
   <string name="tag.restriction_70">Máx 70</string>
   <string name="tag.restriction_80">Máx 80</string>
   <string name="tag.restriction_90">Máx 90</string>
@@ -35,7 +35,7 @@
   <string name="tag.restriction_one_way">Sentido único</string>
   <string name="tag.car_fuel_station">Posto de combustível</string>
   <string name="tag.car_parking">Estacionamento</string>
-  <string name="tag.car_emergency_phone">Telefone de Emergência</string>
+  <string name="tag.car_emergency_phone">Telefone de emergência</string>
   <string name="tag.car_turning_circle">Círculo de viragem</string>
   <string name="tag.car_speed_camera">Radar</string>
   <string name="tag.tourism_view_point">Miradouro</string>
@@ -47,7 +47,7 @@
   <string name="tag.tourism_monument">Monumento</string>
   <string name="tag.tourism_museum">Museu</string>
   <string name="tag.tourism_cinema">Cinema</string>
-  <string name="tag.amenity_bench">Banco de Jardim</string>
+  <string name="tag.amenity_bench">Banco de jardim</string>
   <string name="tag.amenity_water">Água</string>
   <string name="tag.amenity_pharmacy">Farmácia</string>
   <string name="tag.amenity_shop">Loja</string>
@@ -63,11 +63,11 @@
   <string name="tag.amenitymore_police">Polícia</string>
   <string name="tag.amenitymore_fire_station">Quartel de bombeiros</string>
   <string name="tag.amenitymore_bank">Banco</string>
-  <string name="tag.amenitymore_playground">Parque Infantil</string>
+  <string name="tag.amenitymore_playground">Parque infantil</string>
   <string name="tag.amenitymore_pub">Bar</string>
   <string name="tag.amenitymore_hotel">Hotel</string>
   <string name="tag.amenitymore_motel">Motel</string>
-  <string name="tag.amenitymore_hostel">Albergue (Hostel)</string>
+  <string name="tag.amenitymore_hostel">Albergue (hostel)</string>
   <string name="tag.amenitymore_restaurant">Restaurante</string>
   <string name="tag.amenitymore_fastfood">Fast-food</string>
   <string name="tag.amenitymore_camp_site">Parque de campismo</string>
@@ -85,7 +85,7 @@
   <string name="tag.track_footway">Via pedonal exclusiva</string>
   <string name="tag.track_bridleway">Caminho exclusivo para cavalos</string>
   <string name="tag.track_steps">Degraus</string>
-  <string name="tag.track_living_street">Living street</string>
+  <string name="tag.track_living_street">Zona de coexistência</string>
   <string name="tag.track_pedestrian">Pedonal</string>
   <string name="tag.track_grade1">Nível 1</string>
   <string name="tag.track_grade2">Nível 2</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5e5fe2855..5d6db13ec 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -6,7 +6,7 @@
   <string name="app_description">Inspirado pelo OSMTracker no Windows Mobile, permite registar as viagens, marcar pontos importantes (gravações de voz, fotos), exportar no formato GPX para ser utilizado posteriormente em programas como o JOSM.</string>
   <!--TrackLogger-->
   <string name="tracklogger">Registo de trilhos</string>
-  <string name="tracklogger_waiting_gps">À espera do sinal GPS para ativar os botões...</string>
+  <string name="tracklogger_waiting_gps">À espera do sinal GPS para ativar os botões…</string>
   <string name="tracklogger_voicerec_title">Gravação de voz</string>
   <string name="tracklogger_voicerec_text">A gravar um clip áudio de {0}s</string>
   <string name="tracklogger_voicerec_stop">Parar</string>
@@ -23,32 +23,35 @@
   <string name="wplist_longitude">Long:</string>
   <string name="wplist_elevation">Elev:</string>
   <string name="wplist_accuracy">Exatidão:</string>
-  <string name="wplist_compass">Rumo Bússo.:</string>
-  <string name="wplist_compass_accuracy">Precis. Bússo.:</string>
+  <string name="wplist_compass">Direção búss.:</string>
+  <string name="wplist_compass_accuracy">Precis. bússo.:</string>
   <!--Track Manager-->
   <string name="trackmgr">Gestor de trilhos</string>
-  <string name="trackmgr_tracklist">Lista de trilhos</string>
+  <string name="trackmgr_tracklist">Lista de trilhos:</string>
   <string name="trackmgr_waypoints_count">Pontos de referência:</string>
   <string name="trackmgr_trackpoints_count">Pontos de trilhos:</string>
   <string name="trackmgr_empty">Não tem nenhum trilho.</string>
+  <string name="trackmgr_newtrack_hint">Premir para gravar um novo trilho.</string>
   <string name="trackmgr_newtrack_error">Não foi possível criar o novo trilho: {0}</string>
   <string name="trackmgr_continuetrack_hint">Está neste momento a gravar o <b>trilho #{0}</b>\nEscolha-o na lista para continuar</string>
   <string name="trackmgr_contextmenu_stop">Parar registo</string>
   <string name="trackmgr_contextmenu_resume">Continuar registo</string>
   <string name="trackmgr_contextmenu_delete">Eliminar</string>
   <string name="trackmgr_contextmenu_export">Exportar como GPX</string>
-  <string name="trackmgr_contextmenu_osm_upload">Enviar para OpenStreetMap</string>
+  <string name="trackmgr_contextmenu_share">Partilhar GPX</string>
+  <string name="trackmgr_contextmenu_osm_upload">Enviar para o OpenStreetMap</string>
   <string name="trackmgr_contextmenu_display">Ver</string>
   <string name="trackmgr_contextmenu_details">Detalhes</string>
   <string name="trackmgr_contextmenu_title">Trilho #{0}</string>
   <string name="trackmgr_delete_confirm">O trilho #{0} será eliminado</string>
   <string name="trackmgr_deleteall_confirm">Todos os trilhos serão eliminados. Tem a certeza?</string>
-  <string name="trackmgr_exporting">A exportar o trilho #{0}...</string>
-  <string name="trackmgr_exporting_prepare">A preparar a exportação...</string>
+  <string name="trackmgr_exporting">A exportar o trilho #{0}…</string>
+  <string name="trackmgr_exporting_prepare">A preparar a exportação…</string>
   <string name="trackmgr_export_error">Não foi possível exportar o trilho: {0}</string>
   <string name="trackmgr_exportall_confirm">Todos os trilhos serão exportados, o que poderá demorar algum tempo. Quer continuar?</string>
+  <string name="trackmgr_prepare_for_share_error">Não foi possível processar o trilho: {0}</string>
   <!--Track Detail-->
-  <string name="trackdetail">Detalhes do Trilho</string>
+  <string name="trackdetail">Detalhes do trilho</string>
   <string name="trackdetail_startdate">Hora de início:</string>
   <string name="trackdetail_enddate">Hora de fim:</string>
   <string name="trackdetail_startloc">Começa em:</string>
@@ -64,16 +67,16 @@
   <string name="trackdetail_description_mandatory">Tem de escrever uma descrição</string>
   <string name="osm_visibility_private">Privado</string>
   <string name="osm_visibility_public">Público</string>
-  <string name="osm_visibility_trackable">Acompanhável</string>
+  <string name="osm_visibility_trackable">Rastreável</string>
   <string name="osm_visibility_identifiable">Identificável</string>
   <!--OSM upload-->
   <string name="osm_upload">Enviar para OpenStreetMap</string>
-  <string name="osm_upload_ok">Gravar e enviar</string>
+  <string name="osm_upload_ok">Guardar e enviar</string>
   <string name="osm_upload_tmpfile_failed">Não foi possível exportar o trilho para um ficheiro temporário</string>
   <string name="osm_upload_oauth_failed">Não foi possível autenticar no OSM</string>
-  <string name="osm_upload_sending">A enviar o trilho #{0}...</string>
-  <string name="osm_upload_waiting_response">À espera de resposta do servidor OpenStreetMap...</string>
-  <string name="osm_upload_error">Erro ao enviar trilho</string>
+  <string name="osm_upload_sending">A enviar o trilho #{0}…</string>
+  <string name="osm_upload_waiting_response">À espera da resposta do servidor OpenStreetMap…</string>
+  <string name="osm_upload_error">Erro ao enviar o trilho</string>
   <string name="osm_upload_bad_response">O servidor OSM devolveu um erro: ({0}) mensagem {1}</string>
   <string name="osm_upload_unauthorized">Erro de autorização. Deseja eliminar as credenciais guardadas do OpenStreetMap?</string>
   <string name="osm_upload_sucess">Envio para o OpenStreetMap bem sucedido</string>
@@ -86,15 +89,15 @@
   <string name="menu_waypointlist">Pontos de referência</string>
   <string name="menu_about">Sobre</string>
   <string name="menu_displaytrack">Mostrar trilho</string>
-  <string name="menu_stoptracking">Parar e gravar</string>
+  <string name="menu_stoptracking">Parar e guardar</string>
   <string name="menu_newtrack">Novo trilho</string>
   <string name="menu_deletetracks">Eliminar todos os trilhos</string>
   <string name="menu_continue">Continuar trilho</string>
   <string name="menu_stopcurrenttrack">Parar trilho atual</string>
-  <string name="menu_save">Gravar</string>
+  <string name="menu_save">Guardar</string>
   <string name="menu_cancel">Cancelar</string>
   <string name="menu_export">Exportar como GPX</string>
-  <string name="menu_osm_upload">Envio para OpenStreeMap</string>
+  <string name="menu_osm_upload">Envio para o OpenStreeMap</string>
   <string name="menu_center_to_gps">Centrar no GPS</string>
   <string name="menu_exportall">Exportar tudo como GPX</string>
   <!--Errors-->
@@ -110,9 +113,9 @@
   <string name="about">Sobre</string>
   <string name="about_text">Para mais informação, documentos e relatório de problemas, visite a página do projeto:</string>
   <string name="about_translate_text">Ajude a traduzir o OSMTracker:</string>
-  <string name="about_debug_info">Informação de Debug</string>
+  <string name="about_debug_info">Informação de depuração</string>
   <string name="about_export_db">Exportar base de dados</string>
-  <string name="about_exporting_db">A exportar a base de dados...</string>
+  <string name="about_exporting_db">A exportar a base de dados…</string>
   <string name="about_export_db_result">Resultado da exportação da base de dados: %s</string>
   <!--Notification-->
   <string name="notification_ticker_text">O OSMTracker está a registar</string>
@@ -129,31 +132,34 @@
   <string name="various_accuracy">Precisão</string>
   <string name="various_accuracy_with_sats">Precisão {0}{1} ({2}/{3})</string>
   <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">A esperar pela fixação do GPS... ({0}/{1})</string>
+  <string name="various_waiting_gps_fix">A esperar pela fixação do GPS… ({0}/{1})</string>
   <!--parameters: (used sats, visible sats)-->
   <string name="various_heading_display">{0}°</string>
   <!--parameters: (heading in degrees)-->
-  <string name="various_heading">Aguarde pelo rumo...</string>
-  <string name="various_heading_unknown">O rumo não pode ser determinado</string>
+  <string name="various_heading">Aguarde pela direção…</string>
+  <string name="various_heading_unknown">A direção não pode ser determinada</string>
+  <string name="various_export_finished">Processo de exportação concluído com êxito</string>
   <!--OSM map view-->
-  <string name="displaytrackmap">Trilho OpenStreetMap</string>
+  <string name="displaytrackmap">Visualização de trilhos OpenStreetMap</string>
   <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">Atualizar e Instalar</string>
+  <string name="buttons_presets_context_menu_update_install">Atualizar e instalar</string>
   <string name="buttons_presets_context_menu_delete">Eliminar</string>
   <string name="buttons_presets_updating_layout">A atualizar…</string>
   <string name="buttons_presets_successful_update">O layout foi atualizado com sucesso</string>
   <string name="buttons_presets_unsuccessful_update">O layout não foi atualizado, tente novamente mais tarde</string>
   <string name="buttons_presets_delete_message">Tem a certeza que quer eliminar o layout {0}?</string>
   <string name="buttons_presets_delete_positive_confirmation">Sim</string>
+  <string name="buttons_presets_successful_delete">O layout foi eliminado com sucesso</string>
   <string name="buttons_presets_icon_directory_deleted">O diretório do ícone foi eliminado com sucesso</string>
   <string name="buttons_presets_icon_directory_does_not_exist">O ficheiro não tinha nenhum diretório de ícone associado</string>
+  <string name="buttons_presets_unsuccessful_delete">Não foi possível eliminar o layout</string>
   <!--Available Layouts messages-->
   <string name="available_layouts_connection_error">Erro: não foi possível ligar à Internet</string>
   <string name="available_layouts_response_null_exception">Erro: não foi possível estabelecer a ligação ao repositório padrão de layouts personalizados</string>
   <string name="available_layouts_connecting_message">(A estabelecer a ligação…)</string>
   <string name="available_layouts_description_dialog_positive_confirmation">Descarregar</string>
   <string name="available_layouts_not_available_language">O seu idioma não está disponível, selecione um da lista</string>
-  <string name="available_layouts_language_dialog_title">Idiomas Disponíveis</string>
+  <string name="available_layouts_language_dialog_title">Idiomas disponíveis</string>
   <string name="available_layouts_checking_language_dialog">A verificar as versões de idiomas locais</string>
   <string name="available_layouts_downloading_dialog">A descarregar…</string>
   <string name="available_layouts_successful_download">O layout foi descarregado com sucesso</string>
@@ -167,4 +173,13 @@
   <string name="github_repository_settings_branch_name">Nome do ramo:</string>
   <string name="github_repository_settings_valid_server">Repositório do Github válido</string>
   <string name="github_repository_settings_invalid_server">O repositório do Github não é válido</string>
+  <!--App Introduction-->
+  <string name="app_intro">Introdução ao OSMTracker para Android™</string>
+  <!--Intro - slide1-->
+  <string name="app_intro_slide1_title">Bem-vindo ao OSMTracker para Android™ 👋</string>
+  <string name="app_intro_slide1_description">Esta aplicação é um software gratuito que respeita a sua liberdade!</string>
+  <!--Intro - slide2-->
+  <string name="app_intro_slide2_title">Bons trilhos 🗺 😎</string>
+  <string name="app_intro_slide2_description">OSMTracker para Android irá utilizar a sua localização GPS para registar pontos de trilhos e pontos das vias, mesmo quando a aplicação está a ser executada em segundo plano.
+\nOs seus dados não são utilizados para suportar anúncios.</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/waypoints.xml b/app/src/main/res/values-pt-rPT/waypoints.xml
index 46e314719..dc264d0c6 100644
--- a/app/src/main/res/values-pt-rPT/waypoints.xml
+++ b/app/src/main/res/values-pt-rPT/waypoints.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">Gravação de voz</string>
+  <string name="wpt_stillimage">Fotografia</string>
 </resources>
diff --git a/app/src/main/res/values-pt_BR/accessibility.xml b/app/src/main/res/values-pt_BR/accessibility.xml
deleted file mode 100644
index 5a9433723..000000000
--- a/app/src/main/res/values-pt_BR/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">Logo do OSMTracker</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Aumentar zoom</string>
-  <string name="acc.zoom_out">Diminuir zoom</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">Indicador de força do sinal de satélite</string>
-  <string name="acc.record_indicator">Indicador do progresso da gravação</string>
-  <!--Track list-->
-  <string name="acc.track_status">Indicador do status da trilha</string>
-  <string name="acc.upload_status">Indicador do estado do envio para o OpenStreetMap</string>
-</resources>
diff --git a/app/src/main/res/values-pt_BR/strings-preferences.xml b/app/src/main/res/values-pt_BR/strings-preferences.xml
deleted file mode 100644
index 4b9e97d1e..000000000
--- a/app/src/main/res/values-pt_BR/strings-preferences.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">Configurações</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">Configurações do GPS</string>
-  <string name="prefs_gps_os_settings_summary">Exibir tela de configuração do GPS</string>
-  <string name="prefs_check_gps_startup">Verificar GPS ao iniciar</string>
-  <string name="prefs_check_gps_startup_summary">Ao iniciar, verificar se o GPS está desativado e perguntar se quer ativá-lo</string>
-  <string name="prefs_gps_ignore_clock">Ignorar relógio do GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">Ignorar relógio do GPS e usar relógio do Android para os registros de tempo</string>
-  <string name="prefs_use_barometer">Log da pressão barométrica [hPa]</string>
-  <string name="prefs_use_barometer_summary">Alternar requer o reinício da trilha</string>
-  <string name="prefs_gps_logging_interval">Intervalo de registros do GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Use 0 para o menor possível (afeta a duração da bateria)</string>
-  <string name="prefs_gps_logging_interval_seconds">segundos</string>
-  <string name="prefs_gps_logging_min_distance">Distância de registro do GPS</string>
-  <string name="prefs_gps_logging_min_distance_summary">Distância mínima entre os pontos da trilha em metros, use 0 para o mais curto possível</string>
-  <string name="prefs_gps_logging_min_distance_meters">metros</string>
-  <string name="prefs_ui">Interface do usuário</string>
-  <string name="prefs_ui_picture_source">Fonte padrão das imagens</string>
-  <string name="prefs_ui_picture_source_summary">Tirar foto com a câmera ou escolher da galeria?</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>Câmera</item>
-    <item>Galeria de Imagem</item>
-    <item>Perguntar sempre</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">Definições de botões</string>
-  <string name="prefs_ui_buttons_layout_summary">Escolha uma configuração de botões personalizada (veja a documentação)</string>
-  <string name="prefs_ui_buttons_layout_default_section">Layout padrão</string>
-  <string name="prefs_ui_buttons_layout_defaut">Padrão</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">Layout baixado</string>
-  <string name="prefs_ui_buttons_layout_empty_section">Você não baixou arquivos de layout</string>
-  <string name="prefs_ui_available_layout">Layouts Disponíveis</string>
-  <string name="prefs_ui_github_repository_settings">Configurações do repositório do Github</string>
-  <string name="prefs_ui_orientation">Orientação</string>
-  <string name="prefs_ui_orientation_summary">Orientação preferida para a tela dos botões</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>Automática</item>
-    <item>Retrato</item>
-    <item>Paisagem</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">Duração da gravação de voz</string>
-  <string name="prefs_voicerec_duration_seconds">segundos</string>
-  <string name="prefs_theme">Tema gráfico da tela principal</string>
-  <string name="prefs_theme_summary">É necessário reiniciar o aplicativo para que as mudanças tenham efeito</string>
-  <string-array name="prefs_theme_keys">
-    <item>Padrão do sistema</item>
-    <item>Padrão do sistema (escuro)</item>
-    <item>Padrão do sistema (claro)</item>
-    <item>Alto contraste</item>
-  </string-array>
-  <string name="prefs_display_always_on">Tela sempre ligada</string>
-  <string name="prefs_display_always_on_summary">Tela ficará sempre ligada durante a gravação da trilha. Desative para economizar bateria</string>
-  <string name="prefs_displaytrack_osm">Mapa de fundo</string>
-  <string name="prefs_displaytrack_osm_summary">Exibir mapa do OpenStreetMap por baixo. Precisa de uma conexão de dados</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Sempre exibir o fundo do OpenStreetMap? Requer uma conexão de dados</string>
-  <string name="prefs_output">Configurações GPX</string>
-  <string name="prefs_storage_dir">Pasta do armazenamento externo (SD)</string>
-  <string name="prefs_storage_dir_hint">Terá efeito na próxima trilha (não na atual)</string>
-  <string name="prefs_output_one_dir_per_track">Uma pasta por trilha</string>
-  <string name="prefs_output_one_dir_per_track_summary">Salvar cada trilha e arquivos associados em uma pasta própria</string>
-  <string name="prefs_output_filename">Nome do arquivo para trilhas nomeadas</string>
-  <string name="prefs_output_filename_summary">Padrão para nomes de arquivo se a trilha tem um nome</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>Nome da trilha</item>
-    <item>Nome, data e hora do início</item>
-    <item>Data e hora do início</item>
-  </string-array>
-  <string name="prefs_output_accuracy">Precisão do arquivo GPX</string>
-  <string name="prefs_output_accuracy_summary">Adicionar informações sobre precisão nos arquivos GPX, com nomes ou comentários dos pontos de referência</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>Nenhum</item>
-    <item>Com nome do ponto de referência</item>
-    <item>Em um comentário do ponto de referência</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">Usar aproximação HDOP</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">Preencha HDOP no GPX com um valor de aproximação de precisão</string>
-  <string name="prefs_sound_enabled">Ativar som</string>
-  <string name="prefs_sound_enabled_summary">Tocar som quando gravação de voz começa e termina</string>
-  <string name="prefs_osm_clear_oauth_data">Redefinir autenticação OSM</string>
-  <string name="prefs_osm_clear_oauth_data_summary">Esquecer as credenciais e permissões OSM e forçar o OSMTracker a perguntar isso novamente</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">Você vai ter que autorizar OSMTracker para carregar trilhas novamente. Tem certeza?</string>
-  <string name="prefs_map_tile">Provedor de blocos de mapas</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>Nenhum</item>
-    <item>em comentário</item>
-    <item>em extensão</item>
-  </string-array>
-  <string name="prefs_compass_heading">Exportar cabeçalho da bússola</string>
-  <string name="prefs_compass_heading_summary">Define se e como os dados da bússola devem ser exportados para o arquivo GPX</string>
-</resources>
diff --git a/app/src/main/res/values-pt_BR/strings-tags.xml b/app/src/main/res/values-pt_BR/strings-tags.xml
deleted file mode 100644
index 973b0831e..000000000
--- a/app/src/main/res/values-pt_BR/strings-tags.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">Vários</string>
-  <string name="tag.restriction">Restrição</string>
-  <string name="tag.car">Carro</string>
-  <string name="tag.tourism">Turismo</string>
-  <string name="tag.amenity">Confortável</string>
-  <string name="tag.amenity_more">Confortável (+)</string>
-  <string name="tag.way">Via</string>
-  <string name="tag.track">Trilha</string>
-  <string name="tag.landuse">Solo</string>
-  <string name="tag.misc_bus_stop">Ponto de ônibus</string>
-  <string name="tag.misc_railway">Ferrovia</string>
-  <string name="tag.misc_telephone">Telefone</string>
-  <string name="tag.misc_post_box">Caixa postal</string>
-  <string name="tag.misc_atm">Caixa eletrônico</string>
-  <string name="tag.misc_bollard">Coluna</string>
-  <string name="tag.misc_toilets">Banheiros</string>
-  <string name="tag.misc_shelter">Abrigo</string>
-  <string name="tag.misc_surveillance">Fiscalização</string>
-  <string name="tag.restriction_20">Máx. 20</string>
-  <string name="tag.restriction_30">Máx. 30</string>
-  <string name="tag.restriction_40">Máx. 40</string>
-  <string name="tag.restriction_50">Máx. 50</string>
-  <string name="tag.restriction_60">Máx. 60</string>
-  <string name="tag.restriction_70">Máx. 70</string>
-  <string name="tag.restriction_80">Máx. 80</string>
-  <string name="tag.restriction_90">Máx. 90</string>
-  <string name="tag.restriction_100">Máx. 100</string>
-  <string name="tag.restriction_110">Máx. 110</string>
-  <string name="tag.restriction_120">Máx. 120</string>
-  <string name="tag.restriction_130">Máx. 130</string>
-  <string name="tag.restriction_no_exit">Sem saída</string>
-  <string name="tag.restriction_traffic_light">Semáforo</string>
-  <string name="tag.restriction_one_way">Mão única</string>
-  <string name="tag.car_fuel_station">Posto de combustível</string>
-  <string name="tag.car_parking">Estacionamento</string>
-  <string name="tag.car_emergency_phone">Telefone de emergência</string>
-  <string name="tag.car_turning_circle">Balão de retorno</string>
-  <string name="tag.car_speed_camera">Radar de velocidade</string>
-  <string name="tag.tourism_view_point">Mirante</string>
-  <string name="tag.tourism_information">Informações</string>
-  <string name="tag.tourism_picnic">Piquenique</string>
-  <string name="tag.tourism_attraction">Atração turística</string>
-  <string name="tag.tourism_theme_park">Parque temático</string>
-  <string name="tag.tourism_castle">Castelo</string>
-  <string name="tag.tourism_monument">Monumento</string>
-  <string name="tag.tourism_museum">Museu</string>
-  <string name="tag.tourism_cinema">Cinema</string>
-  <string name="tag.amenity_bench">Banco</string>
-  <string name="tag.amenity_water">Água</string>
-  <string name="tag.amenity_pharmacy">Farmácia</string>
-  <string name="tag.amenity_shop">Loja</string>
-  <string name="tag.amenity_marina">Marina</string>
-  <string name="tag.amenity_sport">Esporte</string>
-  <string name="tag.amenity_taxi">Táxi</string>
-  <string name="tag.amenity_doctors">Hospital,\nMédicos</string>
-  <string name="tag.amenity_recycling">Reciclagem</string>
-  <string name="tag.amenity_place_of_worship">Lugar de\nadoração</string>
-  <string name="tag.amenity_post_office">Correios</string>
-  <string name="tag.amenity_library">Livraria</string>
-  <string name="tag.amenitymore_school">Escola</string>
-  <string name="tag.amenitymore_police">Polícia</string>
-  <string name="tag.amenitymore_fire_station">Corpo de Bombeiros</string>
-  <string name="tag.amenitymore_bank">Banco</string>
-  <string name="tag.amenitymore_playground">Playground</string>
-  <string name="tag.amenitymore_pub">Bar</string>
-  <string name="tag.amenitymore_hotel">Hotel</string>
-  <string name="tag.amenitymore_motel">Motel</string>
-  <string name="tag.amenitymore_hostel">Albergue</string>
-  <string name="tag.amenitymore_restaurant">Restaurante</string>
-  <string name="tag.amenitymore_fastfood">Lanchonete</string>
-  <string name="tag.amenitymore_camp_site">Acampamento</string>
-  <string name="tag.way_bridge">Ponte</string>
-  <string name="tag.way_zebra_crossing">Faixa de pedestres</string>
-  <string name="tag.way_motorway">Autoestrada</string>
-  <string name="tag.way_trunk">Via expressa</string>
-  <string name="tag.way_primary">Via Primária</string>
-  <string name="tag.way_secondary">Via Secundária</string>
-  <string name="tag.way_tertiary">Via Terciária</string>
-  <string name="tag.way_residential">Via Residencial</string>
-  <string name="tag.way_service">Via de serviço</string>
-  <string name="tag.track_track">Trilha</string>
-  <string name="tag.track_cycleway">Ciclovia</string>
-  <string name="tag.track_footway">Caminho de pedestres</string>
-  <string name="tag.track_bridleway">Trilha para cavalgada</string>
-  <string name="tag.track_steps">Escada</string>
-  <string name="tag.track_living_street">Via de espaço compartilhado</string>
-  <string name="tag.track_pedestrian">Calçadão</string>
-  <string name="tag.track_grade1">Grau 1</string>
-  <string name="tag.track_grade2">Grau 2</string>
-  <string name="tag.track_grade3">Grau 3</string>
-  <string name="tag.track_grade4">Grau 4</string>
-  <string name="tag.track_grade5">Grau 5</string>
-  <string name="tag.landuse_farm">Fazenda</string>
-  <string name="tag.landuse_landfill">Aterro</string>
-  <string name="tag.landuse_basin">Bacia</string>
-  <string name="tag.landuse_reservoir">Reservatório</string>
-  <string name="tag.landuse_forest">Floresta</string>
-  <string name="tag.landuse_allotments">Loteamentos</string>
-  <string name="tag.landuse_cemetery">Cemitério</string>
-  <string name="tag.landuse_recreation_ground">Área de\nrecreação</string>
-</resources>
diff --git a/app/src/main/res/values-pt_BR/strings.xml b/app/src/main/res/values-pt_BR/strings.xml
deleted file mode 100644
index 00546df03..000000000
--- a/app/src/main/res/values-pt_BR/strings.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker para Android™</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Inspirado no OSMTracker para Windows Mobile, permite gravar suas trilhas, marcar pontos de interesse significativos (gravação de voz, fotos) e exportá-las no formato GPX para uso posterior em ferramentas para o Open Street Map como JOSM.</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">Registro da trilha</string>
-  <string name="tracklogger_waiting_gps">Aguardando estabilização do GPS para ativar botões...</string>
-  <string name="tracklogger_voicerec_title">Gravar voz</string>
-  <string name="tracklogger_voicerec_text">Gravando um {0}s trecho de áudio.</string>
-  <string name="tracklogger_voicerec_stop">Parar</string>
-  <string name="tracklogger_btnBack">Voltar</string>
-  <string name="tracklogger_tracked">Gravado:</string>
-  <string name="tracklogger_gps_disabled">GPS desativado</string>
-  <string name="tracklogger_gps_disabled_hint">O GPS está desativado. Deseja ativá-lo?</string>
-  <string name="tracklogger_choose_gallery_camera">Galeria ou câmera?</string>
-  <string name="tracklogger_camera">Tirar foto com a câmera</string>
-  <string name="tracklogger_gallery">Selecione uma imagem da galeria</string>
-  <!--Waypoint List-->
-  <string name="wplist">Lista de pontos de passagem</string>
-  <string name="wplist_latitude">Lat:</string>
-  <string name="wplist_longitude">Long:</string>
-  <string name="wplist_elevation">Elev:</string>
-  <string name="wplist_accuracy">Precis:</string>
-  <string name="wplist_compass">Rumo Cálc.:</string>
-  <string name="wplist_compass_accuracy">Precis. Cálc.:</string>
-  <!--Track Manager-->
-  <string name="trackmgr">Gerenciar trilhas</string>
-  <string name="trackmgr_tracklist">Lista de trilhas:</string>
-  <string name="trackmgr_waypoints_count">Pontos de referência:</string>
-  <string name="trackmgr_trackpoints_count">Trajeto:</string>
-  <string name="trackmgr_empty">Você não tem nenhuma trilha.</string>
-  <string name="trackmgr_newtrack_hint">Pressione para gravar uma nova trilha.</string>
-  <string name="trackmgr_newtrack_error">Impossível criar uma nova trilha: {0}</string>
-  <string name="trackmgr_continuetrack_hint">Você está gravando a <b>trilha #{0}</b>\nSelecione ela na lista para continuar</string>
-  <string name="trackmgr_contextmenu_stop">Parar gravação</string>
-  <string name="trackmgr_contextmenu_resume">Continuar gravação</string>
-  <string name="trackmgr_contextmenu_delete">Apagar</string>
-  <string name="trackmgr_contextmenu_export">Exportar em GPX</string>
-  <string name="trackmgr_contextmenu_share">Compartilhar GPX</string>
-  <string name="trackmgr_contextmenu_osm_upload">Enviar para OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">Exibir</string>
-  <string name="trackmgr_contextmenu_details">Detalhes</string>
-  <string name="trackmgr_contextmenu_title">Trilha #{0}</string>
-  <string name="trackmgr_delete_confirm">A trilha #{0} será apagada</string>
-  <string name="trackmgr_deleteall_confirm">Todas as trilhas serão apagadas. Tem certeza?</string>
-  <string name="trackmgr_exporting">Exportando trilha #{0}…</string>
-  <string name="trackmgr_exporting_prepare">Preparando para exportar...</string>
-  <string name="trackmgr_export_error">Não foi possível exportar trilha: {0}</string>
-  <string name="trackmgr_exportall_confirm">Todas as trilhas serão exportadas, o que poderá levar muito tempo. Tem certeza?</string>
-  <string name="trackmgr_prepare_for_share_error">Incapaz de processar a trilha: {0}</string>
-  <!--Track Detail-->
-  <string name="trackdetail">Detalhes da trilha</string>
-  <string name="trackdetail_startdate">Início:</string>
-  <string name="trackdetail_enddate">Fim:</string>
-  <string name="trackdetail_startloc">Início em:</string>
-  <string name="trackdetail_endloc">Término em:</string>
-  <string name="trackdetail_exportdate">Exportado:</string>
-  <string name="trackdetail_osm_upload_date">Enviado para o OpenStreetMap:</string>
-  <string name="trackdetail_btn_export">Exportar como GPX</string>
-  <string name="trackdetail_export_notyet">(Ainda não exportado)</string>
-  <string name="trackdetail_osm_upload_notyet">(Ainda não enviado)</string>
-  <string name="trackdetail_export_display">Exibir</string>
-  <string name="trackdetail_description">Descrição</string>
-  <string name="trackdetail_tags">Tags (separado com vírgula)</string>
-  <string name="trackdetail_description_mandatory">Você precisa digitar uma descrição</string>
-  <string name="osm_visibility_private">Privado</string>
-  <string name="osm_visibility_public">Público</string>
-  <string name="osm_visibility_trackable">Rastreável</string>
-  <string name="osm_visibility_identifiable">Identificável</string>
-  <!--OSM upload-->
-  <string name="osm_upload">Enviar para OpenStreetMap</string>
-  <string name="osm_upload_ok">Salvar e enviar</string>
-  <string name="osm_upload_tmpfile_failed">Não foi possível exportar a trilha para um arquivo temporário</string>
-  <string name="osm_upload_oauth_failed">Não foi possível autenticar no OSM</string>
-  <string name="osm_upload_sending">Enviando trilha #{0}…</string>
-  <string name="osm_upload_waiting_response">Esperando servidor do OpenStreetMap responder...</string>
-  <string name="osm_upload_error">Erro ao enviar trilha</string>
-  <string name="osm_upload_bad_response">O servidor do OSM retornou um erro: ({0}) message {1}</string>
-  <string name="osm_upload_unauthorized">Erro de autorização. Gostaria de limpar as credencias do OpenStreetMaps salvas?</string>
-  <string name="osm_upload_sucess">Enviado com sucesso para o OpenStreetMap</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">Gravar voz</string>
-  <string name="gpsstatus_record_stillimage">Tirar foto</string>
-  <string name="gpsstatus_record_textnote">Nota</string>
-  <!--Menu-->
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_waypointlist">Pontos de referência</string>
-  <string name="menu_about">Sobre</string>
-  <string name="menu_displaytrack">Exibir trilha</string>
-  <string name="menu_stoptracking">Parar &amp; salvar</string>
-  <string name="menu_newtrack">Nova trilha</string>
-  <string name="menu_deletetracks">Apagar todas as trilhas</string>
-  <string name="menu_continue">Continuar trilha</string>
-  <string name="menu_stopcurrenttrack">Parar trilha atual</string>
-  <string name="menu_save">Salvar</string>
-  <string name="menu_cancel">Cancelar</string>
-  <string name="menu_export">Exportar como GPX</string>
-  <string name="menu_osm_upload">Enviar para o OpenStreetMap</string>
-  <string name="menu_center_to_gps">Centralizar com GPS</string>
-  <string name="menu_exportall">Exportar tudo como GPX</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">Impossível gravar no armazenamento externo.</string>
-  <string name="error_create_track_dir">Impossível criar a pasta de trilhas %s</string>
-  <string name="error_externalstorage_not_writable_hint">Por favor confira se o armazenamento externo está corretamente inserido e montado.</string>
-  <string name="error_voicerec_failed">Gravação de voz falhou</string>
-  <string name="error_userlayout_parsing">Erro ao analisar arquivo de layout XML. Por favor, voltar para o layout padrão.</string>
-  <!--GPX-->
-  <string name="gpx_track_name">Gravado com OSMTracker para Android™</string>
-  <string name="gpx_hdop_approximation_cmt">Atenção: valores HDOP não são o HDOP como retornado pelo dispositivo GPS. Eles são relativamente precisos na localização em metros.</string>
-  <!--About screen-->
-  <string name="about">Sobre</string>
-  <string name="about_text">Para maiores informações, documentação e relatório de problemas, por favor visite o site:</string>
-  <string name="about_translate_text">Ajudar na tradução do OSMTracker:</string>
-  <string name="about_debug_info">Informação de depuração</string>
-  <string name="about_export_db">Exportar banco de dados</string>
-  <string name="about_exporting_db">Exportando banco de dados...</string>
-  <string name="about_export_db_result">Resultado da exportação do banco de dados: %s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker está gravando trilha</string>
-  <string name="notification_title">OSMTracker está gravando trilha (#{0})</string>
-  <string name="notification_text">Toque aqui para exibir a tela principal</string>
-  <!--Display track-->
-  <string name="displaytrack">Exibir trilha</string>
-  <string name="displaytrack_map">Exibir mapa de fundo</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">Salvar</string>
-  <!--Various-->
-  <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">Precisão</string>
-  <string name="various_accuracy_with_sats">Precisão {0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">Aguardando pelo sinal do GPS… ({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">Aguardando rumo...</string>
-  <string name="various_heading_unknown">O rumo não pôde ser determinado</string>
-  <string name="various_export_finished">Processo de exportação concluído com sucesso</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">Exibindo trilhas do OpenStreetMap</string>
-  <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">Atualizar &amp; Instalar</string>
-  <string name="buttons_presets_context_menu_delete">Excluir</string>
-  <string name="buttons_presets_updating_layout">Atualizando…</string>
-  <string name="buttons_presets_successful_update">O layout foi atualizado com sucesso</string>
-  <string name="buttons_presets_unsuccessful_update">O layout não foi atualizado, tente novamente mais tarde</string>
-  <string name="buttons_presets_delete_message">Tem certeza que deseja excluir o layout {0}?</string>
-  <string name="buttons_presets_delete_positive_confirmation">Sim</string>
-  <string name="buttons_presets_successful_delete">O layout foi excluído com sucesso</string>
-  <string name="buttons_presets_icon_directory_deleted">O diretório do ícone foi excluído com sucesso</string>
-  <string name="buttons_presets_icon_directory_does_not_exist">Este arquivo não tinha nenhum diretório de ícone associado</string>
-  <string name="buttons_presets_unsuccessful_delete">O layout não pôde ser excluído</string>
-  <!--Available Layouts messages-->
-  <string name="available_layouts_connection_error">Erro: não é possível conectar à Internet</string>
-  <string name="available_layouts_response_null_exception">Erro: não é possível conectar ao repositório de layouts personalizados padrão</string>
-  <string name="available_layouts_connecting_message">(Conectando ...)</string>
-  <string name="available_layouts_description_dialog_positive_confirmation">Download</string>
-  <string name="available_layouts_not_available_language">Seu idioma não está disponível, selecione um da lista</string>
-  <string name="available_layouts_language_dialog_title">idiomas disponíveis</string>
-  <string name="available_layouts_checking_language_dialog">Verificando as versões do idioma local</string>
-  <string name="available_layouts_downloading_dialog">Downloading…</string>
-  <string name="available_layouts_successful_download">O layout foi baixado com sucesso</string>
-  <string name="available_layouts_unsuccessful_download">O layout não pode ser baixado, tente novamente mais tarde</string>
-  <string name="available_layouts_null_response_received">Erro ao recuperar dados do servidor</string>
-  <!--Github Repository Settings-->
-  <string name="github_repository_settings_default_checkbox">Padrão</string>
-  <string name="github_repository_settings_custom_checkbox">Personalizado</string>
-  <string name="github_repository_settings_username">Nome de usuário do Github</string>
-  <string name="github_repository_settings_repository_name">Nome do repositório</string>
-  <string name="github_repository_settings_branch_name">Nome da Branch</string>
-  <string name="github_repository_settings_valid_server">Repositório do Github válido</string>
-  <string name="github_repository_settings_invalid_server">repositório do github inválido</string>
-  <!--App Introduction-->
-  <string name="app_intro">OSMTracker para Android ™ Introdução</string>
-  <!--Intro - slide1-->
-  <string name="app_intro_slide1_title">Bem-vindo ao OSMTracker para Android ™ 👋</string>
-  <string name="app_intro_slide1_description">Este App é um software gratuito que respeita a sua liberdade!</string>
-  <!--Intro - slide2-->
-  <string name="app_intro_slide2_title">Boas trilhas 🗺 😎</string>
-  <string name="app_intro_slide2_description">OSMTracker para Android usará sua localização GPS para registrar trackpoints e waypoints, mesmo quando o aplicativo está sendo executado em segundo plano.
-\nSeus dados não são usados para oferecer suporte a anúncios. </string>
-</resources>
diff --git a/app/src/main/res/values-pt_BR/waypoints.xml b/app/src/main/res/values-pt_BR/waypoints.xml
deleted file mode 100644
index a86d493f8..000000000
--- a/app/src/main/res/values-pt_BR/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">Gravação de voz</string>
-  <string name="wpt_stillimage">Foto</string>
-</resources>
diff --git a/app/src/main/res/values-pt_PT/accessibility.xml b/app/src/main/res/values-pt_PT/accessibility.xml
deleted file mode 100644
index 9e73d1b00..000000000
--- a/app/src/main/res/values-pt_PT/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">Logotipo OSMTracker</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Ampliar</string>
-  <string name="acc.zoom_out">Diminuir</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">Indicador de força do sinal de satélite</string>
-  <string name="acc.record_indicator">Indicador de gravação em curso</string>
-  <!--Track list-->
-  <string name="acc.track_status">Indicador de estado do trilho</string>
-  <string name="acc.upload_status">Indicador de envio para o OpenStreetMap</string>
-</resources>
diff --git a/app/src/main/res/values-pt_PT/strings-preferences.xml b/app/src/main/res/values-pt_PT/strings-preferences.xml
deleted file mode 100644
index a308aa636..000000000
--- a/app/src/main/res/values-pt_PT/strings-preferences.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">Configurações</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">Configurações de GPS</string>
-  <string name="prefs_gps_os_settings_summary">Ver configurações do GPS do sistema</string>
-  <string name="prefs_check_gps_startup">Verificar GPS ao iniciar</string>
-  <string name="prefs_check_gps_startup_summary">Verificar se o GPS está inativo no arranque e perguntar se quero ativá-lo</string>
-  <string name="prefs_gps_ignore_clock">Ignorar o relógio do GPS</string>
-  <string name="prefs_gps_ignore_clock_summary">Ignorar o relógio do GPS e usar o relógio do Android para registo da hora</string>
-  <string name="prefs_use_barometer">Registar pressão barométrica [hPa]</string>
-  <string name="prefs_use_barometer_summary">A alternância requer o reinício do trilho</string>
-  <string name="prefs_gps_logging_interval">Intervalo de registo do GPS</string>
-  <string name="prefs_gps_logging_interval_summary">Usar 0 para o valor mais pequeno possível (diminui a duração da bateria)</string>
-  <string name="prefs_gps_logging_interval_seconds">segundos</string>
-  <string name="prefs_gps_logging_min_distance">Distância de registo GPS</string>
-  <string name="prefs_gps_logging_min_distance_summary">Distância mínima entre os pontos do trilho em metros; utilizar 0 para a distância mais curta possível</string>
-  <string name="prefs_gps_logging_min_distance_meters">metros</string>
-  <string name="prefs_ui">Interface do utilizador</string>
-  <string name="prefs_ui_picture_source">Origem das fotografias</string>
-  <string name="prefs_ui_picture_source_summary">Tirar fotos com a câmara ou da galeria?</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>Câmara</item>
-    <item>Galeria</item>
-    <item>Perguntar sempre</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">Predefinições de botões</string>
-  <string name="prefs_ui_buttons_layout_summary">Escolha um conjunto de botões personalizado (veja a documentação)</string>
-  <string name="prefs_ui_buttons_layout_default_section">LAYOUT PADRÃO</string>
-  <string name="prefs_ui_buttons_layout_defaut">Padrão</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">LAYOUT DESCARREGADO</string>
-  <string name="prefs_ui_buttons_layout_empty_section">Não tem ficheiros de layout descarregados</string>
-  <string name="prefs_ui_available_layout">Layouts disponíveis</string>
-  <string name="prefs_ui_github_repository_settings">Configurações do Repositório do Github</string>
-  <string name="prefs_ui_orientation">Orientação</string>
-  <string name="prefs_ui_orientation_summary">Orientação preferida para o ecrã dos botões</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>Automático</item>
-    <item>Retrato (ao alto)</item>
-    <item>Paisagem</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">Duração da gravação de voz</string>
-  <string name="prefs_voicerec_duration_seconds">segundos</string>
-  <string name="prefs_theme">Tema gráfico do ecrã principal</string>
-  <string name="prefs_theme_summary">É necessário reiniciar a aplicação para que as alterações tenham efeito</string>
-  <string-array name="prefs_theme_keys">
-    <item>Tema original do SO</item>
-    <item>Tema original do SO (escuro)</item>
-    <item>Tema original do SO (claro)</item>
-    <item>Alto contraste</item>
-  </string-array>
-  <string name="prefs_display_always_on">Ecrã sempre ligado</string>
-  <string name="prefs_display_always_on_summary">O ecrã manter-se-á ligado enquanto estiver a registar. Desative para poupar bateria</string>
-  <string name="prefs_displaytrack_osm">Mapa de fundo</string>
-  <string name="prefs_displaytrack_osm_summary">Mostrar o mapa OpenStreetMap por baixo do trilho. Necessita de ligação de dados</string>
-  <string name="prefs_displaytrack_osm_summary_ask">Mostrar sempre o fundo do OpenStreetMap? Requer uma conexão de dados</string>
-  <string name="prefs_output">Configurações de GPX</string>
-  <string name="prefs_storage_dir">Pasta de armazenamento externo (SD)</string>
-  <string name="prefs_storage_dir_hint">Aplicável apenas no próximo trilho (não ao atual)</string>
-  <string name="prefs_output_one_dir_per_track">Uma pasta por trilho</string>
-  <string name="prefs_output_one_dir_per_track_summary">Guardar cada trilho e os ficheiros relacionados numa pasta dedicada</string>
-  <string name="prefs_output_filename">Nome do ficheiro para trilhos com nome</string>
-  <string name="prefs_output_filename_summary">Padrão para o nome do ficheiro se o trilho tiver um nome</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>Nome do trilho</item>
-    <item>Nome, data e hora de início</item>
-    <item>Data e hora de início</item>
-  </string-array>
-  <string name="prefs_output_accuracy">Precisão no ficheiro GPX</string>
-  <string name="prefs_output_accuracy_summary">Adicionar informação de precisão no ficheiro GPX, com nome do ponto de referência ou no comentário</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>Nenhum</item>
-    <item>Com nome do ponto de referência</item>
-    <item>No comentário do ponto de referência</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">Usar aproximação HDOP</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">Preencher HDOP no GPX com uma aproximação da precisão</string>
-  <string name="prefs_sound_enabled">Ativar som</string>
-  <string name="prefs_sound_enabled_summary">Reproduzir som quando a gravação de voz começa e termina</string>
-  <string name="prefs_osm_clear_oauth_data">Eliminar a autenticação OSM</string>
-  <string name="prefs_osm_clear_oauth_data_summary">Esquecer as credenciais e permissões do OpenStreetMap e forçar o OSMTracker a requisitá-las novamente</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">Terá de autorizar novamente o OSMTracker para poder enviar trilhos para o OpenStreetMap. Quer continuar?</string>
-  <string name="prefs_map_tile">Fornecedor de mosaicos de mapas</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>Não exportar</item>
-    <item>No comentário</item>
-    <item>Na extensão</item>
-  </string-array>
-  <string name="prefs_compass_heading">Exportar direção da bússola</string>
-  <string name="prefs_compass_heading_summary">Define se e como os dados da bússola devem ser exportados para o ficheiro GPX</string>
-</resources>
diff --git a/app/src/main/res/values-pt_PT/strings-tags.xml b/app/src/main/res/values-pt_PT/strings-tags.xml
deleted file mode 100644
index f1285a69e..000000000
--- a/app/src/main/res/values-pt_PT/strings-tags.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">Vários</string>
-  <string name="tag.restriction">Restrição</string>
-  <string name="tag.car">Carro</string>
-  <string name="tag.tourism">Turismo</string>
-  <string name="tag.amenity">Infraestrutura</string>
-  <string name="tag.amenity_more">Infraestrutura (+)</string>
-  <string name="tag.way">Via</string>
-  <string name="tag.track">Caminho</string>
-  <string name="tag.landuse">Uso do solo</string>
-  <string name="tag.misc_bus_stop">Paragem de autocarro</string>
-  <string name="tag.misc_railway">Ferrovia</string>
-  <string name="tag.misc_telephone">Telefone</string>
-  <string name="tag.misc_post_box">Caixa de correio</string>
-  <string name="tag.misc_atm">Multibanco</string>
-  <string name="tag.misc_bollard">Pilar</string>
-  <string name="tag.misc_toilets">Casa de banho</string>
-  <string name="tag.misc_shelter">Abrigo</string>
-  <string name="tag.misc_surveillance">Vigilância</string>
-  <string name="tag.restriction_20">Máx 20</string>
-  <string name="tag.restriction_30">Máx 30</string>
-  <string name="tag.restriction_40">Máx 40</string>
-  <string name="tag.restriction_50">Máx 50</string>
-  <string name="tag.restriction_60">Máx 60</string>
-  <string name="tag.restriction_70">Máx 70</string>
-  <string name="tag.restriction_80">Máx 80</string>
-  <string name="tag.restriction_90">Máx 90</string>
-  <string name="tag.restriction_100">Máx 100</string>
-  <string name="tag.restriction_110">Máx 110</string>
-  <string name="tag.restriction_120">Máx 120</string>
-  <string name="tag.restriction_130">Máx 130</string>
-  <string name="tag.restriction_no_exit">Sem saída</string>
-  <string name="tag.restriction_traffic_light">Semáforo</string>
-  <string name="tag.restriction_one_way">Sentido único</string>
-  <string name="tag.car_fuel_station">Posto de combustível</string>
-  <string name="tag.car_parking">Estacionamento</string>
-  <string name="tag.car_emergency_phone">Telefone de emergência</string>
-  <string name="tag.car_turning_circle">Círculo de viragem</string>
-  <string name="tag.car_speed_camera">Radar</string>
-  <string name="tag.tourism_view_point">Miradouro</string>
-  <string name="tag.tourism_information">Informação</string>
-  <string name="tag.tourism_picnic">Zona de piquenique</string>
-  <string name="tag.tourism_attraction">Atração</string>
-  <string name="tag.tourism_theme_park">Parque de diversões</string>
-  <string name="tag.tourism_castle">Castelo</string>
-  <string name="tag.tourism_monument">Monumento</string>
-  <string name="tag.tourism_museum">Museu</string>
-  <string name="tag.tourism_cinema">Cinema</string>
-  <string name="tag.amenity_bench">Banco de jardim</string>
-  <string name="tag.amenity_water">Água</string>
-  <string name="tag.amenity_pharmacy">Farmácia</string>
-  <string name="tag.amenity_shop">Loja</string>
-  <string name="tag.amenity_marina">Marina</string>
-  <string name="tag.amenity_sport">Desporto</string>
-  <string name="tag.amenity_taxi">Táxi</string>
-  <string name="tag.amenity_doctors">Hospital,\nMédico</string>
-  <string name="tag.amenity_recycling">Reciclagem</string>
-  <string name="tag.amenity_place_of_worship">Local de\nculto</string>
-  <string name="tag.amenity_post_office">Correios</string>
-  <string name="tag.amenity_library">Biblioteca</string>
-  <string name="tag.amenitymore_school">Escola</string>
-  <string name="tag.amenitymore_police">Polícia</string>
-  <string name="tag.amenitymore_fire_station">Quartel de bombeiros</string>
-  <string name="tag.amenitymore_bank">Banco</string>
-  <string name="tag.amenitymore_playground">Parque infantil</string>
-  <string name="tag.amenitymore_pub">Bar</string>
-  <string name="tag.amenitymore_hotel">Hotel</string>
-  <string name="tag.amenitymore_motel">Motel</string>
-  <string name="tag.amenitymore_hostel">Albergue (hostel)</string>
-  <string name="tag.amenitymore_restaurant">Restaurante</string>
-  <string name="tag.amenitymore_fastfood">Fast-food</string>
-  <string name="tag.amenitymore_camp_site">Parque de campismo</string>
-  <string name="tag.way_bridge">Ponte</string>
-  <string name="tag.way_zebra_crossing">Passadeira</string>
-  <string name="tag.way_motorway">Autoestrada</string>
-  <string name="tag.way_trunk">Via rápida (IP, IC)</string>
-  <string name="tag.way_primary">Estrada Nacional</string>
-  <string name="tag.way_secondary">Estrada Regional</string>
-  <string name="tag.way_tertiary">Estrada Municipal</string>
-  <string name="tag.way_residential">Residencial</string>
-  <string name="tag.way_service">Serviço</string>
-  <string name="tag.track_track">Carreiro florestal / agrícola</string>
-  <string name="tag.track_cycleway">Ciclovia</string>
-  <string name="tag.track_footway">Via pedonal exclusiva</string>
-  <string name="tag.track_bridleway">Caminho exclusivo para cavalos</string>
-  <string name="tag.track_steps">Degraus</string>
-  <string name="tag.track_living_street">Zona de coexistência</string>
-  <string name="tag.track_pedestrian">Pedonal</string>
-  <string name="tag.track_grade1">Nível 1</string>
-  <string name="tag.track_grade2">Nível 2</string>
-  <string name="tag.track_grade3">Nível 3</string>
-  <string name="tag.track_grade4">Nível 4</string>
-  <string name="tag.track_grade5">Nível 5</string>
-  <string name="tag.landuse_farm">Quinta (rural)</string>
-  <string name="tag.landuse_landfill">Aterro</string>
-  <string name="tag.landuse_basin">Bacia</string>
-  <string name="tag.landuse_reservoir">Reservatório</string>
-  <string name="tag.landuse_forest">Floresta</string>
-  <string name="tag.landuse_allotments">Horta urbana</string>
-  <string name="tag.landuse_cemetery">Cemitério</string>
-  <string name="tag.landuse_recreation_ground">Zona de\nrecreio</string>
-</resources>
diff --git a/app/src/main/res/values-pt_PT/strings.xml b/app/src/main/res/values-pt_PT/strings.xml
deleted file mode 100644
index 5d6db13ec..000000000
--- a/app/src/main/res/values-pt_PT/strings.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker para Android™</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">Inspirado pelo OSMTracker no Windows Mobile, permite registar as viagens, marcar pontos importantes (gravações de voz, fotos), exportar no formato GPX para ser utilizado posteriormente em programas como o JOSM.</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">Registo de trilhos</string>
-  <string name="tracklogger_waiting_gps">À espera do sinal GPS para ativar os botões…</string>
-  <string name="tracklogger_voicerec_title">Gravação de voz</string>
-  <string name="tracklogger_voicerec_text">A gravar um clip áudio de {0}s</string>
-  <string name="tracklogger_voicerec_stop">Parar</string>
-  <string name="tracklogger_btnBack">Voltar</string>
-  <string name="tracklogger_tracked">Registados:</string>
-  <string name="tracklogger_gps_disabled">GPS desativado</string>
-  <string name="tracklogger_gps_disabled_hint">O GPS está desativado. Quer ativá-lo?</string>
-  <string name="tracklogger_choose_gallery_camera">Galeria ou câmara?</string>
-  <string name="tracklogger_camera">Fotografar com a câmara</string>
-  <string name="tracklogger_gallery">Selecionar fotografia na galeria</string>
-  <!--Waypoint List-->
-  <string name="wplist">Lista de pontos de referência</string>
-  <string name="wplist_latitude">Lat:</string>
-  <string name="wplist_longitude">Long:</string>
-  <string name="wplist_elevation">Elev:</string>
-  <string name="wplist_accuracy">Exatidão:</string>
-  <string name="wplist_compass">Direção búss.:</string>
-  <string name="wplist_compass_accuracy">Precis. bússo.:</string>
-  <!--Track Manager-->
-  <string name="trackmgr">Gestor de trilhos</string>
-  <string name="trackmgr_tracklist">Lista de trilhos:</string>
-  <string name="trackmgr_waypoints_count">Pontos de referência:</string>
-  <string name="trackmgr_trackpoints_count">Pontos de trilhos:</string>
-  <string name="trackmgr_empty">Não tem nenhum trilho.</string>
-  <string name="trackmgr_newtrack_hint">Premir para gravar um novo trilho.</string>
-  <string name="trackmgr_newtrack_error">Não foi possível criar o novo trilho: {0}</string>
-  <string name="trackmgr_continuetrack_hint">Está neste momento a gravar o <b>trilho #{0}</b>\nEscolha-o na lista para continuar</string>
-  <string name="trackmgr_contextmenu_stop">Parar registo</string>
-  <string name="trackmgr_contextmenu_resume">Continuar registo</string>
-  <string name="trackmgr_contextmenu_delete">Eliminar</string>
-  <string name="trackmgr_contextmenu_export">Exportar como GPX</string>
-  <string name="trackmgr_contextmenu_share">Partilhar GPX</string>
-  <string name="trackmgr_contextmenu_osm_upload">Enviar para o OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">Ver</string>
-  <string name="trackmgr_contextmenu_details">Detalhes</string>
-  <string name="trackmgr_contextmenu_title">Trilho #{0}</string>
-  <string name="trackmgr_delete_confirm">O trilho #{0} será eliminado</string>
-  <string name="trackmgr_deleteall_confirm">Todos os trilhos serão eliminados. Tem a certeza?</string>
-  <string name="trackmgr_exporting">A exportar o trilho #{0}…</string>
-  <string name="trackmgr_exporting_prepare">A preparar a exportação…</string>
-  <string name="trackmgr_export_error">Não foi possível exportar o trilho: {0}</string>
-  <string name="trackmgr_exportall_confirm">Todos os trilhos serão exportados, o que poderá demorar algum tempo. Quer continuar?</string>
-  <string name="trackmgr_prepare_for_share_error">Não foi possível processar o trilho: {0}</string>
-  <!--Track Detail-->
-  <string name="trackdetail">Detalhes do trilho</string>
-  <string name="trackdetail_startdate">Hora de início:</string>
-  <string name="trackdetail_enddate">Hora de fim:</string>
-  <string name="trackdetail_startloc">Começa em:</string>
-  <string name="trackdetail_endloc">Termina em:</string>
-  <string name="trackdetail_exportdate">Exportado:</string>
-  <string name="trackdetail_osm_upload_date">Enviado para o OpenStreetMap:</string>
-  <string name="trackdetail_btn_export">Exportar como GPX</string>
-  <string name="trackdetail_export_notyet">(Ainda não foi exportado)</string>
-  <string name="trackdetail_osm_upload_notyet">(Ainda não foi enviado)</string>
-  <string name="trackdetail_export_display">Ver</string>
-  <string name="trackdetail_description">Descrição</string>
-  <string name="trackdetail_tags">Etiquetas (separadas por vírgulas)</string>
-  <string name="trackdetail_description_mandatory">Tem de escrever uma descrição</string>
-  <string name="osm_visibility_private">Privado</string>
-  <string name="osm_visibility_public">Público</string>
-  <string name="osm_visibility_trackable">Rastreável</string>
-  <string name="osm_visibility_identifiable">Identificável</string>
-  <!--OSM upload-->
-  <string name="osm_upload">Enviar para OpenStreetMap</string>
-  <string name="osm_upload_ok">Guardar e enviar</string>
-  <string name="osm_upload_tmpfile_failed">Não foi possível exportar o trilho para um ficheiro temporário</string>
-  <string name="osm_upload_oauth_failed">Não foi possível autenticar no OSM</string>
-  <string name="osm_upload_sending">A enviar o trilho #{0}…</string>
-  <string name="osm_upload_waiting_response">À espera da resposta do servidor OpenStreetMap…</string>
-  <string name="osm_upload_error">Erro ao enviar o trilho</string>
-  <string name="osm_upload_bad_response">O servidor OSM devolveu um erro: ({0}) mensagem {1}</string>
-  <string name="osm_upload_unauthorized">Erro de autorização. Deseja eliminar as credenciais guardadas do OpenStreetMap?</string>
-  <string name="osm_upload_sucess">Envio para o OpenStreetMap bem sucedido</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">Gravar voz</string>
-  <string name="gpsstatus_record_stillimage">Fotografar</string>
-  <string name="gpsstatus_record_textnote">Nota de texto</string>
-  <!--Menu-->
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_waypointlist">Pontos de referência</string>
-  <string name="menu_about">Sobre</string>
-  <string name="menu_displaytrack">Mostrar trilho</string>
-  <string name="menu_stoptracking">Parar e guardar</string>
-  <string name="menu_newtrack">Novo trilho</string>
-  <string name="menu_deletetracks">Eliminar todos os trilhos</string>
-  <string name="menu_continue">Continuar trilho</string>
-  <string name="menu_stopcurrenttrack">Parar trilho atual</string>
-  <string name="menu_save">Guardar</string>
-  <string name="menu_cancel">Cancelar</string>
-  <string name="menu_export">Exportar como GPX</string>
-  <string name="menu_osm_upload">Envio para o OpenStreeMap</string>
-  <string name="menu_center_to_gps">Centrar no GPS</string>
-  <string name="menu_exportall">Exportar tudo como GPX</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">Não foi possível gravar no armazenamento externo.</string>
-  <string name="error_create_track_dir">Não foi possível criar a pasta do trilho %s</string>
-  <string name="error_externalstorage_not_writable_hint">Por favor, verifique se o armazenamento externo está inserido e montado corretamente.</string>
-  <string name="error_voicerec_failed">A gravação de voz falhou</string>
-  <string name="error_userlayout_parsing">Ocorreu um erro ao processar o ficheiro de layout XML. Por favor, reverta para o layout padrão.</string>
-  <!--GPX-->
-  <string name="gpx_track_name">Registado com o OSMTracker para Android™</string>
-  <string name="gpx_hdop_approximation_cmt">Aviso: os valores HDOP não são os valores HDOP indicados pelo GPS. São aproximações dadas pela exatidão da localização em metros.</string>
-  <!--About screen-->
-  <string name="about">Sobre</string>
-  <string name="about_text">Para mais informação, documentos e relatório de problemas, visite a página do projeto:</string>
-  <string name="about_translate_text">Ajude a traduzir o OSMTracker:</string>
-  <string name="about_debug_info">Informação de depuração</string>
-  <string name="about_export_db">Exportar base de dados</string>
-  <string name="about_exporting_db">A exportar a base de dados…</string>
-  <string name="about_export_db_result">Resultado da exportação da base de dados: %s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">O OSMTracker está a registar</string>
-  <string name="notification_title">O OSMTracker está a registar ({0})</string>
-  <string name="notification_text">Toque aqui para ver o ecrã principal</string>
-  <!--Display track-->
-  <string name="displaytrack">Mostrar trilho</string>
-  <string name="displaytrack_map">Mostrar mapa de fundo</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">Gravar</string>
-  <!--Various-->
-  <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">Precisão</string>
-  <string name="various_accuracy_with_sats">Precisão {0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">A esperar pela fixação do GPS… ({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">Aguarde pela direção…</string>
-  <string name="various_heading_unknown">A direção não pode ser determinada</string>
-  <string name="various_export_finished">Processo de exportação concluído com êxito</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">Visualização de trilhos OpenStreetMap</string>
-  <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">Atualizar e instalar</string>
-  <string name="buttons_presets_context_menu_delete">Eliminar</string>
-  <string name="buttons_presets_updating_layout">A atualizar…</string>
-  <string name="buttons_presets_successful_update">O layout foi atualizado com sucesso</string>
-  <string name="buttons_presets_unsuccessful_update">O layout não foi atualizado, tente novamente mais tarde</string>
-  <string name="buttons_presets_delete_message">Tem a certeza que quer eliminar o layout {0}?</string>
-  <string name="buttons_presets_delete_positive_confirmation">Sim</string>
-  <string name="buttons_presets_successful_delete">O layout foi eliminado com sucesso</string>
-  <string name="buttons_presets_icon_directory_deleted">O diretório do ícone foi eliminado com sucesso</string>
-  <string name="buttons_presets_icon_directory_does_not_exist">O ficheiro não tinha nenhum diretório de ícone associado</string>
-  <string name="buttons_presets_unsuccessful_delete">Não foi possível eliminar o layout</string>
-  <!--Available Layouts messages-->
-  <string name="available_layouts_connection_error">Erro: não foi possível ligar à Internet</string>
-  <string name="available_layouts_response_null_exception">Erro: não foi possível estabelecer a ligação ao repositório padrão de layouts personalizados</string>
-  <string name="available_layouts_connecting_message">(A estabelecer a ligação…)</string>
-  <string name="available_layouts_description_dialog_positive_confirmation">Descarregar</string>
-  <string name="available_layouts_not_available_language">O seu idioma não está disponível, selecione um da lista</string>
-  <string name="available_layouts_language_dialog_title">Idiomas disponíveis</string>
-  <string name="available_layouts_checking_language_dialog">A verificar as versões de idiomas locais</string>
-  <string name="available_layouts_downloading_dialog">A descarregar…</string>
-  <string name="available_layouts_successful_download">O layout foi descarregado com sucesso</string>
-  <string name="available_layouts_unsuccessful_download">Não foi possível descarregar o layout, tente novamente mais tarde</string>
-  <string name="available_layouts_null_response_received">Erro ao obter os dados do servidor</string>
-  <!--Github Repository Settings-->
-  <string name="github_repository_settings_default_checkbox">Padrão</string>
-  <string name="github_repository_settings_custom_checkbox">Personalizado</string>
-  <string name="github_repository_settings_username">Nome de utilizador no Github:</string>
-  <string name="github_repository_settings_repository_name">Nome do repositório:</string>
-  <string name="github_repository_settings_branch_name">Nome do ramo:</string>
-  <string name="github_repository_settings_valid_server">Repositório do Github válido</string>
-  <string name="github_repository_settings_invalid_server">O repositório do Github não é válido</string>
-  <!--App Introduction-->
-  <string name="app_intro">Introdução ao OSMTracker para Android™</string>
-  <!--Intro - slide1-->
-  <string name="app_intro_slide1_title">Bem-vindo ao OSMTracker para Android™ 👋</string>
-  <string name="app_intro_slide1_description">Esta aplicação é um software gratuito que respeita a sua liberdade!</string>
-  <!--Intro - slide2-->
-  <string name="app_intro_slide2_title">Bons trilhos 🗺 😎</string>
-  <string name="app_intro_slide2_description">OSMTracker para Android irá utilizar a sua localização GPS para registar pontos de trilhos e pontos das vias, mesmo quando a aplicação está a ser executada em segundo plano.
-\nOs seus dados não são utilizados para suportar anúncios.</string>
-</resources>
diff --git a/app/src/main/res/values-pt_PT/waypoints.xml b/app/src/main/res/values-pt_PT/waypoints.xml
deleted file mode 100644
index dc264d0c6..000000000
--- a/app/src/main/res/values-pt_PT/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">Gravação de voz</string>
-  <string name="wpt_stillimage">Fotografia</string>
-</resources>
diff --git a/app/src/main/res/values-tr-rTR/accessibility.xml b/app/src/main/res/values-tr-rTR/accessibility.xml
index 88051ea97..d9c455852 100644
--- a/app/src/main/res/values-tr-rTR/accessibility.xml
+++ b/app/src/main/res/values-tr-rTR/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">OSMTracker logo</string>
diff --git a/app/src/main/res/values-tr-rTR/strings-preferences.xml b/app/src/main/res/values-tr-rTR/strings-preferences.xml
deleted file mode 100644
index 717c93a4e..000000000
--- a/app/src/main/res/values-tr-rTR/strings-preferences.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">Tercihler</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">GPS ayarları</string>
-  <string name="prefs_check_gps_startup">Açılışta GPS kontrol et</string>
-  <string name="prefs_gps_ignore_clock">GPS saatini görmezden gel</string>
-  <string name="prefs_gps_ignore_clock_summary">GPS saatini görmezden gel ve zaman bilgisi olarak Android saatini kulllan</string>
-  <string name="prefs_gps_logging_interval_seconds">saniyeler</string>
-  <string name="prefs_ui">Kullanıcı arayüzü</string>
-  <string name="prefs_ui_buttons_layout_defaut">Varsayılan</string>
-  <string name="prefs_voicerec_duration_seconds">saniyeler</string>
-  <string name="prefs_display_always_on">Ekran her zaman açık kalsın</string>
-  <string name="prefs_displaytrack_osm">arkaplan haritası</string>
-  <string name="prefs_map_tile_summary"></string>
-</resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
deleted file mode 100644
index c53f99f5b..000000000
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">Android™ için OSMTracker</string>
-  <string name="app_short_name">OSMTracker</string>
-  <!--TrackLogger-->
-  <string name="tracklogger_voicerec_title">ses kayıt</string>
-  <string name="tracklogger_voicerec_text">{0} bir ses klibi kaydediliyor.</string>
-  <string name="tracklogger_voicerec_stop">Durdur</string>
-  <string name="tracklogger_btnBack">Geri</string>
-  <string name="tracklogger_tracked">İzlendi:</string>
-  <string name="tracklogger_gps_disabled">GPS devre dışı</string>
-  <string name="tracklogger_gps_disabled_hint">GPS devre dışı. Etkinleştirmek ister misiniz?</string>
-  <string name="tracklogger_choose_gallery_camera">galeri mi ya da kamera mı?</string>
-  <string name="tracklogger_camera">Kamera ile fotoğraf çek</string>
-  <string name="tracklogger_gallery">Galeriden fotoğraf seç </string>
-  <!--Waypoint List-->
-  <string name="wplist">varış noktası listesi</string>
-  <string name="wplist_latitude">Enlem:</string>
-  <string name="wplist_longitude">Boylam:</string>
-  <string name="wplist_elevation">Yükseklik:</string>
-  <string name="wplist_accuracy">Doğruluk:</string>
-  <!--Track Manager-->
-  <string name="trackmgr">rota yöneticisi</string>
-  <string name="trackmgr_tracklist">Rota listesi:</string>
-  <string name="trackmgr_waypoints_count">Varış noktası:</string>
-  <string name="trackmgr_empty">Hiç rotanız yok.
-</string>
-  <string name="trackmgr_newtrack_error">Yeni rota oluşturma aktifleştirilmedi:{0}.</string>
-  <string name="trackmgr_contextmenu_stop">Rotayı durdur</string>
-  <string name="trackmgr_contextmenu_resume">Rotaya devam et</string>
-  <string name="trackmgr_contextmenu_delete">Si</string>
-  <string name="trackmgr_contextmenu_osm_upload">OpenStreetMap\'e yükle</string>
-  <string name="trackmgr_contextmenu_display">Ekran</string>
-  <string name="trackmgr_contextmenu_details">Detaylar</string>
-  <string name="trackmgr_contextmenu_title">Rota #{0}</string>
-  <string name="trackmgr_deleteall_confirm">Tüm rotalar silinecek. Emin misiniz?</string>
-  <!--Track Detail-->
-  <string name="trackdetail">Rota detayları</string>
-  <string name="trackdetail_startdate">Başlama zamanı:</string>
-  <string name="trackdetail_enddate">Bitiş zamanı:</string>
-  <string name="trackdetail_startloc">Başlangıç</string>
-  <string name="trackdetail_endloc">Bitiş</string>
-  <string name="trackdetail_osm_upload_date">OpenStreetMap yüklendi:</string>
-  <string name="trackdetail_export_display">Ekran</string>
-  <string name="trackdetail_description">Tanım</string>
-  <string name="trackdetail_tags">Etiketler (virgülle ayrık)</string>
-  <string name="trackdetail_description_mandatory">Bir tanım girmelisiniz</string>
-  <string name="osm_visibility_private">kişisel</string>
-  <string name="osm_visibility_trackable">izlenebilir</string>
-  <string name="osm_visibility_identifiable">Tanımlanabilir</string>
-  <!--OSM upload-->
-  <string name="osm_upload">OpenStreetMap yükleniyor</string>
-  <string name="osm_upload_ok">Kaydet ve yükle</string>
-  <string name="osm_upload_oauth_failed">OSM kimlik doğrulaması yapılamıyor</string>
-  <string name="osm_upload_sending">Rota gönderiliyor #{0}…</string>
-  <string name="osm_upload_waiting_response">Cevap için OpenStreetMap sunucusu bekleniyor…</string>
-  <string name="osm_upload_error">Rota yüklenirken hata oluştu.</string>
-  <string name="osm_upload_bad_response"> OSM sunucusu tekrar hata verdi: ({0}) mesaj {1}</string>
-  <string name="osm_upload_unauthorized">Yetkilendirme hatası. Kaydedilen kimlik bilgisini temizlemek ister misiniz?</string>
-  <string name="osm_upload_sucess">OpenStreetMap\'e yükleme başarılı</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">ses kayıt</string>
-  <string name="gpsstatus_record_stillimage">Fotoğraf çek</string>
-  <string name="gpsstatus_record_textnote">Not al</string>
-  <!--Menu-->
-  <string name="menu_settings">Ayarlar</string>
-  <string name="menu_waypointlist">Varış noktası</string>
-  <string name="menu_about">Hakkında</string>
-  <string name="menu_displaytrack">Rota ekranı</string>
-  <string name="menu_newtrack">Yeni rota</string>
-  <string name="menu_deletetracks">Tüm rotaları sil</string>
-  <string name="menu_continue">Rotaya devam et</string>
-  <string name="menu_stopcurrenttrack">Geçerli rotayı durdur</string>
-  <string name="menu_save">Kaydet</string>
-  <string name="menu_cancel">İptal</string>
-  <string name="menu_osm_upload">OpenStreetMap yükleniyor</string>
-  <string name="menu_center_to_gps">GPS merkezi</string>
-  <!--Errors-->
-  <string name="error_voicerec_failed">ses kaydı hataya uğradı</string>
-  <!--GPX-->
-  <!--About screen-->
-  <string name="about">Hakkında</string>
-  <string name="about_translate_text">OSMTracker çevirisine yardım et:</string>
-  <string name="about_debug_info">debug bilgisi</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker rota oluşturuyor</string>
-  <string name="notification_title">OSMTracker rota oluşturuyor (#{0})</string>
-  <!--Display track-->
-  <string name="displaytrack">Rota ekranı</string>
-  <string name="displaytrack_map">Ekran arkaplan haritası</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">Kaydet</string>
-  <!--Various-->
-  <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">Doğruluk</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <!--OSM map view-->
-  <!--Buttons presets messages-->
-  <!--Available Layouts messages-->
-  <!--Github Repository Settings-->
-  <!--App Introduction-->
-  <!--Intro - slide1-->
-  <!--Intro - slide2-->
-</resources>
diff --git a/app/src/main/res/values-tr-rTR/waypoints.xml b/app/src/main/res/values-tr-rTR/waypoints.xml
index 28db5f50b..43c86f925 100644
--- a/app/src/main/res/values-tr-rTR/waypoints.xml
+++ b/app/src/main/res/values-tr-rTR/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">Ses kayıt</string>
   <string name="wpt_stillimage">Fotoğraf</string>
diff --git a/app/src/main/res/values-tr_TR/accessibility.xml b/app/src/main/res/values-tr_TR/accessibility.xml
deleted file mode 100644
index d9c455852..000000000
--- a/app/src/main/res/values-tr_TR/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">OSMTracker logo</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">Yakınlaş</string>
-  <string name="acc.zoom_out">Uzaklaş</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">uydu sinyal gücü göstergesi</string>
-  <string name="acc.record_indicator">kayıt ilerleme göstergesi</string>
-  <!--Track list-->
-  <string name="acc.track_status">rota durumu göstergesi</string>
-  <string name="acc.upload_status">OpenStreetMap yükleme durumu göstergesi</string>
-</resources>
diff --git a/app/src/main/res/values-tr_TR/strings-tags.xml b/app/src/main/res/values-tr_TR/strings-tags.xml
deleted file mode 100644
index e39355564..000000000
--- a/app/src/main/res/values-tr_TR/strings-tags.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">Diğer</string>
-  <string name="tag.restriction">Sınırlı</string>
-  <string name="tag.car">Otomobil</string>
-  <string name="tag.tourism">Turizm</string>
-  <string name="tag.amenity">Sosyal Tesis</string>
-  <string name="tag.amenity_more">Sosyal Tesis (+)</string>
-  <string name="tag.way">Yol</string>
-  <string name="tag.track">İz</string>
-  <string name="tag.landuse">Kullanımdaki arazi</string>
-  <string name="tag.misc_bus_stop">Otobüs durağı</string>
-  <string name="tag.misc_railway">Demiryolu</string>
-  <string name="tag.misc_telephone">Telefon</string>
-  <string name="tag.misc_post_box">Posta kutusu</string>
-  <string name="tag.misc_atm">ATM</string>
-  <string name="tag.misc_bollard">İskele</string>
-  <string name="tag.misc_toilets">Tuvaletler</string>
-  <string name="tag.misc_shelter">Sığınak</string>
-  <string name="tag.misc_surveillance">Nezaret</string>
-  <string name="tag.restriction_20">En fazla 20</string>
-  <string name="tag.restriction_30">En fazla 30</string>
-  <string name="tag.restriction_40">En fazla 40</string>
-  <string name="tag.restriction_50">En fazla 50</string>
-  <string name="tag.restriction_60">En fazla 60</string>
-  <string name="tag.restriction_70">En fazla 70</string>
-  <string name="tag.restriction_80">En fazla 80</string>
-  <string name="tag.restriction_90">En fazla 90</string>
-  <string name="tag.restriction_100">En fazla 100</string>
-  <string name="tag.restriction_110">En fazla 110</string>
-  <string name="tag.restriction_120">En fazla 120</string>
-  <string name="tag.restriction_130">En fazla 130</string>
-  <string name="tag.restriction_no_exit">Çıkış yok</string>
-  <string name="tag.restriction_traffic_light">Trafik ışığı</string>
-  <string name="tag.restriction_one_way">Tek yön</string>
-  <string name="tag.car_fuel_station">Akaryakıt istasyonu</string>
-  <string name="tag.car_parking">Park yeri</string>
-  <string name="tag.car_emergency_phone">Acil Telefon</string>
-  <string name="tag.car_turning_circle">Kavşak</string>
-  <string name="tag.car_speed_camera">Hız kamerası</string>
-  <string name="tag.tourism_view_point">Görüş noktası</string>
-  <string name="tag.tourism_information">Danışma</string>
-  <string name="tag.tourism_picnic">Piknik yeri</string>
-  <string name="tag.tourism_attraction">İlgi çekici yer</string>
-  <string name="tag.tourism_theme_park">Eğlence parkı</string>
-  <string name="tag.tourism_castle">Kale</string>
-  <string name="tag.tourism_monument">Anıt</string>
-  <string name="tag.tourism_museum">Müze</string>
-  <string name="tag.tourism_cinema">Sinema</string>
-  <string name="tag.amenity_bench">Bank</string>
-  <string name="tag.amenity_water">Su</string>
-  <string name="tag.amenity_pharmacy">Eczane</string>
-  <string name="tag.amenity_shop">Dükkan</string>
-  <string name="tag.amenity_marina">Yat limanı</string>
-  <string name="tag.amenity_sport">Spor</string>
-  <string name="tag.amenity_taxi">Taksi</string>
-  <string name="tag.amenity_recycling">Geri dönüşüm</string>
-  <string name="tag.amenity_post_office">Postane</string>
-  <string name="tag.amenity_library">Kütüphane</string>
-  <string name="tag.amenitymore_school">Okul</string>
-  <string name="tag.amenitymore_police">Polis</string>
-  <string name="tag.amenitymore_fire_station">İtfaiye istasyon</string>
-  <string name="tag.amenitymore_bank">Banka</string>
-  <string name="tag.amenitymore_playground">Oyun alanı</string>
-  <string name="tag.amenitymore_pub">Bar</string>
-  <string name="tag.amenitymore_hotel">Otel</string>
-  <string name="tag.amenitymore_motel">Motel</string>
-  <string name="tag.amenitymore_hostel">Pansiyon</string>
-  <string name="tag.amenitymore_restaurant">Restoran</string>
-  <string name="tag.amenitymore_fastfood">Hızlı yemek</string>
-  <string name="tag.amenitymore_camp_site">Kamp alanı</string>
-  <string name="tag.way_bridge">Köprü</string>
-  <string name="tag.way_zebra_crossing">Yaya geçidi</string>
-  <string name="tag.way_motorway">Otoyol</string>
-  <string name="tag.way_trunk">Baraj</string>
-  <string name="tag.way_primary">birinci</string>
-  <string name="tag.way_secondary">ikinci</string>
-  <string name="tag.way_tertiary">üçüncü derece</string>
-  <string name="tag.way_residential">yerleşim</string>
-  <string name="tag.way_service">servis</string>
-  <string name="tag.track_track">rota</string>
-  <string name="tag.track_cycleway">dönüş yolu</string>
-  <string name="tag.track_footway">Yaya geçidi</string>
-  <string name="tag.track_bridleway">Uygun yol</string>
-  <string name="tag.track_steps">Adımlar</string>
-  <string name="tag.track_living_street">yaşayan sokak</string>
-  <string name="tag.track_pedestrian">yaya</string>
-  <string name="tag.track_grade1">1. sınıf</string>
-  <string name="tag.track_grade2">2. sınıf</string>
-  <string name="tag.track_grade3">3. sınıf</string>
-  <string name="tag.track_grade4">4. sınıf</string>
-  <string name="tag.track_grade5">5. sınıf</string>
-  <string name="tag.landuse_farm">tarla</string>
-  <string name="tag.landuse_landfill">dolgu arazi</string>
-  <string name="tag.landuse_basin">havza</string>
-  <string name="tag.landuse_reservoir">rezervuar</string>
-  <string name="tag.landuse_forest">Orman</string>
-  <string name="tag.landuse_allotments">hisseler</string>
-  <string name="tag.landuse_cemetery">Mezarlık</string>
-</resources>
diff --git a/app/src/main/res/values-tr_TR/waypoints.xml b/app/src/main/res/values-tr_TR/waypoints.xml
deleted file mode 100644
index 43c86f925..000000000
--- a/app/src/main/res/values-tr_TR/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">Ses kayıt</string>
-  <string name="wpt_stillimage">Fotoğraf</string>
-</resources>
diff --git a/app/src/main/res/values-zh-rCN/accessibility.xml b/app/src/main/res/values-zh-rCN/accessibility.xml
index eb8a0c400..26244b6b0 100644
--- a/app/src/main/res/values-zh-rCN/accessibility.xml
+++ b/app/src/main/res/values-zh-rCN/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">OSMTracker 图标</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 60e59e453..c0529bf76 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -140,4 +140,7 @@
   <!--Buttons presets messages-->
   <!--Available Layouts messages-->
   <!--Github Repository Settings-->
+  <!--App Introduction-->
+  <!--Intro - slide1-->
+  <!--Intro - slide2-->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/waypoints.xml b/app/src/main/res/values-zh-rCN/waypoints.xml
index 044a8a15c..ee9c3b6dc 100644
--- a/app/src/main/res/values-zh-rCN/waypoints.xml
+++ b/app/src/main/res/values-zh-rCN/waypoints.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">录音</string>
+  <string name="wpt_stillimage">照片</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/accessibility.xml b/app/src/main/res/values-zh-rTW/accessibility.xml
index 2f47b7805..d62287f11 100644
--- a/app/src/main/res/values-zh-rTW/accessibility.xml
+++ b/app/src/main/res/values-zh-rTW/accessibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About screen-->
   <string name="acc.osmtracker_logo">OSMTracker 標誌</string>
diff --git a/app/src/main/res/values-zh-rTW/strings-tags.xml b/app/src/main/res/values-zh-rTW/strings-tags.xml
index 29dc62cea..6572b5005 100644
--- a/app/src/main/res/values-zh-rTW/strings-tags.xml
+++ b/app/src/main/res/values-zh-rTW/strings-tags.xml
@@ -7,12 +7,14 @@
   <string name="tag.amenity">設施</string>
   <string name="tag.amenity_more">設施 (+)</string>
   <string name="tag.way">道路</string>
+  <string name="tag.track">路徑</string>
   <string name="tag.landuse">土地利用</string>
   <string name="tag.misc_bus_stop">公車站</string>
   <string name="tag.misc_railway">鐵路</string>
   <string name="tag.misc_telephone">電話</string>
   <string name="tag.misc_post_box">郵筒</string>
   <string name="tag.misc_atm">ATM</string>
+  <string name="tag.misc_bollard">安全島</string>
   <string name="tag.misc_toilets">洗手間</string>
   <string name="tag.misc_shelter">涼亭</string>
   <string name="tag.misc_surveillance">監視器</string>
@@ -28,11 +30,18 @@
   <string name="tag.restriction_110">最大值 110</string>
   <string name="tag.restriction_120">最大值 120</string>
   <string name="tag.restriction_130">最大值 130</string>
+  <string name="tag.restriction_no_exit">無出口</string>
+  <string name="tag.restriction_traffic_light">紅綠燈</string>
   <string name="tag.restriction_one_way">單行道</string>
   <string name="tag.car_fuel_station">加油站</string>
   <string name="tag.car_parking">停車場</string>
   <string name="tag.car_emergency_phone">緊急電話</string>
+  <string name="tag.car_turning_circle">迴轉道</string>
   <string name="tag.car_speed_camera">測速照相機</string>
+  <string name="tag.tourism_view_point">視點</string>
+  <string name="tag.tourism_information">道路資訊</string>
+  <string name="tag.tourism_picnic">野餐區</string>
+  <string name="tag.tourism_attraction">景點</string>
   <string name="tag.tourism_theme_park">主題樂園</string>
   <string name="tag.tourism_castle">城堡</string>
   <string name="tag.tourism_monument">紀念館</string>
@@ -42,14 +51,19 @@
   <string name="tag.amenity_water">水域</string>
   <string name="tag.amenity_pharmacy">藥局</string>
   <string name="tag.amenity_shop">購物</string>
+  <string name="tag.amenity_marina">碼頭</string>
+  <string name="tag.amenity_sport">運動場</string>
   <string name="tag.amenity_taxi">計程車</string>
+  <string name="tag.amenity_doctors">醫院,\n醫生</string>
   <string name="tag.amenity_recycling">資源回收</string>
+  <string name="tag.amenity_place_of_worship">宗教\n場所</string>
   <string name="tag.amenity_post_office">郵局</string>
   <string name="tag.amenity_library">圖書館</string>
   <string name="tag.amenitymore_school">學校</string>
   <string name="tag.amenitymore_police">警察局</string>
   <string name="tag.amenitymore_fire_station">消防局</string>
   <string name="tag.amenitymore_bank">銀行</string>
+  <string name="tag.amenitymore_playground">遊樂場</string>
   <string name="tag.amenitymore_pub">Pub</string>
   <string name="tag.amenitymore_hotel">飯店</string>
   <string name="tag.amenitymore_motel">汽車旅館</string>
@@ -59,7 +73,31 @@
   <string name="tag.amenitymore_camp_site">露營區</string>
   <string name="tag.way_bridge">橋</string>
   <string name="tag.way_zebra_crossing">斑馬線</string>
+  <string name="tag.way_motorway">高速公路</string>
+  <string name="tag.way_trunk">主要幹道</string>
+  <string name="tag.way_primary">一級道路</string>
+  <string name="tag.way_secondary">二級道路</string>
+  <string name="tag.way_tertiary">三級道路</string>
+  <string name="tag.way_residential">住宅</string>
+  <string name="tag.way_service">連絡道</string>
+  <string name="tag.track_track">小徑</string>
   <string name="tag.track_cycleway">自行車道</string>
+  <string name="tag.track_footway">步道</string>
+  <string name="tag.track_bridleway">馬道</string>
+  <string name="tag.track_steps">階梯</string>
+  <string name="tag.track_living_street">社區道路</string>
+  <string name="tag.track_pedestrian">人行道</string>
+  <string name="tag.track_grade1">1 級步道</string>
+  <string name="tag.track_grade2">2 級步道</string>
+  <string name="tag.track_grade3">3 級步道</string>
+  <string name="tag.track_grade4">4 級步道</string>
+  <string name="tag.track_grade5">5 級步道</string>
   <string name="tag.landuse_farm">農畜地</string>
+  <string name="tag.landuse_landfill">垃圾掩埋場</string>
+  <string name="tag.landuse_basin">盆地</string>
+  <string name="tag.landuse_reservoir">水庫</string>
   <string name="tag.landuse_forest">森林</string>
+  <string name="tag.landuse_allotments">農場</string>
+  <string name="tag.landuse_cemetery">墓地</string>
+  <string name="tag.landuse_recreation_ground">休閒\n設施</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 49c546c63..3512b5f00 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -31,7 +31,7 @@
   <string name="trackmgr_waypoints_count">航點：</string>
   <string name="trackmgr_trackpoints_count">軌跡點：</string>
   <string name="trackmgr_empty">您尚未有任何的軌跡紀錄資料。</string>
-  <string name="trackmgr_newtrack_hint">要記錄軌跡，請按</string>
+  <string name="trackmgr_newtrack_hint">按壓來開始記錄新的軌跡。</string>
   <string name="trackmgr_newtrack_error">無法開始記錄新軌跡： {0}</string>
   <string name="trackmgr_continuetrack_hint">您目前正在錄製 <b>軌跡 #{0}</b>\n請於清單中選擇該軌跡以繼續</string>
   <string name="trackmgr_contextmenu_stop">停止記錄</string>
@@ -173,4 +173,13 @@
   <string name="github_repository_settings_branch_name">分支名稱：</string>
   <string name="github_repository_settings_valid_server">Github 程式庫有效</string>
   <string name="github_repository_settings_invalid_server">Github 程式庫無效</string>
+  <!--App Introduction-->
+  <string name="app_intro">OSMTracker for Android™ 說明</string>
+  <!--Intro - slide1-->
+  <string name="app_intro_slide1_title">歡迎使用 OSMTracker for Android™👋</string>
+  <string name="app_intro_slide1_description">這款 App 是尊重你自由的自由軟體</string>
+  <!--Intro - slide2-->
+  <string name="app_intro_slide2_title">記錄快樂🗺 😎</string>
+  <string name="app_intro_slide2_description">OSMTracker for Android  會使用你的 GPS 位置來記錄航點和路徑，即便 App 在背景執行。
+\n你的資料並不會拿來給廣告使用。</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/waypoints.xml b/app/src/main/res/values-zh-rTW/waypoints.xml
index 100a0e0f8..1dfb46d4a 100644
--- a/app/src/main/res/values-zh-rTW/waypoints.xml
+++ b/app/src/main/res/values-zh-rTW/waypoints.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="wpt_voicerec">錄製語音</string>
   <string name="wpt_stillimage">照片</string>
diff --git a/app/src/main/res/values-zh_CN/accessibility.xml b/app/src/main/res/values-zh_CN/accessibility.xml
deleted file mode 100644
index 26244b6b0..000000000
--- a/app/src/main/res/values-zh_CN/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">OSMTracker 图标</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">放大</string>
-  <string name="acc.zoom_out">缩小</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">卫星信号强弱指示计</string>
-  <string name="acc.record_indicator">记录进度指示计</string>
-  <!--Track list-->
-  <string name="acc.track_status">轨迹状况指示计</string>
-  <string name="acc.upload_status">OpemStreetMap 上传进度指示计</string>
-</resources>
diff --git a/app/src/main/res/values-zh_CN/strings-preferences.xml b/app/src/main/res/values-zh_CN/strings-preferences.xml
deleted file mode 100644
index 984734c26..000000000
--- a/app/src/main/res/values-zh_CN/strings-preferences.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">设置</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">GPS设置</string>
-  <string name="prefs_gps_os_settings_summary">显示系统GPS设置界面</string>
-  <string name="prefs_check_gps_startup">开启时检查GPS状态</string>
-  <string name="prefs_check_gps_startup_summary">若开启时检查到GPS关闭，开启它</string>
-  <string name="prefs_gps_ignore_clock">忽略GPS授时</string>
-  <string name="prefs_gps_ignore_clock_summary">忽略GPS授时并使用系统时间作为时间戳</string>
-  <string name="prefs_gps_logging_interval">GPS记录间隔</string>
-  <string name="prefs_gps_logging_interval_summary">填0代表最小的可能时间间隔(会影响电池续航时长)</string>
-  <string name="prefs_gps_logging_interval_seconds">秒</string>
-  <string name="prefs_ui">用户界面</string>
-  <string name="prefs_ui_picture_source">默认图片源</string>
-  <string name="prefs_ui_picture_source_summary">拍照还是从相册中选择图片？</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>相机</item>
-    <item>相册</item>
-    <item>总是询问</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">按钮预设</string>
-  <string name="prefs_ui_buttons_layout_summary">选择一套自定义按钮(参见文档)</string>
-  <string name="prefs_ui_buttons_layout_default_section">默认布局</string>
-  <string name="prefs_ui_buttons_layout_defaut">默认</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">下载布局</string>
-  <string name="prefs_ui_buttons_layout_empty_section">不存在已下载的布局文件</string>
-  <string name="prefs_ui_available_layout">可用布局</string>
-  <string name="prefs_ui_github_repository_settings">Github仓库设置</string>
-  <string name="prefs_ui_orientation">屏幕方向</string>
-  <string name="prefs_ui_orientation_summary">按钮界面的屏幕方向偏好</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>自动</item>
-    <item>竖屏</item>
-    <item>横屏</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">录音时长</string>
-  <string name="prefs_voicerec_duration_seconds">秒</string>
-  <string name="prefs_theme">主界面主题</string>
-  <string name="prefs_theme_summary">需重启应用使更改生效</string>
-  <string-array name="prefs_theme_keys">
-    <item>系统默认</item>
-    <item>系统默认(黑)</item>
-    <item>系统默认(白)</item>
-    <item>高对比度</item>
-  </string-array>
-  <string name="prefs_display_always_on">屏幕常亮</string>
-  <string name="prefs_display_always_on_summary">记录轨迹时屏幕常亮。关闭以节约电量</string>
-  <string name="prefs_displaytrack_osm">背景地图</string>
-  <string name="prefs_displaytrack_osm_summary">在轨迹下显示OpenStreetMap。需要数据连接</string>
-  <string name="prefs_output">GPX设置</string>
-  <string name="prefs_storage_dir">外部存储设备(SD卡)路径</string>
-  <string name="prefs_storage_dir_hint">下次追踪生效(本次无效)</string>
-  <string name="prefs_output_one_dir_per_track">每次追踪新建一个目录</string>
-  <string name="prefs_output_one_dir_per_track_summary">分别将每条追踪记录及相关文件到各自目录</string>
-  <string name="prefs_output_filename">已命名轨迹的文件名</string>
-  <string name="prefs_output_filename_summary">文件名格式（如果轨迹有名称）</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>轨迹名称</item>
-    <item>名称，起始日期与时间</item>
-    <item>起始日期与时间</item>
-  </string-array>
-  <string name="prefs_output_accuracy">GPX文件精度</string>
-  <string name="prefs_output_accuracy_summary">将精度信息连同路径点名或路径点注释添加至GPX文件</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>无</item>
-    <item>路径点名</item>
-    <item>路径点注释</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">使用HDOP</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">使用精度信息估算填入GPX的HDOP值</string>
-  <string name="prefs_sound_enabled">开启声音</string>
-  <string name="prefs_sound_enabled_summary">在录音开始、结束时发出声响</string>
-  <string name="prefs_osm_clear_oauth_data">重置 OSM 账户信息</string>
-  <string name="prefs_osm_clear_oauth_data_summary">清除本地OSM账户以及权限信息。OSMTracker将要求用户重新输入这些信息</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">你将要再次授权 OSMTracker 来上传轨迹。确定吗？</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>不保存</item>
-    <item>保存于注释</item>
-    <item>保存于扩展</item>
-  </string-array>
-  <string name="prefs_compass_heading_summary">是否导出轨迹的方向信息，以及如何导出</string>
-</resources>
diff --git a/app/src/main/res/values-zh_CN/strings-tags.xml b/app/src/main/res/values-zh_CN/strings-tags.xml
deleted file mode 100644
index 168ba5832..000000000
--- a/app/src/main/res/values-zh_CN/strings-tags.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">杂项</string>
-  <string name="tag.restriction">限制</string>
-  <string name="tag.car">车</string>
-  <string name="tag.tourism">旅游区</string>
-  <string name="tag.track">追踪</string>
-  <string name="tag.misc_bus_stop">汽车站</string>
-  <string name="tag.misc_railway">铁路</string>
-  <string name="tag.misc_telephone">电话亭</string>
-  <string name="tag.misc_post_box">邮箱</string>
-  <string name="tag.misc_atm">ATM机</string>
-  <string name="tag.misc_toilets">厕所</string>
-  <string name="tag.misc_shelter">庇护所</string>
-  <string name="tag.misc_surveillance">监控</string>
-  <string name="tag.restriction_20">最大 20</string>
-  <string name="tag.restriction_30">最大 30</string>
-  <string name="tag.restriction_40">最大 40</string>
-  <string name="tag.restriction_50">最大 50</string>
-  <string name="tag.restriction_60">最大 60</string>
-  <string name="tag.restriction_70">最大 70</string>
-  <string name="tag.restriction_80">最大 80</string>
-  <string name="tag.restriction_90">最大 90</string>
-  <string name="tag.restriction_100">最大 100</string>
-  <string name="tag.restriction_110">最大 110</string>
-  <string name="tag.restriction_120">最大 120</string>
-  <string name="tag.restriction_130">最大 130</string>
-  <string name="tag.restriction_traffic_light">交通灯</string>
-  <string name="tag.restriction_one_way">单行道</string>
-  <string name="tag.car_fuel_station">加油站</string>
-  <string name="tag.car_parking">停车场</string>
-  <string name="tag.car_emergency_phone">紧急电话</string>
-  <string name="tag.car_speed_camera">测速摄像头</string>
-  <string name="tag.tourism_view_point">景点</string>
-  <string name="tag.tourism_information">信息板</string>
-  <string name="tag.tourism_picnic">露营地</string>
-  <string name="tag.tourism_attraction">名胜</string>
-  <string name="tag.tourism_theme_park">主题公园</string>
-  <string name="tag.tourism_castle">城堡</string>
-  <string name="tag.tourism_monument">纪念馆</string>
-  <string name="tag.tourism_museum">博物馆</string>
-  <string name="tag.tourism_cinema">电影院</string>
-  <string name="tag.amenity_bench">长椅</string>
-  <string name="tag.amenity_water">水域</string>
-  <string name="tag.amenity_pharmacy">药店</string>
-  <string name="tag.amenity_shop">商店</string>
-  <string name="tag.amenity_marina">小船坞</string>
-  <string name="tag.amenity_sport">运动</string>
-  <string name="tag.amenity_taxi">出租车站</string>
-  <string name="tag.amenity_recycling">回收站</string>
-  <string name="tag.amenity_post_office">邮局</string>
-  <string name="tag.amenity_library">图书馆</string>
-  <string name="tag.amenitymore_school">学校</string>
-  <string name="tag.amenitymore_police">警察局</string>
-  <string name="tag.amenitymore_fire_station">消防队</string>
-  <string name="tag.amenitymore_bank">银行</string>
-  <string name="tag.amenitymore_playground">游乐场</string>
-  <string name="tag.amenitymore_pub">酒吧</string>
-  <string name="tag.amenitymore_hotel">酒店</string>
-  <string name="tag.amenitymore_motel">汽车旅馆</string>
-  <string name="tag.amenitymore_hostel">招待所</string>
-  <string name="tag.amenitymore_restaurant">餐厅</string>
-  <string name="tag.amenitymore_fastfood">快餐</string>
-  <string name="tag.amenitymore_camp_site">露营点</string>
-  <string name="tag.way_bridge">桥</string>
-  <string name="tag.way_zebra_crossing">斑马线</string>
-  <string name="tag.way_motorway">高速公路</string>
-  <string name="tag.way_primary">主要道路</string>
-  <string name="tag.way_secondary">次级道路</string>
-  <string name="tag.way_residential">住宅区</string>
-  <string name="tag.track_cycleway">单车道</string>
-  <string name="tag.track_bridleway">马道</string>
-  <string name="tag.track_living_street">生活街道</string>
-  <string name="tag.track_pedestrian">步行街</string>
-  <string name="tag.landuse_farm">农场</string>
-  <string name="tag.landuse_landfill">垃圾填埋场</string>
-  <string name="tag.landuse_reservoir">水库</string>
-  <string name="tag.landuse_forest">森林</string>
-  <string name="tag.landuse_cemetery">墓地</string>
-</resources>
diff --git a/app/src/main/res/values-zh_CN/strings.xml b/app/src/main/res/values-zh_CN/strings.xml
deleted file mode 100644
index c0529bf76..000000000
--- a/app/src/main/res/values-zh_CN/strings.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker for Android™</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">受Windows Mobile操作系统版本的OSMTracker启发，本应用可以让你追踪记录你的旅行轨迹，标记重要的中途点(通过录音、照片等方式)，将其导出为GPX格式，以便此后用于诸如JOSM一类的OpenStreetMap工具。</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">追踪日志</string>
-  <string name="tracklogger_waiting_gps">等待GPS定位来激活按钮...</string>
-  <string name="tracklogger_voicerec_title">录音中</string>
-  <string name="tracklogger_voicerec_text">录制了一个 {0} 秒的音频剪辑 </string>
-  <string name="tracklogger_voicerec_stop">停止</string>
-  <string name="tracklogger_btnBack">后退</string>
-  <string name="tracklogger_tracked">已记录：</string>
-  <string name="tracklogger_gps_disabled">GPS已禁用</string>
-  <string name="tracklogger_gps_disabled_hint">GPS已禁用。是否开启？</string>
-  <string name="tracklogger_choose_gallery_camera">相册或拍照?</string>
-  <string name="tracklogger_camera">用相机拍照</string>
-  <string name="tracklogger_gallery">从相册中选择图片</string>
-  <!--Waypoint List-->
-  <string name="wplist">路点列表</string>
-  <string name="wplist_latitude">纬度：</string>
-  <string name="wplist_longitude">经度：</string>
-  <string name="wplist_elevation">海拔：</string>
-  <string name="wplist_accuracy">精度：</string>
-  <string name="wplist_compass">指南针朝向：</string>
-  <string name="wplist_compass_accuracy">指南针精度：</string>
-  <!--Track Manager-->
-  <string name="trackmgr">轨迹管理器</string>
-  <string name="trackmgr_tracklist">轨迹列表：</string>
-  <string name="trackmgr_waypoints_count">路点：</string>
-  <string name="trackmgr_trackpoints_count">追踪点：</string>
-  <string name="trackmgr_empty">您没有任何轨迹。</string>
-  <string name="trackmgr_newtrack_error">无法创建踪迹: {0}</string>
-  <string name="trackmgr_continuetrack_hint">你正在录制 <b>轨迹 #{0}</b>\n在列表中选择它以继续</string>
-  <string name="trackmgr_contextmenu_stop">停止记录</string>
-  <string name="trackmgr_contextmenu_resume">恢复追踪</string>
-  <string name="trackmgr_contextmenu_delete">删除</string>
-  <string name="trackmgr_contextmenu_export">以 GPX 文件导出</string>
-  <string name="trackmgr_contextmenu_osm_upload">上传到 OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">显示</string>
-  <string name="trackmgr_contextmenu_details">详细</string>
-  <string name="trackmgr_contextmenu_title">踪迹#{0}</string>
-  <string name="trackmgr_delete_confirm">踪迹#{0}将被删除</string>
-  <string name="trackmgr_deleteall_confirm">确定删除所有踪迹吗?</string>
-  <string name="trackmgr_exporting">导出踪迹#{0}…</string>
-  <string name="trackmgr_exporting_prepare">正准备导出…</string>
-  <string name="trackmgr_export_error">不能导出踪迹: {0}</string>
-  <string name="trackmgr_exportall_confirm">所有已录制的轨迹都将被导出，这要花费较长的时间。您确定要这样做？</string>
-  <!--Track Detail-->
-  <string name="trackdetail">追踪细节</string>
-  <string name="trackdetail_startdate">起始时间：</string>
-  <string name="trackdetail_enddate">终止时间：</string>
-  <string name="trackdetail_startloc">起始位置：</string>
-  <string name="trackdetail_endloc">终止位置：</string>
-  <string name="trackdetail_exportdate">导出：</string>
-  <string name="trackdetail_osm_upload_date">上传到OpenStreetMap</string>
-  <string name="trackdetail_btn_export">以GPX文件导出</string>
-  <string name="trackdetail_export_notyet">(未导出)</string>
-  <string name="trackdetail_osm_upload_notyet">(未上传)</string>
-  <string name="trackdetail_export_display">显示</string>
-  <string name="trackdetail_description">描述</string>
-  <string name="trackdetail_tags">标签(逗号分隔)</string>
-  <string name="trackdetail_description_mandatory">你必须输入描述</string>
-  <string name="osm_visibility_private">私人</string>
-  <string name="osm_visibility_public">公开</string>
-  <string name="osm_visibility_trackable">可追踪</string>
-  <string name="osm_visibility_identifiable">可识别</string>
-  <!--OSM upload-->
-  <string name="osm_upload">OpenStreetMap 上传</string>
-  <string name="osm_upload_ok">保存并上传</string>
-  <string name="osm_upload_tmpfile_failed">无法将轨迹导出为临时文件</string>
-  <string name="osm_upload_oauth_failed">无法验证OSM账号</string>
-  <string name="osm_upload_sending">发送轨迹 #{0} 中...</string>
-  <string name="osm_upload_waiting_response">等待 OpenStreetMap 服务器回应</string>
-  <string name="osm_upload_error">上传轨迹时出错</string>
-  <string name="osm_upload_bad_response">OSM服务器返回了一条错误信息：({0}-详细信息如下:{1})</string>
-  <string name="osm_upload_unauthorized">授权错误。是否清除已保存的OpenStreetMap证书？</string>
-  <string name="osm_upload_sucess">已成功上传至OpenStreetMap</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">录音</string>
-  <string name="gpsstatus_record_stillimage">拍照</string>
-  <string name="gpsstatus_record_textnote">记笔记</string>
-  <!--Menu-->
-  <string name="menu_settings">设置</string>
-  <string name="menu_waypointlist">路点</string>
-  <string name="menu_about">关于</string>
-  <string name="menu_displaytrack">显示轨迹</string>
-  <string name="menu_stoptracking">停止 &amp; 保存</string>
-  <string name="menu_newtrack">新轨迹</string>
-  <string name="menu_deletetracks">删除全部轨迹</string>
-  <string name="menu_continue">继续追踪</string>
-  <string name="menu_stopcurrenttrack">停止当前追踪</string>
-  <string name="menu_save">保存</string>
-  <string name="menu_cancel">取消</string>
-  <string name="menu_export">导出为 GPX</string>
-  <string name="menu_osm_upload">OpenStreetMap 上传</string>
-  <string name="menu_center_to_gps">根据GPS位置居中</string>
-  <string name="menu_exportall">导出全部为 GPX</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">无法写入至外部存储。</string>
-  <string name="error_create_track_dir">无法创建追踪文件夹 %s</string>
-  <string name="error_externalstorage_not_writable_hint">请检查外部存储设备是否正确插入和安装。</string>
-  <string name="error_voicerec_failed">录音失败</string>
-  <string name="error_userlayout_parsing">解析XML样式文件出错。请还原回默认样式。</string>
-  <!--GPX-->
-  <string name="gpx_track_name">已以 OSMTracker for Android™ 记录轨迹</string>
-  <string name="gpx_hdop_approximation_cmt">警告：HDOP值与GPS设备返回的HDOP值不同。这些值是由存在数米误差的位置估算得到的。</string>
-  <!--About screen-->
-  <string name="about">关于</string>
-  <string name="about_text">更多详细信息、文档和报告，请参阅项目主页：</string>
-  <string name="about_translate_text">帮助翻译 OSMTracker:</string>
-  <string name="about_debug_info">调试信息</string>
-  <string name="about_export_db">导出数据库</string>
-  <string name="about_exporting_db">正导出数据库…</string>
-  <string name="about_export_db_result">数据库导出结果：%s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker 正在记录轨迹</string>
-  <string name="notification_title">OSMTracker 正在记录踪迹 (#{0})</string>
-  <string name="notification_text">轻触此处显示主界面</string>
-  <!--Display track-->
-  <string name="displaytrack">显示轨迹</string>
-  <string name="displaytrack_map">显示背景地图</string>
-  <string name="displaytrack_north">N</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">保存</string>
-  <!--Various-->
-  <string name="various_unit_meters">m</string>
-  <string name="various_accuracy">准确性</string>
-  <string name="various_accuracy_with_sats">精度{0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">等待GPS修复……({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">等待定向……</string>
-  <string name="various_heading_unknown">前进方向无法确定</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">以 OpenStreetMap 显示轨迹</string>
-  <!--Buttons presets messages-->
-  <!--Available Layouts messages-->
-  <!--Github Repository Settings-->
-  <!--App Introduction-->
-  <!--Intro - slide1-->
-  <!--Intro - slide2-->
-</resources>
diff --git a/app/src/main/res/values-zh_CN/waypoints.xml b/app/src/main/res/values-zh_CN/waypoints.xml
deleted file mode 100644
index ee9c3b6dc..000000000
--- a/app/src/main/res/values-zh_CN/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">录音</string>
-  <string name="wpt_stillimage">照片</string>
-</resources>
diff --git a/app/src/main/res/values-zh_TW/accessibility.xml b/app/src/main/res/values-zh_TW/accessibility.xml
deleted file mode 100644
index d62287f11..000000000
--- a/app/src/main/res/values-zh_TW/accessibility.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--About screen-->
-  <string name="acc.osmtracker_logo">OSMTracker 標誌</string>
-  <!--Zoom in/out in map view-->
-  <string name="acc.zoom_in">放大</string>
-  <string name="acc.zoom_out">縮小</string>
-  <!--GPS status bar-->
-  <string name="acc.sat_indicator">訊號強度</string>
-  <string name="acc.record_indicator">正在記錄</string>
-  <!--Track list-->
-  <string name="acc.track_status">軌跡狀態</string>
-  <string name="acc.upload_status">OSM上傳進度</string>
-</resources>
diff --git a/app/src/main/res/values-zh_TW/strings-preferences.xml b/app/src/main/res/values-zh_TW/strings-preferences.xml
deleted file mode 100644
index 954a1102f..000000000
--- a/app/src/main/res/values-zh_TW/strings-preferences.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Preferences-->
-  <string name="prefs">設定</string>
-  <string name="prefs_gps">GPS</string>
-  <string name="prefs_gps_os_settings">GPS 設定</string>
-  <string name="prefs_gps_os_settings_summary">顯示系統 GPS 設定畫面</string>
-  <string name="prefs_check_gps_startup">在啟動時檢查 GPS 狀態</string>
-  <string name="prefs_check_gps_startup_summary">啟動時檢查 GPS 是否關閉並提示開啟。</string>
-  <string name="prefs_gps_ignore_clock">忽略 GPS 的時間</string>
-  <string name="prefs_gps_ignore_clock_summary">忽略 GPS 的時間，改用 Android 系統時間</string>
-  <string name="prefs_use_barometer">記錄氣壓 [hPa]</string>
-  <string name="prefs_use_barometer_summary">切換需要重新啟動軌跡記錄</string>
-  <string name="prefs_gps_logging_interval">GPS 記錄頻率</string>
-  <string name="prefs_gps_logging_interval_summary">使用 0 會盡可能的記錄資料 (會影響電池續航力)</string>
-  <string name="prefs_gps_logging_interval_seconds">秒</string>
-  <string name="prefs_gps_logging_min_distance">GPS 記錄距離</string>
-  <string name="prefs_gps_logging_min_distance_summary">以公尺尺度的航點之間最小距離，設為 0 則是最小的可能</string>
-  <string name="prefs_gps_logging_min_distance_meters">公尺</string>
-  <string name="prefs_ui">使用者介面</string>
-  <string name="prefs_ui_picture_source">預設照片來源</string>
-  <string name="prefs_ui_picture_source_summary">拍張照或從相簿挑選？</string>
-  <string-array name="prefs_ui_picture_source_keys">
-    <item>相機</item>
-    <item>相簿</item>
-    <item>總是詢問我</item>
-  </string-array>
-  <string name="prefs_ui_buttons_layout">按鍵配置</string>
-  <string name="prefs_ui_buttons_layout_summary">選擇自訂的按鍵配置 (參見文件)</string>
-  <string name="prefs_ui_buttons_layout_default_section">預設樣式</string>
-  <string name="prefs_ui_buttons_layout_defaut">預設</string>
-  <string name="prefs_ui_buttons_layout_downloaded_section">下載樣式</string>
-  <string name="prefs_ui_buttons_layout_empty_section">你沒有下載樣式檔</string>
-  <string name="prefs_ui_available_layout">可用的樣式</string>
-  <string name="prefs_ui_github_repository_settings">Github 程式庫設定</string>
-  <string name="prefs_ui_orientation">排列方向</string>
-  <string name="prefs_ui_orientation_summary">偏好的功能鈕介面排列方向</string>
-  <string-array name="prefs_ui_orientation_options_keys">
-    <item>自動</item>
-    <item>直立</item>
-    <item>橫向</item>
-  </string-array>
-  <string name="prefs_voicerec_duration">語音錄製長度</string>
-  <string name="prefs_voicerec_duration_seconds">秒</string>
-  <string name="prefs_theme">主功能畫面圖像主題</string>
-  <string name="prefs_theme_summary">需重新啟用程式，這項設定才會生效</string>
-  <string-array name="prefs_theme_keys">
-    <item>作業系統預設</item>
-    <item>作業系統預設 (暗)</item>
-    <item>作業系統預設 (亮)</item>
-    <item>高反差</item>
-  </string-array>
-  <string name="prefs_display_always_on">讓螢幕維持開啟</string>
-  <string name="prefs_display_always_on_summary">在記錄軌跡時，螢幕會保持開啟。關閉這個設定可節省用電量</string>
-  <string name="prefs_displaytrack_osm">背景地圖</string>
-  <string name="prefs_displaytrack_osm_summary">在軌跡底下顯示 OpenStreetMap 地圖。本功能需有可用的網路連結以傳輸資料</string>
-  <string name="prefs_displaytrack_osm_summary_ask">保持顯示 OpenStreetMap 底圖？此功能需要連線</string>
-  <string name="prefs_output">GPX 相關設定</string>
-  <string name="prefs_storage_dir">外部儲存媒體 (SD) 資料夾位置</string>
-  <string name="prefs_storage_dir_hint">設定值將在記錄下一筆軌跡資料時生效 (不是目前這筆)</string>
-  <string name="prefs_output_one_dir_per_track">給每筆軌跡各配置一個專屬資料夾</string>
-  <string name="prefs_output_one_dir_per_track_summary">將每筆軌跡以及相關的檔案一起放在專屬的資料夾當中</string>
-  <string name="prefs_output_filename">軌跡資料檔命名</string>
-  <string name="prefs_output_filename_summary">軌跡資料檔的命名樣式</string>
-  <string-array name="prefs_output_filename_keys">
-    <item>軌跡名稱</item>
-    <item>軌跡名稱，起始日期與時間</item>
-    <item>起始日期與時間</item>
-  </string-array>
-  <string name="prefs_output_accuracy">在 GPX 檔中附加精確度資訊</string>
-  <string name="prefs_output_accuracy_summary">將精確度資訊添加於 GPX 檔中的航點名稱，或是航點註解中</string>
-  <string-array name="prefs_output_accuracy_keys">
-    <item>無</item>
-    <item>於航點名稱內</item>
-    <item>於航點註解中</item>
-  </string-array>
-  <string name="prefs_output_gpx_hdop_approximation">使用 HDOP 近似值</string>
-  <string name="prefs_output_gpx_hdop_approximation_summary">在 GPX 檔中填入 HDOP 近似值</string>
-  <string name="prefs_sound_enabled">使用聲音</string>
-  <string name="prefs_sound_enabled_summary">當錄製語音期間可播放聲音</string>
-  <string name="prefs_osm_clear_oauth_data">重新設定 OSM 認證</string>
-  <string name="prefs_osm_clear_oauth_data_summary">捨棄現存的 OSM 認證與權限資訊，強制 OSMTracker 重新取得它們</string>
-  <string name="prefs_osm_clear_oauth_data_dialog">您必須重新認證 OSMTracker 方能繼續上傳軌跡資料，確定嗎？</string>
-  <string name="prefs_map_tile">地圖圖磚提供者</string>
-  <string name="prefs_map_tile_summary"></string>
-  <string-array name="prefs_map_tile_keys">
-    <item>Mapnik</item>
-    <item>Cycle Map</item>
-    <item>MapQuest Open</item>
-  </string-array>
-  <string-array name="prefs_compass_heading_keys">
-    <item>無</item>
-    <item>於註解</item>
-    <item>於副檔名</item>
-  </string-array>
-  <string name="prefs_compass_heading">匯出羅盤方位</string>
-  <string name="prefs_compass_heading_summary">定義羅盤資料要如何匯出到 GPX 檔案</string>
-</resources>
diff --git a/app/src/main/res/values-zh_TW/strings-tags.xml b/app/src/main/res/values-zh_TW/strings-tags.xml
deleted file mode 100644
index 6572b5005..000000000
--- a/app/src/main/res/values-zh_TW/strings-tags.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tag.misc">其他</string>
-  <string name="tag.restriction">限制</string>
-  <string name="tag.car">汽車</string>
-  <string name="tag.tourism">觀光</string>
-  <string name="tag.amenity">設施</string>
-  <string name="tag.amenity_more">設施 (+)</string>
-  <string name="tag.way">道路</string>
-  <string name="tag.track">路徑</string>
-  <string name="tag.landuse">土地利用</string>
-  <string name="tag.misc_bus_stop">公車站</string>
-  <string name="tag.misc_railway">鐵路</string>
-  <string name="tag.misc_telephone">電話</string>
-  <string name="tag.misc_post_box">郵筒</string>
-  <string name="tag.misc_atm">ATM</string>
-  <string name="tag.misc_bollard">安全島</string>
-  <string name="tag.misc_toilets">洗手間</string>
-  <string name="tag.misc_shelter">涼亭</string>
-  <string name="tag.misc_surveillance">監視器</string>
-  <string name="tag.restriction_20">最大值 20</string>
-  <string name="tag.restriction_30">最大值 30</string>
-  <string name="tag.restriction_40">最大值 40</string>
-  <string name="tag.restriction_50">最大值 50</string>
-  <string name="tag.restriction_60">最大值 60</string>
-  <string name="tag.restriction_70">最大值 70</string>
-  <string name="tag.restriction_80">最大值 80</string>
-  <string name="tag.restriction_90">最大值 90</string>
-  <string name="tag.restriction_100">最大值 100</string>
-  <string name="tag.restriction_110">最大值 110</string>
-  <string name="tag.restriction_120">最大值 120</string>
-  <string name="tag.restriction_130">最大值 130</string>
-  <string name="tag.restriction_no_exit">無出口</string>
-  <string name="tag.restriction_traffic_light">紅綠燈</string>
-  <string name="tag.restriction_one_way">單行道</string>
-  <string name="tag.car_fuel_station">加油站</string>
-  <string name="tag.car_parking">停車場</string>
-  <string name="tag.car_emergency_phone">緊急電話</string>
-  <string name="tag.car_turning_circle">迴轉道</string>
-  <string name="tag.car_speed_camera">測速照相機</string>
-  <string name="tag.tourism_view_point">視點</string>
-  <string name="tag.tourism_information">道路資訊</string>
-  <string name="tag.tourism_picnic">野餐區</string>
-  <string name="tag.tourism_attraction">景點</string>
-  <string name="tag.tourism_theme_park">主題樂園</string>
-  <string name="tag.tourism_castle">城堡</string>
-  <string name="tag.tourism_monument">紀念館</string>
-  <string name="tag.tourism_museum">博物館</string>
-  <string name="tag.tourism_cinema">電影院</string>
-  <string name="tag.amenity_bench">長椅</string>
-  <string name="tag.amenity_water">水域</string>
-  <string name="tag.amenity_pharmacy">藥局</string>
-  <string name="tag.amenity_shop">購物</string>
-  <string name="tag.amenity_marina">碼頭</string>
-  <string name="tag.amenity_sport">運動場</string>
-  <string name="tag.amenity_taxi">計程車</string>
-  <string name="tag.amenity_doctors">醫院,\n醫生</string>
-  <string name="tag.amenity_recycling">資源回收</string>
-  <string name="tag.amenity_place_of_worship">宗教\n場所</string>
-  <string name="tag.amenity_post_office">郵局</string>
-  <string name="tag.amenity_library">圖書館</string>
-  <string name="tag.amenitymore_school">學校</string>
-  <string name="tag.amenitymore_police">警察局</string>
-  <string name="tag.amenitymore_fire_station">消防局</string>
-  <string name="tag.amenitymore_bank">銀行</string>
-  <string name="tag.amenitymore_playground">遊樂場</string>
-  <string name="tag.amenitymore_pub">Pub</string>
-  <string name="tag.amenitymore_hotel">飯店</string>
-  <string name="tag.amenitymore_motel">汽車旅館</string>
-  <string name="tag.amenitymore_hostel">青年旅社</string>
-  <string name="tag.amenitymore_restaurant">餐館</string>
-  <string name="tag.amenitymore_fastfood">速食店</string>
-  <string name="tag.amenitymore_camp_site">露營區</string>
-  <string name="tag.way_bridge">橋</string>
-  <string name="tag.way_zebra_crossing">斑馬線</string>
-  <string name="tag.way_motorway">高速公路</string>
-  <string name="tag.way_trunk">主要幹道</string>
-  <string name="tag.way_primary">一級道路</string>
-  <string name="tag.way_secondary">二級道路</string>
-  <string name="tag.way_tertiary">三級道路</string>
-  <string name="tag.way_residential">住宅</string>
-  <string name="tag.way_service">連絡道</string>
-  <string name="tag.track_track">小徑</string>
-  <string name="tag.track_cycleway">自行車道</string>
-  <string name="tag.track_footway">步道</string>
-  <string name="tag.track_bridleway">馬道</string>
-  <string name="tag.track_steps">階梯</string>
-  <string name="tag.track_living_street">社區道路</string>
-  <string name="tag.track_pedestrian">人行道</string>
-  <string name="tag.track_grade1">1 級步道</string>
-  <string name="tag.track_grade2">2 級步道</string>
-  <string name="tag.track_grade3">3 級步道</string>
-  <string name="tag.track_grade4">4 級步道</string>
-  <string name="tag.track_grade5">5 級步道</string>
-  <string name="tag.landuse_farm">農畜地</string>
-  <string name="tag.landuse_landfill">垃圾掩埋場</string>
-  <string name="tag.landuse_basin">盆地</string>
-  <string name="tag.landuse_reservoir">水庫</string>
-  <string name="tag.landuse_forest">森林</string>
-  <string name="tag.landuse_allotments">農場</string>
-  <string name="tag.landuse_cemetery">墓地</string>
-  <string name="tag.landuse_recreation_ground">休閒\n設施</string>
-</resources>
diff --git a/app/src/main/res/values-zh_TW/strings.xml b/app/src/main/res/values-zh_TW/strings.xml
deleted file mode 100644
index 3512b5f00..000000000
--- a/app/src/main/res/values-zh_TW/strings.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Generic strings-->
-  <string name="app_name">OSMTracker for Android™</string>
-  <string name="app_short_name">OSMTracker</string>
-  <string name="app_description">受到 Windows Mobile 的啟發，此 APP 可讓您記錄您的旅程，標記明顯的地標 (透過錄音、照片)，並匯出成為 GPX 格式供 Open Streep Map 工具使用，如：JOSM。</string>
-  <!--TrackLogger-->
-  <string name="tracklogger">軌跡記錄器</string>
-  <string name="tracklogger_waiting_gps">等待 GPS 修正以開啟按鈕...</string>
-  <string name="tracklogger_voicerec_title">錄音</string>
-  <string name="tracklogger_voicerec_text">錄製一段 {0} 秒的聲音片段。</string>
-  <string name="tracklogger_voicerec_stop">停止</string>
-  <string name="tracklogger_btnBack">返回</string>
-  <string name="tracklogger_tracked">記錄了：</string>
-  <string name="tracklogger_gps_disabled">GPS 目前是關閉的</string>
-  <string name="tracklogger_gps_disabled_hint">GPS 目前是關閉的，您想要開啟它嗎？</string>
-  <string name="tracklogger_choose_gallery_camera">使用相簿或相機？</string>
-  <string name="tracklogger_camera">使用相機拍照</string>
-  <string name="tracklogger_gallery">從相簿中選擇照片</string>
-  <!--Waypoint List-->
-  <string name="wplist">航點清單</string>
-  <string name="wplist_latitude">緯度：</string>
-  <string name="wplist_longitude">經度：</string>
-  <string name="wplist_elevation">海拔：</string>
-  <string name="wplist_accuracy">精確度：</string>
-  <string name="wplist_compass">羅盤方位：</string>
-  <string name="wplist_compass_accuracy">羅盤精確度：</string>
-  <!--Track Manager-->
-  <string name="trackmgr">軌跡管理</string>
-  <string name="trackmgr_tracklist">軌跡清單：</string>
-  <string name="trackmgr_waypoints_count">航點：</string>
-  <string name="trackmgr_trackpoints_count">軌跡點：</string>
-  <string name="trackmgr_empty">您尚未有任何的軌跡紀錄資料。</string>
-  <string name="trackmgr_newtrack_hint">按壓來開始記錄新的軌跡。</string>
-  <string name="trackmgr_newtrack_error">無法開始記錄新軌跡： {0}</string>
-  <string name="trackmgr_continuetrack_hint">您目前正在錄製 <b>軌跡 #{0}</b>\n請於清單中選擇該軌跡以繼續</string>
-  <string name="trackmgr_contextmenu_stop">停止記錄</string>
-  <string name="trackmgr_contextmenu_resume">繼續記錄</string>
-  <string name="trackmgr_contextmenu_delete">刪除</string>
-  <string name="trackmgr_contextmenu_export">匯出 GPX 檔</string>
-  <string name="trackmgr_contextmenu_share">分享 GPX 檔案</string>
-  <string name="trackmgr_contextmenu_osm_upload">上傳至 OpenStreetMap</string>
-  <string name="trackmgr_contextmenu_display">顯示</string>
-  <string name="trackmgr_contextmenu_details">詳細資訊</string>
-  <string name="trackmgr_contextmenu_title">軌跡 #{0}</string>
-  <string name="trackmgr_delete_confirm">軌跡 #{0} 將被刪除</string>
-  <string name="trackmgr_deleteall_confirm">所有的軌跡都會被刪除，您確定嗎？</string>
-  <string name="trackmgr_exporting">匯出軌跡 #{0}…</string>
-  <string name="trackmgr_exporting_prepare">準備輸出...</string>
-  <string name="trackmgr_export_error">無法匯出軌跡： {0}</string>
-  <string name="trackmgr_exportall_confirm">將匯出所有軌跡，可能會耗費不少時間。您確定嗎？</string>
-  <string name="trackmgr_prepare_for_share_error">無法處理軌跡：{0}</string>
-  <!--Track Detail-->
-  <string name="trackdetail">軌跡細節</string>
-  <string name="trackdetail_startdate">開始時間：</string>
-  <string name="trackdetail_enddate">結束時間：</string>
-  <string name="trackdetail_startloc">開始於：</string>
-  <string name="trackdetail_endloc">結束於：</string>
-  <string name="trackdetail_exportdate">匯出：</string>
-  <string name="trackdetail_osm_upload_date">上傳至 OpenStreetMap：</string>
-  <string name="trackdetail_btn_export">匯出為 GPX 檔</string>
-  <string name="trackdetail_export_notyet">(尚未匯出)</string>
-  <string name="trackdetail_osm_upload_notyet">(尚未上傳)</string>
-  <string name="trackdetail_export_display">顯示</string>
-  <string name="trackdetail_description">描述</string>
-  <string name="trackdetail_tags">標籤 (以半形逗號分隔)</string>
-  <string name="trackdetail_description_mandatory">您必須填寫描述欄</string>
-  <string name="osm_visibility_private">私人</string>
-  <string name="osm_visibility_public">公開</string>
-  <string name="osm_visibility_trackable">可追蹤的</string>
-  <string name="osm_visibility_identifiable">可辨識的</string>
-  <!--OSM upload-->
-  <string name="osm_upload">上傳至 OpenStreetMap</string>
-  <string name="osm_upload_ok">儲存並上傳</string>
-  <string name="osm_upload_tmpfile_failed">無法將此軌跡匯出到暫存檔</string>
-  <string name="osm_upload_oauth_failed">無法與 OSM 伺服器取得認證</string>
-  <string name="osm_upload_sending">發送軌跡 #{0}…</string>
-  <string name="osm_upload_waiting_response">等候 OpenStreetMap 伺服器回應…</string>
-  <string name="osm_upload_error">上傳軌跡的過程中發生錯誤</string>
-  <string name="osm_upload_bad_response">OSM 伺服器傳回錯誤: ({0}) 訊息 {1}</string>
-  <string name="osm_upload_unauthorized">認證錯誤。您想要清除現存的 OpenStreetMap 認證資料嗎？</string>
-  <string name="osm_upload_sucess">成功上傳至 OpenStreetMap</string>
-  <!--GPS Status & record bar-->
-  <string name="gpsstatus_record_voicerec">錄製語音</string>
-  <string name="gpsstatus_record_stillimage">拍照</string>
-  <string name="gpsstatus_record_textnote">文字筆記</string>
-  <!--Menu-->
-  <string name="menu_settings">設定</string>
-  <string name="menu_waypointlist">航點</string>
-  <string name="menu_about">關於</string>
-  <string name="menu_displaytrack">顯示軌跡</string>
-  <string name="menu_stoptracking">停止並儲存</string>
-  <string name="menu_newtrack">新軌跡</string>
-  <string name="menu_deletetracks">刪除全部軌跡</string>
-  <string name="menu_continue">繼續軌跡</string>
-  <string name="menu_stopcurrenttrack">停止目前軌跡</string>
-  <string name="menu_save">儲存</string>
-  <string name="menu_cancel">取消</string>
-  <string name="menu_export">匯出為 GPX 檔</string>
-  <string name="menu_osm_upload">上傳到 OpenStreetMap</string>
-  <string name="menu_center_to_gps">以 GPS 為中心</string>
-  <string name="menu_exportall">全部匯出為 GPX 檔</string>
-  <!--Errors-->
-  <string name="error_externalstorage_not_writable">無法寫入外部儲存媒體。</string>
-  <string name="error_create_track_dir">無法建立軌跡資料夾 %s</string>
-  <string name="error_externalstorage_not_writable_hint">請檢查外部儲存媒體是否正確安置與掛載。</string>
-  <string name="error_voicerec_failed">語音錄製失敗</string>
-  <string name="error_userlayout_parsing">解析 XML 外觀配置檔時發生錯誤。請改用預設外觀。</string>
-  <!--GPX-->
-  <string name="gpx_track_name">使用 OSMTracker for Android™ 記錄</string>
-  <string name="gpx_hdop_approximation_cmt">警告：HDOP值並非GPS裝置回報的HDOP，HDOP值會與實際地點差大約幾公尺。</string>
-  <!--About screen-->
-  <string name="about">關於</string>
-  <string name="about_text">更多資訊、文件與問題回報，請洽本專案首頁：</string>
-  <string name="about_translate_text">請幫忙翻譯 OSMTracker：</string>
-  <string name="about_debug_info">除錯資訊</string>
-  <string name="about_export_db">匯出資料庫</string>
-  <string name="about_exporting_db">匯出資料庫中...</string>
-  <string name="about_export_db_result">資料庫匯出結果：%s</string>
-  <!--Notification-->
-  <string name="notification_ticker_text">OSMTracker 記錄中</string>
-  <string name="notification_title">OSMTracker 記錄中 (#{0})</string>
-  <string name="notification_text">點擊這裡顯示主功能畫面</string>
-  <!--Display track-->
-  <string name="displaytrack">顯示軌跡</string>
-  <string name="displaytrack_map">顯示地圖背景</string>
-  <string name="displaytrack_north">北</string>
-  <!--Track detail-->
-  <string name="trackdetail_save">儲存</string>
-  <!--Various-->
-  <string name="various_unit_meters">公尺</string>
-  <string name="various_accuracy">精確度</string>
-  <string name="various_accuracy_with_sats">精準度 {0}{1} ({2}/{3})</string>
-  <!--parameters: (accuracy, meters, used sats, visible sats)-->
-  <string name="various_waiting_gps_fix">等待 GPS 修正… ({0}/{1})</string>
-  <!--parameters: (used sats, visible sats)-->
-  <string name="various_heading_display">{0}°</string>
-  <!--parameters: (heading in degrees)-->
-  <string name="various_heading">等待方位…</string>
-  <string name="various_heading_unknown">無法偵測方位</string>
-  <string name="various_export_finished">成功完成匯出程序</string>
-  <!--OSM map view-->
-  <string name="displaytrackmap">OpenStreetMap 軌跡畫面</string>
-  <!--Buttons presets messages-->
-  <string name="buttons_presets_context_menu_update_install">更新與安裝</string>
-  <string name="buttons_presets_context_menu_delete">刪除</string>
-  <string name="buttons_presets_updating_layout">更新中...</string>
-  <string name="buttons_presets_successful_update">樣式已經成功更新</string>
-  <string name="buttons_presets_unsuccessful_update">樣式還未更新，請稍後再試一次</string>
-  <string name="buttons_presets_delete_message">你確定要刪除 {0} 樣式嗎？</string>
-  <string name="buttons_presets_delete_positive_confirmation">是</string>
-  <string name="buttons_presets_successful_delete">成功刪除模式</string>
-  <string name="buttons_presets_icon_directory_deleted">圖標目錄已經成功刪除</string>
-  <string name="buttons_presets_icon_directory_does_not_exist">檔案並沒有與任何圖標目錄相關</string>
-  <string name="buttons_presets_unsuccessful_delete">無法刪除模式</string>
-  <!--Available Layouts messages-->
-  <string name="available_layouts_connection_error">錯誤：無法連線到網路</string>
-  <string name="available_layouts_response_null_exception">錯誤：無法連線到預設客製樣式庫</string>
-  <string name="available_layouts_connecting_message">(連線中...)</string>
-  <string name="available_layouts_description_dialog_positive_confirmation">下載</string>
-  <string name="available_layouts_not_available_language">你使用的語言並不能用，請從清單選擇一個</string>
-  <string name="available_layouts_language_dialog_title">可用語言</string>
-  <string name="available_layouts_checking_language_dialog">檢查本地語言版本</string>
-  <string name="available_layouts_downloading_dialog">下載中...</string>
-  <string name="available_layouts_successful_download">樣式已經成功下載</string>
-  <string name="available_layouts_unsuccessful_download">樣式無法下載，請稍後再試一次</string>
-  <string name="available_layouts_null_response_received">從伺服器取得資料出現錯誤</string>
-  <!--Github Repository Settings-->
-  <string name="github_repository_settings_default_checkbox">預設</string>
-  <string name="github_repository_settings_custom_checkbox">客製</string>
-  <string name="github_repository_settings_username">Github 使用者名稱：</string>
-  <string name="github_repository_settings_repository_name">程式庫名稱：</string>
-  <string name="github_repository_settings_branch_name">分支名稱：</string>
-  <string name="github_repository_settings_valid_server">Github 程式庫有效</string>
-  <string name="github_repository_settings_invalid_server">Github 程式庫無效</string>
-  <!--App Introduction-->
-  <string name="app_intro">OSMTracker for Android™ 說明</string>
-  <!--Intro - slide1-->
-  <string name="app_intro_slide1_title">歡迎使用 OSMTracker for Android™👋</string>
-  <string name="app_intro_slide1_description">這款 App 是尊重你自由的自由軟體</string>
-  <!--Intro - slide2-->
-  <string name="app_intro_slide2_title">記錄快樂🗺 😎</string>
-  <string name="app_intro_slide2_description">OSMTracker for Android  會使用你的 GPS 位置來記錄航點和路徑，即便 App 在背景執行。
-\n你的資料並不會拿來給廣告使用。</string>
-</resources>
diff --git a/app/src/main/res/values-zh_TW/waypoints.xml b/app/src/main/res/values-zh_TW/waypoints.xml
deleted file mode 100644
index 1dfb46d4a..000000000
--- a/app/src/main/res/values-zh_TW/waypoints.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="wpt_voicerec">錄製語音</string>
-  <string name="wpt_stillimage">照片</string>
-</resources>