Use actual native languages for world map

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2026-01-19 09:23:52 +00:00 · 2026-01-18 14:26:22 +01:00
215 changed files with 727 additions and 735 deletions
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -34,63 +34,19 @@ on:
      - track_generator/**
      - xcode/**

-env:
-  SUBMODULE_CACHE_PATHS: |
-    .git/modules
-    3party/CMake-MetalShaderSupport
-    3party/Vulkan-Headers
-    3party/boost
-    3party/expat
-    3party/fast_double_parser
-    3party/fast_obj
-    3party/freetype/freetype
-    3party/gflags
-    3party/glaze
-    3party/glfw
-    3party/glm
-    3party/googletest
-    3party/harfbuzz/harfbuzz
-    3party/icu/icu
-    3party/imgui/imgui
-    3party/jansson/jansson
-    3party/just_gtfs
-    3party/protobuf/protobuf
-    3party/pugixml/pugixml
-    3party/utfcpp
-    tools/kothic
-    tools/osmctools
-
 jobs:
  lint:
    name: Android Lint
    runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
-      options: --user root
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1

-      - name: Cache world map
-        uses: actions/cache@v4
-        with:
-          path: data/world_mwm
-          key: world-mwm
-
-      - uses: actions/cache@v4
-        with:
-          path: ${{ env.SUBMODULE_CACHE_PATHS }}
-          key: submodules-${{ hashFiles('.gitmodules') }}
-          restore-keys: |
-            submodules-
-
-      - name: Sync and update submodules
+      - name: Parallel submodules checkout
        shell: bash
-        run: |
-          git submodule sync --recursive
-          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

      - name: Lint
        shell: bash
@@ -100,9 +56,6 @@ jobs:
  android-check:
    name: Build Android Debug
    runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
-      options: --user root
    strategy:
      fail-fast: false
      matrix:
@@ -118,32 +71,23 @@ jobs:
      cancel-in-progress: true

    steps:
+      - name: Install build tools and dependencies
+        shell: bash
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build
+
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 200 # enough to get all commits for the current day

-      - name: Cache world map
-        uses: actions/cache@v4
-        with:
-          path: data/world_mwm
-          key: world-mwm
-
-      - uses: actions/cache@v4
-        with:
-          path: ${{ env.SUBMODULE_CACHE_PATHS }}
-          key: submodules-${{ hashFiles('.gitmodules') }}
-          restore-keys: |
-            submodules-
-
-      - name: Sync and update submodules
+      - name: Parallel submodules checkout
        shell: bash
-        run: |
-          git submodule sync --recursive
-          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

      - name: Configure ccache
-        uses: https://github.com/hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: ${{ github.workflow }}-${{ matrix.flavor }}

@@ -153,11 +97,14 @@ jobs:
        env:
          CMAKE_C_COMPILER_LAUNCHER: ccache
          CMAKE_CXX_COMPILER_LAUNCHER: ccache
-        run: ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
+        run: |
+          cmake --version
+          ninja --version
+          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}

      - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: android-${{ matrix.flavor }}
-          path: android/app/build/outputs/apk/**/*.apk
+          path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
          if-no-files-found: error
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -1,6 +1,9 @@
 name: Android Check
 on:
  workflow_dispatch: # Manual trigger
+  push:
+    branches:
+      - main

 env:
  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
    </a>
-    <a href="https://codeberg.org/comaps/comaps/actions?workflow=android-check.yaml">
-      <img src="https://codeberg.org/comaps/comaps/badges/workflows/android-check.yaml/badge.svg?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
+    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
--- a/android/app/src/main/res/drawable/ic_track_recording_off.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_off.xml
@@ -5,6 +5,45 @@
  android:viewportWidth="74"
  android:viewportHeight="57">
  <path
+    android:pathData="m67.3,21.772 l-28.103,11.757 11.772,5.095 5.463,11.606z"
+    android:strokeLineJoin="round"
+    android:strokeWidth="2"
    android:fillColor="#757575"
-    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    android:strokeColor="#757575" />
+  <path
+    android:pathData="M45.042,44.7m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M37.942,51.6m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M27.842,52m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="m26.942,43.5c0,2.485 -2.015,4.5 -4.5,4.5 -2.485,0 -4.5,-2.015 -4.5,-4.5 0,-2.485 2.015,-4.5 4.5,-4.5 2.485,0 4.5,2.015 4.5,4.5z"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M26.642,34.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M34.042,27.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M40.842,20.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M41.842,10.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M32.842,4.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M23.842,9.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M16.842,16.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M9.842,23.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
 </vector>
--- a/android/app/src/main/res/drawable/ic_track_recording_on.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_on.xml
@@ -9,6 +9,45 @@
      android:fillColor="@color/active_track_recording"
      android:fillAlpha="0.78" />
    <path
-      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
-      android:fillColor="#ffffff"/>
+      android:pathData="m78.907,32.87 l-31.833,13.318 13.335,5.772 6.188,13.147z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff" />
+    <path
+      android:pathData="M49.731,57.709a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M41.688,65.525a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M30.247,65.978a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="m34.324,56.35c0,2.815 -2.282,5.097 -5.097,5.097 -2.815,0 -5.097,-2.282 -5.097,-5.097 0,-2.815 2.282,-5.097 5.097,-5.097 2.815,0 5.097,2.282 5.097,5.097z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M28.888,46.155a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M37.27,38.226a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M44.974,30.297a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M46.106,18.969a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M35.911,12.173a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M25.718,17.837a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M17.788,25.766a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M9.858,33.695a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
 </vector>
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -129,7 +129,7 @@
    <string name="clear_search">Dilea Istori Hwilas</string>
    <string name="read_in_wikipedia">Wikipedya</string>
    <string name="wikimedia_commons">Wikimedia Commons</string>
-    <string name="p2p_your_location">Dha Tyller</string>
+    <string name="p2p_your_location">Agas Tyller</string>
    <string name="p2p_start">Dalleth</string>
    <string name="next_button">Nessa</string>
    <string name="editor_time_add">Addya Rol Vetyansow</string>
@@ -186,8 +186,8 @@
    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
-    <string name="editor_osm_history">Dha istori golegyans</string>
-    <string name="editor_osm_notes">Dha notennow mappow</string>
+    <string name="editor_osm_history">Agas istori golegyans</string>
+    <string name="editor_osm_notes">Agas notennow mappow</string>
    <string name="editor_operator">Oberador</string>
    <string name="operator">Oberador: %s</string>
    <string name="kilometers_per_hour">kdo</string>
@@ -266,9 +266,9 @@
    <string name="toll_road">Tollfordh</string>
    <string name="unpaved_road">Fordh dor</string>
    <string name="ferry_crossing">Kowbalhyns</string>
-    <string name="yes">Ea</string>
+    <string name="yes">Ya</string>
    <string name="no">Na</string>
-    <string name="yes_available">Ea</string>
+    <string name="yes_available">Ya</string>
    <string name="no_available">Na</string>
    <string name="capacity">Dalghuster: %s</string>
    <string name="network">Rosweyth: %s</string>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -151,7 +151,7 @@
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Impossível carregar favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
+    <string name="load_kmz_failed">Surgiu uma falha ao enviar os favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">O tipo de ficheiro não é reconhecido pela aplicação: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -549,7 +549,7 @@
    <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
    <string name="error_enter_correct_name">Introduza um nome correto</string>
-    <string name="bookmark_lists">Listas de Favoritos</string>
+    <string name="bookmark_lists">Listas</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Ocultar tudo</string>
    <string name="bookmark_lists_show_all">Mostrar tudo</string>
@@ -560,7 +560,7 @@
    </plurals>
    <string name="bookmarks_create_new_group">Criar nova lista</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar favoritos</string>
+    <string name="bookmarks_import">Importar favoritos e trajetos</string>
    <string name="bookmarks_error_message_share_general">Não foi possível partilhar devido a um erro da aplicação</string>
    <string name="bookmarks_error_title_share_empty">Erro ao partilhar</string>
    <string name="bookmarks_error_message_share_empty">Não é possível partilhar uma lista vazia</string>
@@ -748,7 +748,7 @@
    <string name="browser_not_available">O navegador de Internet não está disponível</string>
    <string name="volume">Volume</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos os Favoritos e Trajetos</string>
+    <string name="bookmarks_export">Exportar todos os favoritos e trajetos</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Definições do sistema de síntese de voz</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -780,7 +780,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuar gravação</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Guardar nos Favoritos?</string>
+    <string name="track_recording_alert_title">Guardar em Favoritos e Trajetos?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">O trajeto está vazio - não há nada para guardar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -847,10 +847,10 @@
    <string name="backup_interval_every_day">Diariamente</string>
    <string name="backup_interval_every_week">Semanalmente</string>
    <string name="backup_interval_manual_only">Off (apenas manual)</string>
-    <string name="bookmark_color">Cor do Favorito</string>
+    <string name="bookmark_color">Cor do marcador</string>
    <string name="pref_backup_now_summary_ok">Backup completado com sucesso</string>
    <string name="pref_backup_location_summary_initial">Por favor selecione uma pasta primeiro e garanta permissão</string>
-    <string name="pref_backup_title">Backup dos Favoritos</string>
+    <string name="pref_backup_title">Backup dos marcadores e trajetos</string>
    <string name="dialog_report_error_missing_folder">A localização de backup selecionada não está disponível ou não permite escrita. Selecione outra localização, por favor.</string>
    <string name="dialog_report_error_with_logs">Por favor, envie-nos um reporte de erro:\n - \"Ativar o histórico\" nas definições\n - reproduza o problema\n - no ecrã de \"Acerca &amp; Ajuda\" pressione o botão para \"Reportar um problema\" e envie via email ou chat\n - desative o histórico</string>
    <string name="open_now">Aberto agora</string>
@@ -914,5 +914,4 @@
    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
    <string name="download_resources_custom_url_summary_none">Indefinido</string>
    <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
-    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -412,7 +412,7 @@
        <item quantity="few">%d datoteke najdene. Po pretvorbi si jih lahko ogledate.</item>
        <item quantity="other">%d datotek najdenih. Po pretvorbi si jih lahko ogledate.</item>
    </plurals>
-    <string name="restore">Povrni</string>
+    <string name="restore">Obnovi</string>
    <plurals name="tracks">
        <item quantity="one">%d pot</item>
        <item quantity="two">%d poti</item>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -493,9 +493,9 @@
    <string name="editor_more_about_osm">关于 OpenStreetMap 的更多信息</string>
    <string name="editor_osm_history">您的编辑历史</string>
    <string name="editor_osm_notes">您的地图数据注记</string>
-    <string name="editor_operator">运营方</string>
+    <string name="editor_operator">操作员</string>
    <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
-    <string name="operator">运营方：%s</string>
+    <string name="operator">操作员: %s</string>
    <string name="editor_category_unsuitable_title">找不到合适的类别？</string>
    <string name="editor_category_unsuitable_text">CoMaps 只允许添加简单的点类别，即无法添加城镇、道路、湖泊、建筑轮廓等类别。请直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 添加此类类别。请查看我们的<a href="https://www.comaps.app/support/advanced-map-editing/">指南</a>，了解详细的步骤说明。</string>
    <string name="downloader_no_downloaded_maps_title">您尚未下载任何地图</string>
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -153,7 +153,7 @@ project.afterEvaluate {

  final taskName = gradle.startParameter.taskNames

-  if (['assemble', 'bundle', 'compile', 'install', 'lint', 'publish', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
    exec {
      workingDir '../..'

--- a/android/sdk/src/main/assets/countries_meta.txt
+++ b/android/sdk/src/main/assets/countries_meta.txt
@@ -0,0 +1 @@
+../../../../../data/countries_meta.txt
--- a/android/sdk/src/main/res/values-af/types_strings.xml
+++ b/android/sdk/src/main/res/values-af/types_strings.xml
@@ -117,6 +117,7 @@
    <string name="type.amenity.public_bookcase">Boekekas</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Herwinningsentrum</string>
+    <string name="type.amenity.recycling">Herwinningshouer</string>
    <string name="type.amenity.recycling.container">Herwinningshouer</string>
    <string name="type.recycling.batteries">Batterye</string>
    <string name="type.recycling.clothes">Klere</string>
--- a/android/sdk/src/main/res/values-ar/types_strings.xml
+++ b/android/sdk/src/main/res/values-ar/types_strings.xml
@@ -130,6 +130,7 @@
    <string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
+    <string name="type.amenity.recycling">حاوية لإعادة التدوير</string>
    <string name="type.amenity.recycling.container">حاوية لإعادة التدوير</string>
    <string name="type.recycling.batteries">بطاريات</string>
    <string name="type.recycling.clothes">ملابس</string>
--- a/android/sdk/src/main/res/values-az/types_strings.xml
+++ b/android/sdk/src/main/res/values-az/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Kitab mübadiləsi</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Təkrar Emal Mərkəzi</string>
+    <string name="type.amenity.recycling">Təkrar emal konteyneri</string>
    <string name="type.amenity.recycling.container">Təkrar emal konteyneri</string>
    <string name="type.recycling.batteries">Batareyalar</string>
    <string name="type.recycling.clothes">Geyim</string>
--- a/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
+++ b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
@@ -149,6 +149,7 @@
    <string name="type.amenity.pub">Pab</string>
    <string name="type.amenity.public_bookcase">Razmena knjiga</string>
    <string name="type.amenity.recycling.centre">Centar za reciklažu</string>
+    <string name="type.amenity.recycling">Kontejner za reciklažu</string>
    <string name="type.amenity.recycling.container">Kontejner za reciklažu</string>
    <string name="type.recycling.batteries">Beterije</string>
    <string name="type.recycling.clothes">Stara odeća</string>
--- a/android/sdk/src/main/res/values-be/types_strings.xml
+++ b/android/sdk/src/main/res/values-be/types_strings.xml
@@ -54,6 +54,7 @@
    <string name="type.amenity.prison">Турма</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Прыём другсыравіны</string>
+    <string name="type.amenity.recycling">Кантэйнер для другаснай сыравіны</string>
    <string name="type.amenity.recycling.container">Кантэйнер для другаснай сыравіны</string>
    <string name="type.recycling.batteries">Батарэйкі</string>
    <string name="type.recycling.clothes">Адзенне</string>
--- a/android/sdk/src/main/res/values-bg/types_strings.xml
+++ b/android/sdk/src/main/res/values-bg/types_strings.xml
@@ -587,6 +587,7 @@
    <string name="type.amenity.police">Полиция</string>
    <string name="type.amenity.pub">Кръчма</string>
    <string name="type.amenity.public_bookcase">Книжен обмен</string>
+    <string name="type.amenity.recycling">Кофи за преработваем отпадък</string>
    <string name="type.amenity.recycling.container">Кофи за преработваем отпадък</string>
    <string name="type.recycling.clothes">Дрехи</string>
    <string name="type.recycling.glass_bottles">Стъклени бутилки</string>
--- a/android/sdk/src/main/res/values-ca/types_strings.xml
+++ b/android/sdk/src/main/res/values-ca/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Intercanvi de llibres</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centre de reciclatge</string>
+    <string name="type.amenity.recycling">Contenidor de reciclatge</string>
    <string name="type.amenity.recycling.container">Contenidor de reciclatge</string>
    <string name="type.recycling.batteries">Bateries</string>
    <string name="type.recycling.clothes">Roba</string>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -115,6 +115,7 @@
    <string name="type.amenity.public_bookcase">Výměna knih</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Recyklační středisko</string>
+    <string name="type.amenity.recycling">Recyklační nádoba</string>
    <string name="type.amenity.recycling.container">Recyklační nádoba</string>
    <string name="type.recycling.batteries">Baterie</string>
    <string name="type.recycling.clothes">Staré oblečení</string>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -114,6 +114,7 @@
    <string name="type.amenity.public_bookcase">Bogbytteskab</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Genbrugsplads</string>
+    <string name="type.amenity.recycling">Genbrugscontainer</string>
    <string name="type.amenity.recycling.container">Genbrugscontainer</string>
    <string name="type.recycling.batteries">Batterier</string>
    <string name="type.recycling.clothes">Tekstil</string>
@@ -957,7 +958,7 @@
    <string name="type.shop.coffee">Kaffehandel</string>
    <string name="type.shop.computer">Computerforretning</string>
    <string name="type.shop.confectionery">Slikbutik</string>
-    <string name="type.shop.convenience">Nærbutik</string>
+    <string name="type.shop.convenience">Døgnbutik</string>
    <string name="type.shop.copyshop">Kopieringsbutik</string>
    <string name="type.shop.cosmetics">Kosmetiker</string>
    <string name="type.shop.curtain">Gardinhandel</string>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Bücherschrank</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Recyclinghof</string>
+    <string name="type.amenity.recycling">Wertstoffcontainer</string>
    <string name="type.amenity.recycling.container">Wertstoffcontainer</string>
    <string name="type.recycling.batteries">Batterien</string>
    <string name="type.recycling.clothes">Altkleider</string>
--- a/android/sdk/src/main/res/values-el/types_strings.xml
+++ b/android/sdk/src/main/res/values-el/types_strings.xml
@@ -122,6 +122,7 @@
    <string name="type.amenity.public_bookcase">Ανταλλαγή βιβλίων</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Κέντρο ανακύκλωσης</string>
+    <string name="type.amenity.recycling">Κάδος ανακύκλωσης</string>
    <string name="type.amenity.recycling.container">Κάδος ανακύκλωσης</string>
    <string name="type.recycling.batteries">Μπαταρίες</string>
    <string name="type.recycling.clothes">Ρούχα</string>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Intercambio de libros</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro de reciclaje</string>
+    <string name="type.amenity.recycling">Contenedor de reciclaje</string>
    <string name="type.amenity.recycling.container">Contenedor de reciclaje</string>
    <string name="type.recycling.batteries">Baterías</string>
    <string name="type.recycling.clothes">Ropa</string>
@@ -1397,7 +1398,7 @@
    <string name="type.building.guardhouse">Garita de seguridad</string>
    <string name="type.power.portal">Torre de alta tensión</string>
    <string name="type.shop.lighting">Tienda de iluminación</string>
-    <string name="type.amenity.bench.backless">Sin respaldo</string>
+    <string name="type.amenity.bench.backless">Banco sin respaldo</string>
    <string name="type.leisure.bandstand">Templete</string>
    <string name="type.leisure.sports_centre.sport.multi">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.american_football">Centro deportivo</string>
@@ -1508,5 +1509,4 @@
    <string name="type.railway.turntable">Plataforma giratoria ferroviaria</string>
    <string name="type.tourism.information.tactile_map">Mapa táctil</string>
    <string name="type.emergency.disaster_help_point">Punto de ayuda para emergencias y desastres</string>
-    <string name="type.emergency.access_point.address">Dirección de Punto de Emergencia</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Avalik raamaturiiul</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Jäätmejaam</string>
+    <string name="type.amenity.recycling">Taaskasutuskonteiner</string>
    <string name="type.amenity.recycling.container">Taaskasutuskonteiner</string>
    <string name="type.recycling.batteries">Patareid</string>
    <string name="type.recycling.clothes">Rõivad</string>
@@ -1395,7 +1396,7 @@
    <string name="type.power.portal">Õhuliini värava-tüüpi mast</string>
    <string name="type.office.security">Turvafirma kontor</string>
    <string name="type.shop.lighting">Lambipood</string>
-    <string name="type.amenity.bench.backless">Ilma seljatoeta</string>
+    <string name="type.amenity.bench.backless">Ilma seljatoeta pink</string>
    <string name="type.leisure.bandstand">Väike vabaõhulava</string>
    <string name="type.leisure.sports_centre.sport.multi">Spordikeskus</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Joogastuudio</string>
@@ -1507,5 +1508,4 @@
    <string name="type.amenity.charging_station.motorcycle">Mootorrattad</string>
    <string name="type.amenity.charging_station.small">Väike laadimisjaam</string>
    <string name="type.emergency.disaster_help_point">Katastroofiabi teenused</string>
-    <string name="type.emergency.access_point.address">Hädaolukorras asukohatuvastuspunkti aadress</string>
 </resources>
--- a/android/sdk/src/main/res/values-eu/types_strings.xml
+++ b/android/sdk/src/main/res/values-eu/types_strings.xml
@@ -129,6 +129,7 @@
    <string name="type.amenity.public_bookcase">Liburu trukea</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Birziklapen zentroa</string>
+    <string name="type.amenity.recycling">Birziklatzeko edukiontzia</string>
    <string name="type.amenity.recycling.container">Birziklatzeko edukiontzia</string>
    <string name="type.recycling.batteries">Bateriak</string>
    <string name="type.recycling.clothes">Arropa</string>
--- a/android/sdk/src/main/res/values-fa/types_strings.xml
+++ b/android/sdk/src/main/res/values-fa/types_strings.xml
@@ -115,6 +115,7 @@
    <string name="type.amenity.pub">میکده</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">مرکز بازیافت</string>
+    <string name="type.amenity.recycling">ظرف بازیافت</string>
    <string name="type.amenity.recycling.container">ظرف بازیافت</string>
    <string name="type.recycling.batteries">ﺎﻫ ﯼﺮﺗﺎﺑ</string>
    <string name="type.recycling.clothes">لباسهای قدیمی</string>
--- a/android/sdk/src/main/res/values-fi/types_strings.xml
+++ b/android/sdk/src/main/res/values-fi/types_strings.xml
@@ -128,6 +128,7 @@
    <string name="type.amenity.public_bookcase">Kirjahylly</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Kierrätyskeskus</string>
+    <string name="type.amenity.recycling">Kierrätysjäteastia</string>
    <string name="type.amenity.recycling.container">Kierrätysjäteastia</string>
    <string name="type.recycling.batteries">Paristot</string>
    <string name="type.recycling.clothes">Vaatteet</string>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -124,6 +124,7 @@
    <string name="type.amenity.public_bookcase">Microbibliothèque</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centre de recyclage</string>
+    <string name="type.amenity.recycling">Conteneur de recyclage</string>
    <string name="type.amenity.recycling.container">Conteneur de recyclage</string>
    <string name="type.recycling.batteries">Batteries</string>
    <string name="type.recycling.clothes">Vêtements usagés</string>
@@ -1396,7 +1397,7 @@
    <string name="type.building.guardhouse">Guérite de sécurité</string>
    <string name="type.power.portal">Portique haute tension</string>
    <string name="type.shop.lighting">Boutique de luminaires</string>
-    <string name="type.amenity.bench.backless">Sans dossier</string>
+    <string name="type.amenity.bench.backless">Banc sans dossier</string>
    <string name="type.leisure.bandstand">Kiosque à musique</string>
    <string name="type.leisure.sports_centre.sport.multi">Complexe sportif</string>
    <string name="type.leisure.sports_centre.sport.american_football">Complexe sportif</string>
--- a/android/sdk/src/main/res/values-gl/types_strings.xml
+++ b/android/sdk/src/main/res/values-gl/types_strings.xml
@@ -138,6 +138,7 @@
    <string name="type.amenity.pub">Pub</string>
    <string name="type.amenity.public_bookcase">Intercambio de libros</string>
    <string name="type.amenity.recycling.centre">Centro de reciclaxe</string>
+    <string name="type.amenity.recycling">Contedora de reciclaxe</string>
    <string name="type.amenity.recycling.container">Contedora de reciclaxe</string>
    <string name="type.recycling.batteries">Baterías</string>
    <string name="type.recycling.clothes">Roupa</string>
--- a/android/sdk/src/main/res/values-gsw/types_strings.xml
+++ b/android/sdk/src/main/res/values-gsw/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.pub">Beiz</string>
    <string name="type.amenity.public_bookcase">Büecherschrank</string>
    <string name="type.amenity.recycling.centre">Recyclinghof</string>
+    <string name="type.amenity.recycling">Recyclingcontainer</string>
    <string name="type.amenity.recycling.container">Recyclingcontainer</string>
    <string name="type.recycling.batteries">Batterie</string>
    <string name="type.recycling.clothes">Altchleider</string>
--- a/android/sdk/src/main/res/values-hi/types_strings.xml
+++ b/android/sdk/src/main/res/values-hi/types_strings.xml
@@ -97,6 +97,7 @@
    <string name="type.amenity.public_bookcase">सार्वजनिक किताबों की अलमारी</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">रीसाइक्लिंग सेंटर</string>
+    <string name="type.amenity.recycling">रीसाइक्लिंग कंटेनर</string>
    <string name="type.amenity.recycling.container">रीसाइक्लिंग कंटेनर</string>
    <string name="type.amenity.restaurant">रेस्तरां</string>
    <string name="type.amenity.sanitary_dump_station">सेनेटरी डंप स्टेशन</string>
--- a/android/sdk/src/main/res/values-hr/types_strings.xml
+++ b/android/sdk/src/main/res/values-hr/types_strings.xml
@@ -151,6 +151,7 @@
    <string name="type.amenity.pub">Pub</string>
    <string name="type.amenity.public_bookcase">Razmjena knjiga</string>
    <string name="type.amenity.recycling.centre">Centar za recikliranje</string>
+    <string name="type.amenity.recycling">Kontejner za recikliranje</string>
    <string name="type.amenity.recycling.container">Kontejner za recikliranje</string>
    <string name="type.recycling.batteries">Baterije</string>
    <string name="type.recycling.clothes">Odjeća</string>
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -117,6 +117,7 @@
    <string name="type.amenity.public_bookcase">Nyilvános könyvespolc</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Hulladékudvar</string>
+    <string name="type.amenity.recycling">Szelektív hulladékgyűjtés</string>
    <string name="type.amenity.recycling.container">Szelektív hulladékgyűjtő konténer</string>
    <string name="type.recycling.batteries">Elem, akkumulátor</string>
    <string name="type.recycling.clothes">Ruha</string>
--- a/android/sdk/src/main/res/values-in/types_strings.xml
+++ b/android/sdk/src/main/res/values-in/types_strings.xml
@@ -112,6 +112,7 @@
    <string name="type.amenity.public_bookcase">Rak Buku</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">TPA</string>
+    <string name="type.amenity.recycling">Wadah daur ulang</string>
    <string name="type.amenity.recycling.container">Wadah daur ulang</string>
    <string name="type.recycling.batteries">Baterai</string>
    <string name="type.recycling.clothes">Pakaian lama</string>
--- a/android/sdk/src/main/res/values-is/types_strings.xml
+++ b/android/sdk/src/main/res/values-is/types_strings.xml
@@ -35,6 +35,7 @@
    <string name="type.amenity.pub">Krá</string>
    <string name="type.amenity.public_bookcase">Bókaskipti</string>
    <string name="type.amenity.recycling.centre">Endurvinnslustöð</string>
+    <string name="type.amenity.recycling">Endurvinnslugámur</string>
    <string name="type.recycling.plastic_bottles">Plastflöskur</string>
    <string name="type.recycling.scrap_metal">Brotajárn</string>
    <string name="type.amenity.school">Skóli</string>
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Biblioteca di strada</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro di riciclaggio</string>
+    <string name="type.amenity.recycling">Contenitore per materiali riciclabili</string>
    <string name="type.amenity.recycling.container">Contenitore per materiali riciclabili</string>
    <string name="type.recycling.batteries">Batterie</string>
    <string name="type.recycling.clothes">Vestiti usati</string>
--- a/android/sdk/src/main/res/values-iw/types_strings.xml
+++ b/android/sdk/src/main/res/values-iw/types_strings.xml
@@ -129,6 +129,7 @@
    <string name="type.amenity.public_bookcase">כוננית ספרים ציבורית</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">מרכז מיחזור</string>
+    <string name="type.amenity.recycling">מיכל מיחזור</string>
    <string name="type.amenity.recycling.container">מיכל מיחזור</string>
    <string name="type.recycling.batteries">סוללות</string>
    <string name="type.recycling.clothes">בגדים</string>
--- a/android/sdk/src/main/res/values-ja/types_strings.xml
+++ b/android/sdk/src/main/res/values-ja/types_strings.xml
@@ -130,6 +130,7 @@
    <string name="type.amenity.public_bookcase">街角文庫</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">リサイクルセンター</string>
+    <string name="type.amenity.recycling">リサイクルボックス</string>
    <string name="type.amenity.recycling.container">リサイクルボックス</string>
    <string name="type.recycling.batteries">バッテリー</string>
    <string name="type.recycling.clothes">古着</string>
--- a/android/sdk/src/main/res/values-ko/types_strings.xml
+++ b/android/sdk/src/main/res/values-ko/types_strings.xml
@@ -117,6 +117,7 @@
    <string name="type.amenity.public_bookcase">도서 교환</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">재활용센터</string>
+    <string name="type.amenity.recycling">재활용 쓰레기통</string>
    <string name="type.amenity.recycling.container">재활용 쓰레기통</string>
    <string name="type.recycling.batteries">배터리</string>
    <string name="type.recycling.clothes">낡은 옷</string>
--- a/android/sdk/src/main/res/values-kw/types_strings.xml
+++ b/android/sdk/src/main/res/values-kw/types_strings.xml
@@ -97,6 +97,7 @@
    <string name="type.amenity.pub">Barr</string>
    <string name="type.amenity.public_bookcase">Keschanj Lyver</string>
    <string name="type.amenity.recycling.centre">Kresen Eylgylghyans</string>
+    <string name="type.amenity.recycling">Kofen Eylgylghyans</string>
    <string name="type.amenity.recycling.container">Kofen Eylgylghyans</string>
    <string name="type.recycling.batteries">Batriow</string>
    <string name="type.recycling.clothes">Dillas</string>
--- a/android/sdk/src/main/res/values-lt/types_strings.xml
+++ b/android/sdk/src/main/res/values-lt/types_strings.xml
@@ -110,7 +110,7 @@
    <string name="type.amenity.bank">Bankas</string>
    <string name="type.amenity.bar">Baras</string>
    <string name="type.amenity.bench">Suolas</string>
-    <string name="type.amenity.bench.backless">Be atramos</string>
+    <string name="type.amenity.bench.backless">Suolas be atramos</string>
    <string name="type.amenity.bicycle_parking">Dviračių stovėjimo aikštelė</string>
    <string name="type.amenity.bicycle_parking.covered">Dengta dviračių stovėjimo aikštelė</string>
    <string name="type.amenity.boat_rental">Valčių nuoma</string>
@@ -136,8 +136,8 @@
    <string name="type.leisure.adult_gaming_centre">Lošimo automatų salonas</string>
    <string name="type.leisure.amusement_arcade">Žaidimo automatų salonas</string>
    <string name="type.amenity.charging_station">Krovimo stotelė</string>
-    <string name="type.amenity.charging_station.bicycle">Elektriniams dviračiams</string>
-    <string name="type.amenity.charging_station.motorcar">Elektromobiliams</string>
+    <string name="type.amenity.charging_station.bicycle">Elektrinių dviračių krovimo stotelė</string>
+    <string name="type.amenity.charging_station.motorcar">Elektromobilių krovimo stotelė</string>
    <string name="type.amenity.childcare">Lopšelis</string>
    <string name="type.amenity.cinema">Kino teatras</string>
    <string name="type.leisure.bowling_alley">Boulingo klubas</string>
@@ -225,6 +225,7 @@
    <string name="type.amenity.pub">Aludė</string>
    <string name="type.amenity.public_bookcase">Knygų namelis</string>
    <string name="type.amenity.recycling.centre">Antrinių žaliavų surinkimo aikštelė</string>
+    <string name="type.amenity.recycling">Antrinių žaliavų konteineris</string>
    <string name="type.amenity.recycling.container">Antrinių žaliavų konteineris</string>
    <string name="type.recycling.batteries">Baterijos</string>
    <string name="type.recycling.clothes">Tekstilė</string>
@@ -1432,8 +1433,4 @@
    <string name="type.tourism.information.tactile_map">Taktilinis žemėlapis</string>
    <string name="type.railway.disused.bridge">Apleistas geležinkelio tiltas</string>
    <string name="type.railway.disused.tunnel">Apleistas geležinkelio tunelis</string>
-    <string name="type.amenity.charging_station.motorcycle">Motociklams</string>
-    <string name="type.amenity.charging_station.small">Ribota galia</string>
-    <string name="type.emergency.access_point.address">Evakuacijos adresas</string>
-    <string name="type.emergency.disaster_help_point">Pagalbos stichinių nelaimių atvejais punktas</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -123,7 +123,7 @@
    <string name="type.leisure.common">Valsts zemes īpašums</string>
    <string name="type.leisure.dog_park">Suņu parks</string>
    <string name="type.disusedbusiness">Brīva uzņēmējdarbība</string>
-    <string name="type.amenity.bench.backless">Bez atzveltnes</string>
+    <string name="type.amenity.bench.backless">Sols bez atzveltnes</string>
    <string name="type.shop.coffee">Kafijas mazumtirgotājs</string>
    <string name="type.shop.computer">Datorveikals</string>
    <string name="type.shop.confectionery">Saldumu veikals</string>
--- a/android/sdk/src/main/res/values-mr/types_strings.xml
+++ b/android/sdk/src/main/res/values-mr/types_strings.xml
@@ -112,6 +112,7 @@
    <string name="type.amenity.pub">पब</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">भंगार केंद्र</string>
+    <string name="type.amenity.recycling">रीसायकलिंग कंटेनर</string>
    <string name="type.amenity.recycling.container">रीसायकलिंग कंटेनर</string>
    <string name="type.recycling.batteries">घरगुती बॅटरी</string>
    <string name="type.recycling.clothes">कपडे</string>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -120,6 +120,7 @@
    <string name="type.amenity.public_bookcase">Bokhylle</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Resirkuleringssenter</string>
+    <string name="type.amenity.recycling">Gjenvinningsbeholder</string>
    <string name="type.amenity.recycling.container">Gjenvinningsbeholder</string>
    <string name="type.recycling.batteries">Batterier</string>
    <string name="type.recycling.clothes">Gamle klær</string>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -130,6 +130,7 @@
    <string name="type.amenity.public_bookcase">Boekenkast</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Milieustraat</string>
+    <string name="type.amenity.recycling">Recycling container</string>
    <string name="type.amenity.recycling.container">Recycling container</string>
    <string name="type.recycling.batteries">Batterijen</string>
    <string name="type.recycling.clothes">Oude kleding</string>
@@ -1395,7 +1396,7 @@
    <string name="type.building.guardhouse">Beveiligingsloket</string>
    <string name="type.power.portal">Verdeelstation</string>
    <string name="type.shop.lighting">Verlichtingswinkel</string>
-    <string name="type.amenity.bench.backless">Zonder bankje</string>
+    <string name="type.amenity.bench.backless">Bankje</string>
    <string name="type.amenity.boat_rental">Bootverhuur</string>
    <string name="type.man_made.telescope">Telescoop</string>
    <string name="type.man_made.telescope.optical">Telescoop (optisch)</string>
--- a/android/sdk/src/main/res/values-pl/types_strings.xml
+++ b/android/sdk/src/main/res/values-pl/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Wymiana książek</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centrum przetwórstwa odpadów</string>
+    <string name="type.amenity.recycling">Pojemnik do recyklingu</string>
    <string name="type.amenity.recycling.container">Pojemnik do recyklingu</string>
    <string name="type.recycling.batteries">Baterie</string>
    <string name="type.recycling.clothes">Stare ubrania</string>
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -110,6 +110,7 @@
    <string name="type.amenity.public_bookcase">Biblioteca livre</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+    <string name="type.amenity.recycling">Contêiner de reciclagem</string>
    <string name="type.amenity.recycling.container">Contêiner de reciclagem</string>
    <string name="type.recycling.batteries">Baterias</string>
    <string name="type.recycling.clothes">Roupas velhas</string>
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Biblioteca livre</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+    <string name="type.amenity.recycling">Contentor de reciclagem</string>
    <string name="type.amenity.recycling.container">Contentor de reciclagem</string>
    <string name="type.recycling.batteries">Baterias</string>
    <string name="type.recycling.clothes">Roupas velhas</string>
@@ -1396,7 +1397,7 @@
    <string name="type.building.guardhouse">Cabine de Segurança</string>
    <string name="type.power.portal">Portal de Energia</string>
    <string name="type.shop.lighting">Loja de Iluminação</string>
-    <string name="type.amenity.bench.backless">Sem Encosto</string>
+    <string name="type.amenity.bench.backless">Banco sem Encosto</string>
    <string name="type.leisure.bandstand">Coreto</string>
    <string name="type.leisure.sports_centre.sport.multi">Centro Desportivo</string>
    <string name="type.leisure.sports_centre.sport.american_football">Centro Desportivo</string>
@@ -1507,6 +1508,4 @@
    <string name="type.railway.miniature.tunnel">Túnel Ferroviário em Miniatura</string>
    <string name="type.railway.turntable">Plataforma Giratória Ferroviária</string>
    <string name="type.tourism.information.tactile_map">Mapa tátil</string>
-    <string name="type.emergency.access_point.address">Endereço de Resgate de Emergência</string>
-    <string name="type.emergency.disaster_help_point">Ponto de Ajuda de Emergências e Desastres</string>
 </resources>
--- a/android/sdk/src/main/res/values-ro/types_strings.xml
+++ b/android/sdk/src/main/res/values-ro/types_strings.xml
@@ -110,6 +110,7 @@
    <string name="type.amenity.public_bookcase">Bibliotecă</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centru de reciclare</string>
+    <string name="type.amenity.recycling">Containere pentru reciclare</string>
    <string name="type.amenity.recycling.container">Containere pentru reciclare</string>
    <string name="type.recycling.batteries">Baterii</string>
    <string name="type.recycling.clothes">Haine vechi</string>
--- a/android/sdk/src/main/res/values-ru/types_strings.xml
+++ b/android/sdk/src/main/res/values-ru/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Книгообмен</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Приём вторсырья</string>
+    <string name="type.amenity.recycling">Контейнер для вторсырья</string>
    <string name="type.amenity.recycling.container">Контейнер для вторсырья</string>
    <string name="type.recycling.batteries">Батарейки</string>
    <string name="type.recycling.clothes">Одежда</string>
--- a/android/sdk/src/main/res/values-sk/types_strings.xml
+++ b/android/sdk/src/main/res/values-sk/types_strings.xml
@@ -125,6 +125,7 @@
    <string name="type.amenity.public_bookcase">Knižná búdka</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Zberné suroviny</string>
+    <string name="type.amenity.recycling">Recyklačný kontajner</string>
    <string name="type.amenity.recycling.container">Recyklačný kontajner</string>
    <string name="type.recycling.batteries">Batérie</string>
    <string name="type.recycling.clothes">Staré oblečenie</string>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -28,7 +28,7 @@
    <string name="type.amenity.bar">Lokal</string>
    <string name="type.amenity.bbq">Žar na prostem</string>
    <string name="type.amenity.bench">Klop</string>
-    <string name="type.amenity.bench.backless">Brez naslonjala</string>
+    <string name="type.amenity.bench.backless">Klop brez naslonjala</string>
    <string name="type.amenity.bicycle_parking">Parkirišče za kolesa</string>
    <string name="type.amenity.bicycle_parking.covered">Pokrito parkirišče za kolesa</string>
    <string name="type.amenity.bicycle_rental">Izposoja koles</string>
@@ -309,6 +309,7 @@
    <string name="type.amenity.prep_school">Inštrukcije</string>
    <string name="type.amenity.mobile_money_agent">Posrednik mobilnega denarja</string>
    <string name="type.amenity.recycling.centre">Zbirno mesto za ločene odpadke</string>
+    <string name="type.amenity.recycling">Zabojnik za ločene odpadke</string>
    <string name="type.amenity.recycling.container">Zabojnik za ločene odpadke</string>
    <string name="type.amenity.shelter.public_transport">Zavetje</string>
    <string name="type.amenity.vending_machine.public_transport_tickets">Avtomat za vozovnice javnega prometa</string>
@@ -1220,7 +1221,7 @@
    <string name="type.shop.coffee">Trgovina s kavo</string>
    <string name="type.shop.computer">Računalniška trgovina</string>
    <string name="type.shop.confectionery">Slaščičarna</string>
-    <string name="type.shop.convenience">Trgovina z osnovnimi potrebščinami</string>
+    <string name="type.shop.convenience">Trgovina z mešanim blagom</string>
    <string name="type.shop.copyshop">Kopirnica</string>
    <string name="type.shop.cosmetics">Kozmetična trgovina</string>
    <string name="type.shop.curtain">Trgovina z zavesami</string>
@@ -1320,7 +1321,7 @@
    <string name="type.shop.perfumery">Trgovina z dišavami</string>
    <string name="type.shop.sewing">Šiviljska trgovina</string>
    <string name="type.shop.storage_rental">Najem skladiščnih prostorov</string>
-    <string name="type.tourism.hostel">Hostel</string>
+    <string name="type.tourism.hostel">Gostišče</string>
    <string name="type.tourism.hotel">Hotel</string>
    <string name="type.tourism.information">Turistične informacije</string>
    <string name="type.tourism.information.board">Informacijska tabla</string>
@@ -1330,88 +1331,6 @@
    <string name="type.wheelchair.no">Nedostopno za invalidske vozičke</string>
    <string name="type.wheelchair.yes">Polna dostopnost za invalidske vozičke</string>
    <string name="type.aerialway.j.bar">Sidra</string>
-    <string name="type.aerialway.magic_carpet">Tekoči trak</string>
+    <string name="type.aerialway.magic_carpet">Preproge</string>
    <string name="type.aerialway.platter">Krožniki</string>
-    <string name="type.emergency.access_point.address">Naslov za reševanja v sili</string>
-    <string name="type.natural.water.lock">Zaporna komora</string>
-    <string name="type.shop.doityourself">Trgovina za dom in vrt</string>
-    <string name="type.shop.houseware">Gospodinjska trgovina</string>
-    <string name="type.shop.beauty.day_spa">Lepotni in sprostitveni center</string>
-    <string name="type.shop.outdoor">Trgovina z opremo za aktivnosti na prostem</string>
-    <string name="type.shop.outpost">Prevzemna točka</string>
-    <string name="type.shop.pasta">Trgovina s testeninami</string>
-    <string name="type.shop.pastry">Prodajalna peciva</string>
-    <string name="type.shop.pawnbroker">Zastavljalnica</string>
-    <string name="type.shop.pet">Trgovina s hišnimi ljubljenčki</string>
-    <string name="type.shop.pet_grooming">Negovalni salon za hišne ljubljenčke</string>
-    <string name="type.shop.photo">Fotografska trgovina</string>
-    <string name="type.shop.rental">Izposojevalnica</string>
-    <string name="type.shop.rental.bicycle">Izposojevalnica koles</string>
-    <string name="type.shop.variety_store">Trgovina z mešanim blagom</string>
-    <string name="type.shop.video">Videotrgovina</string>
-    <string name="type.shop.appliance">Trgovina z gospodinjskimi aparati</string>
-    <string name="type.shop.charity">Dobrodelna trgovina</string>
-    <string name="type.shop.tobacco">Trgovina s tobačnimi izdelki</string>
-    <string name="type.shop.trade">Specializirana trgovina</string>
-    <string name="type.shop.wholesale">Trgovina na debelo</string>
-    <string name="type.sport.curling">Curling</string>
-    <string name="type.sport.field_hockey">Hokej na travi</string>
-    <string name="type.sport.futsal">Dvoranski nogomet</string>
-    <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.pelota">Basque Pelota</string>
-    <string name="type.shop.craft">Trgovina z materiali za ustvarjanje</string>
-    <string name="type.attraction.amusement_ride">Zabaviščna vožnja</string>
-    <string name="type.attraction.bumper_car">Vožnja z avtomobilčki</string>
-    <string name="type.attraction.big_wheel">Panoramsko kolo</string>
-    <string name="type.attraction.carousel">Vrtiljak</string>
-    <string name="type.attraction.historic">Zgodovinska znamenitost</string>
-    <string name="type.attraction.maze">Labirint</string>
-    <string name="type.attraction.roller_coaster">Bobkart</string>
-    <string name="type.tourism.attraction.specified">Znamenitost</string>
-    <string name="type.tourism.camp_site">Taborni prostor</string>
-    <string name="type.tourism.caravan_site">Kamp za počitniške prikolice</string>
-    <string name="type.tourism.chalet">Počitniška hišica</string>
-    <string name="type.tourism.gallery">Umetnostna galerija</string>
-    <string name="type.tourism.guest_house">Gostišče</string>
-    <string name="type.tourism.information.tactile_map">Zemljevid za slepe in slabovidne</string>
-    <string name="type.tourism.zoo.petting">Otroški živalski vrt</string>
-    <string name="type.waterway.lock_gate">Plovna zapornica</string>
-    <string name="type.aerialway.rope_tow">Vrvna vlečnica</string>
-    <string name="type.aerialway.t.bar">Vlečnica na T</string>
-    <string name="type.piste_type.downhill">Smučarska proga</string>
-    <string name="type.piste_type.downhill.area">Spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.advanced">Zahtevna smučarska proga</string>
-    <string name="type.piste_type.downhill.advanced.area">Zahtevna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.easy">Enostavna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.easy.area">Enostavna smučarska proga</string>
-    <string name="type.piste_type.downhill.expert">Zelo zahtevna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.expert.area">Zelo zahtevna smučarska proga</string>
-    <string name="type.piste_type.downhill.freeride">Proga za tek na smučeh – prosti slog</string>
-    <string name="type.piste_type.downhill.intermediate">Srednje zahtevna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.intermediate.area">Srednje zahtevna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.novice">Začetniška spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.novice.area">Začetniška smučarska proga</string>
-    <string name="type.piste_type.nordic">Proga za nordijsko smučanje</string>
-    <string name="type.piste_type.sled">Sankaška steza</string>
-    <string name="type.piste_type.sled.area">Sankaška steza</string>
-    <string name="type.piste_type.snow_park">Snežni park</string>
-    <string name="type.piste_type.hike">Zimska pohodniška pot</string>
-    <string name="type.piste_type.connection">Povezovalna proga</string>
-    <string name="type.piste_type.skitour">Proga za turno smučanje</string>
-    <string name="type.amenity.events_venue">Prireditveni prostor</string>
-    <string name="type.shop.auction">Dražba</string>
-    <string name="type.shop.collector">Trgovina s zbirateljskimi predmeti</string>
-    <string name="type.self_service.yes">Na voljo samopostrežba</string>
-    <string name="type.self_service.only">Samo samopostrežno</string>
-    <string name="type.self_service.partially">Delno samopostrežno</string>
-    <string name="type.self_service.no">Ni samopostrežno</string>
-    <string name="type.amenity.social_facility">Socialna ustanova</string>
-    <string name="type.social_facility.soup_kitchen">Kuhinja za brezdomce</string>
-    <string name="type.social_facility.food_bank">Brezplačna delilnica hrane</string>
-    <string name="type.amenity.food_sharing">Razdeljevalnica hrane</string>
-    <string name="type.amenity.give_box">Zaboj za darove</string>
-    <string name="type.emergency.emergency_ward_entrance">Vhod v urgentni oddelek</string>
-    <string name="type.amenity.dojo">Dojo (vadbeni prostor borilnih veščin)</string>
-    <string name="type.leisure.sports_hall">Športna dvorana</string>
-    <string name="type.xmas.tree">Božično drevo</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -6,8 +6,8 @@
    <string name="type.addr_interpolation.odd">Адреса/Блок</string>
    <string name="type.aerialway">Жичара</string>
    <string name="type.aerialway.cable_car">Жичара</string>
-    <string name="type.aerialway.chair_lift">Ски-лифт</string>
-    <string name="type.aerialway.drag_lift">Ски-лифт једносед</string>
+    <string name="type.aerialway.chair_lift">Седежница</string>
+    <string name="type.aerialway.drag_lift">Вучница</string>
    <string name="type.aerialway.gondola">Гондола</string>
    <string name="type.aerialway.mixed_lift">Комбинована жичара</string>
    <string name="type.aerialway.station">Станица жичаре</string>
@@ -130,6 +130,7 @@
    <string name="type.amenity.public_bookcase">Размена књига</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Центар за рециклажу</string>
+    <string name="type.amenity.recycling">Контејнер за рециклажу</string>
    <string name="type.amenity.recycling.container">Контејнер за рециклажу</string>
    <string name="type.recycling.batteries">Бетерије</string>
    <string name="type.recycling.clothes">Стара одећа</string>
--- a/android/sdk/src/main/res/values-sv/types_strings.xml
+++ b/android/sdk/src/main/res/values-sv/types_strings.xml
@@ -115,6 +115,7 @@
    <string name="type.amenity.public_bookcase">Bokskåp</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Återvinningscentral</string>
+    <string name="type.amenity.recycling">Behållare för återvinningsbart avfall</string>
    <string name="type.amenity.recycling.container">Behållare för återvinningsbart avfall</string>
    <string name="type.recycling.batteries">Batterier</string>
    <string name="type.recycling.clothes">Gamla kläder</string>
--- a/android/sdk/src/main/res/values-ta/types_strings.xml
+++ b/android/sdk/src/main/res/values-ta/types_strings.xml
@@ -146,6 +146,7 @@
    <string name="type.amenity.pub">பப்</string>
    <string name="type.amenity.public_bookcase">புத்தக பரிமாற்றம்</string>
    <string name="type.amenity.recycling.centre">மறுசுழற்சி நடுவண்</string>
+    <string name="type.amenity.recycling">மறுசுழற்சி கொள்கலன்</string>
    <string name="type.amenity.recycling.container">மறுசுழற்சி கொள்கலன்</string>
    <string name="type.recycling.batteries">பேட்டரிகள்</string>
    <string name="type.recycling.clothes">ஆடைகள்</string>
--- a/android/sdk/src/main/res/values-th/types_strings.xml
+++ b/android/sdk/src/main/res/values-th/types_strings.xml
@@ -118,6 +118,7 @@
    <string name="type.amenity.public_bookcase">ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">ศูนย์รีไซเคิล</string>
+    <string name="type.amenity.recycling">บรรจุภัณฑ์รีไซเคิล</string>
    <string name="type.amenity.recycling.container">บรรจุภัณฑ์รีไซเคิล</string>
    <string name="type.recycling.batteries">แบตเตอรี่</string>
    <string name="type.recycling.clothes">เสื้อผ้าเก่า</string>
--- a/android/sdk/src/main/res/values-tr/types_strings.xml
+++ b/android/sdk/src/main/res/values-tr/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Kitap Değişimi</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Geri Dönüşüm Merkezi</string>
+    <string name="type.amenity.recycling">Atık Toplama Merkezi</string>
    <string name="type.amenity.recycling.container">Atık Toplama Merkezi</string>
    <string name="type.recycling.batteries">Piller</string>
    <string name="type.recycling.clothes">Kıyafet</string>
--- a/android/sdk/src/main/res/values-uk/types_strings.xml
+++ b/android/sdk/src/main/res/values-uk/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Книгообмін</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Прийом вторсировини</string>
+    <string name="type.amenity.recycling">Контейнер для вторсировини</string>
    <string name="type.amenity.recycling.container">Контейнер для вторсировини</string>
    <string name="type.recycling.batteries">Батарейки</string>
    <string name="type.recycling.clothes">Одяг</string>
--- a/android/sdk/src/main/res/values-vi/types_strings.xml
+++ b/android/sdk/src/main/res/values-vi/types_strings.xml
@@ -117,6 +117,7 @@
    <string name="type.amenity.public_bookcase">Kệ sách</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Trung tâm tái sinh</string>
+    <string name="type.amenity.recycling">Thùng rác</string>
    <string name="type.amenity.recycling.container">Thùng rác</string>
    <string name="type.recycling.batteries">Ắc quy</string>
    <string name="type.recycling.clothes">Quần áo cũ</string>
--- a/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">書架</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">回收中心</string>
+    <string name="type.amenity.recycling">回收箱</string>
    <string name="type.amenity.recycling.container">回收箱</string>
    <string name="type.recycling.batteries">電池</string>
    <string name="type.recycling.clothes">舊衣物</string>
--- a/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
@@ -269,6 +269,7 @@
    <string name="type.amenity.pub">酒吧</string>
    <string name="type.amenity.public_bookcase">漂書站</string>
    <string name="type.amenity.recycling.centre">回收中心</string>
+    <string name="type.amenity.recycling">回收箱</string>
    <string name="type.amenity.recycling.container">回收箱</string>
    <string name="type.recycling.batteries">電池</string>
    <string name="type.recycling.clothes">衣服</string>
--- a/android/sdk/src/main/res/values-zh/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">公共书架</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">资源回收设施</string>
+    <string name="type.amenity.recycling">回收容器</string>
    <string name="type.amenity.recycling.container">回收容器</string>
    <string name="type.recycling.batteries">电池</string>
    <string name="type.recycling.clothes">旧衣物</string>
@@ -354,7 +355,7 @@
    <string name="type.entrance">入口</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">主要入口</string>
-    <string name="type.entrance.exit">单向出口</string>
+    <string name="type.entrance.exit">出口</string>
    <string name="type.fee.yes">¥</string>
    <string name="type.fee.no">免费</string>
    <string name="type.healthcare.laboratory">医学实验室</string>
@@ -1392,36 +1393,8 @@
    <string name="type.post_office.post_partner">邮政合作点</string>
    <string name="type.barrier.wicket_gate">旁门</string>
    <string name="type.amenity.animal_shelter">动物收容所</string>
-    <string name="type.amenity.bench.backless">无靠背长凳</string>
+    <string name="type.amenity.bench.backless">长凳</string>
    <string name="type.office.security">保安室</string>
    <string name="type.building.guardhouse">保安亭</string>
    <string name="type.power.portal">能源站</string>
-    <string name="type.entrance.emergency">应急出口</string>
-    <string name="type.amenity.boat_rental">船只租赁</string>
-    <string name="type.man_made.telescope">望远镜</string>
-    <string name="type.man_made.telescope.optical">光学望远镜</string>
-    <string name="type.man_made.telescope.radio">射电望远镜</string>
-    <string name="type.man_made.telescope.gamma">伽玛射线望远镜</string>
-    <string name="type.man_made.observatory">观测台</string>
-    <string name="type.amenity.charging_station.motorcycle">摩托车</string>
-    <string name="type.amenity.car_pooling">拼车</string>
-    <string name="type.xmas.tree">圣诞树</string>
-    <string name="type.amenity.food_sharing">食物共享设施</string>
-    <string name="type.amenity.give_box">捐赠箱</string>
-    <string name="type.shop.beauty.nails">美甲店</string>
-    <string name="type.railway.turntable">铁路转车盘</string>
-    <string name="type.railway.disused.tunnel">废弃铁路隧道</string>
-    <string name="type.railway.miniature">小火车轨道</string>
-    <string name="type.railway.disused.bridge">废弃铁路桥</string>
-    <string name="type.natural.tree">树</string>
-    <string name="type.natural.sand">沙子</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">运动中心</string>
-    <string name="type.leisure.sports_centre.sport.swimming">游泳中心</string>
-    <string name="type.cardinal.south">南</string>
-    <string name="type.cardinal.east">东</string>
-    <string name="type.cardinal.west">西</string>
-    <string name="type.cardinal.north">北</string>
-    <string name="type.entrance.garage">车库入口</string>
-    <string name="type.entrance.entry">单向入口</string>
-    <string name="type.emergency.access_point">紧急连络点</string>
 </resources>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -154,7 +154,8 @@
    <string name="type.amenity.pub">Pub</string>
    <string name="type.amenity.public_bookcase">Book Exchange</string>
    <!-- SECTION: Types: Recycling -->
-    <string name="type.amenity.recycling.centre">Recycling Centre</string>
+    <string name="type.amenity.recycling.centre">Recycling Center</string>
+    <string name="type.amenity.recycling">Recycling Container</string>
    <string name="type.amenity.recycling.container">Recycling Container</string>
    <string name="type.recycling.batteries">Batteries</string>
    <string name="type.recycling.clothes">Clothes</string>
--- a/data/categories-strings/ar.json/localize.json
+++ b/data/categories-strings/ar.json/localize.json
@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "فحص المركبة",
 "amenity-waste_disposal": "قمامة|مهملات|سلة مهملات|صندوق قمامة",
 "amenity-recycling-centre|@category_recycling": "مركز إعادة تدوير",
-"amenity-recycling-container|@category_recycling": "حاوية لإعادة التدوير",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "حاوية لإعادة التدوير",
 "recycling-batteries|@category_recycling": "ﺕﺎﻳﺭﺎﻄﺑ|بطاريات",
 "recycling-clothes|@category_recycling": "إعادة تدوير الملابس القديم|ملابس قديمة|ملابس",
 "recycling-glass_bottles|@category_recycling": "زجاجات زجاجية",
--- a/data/categories-strings/be.json/localize.json
+++ b/data/categories-strings/be.json/localize.json
@@ -109,7 +109,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3Паштовае аддзяленне",
 "amenity-vehicle_inspection": "Тэхагляд аўтамабіля",
 "amenity-recycling-centre|@category_recycling": "5Пункт прыёму другаснай сыравіны",
-"amenity-recycling-container|@category_recycling": "Кантэйнер для другаснай сыравіны",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Кантэйнер для другаснай сыравіны",
 "recycling-batteries|@category_recycling": "5Прыём батарэек|Утылізацыя батарэек|5Перапрацоўка батарэек|5Здаць батарэйкі|4Збор батарэек|5Батарэйкі",
 "recycling-clothes|@category_recycling": "5Прыём адзення|Старае адзенне|Здаць непатрэбныя рэчы|Здаць рэчы|5Здаць адзенне",
 "recycling-glass_bottles|@category_recycling": "5Прыём шклатары|Прыём шкла|5Перапрацоўка шкла|5Здаць шклатару|Здаць бутэлькі|4Збор шклотары|5Шклатара|Шклабало|Шкляныя бутэлькі",
--- a/data/categories-strings/bg.json/localize.json
+++ b/data/categories-strings/bg.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Проверка на автомобила",
 "amenity-waste_disposal": "Боклук|кош|контейнер|отпадък|бунище",
 "amenity-recycling-centre|@category_recycling": "Рециклиране|разделно събиране|Преработвателно средище",
-"amenity-recycling-container|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък",
 "recycling-batteries|@category_recycling": "Батерии",
 "recycling-clothes|@category_recycling": "Стари дрехи|рециклиране|",
 "recycling-glass_bottles|@category_recycling": "Стъкло|шише|рециклиране",
--- a/data/categories-strings/cs.json/localize.json
+++ b/data/categories-strings/cs.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Kontrola vozidla",
 "amenity-waste_disposal": "Odpadky|koš|popelnice|uložiště odpadu",
 "amenity-recycling-centre|@category_recycling": "Recyklační středisko",
-"amenity-recycling-container|@category_recycling": "Recyklační nádoba",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklační nádoba",
 "recycling-batteries|@category_recycling": "Baterie",
 "recycling-clothes|@category_recycling": "Staré oblečení|Recyklujte staré oblečení",
 "recycling-glass_bottles|@category_recycling": "Skleněné lahve",
--- a/data/categories-strings/da.json/localize.json
+++ b/data/categories-strings/da.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Bilsyn",
 "amenity-waste_disposal": "Bortskaffelse af affald|skraldespand|skrald",
 "amenity-recycling-centre|@category_recycling": "Genbrugsplads",
-"amenity-recycling-container|@category_recycling": "Genbrugscontainer",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Genbrugscontainer",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gammelt tøj|Genbrug gammelt tøj|Tekstil",
 "recycling-glass_bottles|@category_recycling": "Glasflasker",
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -172,7 +172,7 @@
 "amenity-vehicle_inspection": "Fahrzeuginspektion",
 "amenity-waste_disposal": "4Müllcontainer|Mülltonne|Abfälle|Müll|Müllentsorgung",
 "amenity-recycling-centre|@category_recycling": "3Recyclinghof|3Recyclingzentrum|3Wertstoffhof|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "Batterien",
 "recycling-clothes|@category_recycling": "3Altkleider|3Alte Kleidung|3Kleiderspende|3Altkleidercontainer",
 "recycling-glass_bottles|@category_recycling": "4Glas-Container|3Glasflaschen|3Altglas",
--- a/data/categories-strings/el.json/localize.json
+++ b/data/categories-strings/el.json/localize.json
@@ -160,7 +160,7 @@
 "amenity-vehicle_inspection": "Έλεγχος οχήματος",
 "amenity-waste_disposal": "Διαχείριση απορριμμάτων|σκουπίδια",
 "amenity-recycling-centre|@category_recycling": "Κέντρο ανακύκλωσης",
-"amenity-recycling-container|@category_recycling": "Κάδος ανακύκλωσης",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Κάδος ανακύκλωσης",
 "recycling-batteries|@category_recycling": "Μπαταρίες",
 "recycling-clothes|@category_recycling": "Παλιά ρούχα|Ανακύκλωση παλαιών ρούχων",
 "recycling-glass_bottles|@category_recycling": "Γυάλινα μπουκάλια",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -182,7 +182,7 @@
 "amenity-vehicle_inspection": "Vehicle Inspection",
 "amenity-waste_disposal": "4Dumpster|4Trash bin|4garbage bin|waste disposal|U+1F6AE",
 "amenity-recycling-centre|@category_recycling": "4Recycling Centre|Tip|Dump|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "4Recycling Container|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "4Recycling of Batteries|Household Batteries Disposal|Household Battery Disposal|4Batteries Disposal|Battery Disposal|Batteries Recycling|Battery Recycling|Batteries",
 "recycling-clothes|@category_recycling": "4Recycling of Clothes|Clothes Recycling|Textile Recycling|Donate Clothes|Clothes Collection Bin|Clothes",
 "recycling-glass_bottles|@category_recycling": "4Recycling of Glass Bottles|4Glass Bottles Recycling|Glass Waste",
--- a/data/categories-strings/es-MX.json/localize.json
+++ b/data/categories-strings/es-MX.json/localize.json
@@ -1,7 +1,7 @@
 {
 "@category_recycling": "Reciclaje|Reciclaje de desechos|Eliminación de desechos|Materiales reciclables|Recogida separada de basura|Clasificación de desechos|Reutilización",
 "shop-houseware|@shop": "Enseres domésticos|Tienda de artículos para el hogar",
-"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
 "recycling-clothes|@category_recycling": "Ropa vieja|Reciclaje de cosas innecesarias|Ropa",
 "recycling-glass_bottles|@category_recycling": "Envase de vidrio",
 "recycling-paper|@category_recycling": "Desechos de papel|Papel",
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -169,7 +169,7 @@
 "amenity-vehicle_inspection": "Inspección de vehículos|inspección vehicular|ITV",
 "amenity-waste_disposal": "Basura|Basurero|Cubo de basura|Contenedor de basura",
 "amenity-recycling-centre|@category_recycling": "Centro de reciclaje|punto limpio|punto verde|5Punto de reciclaje|ecoparque",
-"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje",
 "recycling-batteries|@category_recycling": "Baterías|Pilas|Reciclaje de baterías|10Reciclaje de pilas",
 "recycling-clothes|@category_recycling": "10Reciclaje de ropa|Reciclaje textil",
 "recycling-glass_bottles|@category_recycling": "Cascos de botellas|10Reciclaje de vidrio|Vidrio",
--- a/data/categories-strings/et.json/localize.json
+++ b/data/categories-strings/et.json/localize.json
@@ -166,7 +166,7 @@
 "amenity-vehicle_inspection": "Sõiduki ülevaatus",
 "amenity-waste_disposal": "Prügikast",
 "amenity-recycling-centre|@category_recycling": "Taaskasutuskeskus|Jäätmejaam",
-"amenity-recycling-container|@category_recycling": "Prügikonteiner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Prügikonteiner",
 "recycling-batteries|@category_recycling": "Patareid",
 "recycling-clothes|@category_recycling": "Rõivaste taaskasutus|Rõivad",
 "recycling-glass_bottles|@category_recycling": "Taarapunkt",
--- a/data/categories-strings/eu.json/localize.json
+++ b/data/categories-strings/eu.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Ibilgailuen Ikuskapena",
 "amenity-waste_disposal": "Zaborrontzia",
 "amenity-recycling-centre|@category_recycling": "Birziklatze zentroa|garbigune|Birziklapen zentroa",
-"amenity-recycling-container|@category_recycling": "Birziklatzeko edukiontzia",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Birziklatzeko edukiontzia",
 "recycling-batteries|@category_recycling": "Bateriak",
 "recycling-clothes|@category_recycling": "Arropa zaharra|Alferrikako gauzak birziklatzea|Arropa",
 "recycling-glass_bottles|@category_recycling": "Botila kaskoak",
--- a/data/categories-strings/fa.json/localize.json
+++ b/data/categories-strings/fa.json/localize.json
@@ -160,7 +160,7 @@
 "amenity-vehicle_inspection": "بازرسی وسایل نقلیه",
 "amenity-waste_disposal": "زباله دانی",
 "amenity-recycling-centre|@category_recycling": "مرکز بازیافت",
-"amenity-recycling-container|@category_recycling": "ظرف بازیافت",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "ظرف بازیافت",
 "recycling-batteries|@category_recycling": "ﺎﻫ ﯼﺮﺗﺎﺑ",
 "recycling-clothes|@category_recycling": "بازیافت لباسهای قدیمی|لباسهای قدیمی",
 "recycling-glass_bottles|@category_recycling": "بطریهای شیشهای",
--- a/data/categories-strings/fi.json/localize.json
+++ b/data/categories-strings/fi.json/localize.json
@@ -158,7 +158,7 @@
 "amenity-vehicle_inspection": "Ajoneuvon tarkastus",
 "amenity-waste_disposal": "Roska",
 "amenity-recycling-centre|@category_recycling": "Kierrätyskeskus",
-"amenity-recycling-container|@category_recycling": "Kierrätysjäteastia",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Kierrätysjäteastia",
 "recycling-batteries|@category_recycling": "Paristot",
 "recycling-clothes|@category_recycling": "Vanhat vaatteet|Jätä tarpeettomat tavarat tähän|Vaatteet",
 "recycling-glass_bottles|@category_recycling": "Lasipullot",
--- a/data/categories-strings/fr.json/localize.json
+++ b/data/categories-strings/fr.json/localize.json
@@ -167,7 +167,7 @@
 "amenity-vehicle_inspection": "Inspection de véhicule|Contrôle technique",
 "amenity-waste_disposal": "Déchets|poubelle|déchet",
 "amenity-recycling-centre|@category_recycling": "Centre de recyclage|Déchetterie|Déchèterie",
-"amenity-recycling-container|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire",
 "recycling-batteries|@category_recycling": "Batteries",
 "recycling-clothes|@category_recycling": "Vêtements usagés",
 "recycling-glass_bottles|@category_recycling": "Verre|bouteille|bocaux",
--- a/data/categories-strings/hi.json/localize.json
+++ b/data/categories-strings/hi.json/localize.json
@@ -135,7 +135,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3डाकघर",
 "amenity-waste_disposal": "3कचरे के डिब्बे",
 "amenity-recycling-centre|@category_recycling": "4रीसाइक्लिंग सेंटर",
-"amenity-recycling-container|@category_recycling": "रीसाइक्लिंग कंटेनर",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसाइक्लिंग कंटेनर",
 "amenity-school": "4विदयालय|विद्यालय",
 "amenity-shelter": "4आश्रय",
 "amenity-shelter-basic_hut": "द्विवार्षिक झोपड़ी",
--- a/data/categories-strings/hu.json/localize.json
+++ b/data/categories-strings/hu.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Gépjármű átvizsgálás",
 "amenity-waste_disposal": "Szemeteskonténer|Kuka|Hulladék|Szemét",
 "amenity-recycling-centre|@category_recycling": "Hulladékudvar|Újrahasznosító központ|hulladékgyűjtő központ",
-"amenity-recycling-container|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer",
 "recycling-batteries|@category_recycling": "Elemek|Elem, akkumulátor",
 "recycling-clothes|@category_recycling": "Régi ruhák|Régi ruhák újrahasznosítása|Ruha",
 "recycling-glass_bottles|@category_recycling": "Üveg palackok",
--- a/data/categories-strings/id.json/localize.json
+++ b/data/categories-strings/id.json/localize.json
@@ -154,7 +154,7 @@
 "amenity-vehicle_inspection": "Pemeriksaan kendaraan",
 "amenity-waste_disposal": "Sampah",
 "amenity-recycling-centre|@category_recycling": "TPA",
-"amenity-recycling-container|@category_recycling": "Wadah daur ulang",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Wadah daur ulang",
 "recycling-batteries|@category_recycling": "Baterai",
 "recycling-clothes|@category_recycling": "Pakaian lama|Mendaur ulang pakaian lama",
 "recycling-glass_bottles|@category_recycling": "Botol kaca",
--- a/data/categories-strings/it.json/localize.json
+++ b/data/categories-strings/it.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Ispezione del veicolo",
 "amenity-waste_disposal": "Spazzatura",
 "amenity-recycling-centre|@category_recycling": "Centro di riciclaggio",
-"amenity-recycling-container|@category_recycling": "Contenitore per materiali riciclabili",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenitore per materiali riciclabili",
 "recycling-batteries|@category_recycling": "Batterie",
 "recycling-clothes|@category_recycling": "Vestiti usati|Riciclare vestiti usati|Raccolta indumenti",
 "recycling-glass_bottles|@category_recycling": "Contenitori in vetro",
--- a/data/categories-strings/ja.json/localize.json
+++ b/data/categories-strings/ja.json/localize.json
@@ -162,7 +162,7 @@
 "amenity-vehicle_inspection": "車検",
 "amenity-waste_disposal": "ゴミ|ごみ|リサイクル|再利用|ダストボックス",
 "amenity-recycling-centre|@category_recycling": "リサクルセンター",
-"amenity-recycling-container|@category_recycling": "リサイクルボックス",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "リサイクルボックス",
 "recycling-batteries|@category_recycling": "バッテリー",
 "recycling-clothes|@category_recycling": "古着|古着のリサイクル",
 "recycling-glass_bottles|@category_recycling": "ガラス瓶",
--- a/data/categories-strings/ko.json/localize.json
+++ b/data/categories-strings/ko.json/localize.json
@@ -157,7 +157,7 @@
 "amenity-vehicle_inspection": "차량검사",
 "amenity-waste_disposal": "쓰레기|휴지통",
 "amenity-recycling-centre|@category_recycling": "재활용센터|재활용 센터",
-"amenity-recycling-container|@category_recycling": "재활용 쓰레기통|재활용품통",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "재활용 쓰레기통|재활용품통",
 "recycling-batteries|@category_recycling": "배터리",
 "recycling-clothes|@category_recycling": "낡은 옷|낡은 옷 재활|낡은 옷 재활용",
 "recycling-glass_bottles|@category_recycling": "유리병",
--- a/data/categories-strings/lv.json/localize.json
+++ b/data/categories-strings/lv.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Transportlīdzekļu tehniskā apskate|tehniskā apskate|4CSDD",
 "amenity-waste_disposal": "Atkritumu tvertne|atkritumu konteiners|miskaste|U+1F6AE",
 "amenity-recycling-centre|@category_recycling": "Atkritumu pārstrādes centrs|pārstrādes centrs|izgāztuve|U+1F6AE|U+267B",
-"amenity-recycling-container|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B",
 "recycling-batteries|@category_recycling": "Bateriju utilizācija|bateriju pārstrāde|bateriju nodošana",
 "recycling-clothes|@category_recycling": "Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana",
 "recycling-glass_bottles|@category_recycling": "Stikla pārstrāde|stikla nodošana|stikla atkritumi",
--- a/data/categories-strings/mr.json/localize.json
+++ b/data/categories-strings/mr.json/localize.json
@@ -154,7 +154,7 @@
 "amenity-vehicle_inspection": "वाहन तपासणी",
 "amenity-waste_disposal": "कचरापेटी",
 "amenity-recycling-centre|@category_recycling": "भंगारवाला|पुनर्वापर केंद्र|रिसायकल सेंटर|भंगार केंद्र",
-"amenity-recycling-container|@category_recycling": "रीसायकलिंग कंटेनर",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसायकलिंग कंटेनर",
 "recycling-batteries|@category_recycling": "बॅटर भंगारवाला|घरगुती बॅटरी",
 "recycling-clothes|@category_recycling": "कपडे भंगारवाला|कपडे",
 "recycling-glass_bottles|@category_recycling": "काचेच्या बाटल्यांचे पुनर्वापर",
--- a/data/categories-strings/nb.json/localize.json
+++ b/data/categories-strings/nb.json/localize.json
@@ -156,7 +156,7 @@
 "amenity-vehicle_inspection": "Inspeksjon av kjøretøy",
 "amenity-waste_disposal": "4Søppeldunk|4søppel",
 "amenity-recycling-centre|@category_recycling": "Resirkuleringssenter|innsamlingsstasjon",
-"amenity-recycling-container|@category_recycling": "Gjenvinningsbeholder",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Gjenvinningsbeholder",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gamle klær|Levere gamle klær",
 "recycling-glass_bottles|@category_recycling": "Glassemballasje",
--- a/data/categories-strings/nl.json/localize.json
+++ b/data/categories-strings/nl.json/localize.json
@@ -164,7 +164,7 @@
 "amenity-vehicle_inspection": "Voertuiginspectie",
 "amenity-waste_disposal": "4Afvalcontainer|afval|prullenbak|vuilnis",
 "amenity-recycling-centre|@category_recycling": "Milieustraat|recycling centrum|milieupark|gemeentewerf",
-"amenity-recycling-container|@category_recycling": "Recycling container",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recycling container",
 "recycling-batteries|@category_recycling": "Batterijen",
 "recycling-clothes|@category_recycling": "Oude kleding|Oude kleding recyclen",
 "recycling-glass_bottles|@category_recycling": "4Recycling van glasflessen|4Glasrecycling|Glasafval|Glascontainer|Glasbak",
--- a/data/categories-strings/pl.json/localize.json
+++ b/data/categories-strings/pl.json/localize.json
@@ -166,7 +166,7 @@
 "amenity-vehicle_inspection": "Kontrola pojazdu",
 "amenity-waste_disposal": "Wysypisko|Śmieci|ponowne odtworzenie|odpady",
 "amenity-recycling-centre|@category_recycling": "Przetwarzanie odpadów|Centrum przetwórstwa odpadów",
-"amenity-recycling-container|@category_recycling": "Pojemnik do recyklingu",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Pojemnik do recyklingu",
 "recycling-batteries|@category_recycling": "Baterie",
 "recycling-clothes|@category_recycling": "Stare ubrania|Przekaż niepotrzebne rzeczy",
 "recycling-glass_bottles|@category_recycling": "Szkło",
--- a/data/categories-strings/pt-BR.json/localize.json
+++ b/data/categories-strings/pt-BR.json/localize.json
@@ -137,7 +137,7 @@
 "amenity-post_office|post_office-post_partner|@category_post": "3Correios",
 "amenity-waste_disposal": "Depósito de lixo|lixo",
 "amenity-recycling-centre|@category_recycling": "Reciclagem|descarte seletivo",
-"amenity-recycling-container|@category_recycling": "Recipiente de reciclagem",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recipiente de reciclagem",
 "recycling-batteries|@category_recycling": "Baterias",
 "recycling-clothes|@category_recycling": "Roupas velhas|Reciclar roupas velhas",
 "recycling-glass_bottles|@category_recycling": "Garrafas de vidro",
--- a/data/categories-strings/pt.json/localize.json
+++ b/data/categories-strings/pt.json/localize.json
@@ -163,7 +163,7 @@
 "amenity-vehicle_inspection": "Inspeção veicular",
 "amenity-waste_disposal": "Contentor do lixo|Caixote do lixo|lixo",
 "amenity-recycling-centre|@category_recycling": "Centro de reciclagem|Ecocentro",
-"amenity-recycling-container|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem",
 "recycling-batteries|@category_recycling": "Baterias",
 "recycling-clothes|@category_recycling": "Reciclagem de roupas|Roupas velhas",
 "recycling-glass_bottles|@category_recycling": "Resíduos de vidro",
--- a/data/categories-strings/ro.json/localize.json
+++ b/data/categories-strings/ro.json/localize.json
@@ -155,7 +155,7 @@
 "amenity-vehicle_inspection": "Inspecția vehiculului",
 "amenity-waste_disposal": "Gunoi",
 "amenity-recycling-centre|@category_recycling": "Centru de reciclare",
-"amenity-recycling-container|@category_recycling": "Containere pentru reciclare",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Containere pentru reciclare",
 "recycling-batteries|@category_recycling": "Baterii",
 "recycling-clothes|@category_recycling": "Haine vechi|Înmânarea lucrurilor inutile",
 "recycling-glass_bottles|@category_recycling": "Deșeuri de sticlă",
--- a/data/categories-strings/ru.json/localize.json
+++ b/data/categories-strings/ru.json/localize.json
@@ -167,7 +167,7 @@
 "amenity-vehicle_inspection": "Техосмотр автомобиля",
 "amenity-waste_disposal": "4Мусорный контейнер|мусорка",
 "amenity-recycling-centre|@category_recycling": "5Пункт приёма вторсырья",
-"amenity-recycling-container|@category_recycling": "Контейнер для вторсырья",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсырья",
 "recycling-batteries|@category_recycling": "5Приём батареек|Утилизация батареек|5Переработка батареек|5Сдать батарейки|4Сбор батареек|5Батарейки",
 "recycling-clothes|@category_recycling": "5Приём одежды|Старая одежда|Сдать ненужные вещи|Сдать вещи|5Сдать одежду|Одежда",
 "recycling-glass_bottles|@category_recycling": "5Приём стеклотары|Приём стекла|5Переработка стекла|5Сдать cтеклотару|Сдать бутылки|4Сбор стеклотары|5Стеклотара|Стеклобой|Стеклянные бутылки",
--- a/data/categories-strings/sk.json/localize.json
+++ b/data/categories-strings/sk.json/localize.json
@@ -159,7 +159,7 @@
 "amenity-vehicle_inspection": "Kontrola vozidla",
 "amenity-waste_disposal": "Odpadky|kôš",
 "amenity-recycling-centre|@category_recycling": "Zberné suroviny",
-"amenity-recycling-container|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklačný odpad|Recyklačný kontajner",
 "recycling-batteries|@category_recycling": "Batérie",
 "recycling-clothes|@category_recycling": "Staré oblečenie|Recyklácia starých šiat",
 "recycling-glass_bottles|@category_recycling": "Sklenené fľaše",
--- a/data/categories-strings/sr.json/localize.json
+++ b/data/categories-strings/sr.json/localize.json
@@ -128,7 +128,7 @@
 "amenity-vehicle_inspection": "8Технички преглед возила|8Tehnički pregled vozila",
 "amenity-waste_disposal": "Контејнер за смеће|Kontejner za smeće",
 "amenity-recycling-centre|@category_recycling": "Рециклажни центар|Reciklažni centar",
-"amenity-recycling-container|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner",
 "recycling-batteries|@category_recycling": "Рециклажа батерија|Reciklaža baterija",
 "recycling-clothes|@category_recycling": "Рециклажа одеће|Reciklaža odeće",
 "recycling-glass_bottles|@category_recycling": "Рециклажа стакла|Reciklaža stakla",
--- a/data/categories-strings/sv.json/localize.json
+++ b/data/categories-strings/sv.json/localize.json
@@ -161,7 +161,7 @@
 "amenity-vehicle_inspection": "Fordonsinspektion",
 "amenity-waste_disposal": "4Avfallscontainer|Soptunna|skräp|avfall",
 "amenity-recycling-centre|@category_recycling": "Återvinningscentral",
-"amenity-recycling-container|@category_recycling": "Behållare för återvinningsbart avfall",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Behållare för återvinningsbart avfall",
 "recycling-batteries|@category_recycling": "Batterier",
 "recycling-clothes|@category_recycling": "Gamla kläder|Överlämna onödiga saker",
 "recycling-glass_bottles|@category_recycling": "Returglas",
--- a/data/categories-strings/th.json/localize.json
+++ b/data/categories-strings/th.json/localize.json
@@ -158,7 +158,7 @@
 "amenity-vehicle_inspection": "การตรวจสอบยานพาหนะ",
 "amenity-waste_disposal": "ขยะ|ถังขยะ",
 "amenity-recycling-centre|@category_recycling": "ศูนย์รีไซเคิล",
-"amenity-recycling-container|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "บรรจุภัณฑ์รีไซเคิล",
 "recycling-batteries|@category_recycling": "แบตเตอรี่",
 "recycling-clothes|@category_recycling": "เสื้อผ้าเก่า|รีไซเคิลเสื้อผ้าเก่า",
 "recycling-glass_bottles|@category_recycling": "ขวดแก้ว",
--- a/data/categories-strings/tr.json/localize.json
+++ b/data/categories-strings/tr.json/localize.json
@@ -168,7 +168,7 @@
 "amenity-vehicle_inspection": "Araç muayenesi",
 "amenity-waste_disposal": "Çöplük|Çöp kutusu|çöp",
 "amenity-recycling-centre|@category_recycling": "4Geri dönüşüm merkezi",
-"amenity-recycling-container|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi",
 "recycling-batteries|@category_recycling": "3Piller|Atık Pil Toplama|Atık pil kutusu",
 "recycling-clothes|@category_recycling": "4Eski kıyafetler|Eski kıyafetler geri dönüşümü|Kıyafet toplama kutusu|giysi toplama kutusu|Kıyafet",
 "recycling-glass_bottles|@category_recycling": "4Cam şişeler Geri Dönüşümü",
--- a/data/categories-strings/uk.json/localize.json
+++ b/data/categories-strings/uk.json/localize.json
@@ -164,7 +164,7 @@
 "amenity-vehicle_inspection": "Техогляд автомобіля",
 "amenity-waste_disposal": "4Сміттєвий контейнер|сміття|смітник",
 "amenity-recycling-centre|@category_recycling": "5Пункт прийому вторинної сировини",
-"amenity-recycling-container|@category_recycling": "Контейнер для вторсировини",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсировини",
 "recycling-batteries|@category_recycling": "5Прийом батарейок|Утилізація батарей|5Переробка батарей|5Здати батареї|4Збір батарейок|5Батарейки",
 "recycling-clothes|@category_recycling": "5Прийом одягу|Старий одяг|Здати непотрібні речі|Здати речі|5Здати одяг|Одяг",
 "recycling-glass_bottles|@category_recycling": "5Прийом склотари|Прийом скла|5Переробка скла|5Здати склотару|Здати пляшки|4Збір склотари|5Склотара|Склобой|Скляні пляшки",
--- a/data/categories-strings/vi.json/localize.json
+++ b/data/categories-strings/vi.json/localize.json
@@ -155,7 +155,7 @@
 "amenity-vehicle_inspection": "Kiểm tra xe",
 "amenity-waste_disposal": "Xử lý chất thải|Rác",
 "amenity-recycling-centre|@category_recycling": "Trung tâm tái sinh",
-"amenity-recycling-container|@category_recycling": "Thùng rác",
+"amenity-recycling-container|amenity-recycling|@category_recycling": "Thùng rác",
 "recycling-batteries|@category_recycling": "Ắc quy",
 "recycling-clothes|@category_recycling": "Quần áo cũ|Chuyển giao những thứ không cần thiết",
 "recycling-glass_bottles|@category_recycling": "Chai lọ thủy tinh",
--- a/Show More
+++ b/Show More