[generator] Fixed ordering for many subtypes

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

.forgejo/workflows/android-check.yaml

@@ -34,19 +34,63 @@ 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: Parallel submodules checkout
+      - 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
         shell: bash
-        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: |
+          git submodule sync --recursive
+          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Lint
         shell: bash
@@ -56,6 +100,9 @@ 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:
@@ -71,23 +118,32 @@ 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: Parallel submodules checkout
+      - 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
         shell: bash
-        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: |
+          git submodule sync --recursive
+          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Configure ccache
-        uses: hendrikmuhs/ccache-action@v1.2
+        uses: https://github.com/hendrikmuhs/ccache-action@v1.2
         with:
           key: ${{ github.workflow }}-${{ matrix.flavor }}
 
@@ -97,14 +153,11 @@ jobs:
         env:
           CMAKE_C_COMPILER_LAUNCHER: ccache
           CMAKE_CXX_COMPILER_LAUNCHER: ccache
-        run: |
-          cmake --version
-          ninja --version
-          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
+        run: ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
 
       - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: android-${{ matrix.flavor }}
-          path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
+          path: android/app/build/outputs/apk/**/*.apk
           if-no-files-found: error

.forgejo/workflows/process_subways.yml

@@ -1,13 +1,23 @@
-name: process_subways
+name: compare_subways
 on:
   workflow_dispatch: # Manual trigger
+    inputs:
+      subways-branch:
+        description: 'Check out a different subways repo branch?'
+        required: true
+        type: string
+        default: master
+  schedule:
+    # Run daily at 00:00 UTC
+    - cron: '0 0 * * *'
 
 env:
-  PLANET: /home/planet/planet/planet.o5m
-  TMPDIR: /tmp
+  #PLANET: /home/planet/planet/planet-latest.pbf
+  #TMPDIR: /tmp
   HTML_DIR: "/mnt/4tbexternal/osm-planet/subway/validator"
-  DUMP: "$HTML_DIR"
-  SKIP_PLANET_UPDATE: "1"
+  #DUMP: "$HTML_DIR"
+  #SKIP_PLANET_UPDATE: "1"
+  SPREADSHEET_ID: "1SEW1-NiNOnA2qDwievcxYV1FOaQl1mb1fdeyqAxHu3k"
   DEBIAN_FRONTEND: nonnteractive
   TZ: Etc/UTC
 
@@ -22,20 +32,69 @@ jobs:
       volumes:
         - /mnt/4tbexternal:/mnt/4tbexternal
     concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
       - uses: actions/cache@v4
         with:
           path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
+          key: cache-${{ github.run_id }}-${{ github.run_attempt }}}
+      - name: Checkout main repo
+        shell: bash
+        run: |
+          echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
+          cd ~
+          git clone --depth 1 -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+          # --recurse-submodules --shallow-submodules
       - name: Checkout subways repo
         shell: bash
         run: |
           cd ~
-          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
+          git clone --depth 1 -b ${{ inputs.subways-branch }} --single-branch https://codeberg.org/comaps/subways.git
+
+  update-planet-pbf:
+    name: Update PBF Planet
+    runs-on: mapfilemaker
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+    concurrency:
+      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Download Planet File if Absent
+        shell: bash
+        # TODO: replace wget2 with curl -Z
+        run: |
+          if [ ! -d /home/planet/planet/ ]; then
+          mkdir -p /home/planet/planet/
+          fi
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          cd /home/planet/planet/
+          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
+          else
+          echo "planet-latest.osm.pbf was found, raw download not required."
+          fi
+      - name: Update PBF Planet
+        shell: bash
+        run: |
+          cd /home/planet/planet/
+          rm -f planet-latest-new.osm.pbf
+          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
+          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
+      - name: Notify Zulip
+        run: |
+          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
+            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
+            --data-urlencode type=stream \
+            --data-urlencode 'to="DevOps"' \
+            --data-urlencode topic=codeberg-bot \
+            --data-urlencode 'content=PBF planet update is done!'
 
   update-planet-o5m:
+    if: false
     name: Update O5M Planet
     runs-on: mapfilemaker
     container:
@@ -44,7 +103,7 @@ jobs:
         - /mnt/4tbexternal/:/mnt/4tbexternal/
         - /mnt/4tbexternal/osm-planet:/home/planet
     concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
       - name: Check for O5M Planet File
@@ -82,9 +141,8 @@ jobs:
             --data-urlencode topic=codeberg-bot \
             --data-urlencode 'content=O5M planet update is done!'
 
-  update-subways:
-    if: inputs.run-subways
-    name: Update Subways
+  compare-subways:
+    name: Compare Subways
     runs-on: mapfilemaker
     needs:
       - clone-repos
@@ -94,31 +152,19 @@ jobs:
         - /mnt/4tbexternal/:/mnt/4tbexternal/
         - /mnt/4tbexternal/osm-planet:/home/planet
     concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      group: ${{ github.workflow }}-compare-subways-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     steps:
       - uses: actions/cache@v4
         with:
           path: "~"
           key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Update Subways
+      - name: Compare Subways
         shell: bash
         run: |
           cd ~/comaps/
           cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
           ./tools/unix/maps/generate_subways.sh
-      - name: Compare with VK validation
-        shell: bash
-        run: |
-          cd ~/subways
-          if [ -f "$HTML_DIR/index.html" ]; then
-            echo "Comparing local validation with VK's validation..."
-            python3 ./scripts/compare_html_validation.py "$HTML_DIR/index.html" \
-              --vk-url "https://maps.vk.com/osm/tools/subways/latest/index.html"
-          else
-            echo "Local index.html not found at $HTML_DIR/index.html"
-            exit 1
-          fi
       - name: Notify Zulip
         run: |
           curl -X POST https://comaps.zulipchat.com/api/v1/messages \
@@ -127,3 +173,47 @@ jobs:
             --data-urlencode 'to="DevOps"' \
             --data-urlencode topic=codeberg-bot \
             --data-urlencode 'content=Subways are done!'
+      - name: Compare with VK validation
+        shell: bash
+        run: |
+          set -e
+          cd ~/subways
+          if [ -f "$HTML_DIR/cities.txt" ]; then
+            echo "Comparing local validation with VK's validation..."
+            python3 ./scripts/compare_html_validation.py "$HTML_DIR/cities.txt" \
+              --remote-url "https://maps.vk.com/osm/tools/subways/latest/cities.txt"
+          else
+            echo "Local cities.txt not found at $HTML_DIR/cities.txt"
+            exit 1
+          fi
+      - name: Compare Google Sheets Data
+        shell: bash
+        run: |
+          set -e
+
+          # Download the Google Sheets data
+          GOOGLE_SHEETS_URL="https://docs.google.com/spreadsheets/d/${SPREADSHEET_ID}/export?format=csv"
+          echo "Downloading Google Sheets data from: $GOOGLE_SHEETS_URL"
+          curl -sL "$GOOGLE_SHEETS_URL" -o /tmp/google_sheets.csv
+
+          # Normalize line endings to avoid spurious diffs
+          sed 's/\r$//' source_data/Rapid.csv > /tmp/local_normalized.csv
+          sed 's/\r$//' /tmp/google_sheets.csv > /tmp/google_normalized.csv
+
+          # Generate unified diff
+          echo ""
+          echo "Differences between local Rapid.csv and Google Sheets:"
+          echo ""
+
+          if diff -u /tmp/local_normalized.csv /tmp/google_normalized.csv > /tmp/full_diff.txt; then
+            echo "No differences found! Local Rapid.csv is in sync with Google Sheets."
+            exit 0
+          else
+            cat /tmp/full_diff.txt
+
+            echo ""
+            echo "The above diff can be saved as a patch and applied with:"
+            echo "  patch source_data/Rapid.csv < patch-file"
+            echo "or by manually reviewing and applying the changes."
+            exit 1
+          fi

.github/workflows/android-check.yaml

@@ -1,9 +1,6 @@
 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

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://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 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>
     <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"/>

android/app/src/fdroid/play/listings/ar/full-description.txt

@@ -0,0 +1,32 @@
+تطبيق خرائط مجاني ومفتوح المصدر تقوده المجتمع، مبني على بيانات OpenStreetMap ويعززه الالتزام بالشفافية والخصوصية وعدم الربح. CoMaps هو فرع/انبثاق من Organic Maps، والذي بدوره هو فرع من Maps.ME.
+
+اقرأ المزيد عن أسباب المشروع واتجاهه على <b><i>codeberg.org/comaps</i></b>.
+انضم إلى المجتمع هناك وساعد في صنع أفضل تطبيق خرائط
+• استخدم التطبيق وانشر الكلمة عنه
+• قدم الملاحظات وأبلغ عن المشكلات
+• حدِّث بيانات الخرائط في التطبيق أو على موقع OpenStreetMap
+
+‣ <b>مرتكز على وضع عدم الاتصال</b>: خطط وابحث عن طريقك في رحلتك بالخارج دون الحاجة إلى خدمة الهاتف الخلوي، ابحث عن نقاط الطريق أثناء التنزه البعيد، إلخ. جميع وظائف التطبيق مصممة للعمل دون اتصال.
+‣ <b>يحترم الخصوصية</b>: التطبيق مصمم مع مراعاة الخصوصية - لا يحدد هوية الأشخاص، لا يتتبع، ولا يجمع المعلومات الشخصية. خالٍ من الإعلانات.
+‣ <b>بسيط ومصقول</b>: ميزات أساسية سهلة الاستخدام تعمل ببساطة.
+‣ <b>يوفر بطاريتك ومساحتك</b>: لا يستنزف بطاريتك مثل تطبيقات الملاحة الأخرى. الخرائط المدمجة توفر مساحة ثمينة على هاتفك.
+‣ <b>مجاني ومبني من قبل المجتمع</b>: ساعد أشخاص مثلك في بناء التطبيق بإضافة أماكن إلى OpenStreetMap، واختبار الميزات وإبداء الملاحظات، والمساهمة بمهاراتهم التطويرية وأموالهم.
+‣ <b>قرارات ومالية مفتوحة وشفافة، غير ربحية ومفتوحة المصدر بالكامل.</b>
+
+<b>الميزات الرئيسية</b>:
+• خرائط تفصيلية قابلة للتحميل تحتوي على أماكن غير متوفرة في خرائط Google
+• وضع خارجي مع مسارات المشي لمسافات طويلة المميزة، مواقع التخييم، مصادر المياه، القمم، خطوط الكنتور، إلخ
+• ممرات المشي ومسارات الدراجات
+• نقاط الاهتمام مثل المطاعم، محطات الوقود، الفنادق، المتاجر، المعالم السياحية والكثير غيرها
+• البحث بالاسم أو العنوان أو فئة نقطة الاهتمام
+• ملاحة مع إعلانات صوتية للمشي أو ركوب الدراجات أو القيادة
+• وضع إشارة على أماكنك المفضلة بنقرة واحدة
+• مقالات ويكيبيديا دون اتصال
+• طبقة مترو الأنفاق والتوجيهات
+• تسجيل المسار
+• تصدير واستيراد العلامات والمسارات بصيغ KML وKMZ وGPX
+• وضع الظلام للاستخدام أثناء الليل
+• تحسين بيانات الخرائط للجميع باستخدام محرر مدمج أساسي
+
+<b>الحرية هنا</b>
+اكتشف رحلتك، ابحر في العالم مع وضع الخصوصية والمجتمع في المقدمة!

android/app/src/fdroid/play/listings/ar/short-description.txt

@@ -0,0 +1 @@
+تنقل سهل في الخريطة - اكتشف المزيد من رحلتك - مدعوم من المجتمع

android/app/src/fdroid/play/listings/ar/title.txt

@@ -0,0 +1 @@
+تنزه، تنقل، قُد بدون إتصال الإنترنت مع الخصوصية

android/app/src/fdroid/play/listings/kw/full-description.txt

@@ -7,7 +7,7 @@ Omjunya an kemeneth ena ha gweres gul an app mappys gwella
 • Nowedhi data mappa yn an app po war an gwasiva OpenStreetMap
 
 ‣ <b>Fogellys war dhywarlinen</b>: Devisya ha viajya dha viaj tramor neb res rag gonis kellgowser, hwilas leow ha war unn gwandrans pell, h.e. Oll nasyow app yw desinys dhe oberi dhywarlinen.
-‣ <b>Ow Gul Revrons dhe Privetter</b>: An app yw desinys gans privetter yn brys - na aswon tus, na helerghi, ha na kuntel kudhlow personel. Heb argemynnow.
+‣ <b>Ow Gul Revrons dhe Privetter</b>: An app yw desinys gans privetter yn brys - na aswon tus, na helerghi, ha na kuntel kedhlow personel. Heb argemynnow.
 ‣ <b>Sempel ha Polsys</b>: nasyow es may oberi poran.
 ‣ <b>Sawya dha Batri hag Efander</b>: Na gwakhe dha batri haval dhe appys navigacyon aral. Mappys kesstrothys sawya efander precyous war dha kellgowser.
 ‣ <b>Rydh ha Byldys gans an Kemeneth</b>: Tus haval dhe ty gwerys byldya an app gans owth addya leos dhe OpenStreetMap, ow previ ha dasliva a-dro nasyow hag ow kevri aga sleynethow hag arghans i.

android/app/src/google/play/listings/ar/full-description.txt

@@ -0,0 +1,36 @@
+تطبيق خرائط مجاني ومفتوح المصدر تقوده المجتمع، مبني على بيانات OpenStreetMap ويعززه الالتزام بالشفافية والخصوصية وعدم الربحية.
+
+انضم إلى المجتمع وساعد في صنع أفضل تطبيق خرائط
+• استخدم التطبيق وانشر الكلمة عنه
+• قدم ملاحظاتك وأبلغ عن المشاكل
+• حدِّث بيانات الخريطة في التطبيق أو على موقع OpenStreetMap
+
+<i>ملاحظاتك وتقييماتك الخمس نجوم هي أفضل دعم لنا!</i>
+
+‣ <b>بسيط ومصقول</b>: ميزات أساسية سهلة الاستخدام تعمل ببساطة.
+‣ <b>مركز على العمل دون اتصال</b>: خطط وابحث عن طريقك في رحلاتك بالخارج دون الحاجة لخدمة الهاتف، ابحث عن نقاط الطريق خلال رحلات المشي البعيدة، إلخ. جميع وظائف التطبيق مصممة للعمل دون اتصال.
+‣ <b>يحترم الخصوصية</b>: التطبيق مصمم مع مراعاة الخصوصية - لا يعرّف الأشخاص، لا يتتبع، ولا يجمع المعلومات الشخصية. خالٍ من الإعلانات.
+‣ <b>يوفر بطاريتك ومساحتك</b>: لا يستنزف بطاريتك مثل تطبيقات الملاحة الأخرى. الخرائط المدمجة توفر مساحة ثمينة على هاتفك.
+‣ <b>مجاني ومبني بواسطة المجتمع</b>: أشخاص مثلك ساعدوا في بناء التطبيق بإضافة أماكن إلى OpenStreetMap، واختبار الميزات وإعطاء ملاحظات، والمساهبة بمهاراتهم التطويرية وأموالهم.
+‣ <b>قرارات ومالية مفتوحة وشفافة، غير ربحية ومفتوحة المصدر بالكامل.</b>
+
+<b>الميزات الرئيسية</b>:
+• خرائط مفصلة قابلة للتحميل تحتوي على أماكن غير متوفرة في خرائط جوجل
+• وضع خارجي مع مسارات المشي المميزة، مواقع التخييم، مصادر المياه، القمم، خطوط الكنتور، إلخ
+• مسارات المشي ومسارات الدراجات
+• نقاط الاهتمام مثل المطاعم، محطات الوقود، الفنادق، المتاجر، المعالم السياحية والكثير غيرها
+• البحث بالاسم أو العنوان أو فئة نقطة الاهتمام
+• ملاحة مع إعلانات صوتية للمشي، ركوب الدراجات، أو القيادة
+• وضع إشارة على أماكنك المفضلة بنقرة واحدة
+• مقالات ويكيبيديا دون اتصال
+• طبقة مترو الأنفاق وإرشادات الاتجاهات
+• تسجيل المسار
+• تصدير واستيراد العلامات والمسارات بصيغ KML، KMZ، GPX
+• وضع مظلم للاستخدام خلال الليل
+• تحسين بيانات الخريطة للجميع باستخدام محرر مدمج أساسي
+• دعم Android Auto
+
+يرجى الإبلاغ عن مشاكل التطبيق، اقتراح أفكار والانضمام إلى مجتمعنا على موقع <b><i>comaps.app</i></b>.
+
+<b>الحرية هنا</b>
+اكتشف رحلتك، ابحر في العالم مع وضع الخصوصية والمجتمع في المقدمة!

android/app/src/google/play/listings/ar/short-description.txt

@@ -0,0 +1 @@
+تنقل سهل في الخريطة - اكتشف المزيد من رحلتك - مدعوم من المجتمع

android/app/src/google/play/listings/ar/title.txt

@@ -0,0 +1 @@
+CoMaps - التنقل مع الخصوصية

android/app/src/google/play/listings/uk/short-description.txt

@@ -0,0 +1 @@
+Проста навігація по мапі - Дізнайтеся більше про свою подорож - Розроблено спільнотою

android/app/src/google/play/listings/uk/title.txt

@@ -0,0 +1 @@
+Приватна навігація

android/app/src/main/res/drawable/ic_track_recording_off.xml

@@ -3,47 +3,9 @@
   android:width="74dp"
   android:height="57dp"
   android:viewportWidth="74"
-  android:viewportHeight="57">
+  android:viewportHeight="57"
+  android:tint="?iconTint">
   <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: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" />
+    android:fillColor="#FFFFFF"
+    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.425L25.208,36.215c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048L48.119,30.283c-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.042L65.323,13.832c2.091,-0.869 4.357,1.392 3.486,3.478L58.355,39.913c-1.219,2.607 -5.053,1.736 -5.053,-1.044V34.451c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525L37.505,48.354C33.137,52.76 26.02,52.798 21.604,48.44 17.191,44.082 17.152,36.979 21.52,32.573L36.117,17.847c1.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.091C8.633,32.629 5,29.002 5,24.538c0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
 </vector>

android/app/src/main/res/drawable/ic_track_recording_on.xml

@@ -6,48 +6,9 @@
   android:viewportHeight="80">
     <path
       android:pathData="m4.858,10.076c0,-5.523 4.477,-10 10,-10h60c5.523,0 10,4.477 10,10v60c0,5.523 -4.477,10 -10,10h-60c-5.523,0 -10,-4.477 -10,-10z"
-      android:fillColor="@color/active_track_recording"
+      android:fillColor="@color/base_red"
       android:fillAlpha="0.78" />
     <path
-      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" />
+      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.333L31.879,49.485c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051L56.401,43.152c-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.383L74.814,25.588c2.238,-0.928 4.663,1.486 3.731,3.713L67.356,53.433c-1.305,2.783 -5.408,1.854 -5.408,-1.115V47.601c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561L45.04,62.444C40.365,67.148 32.747,67.189 28.021,62.536 23.298,57.883 23.256,50.299 27.931,45.595L43.554,29.873c1.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"/>
 </vector>

android/app/src/main/res/layout/fragment_editor.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_phone.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="@color/bg_editor"
+        android:background="?colorSurfaceContainerLow"
         android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView

android/app/src/main/res/layout/fragment_timetable.xml

@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_editor"
+    android:background="?colorSurfaceContainerLow"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,7 +19,7 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="@color/bg_editor"/>
+    android:background="?colorSurfaceContainerLow"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"

android/app/src/main/res/layout/fragment_timetable_advanced.xml

@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor">
+  android:background="?colorSurfaceContainerLow">
 
   <LinearLayout
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_timetable_simple.xml

@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/bg_editor"
+  android:background="?colorSurfaceContainerLow"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>

android/app/src/main/res/layout/localized_name.xml

@@ -7,7 +7,6 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
-  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -25,7 +24,6 @@
     android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/fg_editor"
     android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton

android/app/src/main/res/layout/map_buttons_zoom.xml

@@ -12,7 +12,7 @@
     android:tint="?iconTint"
     app:srcCompat="@drawable/ic_plus"
     app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
-    android:layout_marginBottom="@dimen/margin_eighth"
+    android:layout_marginBottom="@dimen/margin_eighth_plus"
     android:contentDescription="@string/zoom_in"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/nav_zoom_out"

android/app/src/main/res/values-ar/strings.xml

@@ -2,22 +2,22 @@
 <resources>
     <!-- SECTION: Strings -->
     <!-- Button text (should be short) -->
-    <string name="back">رجوع</string>
+    <string name="back">ارجع</string>
     <!-- Button text (should be short) -->
-    <string name="cancel">إلغاء</string>
+    <string name="cancel">ألغِ</string>
     <!-- Button which deletes downloaded country -->
-    <string name="delete">حذف</string>
-    <string name="download_maps">تنزيل الخرائط</string>
+    <string name="delete">احذف</string>
+    <string name="download_maps">نزّل الخرائط</string>
     <!-- Settings/Downloader - info for country when download fails -->
     <string name="download_has_failed">فشلت عملية التنزيل، انقر لإعادة المحاولة</string>
     <!-- Settings/Downloader - info for country which started downloading -->
-    <string name="downloading">جاري التنزيل…</string>
+    <string name="downloading">جارِ التنزيل…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">الكيلومترات</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">الأميال</string>
     <!-- Update maps later button text -->
-    <string name="later">ًلاحقا</string>
+    <string name="later">لاحقًا</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">البحث</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->

android/app/src/main/res/values-cs/strings.xml

@@ -148,7 +148,7 @@
     <!-- message title of loading file -->
     <string name="load_kmz_title">Načítání oblíbených</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Oblíbená místa byla úspěšně nahrána! Naleznete je na mapě nebo ve správci oblíbených.</string>
+    <string name="load_kmz_successful">Oblíbené byly úspěšně nahrány! Naleznete je na mapě nebo ve správci oblíbených.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">Nepodařilo se načíst oblíbená místa. Soubor může být poškozený nebo vadný.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -804,7 +804,7 @@
     <string name="error_enter_correct_instagram_page">Zadejte platné uživatelské jméno nebo webovou adresu Instagramu</string>
     <string name="error_enter_correct_twitter_page">Zadejte platné uživatelské jméno nebo webovou adresu Twitteru</string>
     <string name="maps_storage_free_size">%1$s z %2$s volných</string>
-    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš má oblíbená místa; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/download/ \n \nUžij si cestování s CoMaps!</string>
+    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš má oblíbená místa; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://www.comaps.app/cs/download/\n \nUžij si cestování s CoMaps!</string>
     <string name="disk_error">Nepodařilo se vytvořit složku a přesunout soubory v interní paměti zařízení nebo na SD kartě</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="error_enter_correct_vk_page">Zadejte platné uživatelské jméno nebo webovou adresu VK</string>

android/app/src/main/res/values-de/strings.xml

@@ -281,7 +281,7 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Karte aktualisieren</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google-Standortverknüpfungsdienst</string>
+    <string name="google_play_services">Google’s verknüpfter Ortungsdienst</string>
     <!-- Preference text -->
     <string name="pref_use_google_play">Ein proprietärer Dienst, der GPS, Wi-Fi, Mobilfunknetzwerke etc. kombiniert, um den Standort genauer zu bestimmen. Er kann sich mit Google-Servern verbinden.</string>
     <!-- Preference title -->

android/app/src/main/res/values-el/strings.xml

@@ -843,7 +843,7 @@
     <string name="avoid_paved">Αποφυγή στρωμένων δρόμων</string>
     <string name="unknown_power_output">άγνωστο</string>
     <string name="unknown_count">άγνωστο</string>
-    <string name="advanced">Προχωρημένο</string>
+    <string name="advanced">Προχωρημένες</string>
     <string name="charge_socket_count">Πλήθος</string>
     <string name="ruler">Χάρακας</string>
     <string name="clear">Εκκαθάριση</string>
@@ -870,4 +870,12 @@
     <string name="error_enter_correct_fediverse_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Mastodon</string>
     <string name="error_enter_correct_bluesky_page">Εισάγετε ένα έγκυρο όνομα χρήστη ή διεύθυνση Bluesky</string>
     <string name="power_management">Διαχείριση ενέργειας</string>
+    <string name="download_resources_custom_url_error_scheme">Παρακαλούμε είσαγετε ένα URL που να ξεκινά με http:// ή https://</string>
+    <string name="error_value_must_be_positive">Η τιμή πρέπει να είναι θετική</string>
+    <string name="error_invalid_number">Άκυρος αριθμός</string>
+    <string name="offline_explanation_title">Χάρτες εκτός σύνδεσης</string>
+    <string name="list_description_empty">Επεξεργαστείτε τη λίστα για να προσθέσετε περιγραφή</string>
+    <string name="download_resources_custom_url_summary_none">Δεν έχει οριστεί</string>
+    <string name="download_resources_custom_url_title">Προσαρμοσμένος διακομιστής χάρτη</string>
+    <string name="download_resources_custom_url_message">Παρακάμπτει τον προεπιλεγμένο διακομιστή λήψης χάρτη για τις λήψεις χαρτών. Αφήστε το κενό για να χρησιμοποιήσετε τον προεπιλεγμένο διακομιστή του CoMaps.</string>
 </resources>

android/app/src/main/res/values-eo/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="search">Serĉu</string>
     <string name="cancel">Nuligi</string>
-    <string name="bookmarks_and_tracks">Legosignoj kaj Trakoj</string>
+    <string name="bookmarks_and_tracks">Favorataj</string>
     <string name="back">Reen</string>
     <string name="app_site_url">https://comaps.app/eo</string>
     <string name="delete">Forigi</string>

android/app/src/main/res/values-es-rMX/strings.xml

@@ -215,4 +215,23 @@
     <string name="about_headline">Proyecto abierto impulsado por la comunidad</string>
     <string name="saved">Guardado</string>
     <string name="about_proposition_3">• No necesita conexión a internet, rápido y compacto</string>
+    <string name="downloading">Descargando…</string>
+    <string name="download_maps">Descargar Mapas</string>
+    <string name="kilometres">Kilómetros</string>
+    <string name="miles">Millas</string>
+    <string name="search">Buscar</string>
+    <string name="delete">Borrar</string>
+    <string name="download_has_failed">La descarga ha fallado, presiona para volver a intentarlo</string>
+    <string name="later">Más tarde</string>
+    <string name="search_map">Buscar en el mapa</string>
+    <string name="location_is_disabled_long_text">Actualmente tienes todos los Servicios de Localización desactivados para este dispositivo o aplicación. Por favor, actívalos en Ajustes.</string>
+    <string name="limited_accuracy">Precisión Limitada</string>
+    <string name="zoom_to_country">Mostrar en el mapa</string>
+    <string name="country_status_download_failed">La descarga ha fallado</string>
+    <string name="try_again">Inténtalo de nuevo</string>
+    <string name="about_menu_title">Acerca de CoMaps</string>
+    <string name="about_proposition_2">• Centrado en la privacidad y sin anuncios</string>
+    <string name="about_developed_by_enthusiasts">Totalmente de código abierto, sin fines de lucro, toma de decisiones y finanzas transparentes.</string>
+    <string name="close">Cerrar</string>
+    <string name="download">Descargar</string>
 </resources>

android/app/src/main/res/values-es/strings.xml

@@ -149,7 +149,7 @@
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
     <string name="share_bookmarks_email_subject">Mis favoritos de CoMaps</string>
-    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis favoritos de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfrute viajando con CoMaps!</string>
+    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis favoritos. Por favor, ábrelos si tienes instalado CoMaps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este enlace: https://www.comaps.app/es/download/ \n\n¡Disfruta viajando con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Cargando favoritos</string>
     <!-- Kmz file successful loading -->
@@ -609,7 +609,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Estilos y capas del mapa</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
-    <string name="bookmarks_empty_list_message">Para agregar un marcador, toca un lugar en el mapa y después toca el icono de la estrella</string>
+    <string name="bookmarks_empty_list_message">Para guardar un lugar, toca un lugar en el mapa y después toca el icono de la estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>

android/app/src/main/res/values-et/strings.xml

@@ -797,7 +797,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Jätka salvestamist</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Kas salvestame lemmikute alla?</string>
+    <string name="track_recording_alert_title">Kas salvestame lemmikute loendisse?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Rada on tühi - ei ole midagi salvestada</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->

android/app/src/main/res/values-eu/strings.xml

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Markagailuak</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</string>
+    <string name="bookmarks_and_tracks">Gogokoak</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Izena</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->

android/app/src/main/res/values-fr/strings.xml

@@ -151,11 +151,11 @@
     <string name="share_bookmarks_email_subject">Mes favoris CoMaps.</string>
     <string name="share_bookmarks_email_body">Bonjour,\n \nVous trouverez ci-joint mes favoris, veuillez les ouvrir dans l’application CoMaps. Si vous ne l’avez pas encore installée, téléchargez l\'application depuis : https://www.comaps.app/download/ \n \nBon voyage avec CoMaps !</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Chargement des Favoris</string>
+    <string name="load_kmz_title">Chargement des favoris</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Les favoris ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l’écran du Gestionnaire des Favoris.</string>
+    <string name="load_kmz_successful">Vos favoris ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l\'écran Gestionnaire de favoris.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Erreur lors du chargement des Favoris. Le fichier pourrait être corrompu ou défectueux.</string>
+    <string name="load_kmz_failed">Échec du chargement des favoris. Le fichier est peut-être corrompu ou défectueux.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Le type de fichier n’est pas reconnu par l’appli :\n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -503,7 +503,7 @@
     <string name="minute">min</string>
     <string name="day">j</string>
     <string name="placepage_more_button">Plus</string>
-    <string name="placepage_edit_bookmark_button">Modifier l\'emplacement enregistré</string>
+    <string name="placepage_edit_bookmark_button">Modifier le lieu enregistré</string>
     <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
     <string name="editor_reset_edits_button">Annuler les modifications</string>
@@ -578,7 +578,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Créer une nouvelle liste</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer des favoris</string>
+    <string name="bookmarks_import">Importer les favoris</string>
     <string name="bookmarks_error_message_share_general">Impossible de partager en raison d’une erreur d’application</string>
     <string name="bookmarks_error_title_share_empty">Erreur de partage</string>
     <string name="bookmarks_error_message_share_empty">Impossible de partager une liste vide</string>
@@ -812,7 +812,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continuer l’enregistrement</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</string>
+    <string name="track_recording_alert_title">Enregistrer dans les favoris ?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">L’itinéraire est vide - il n’y a rien à enregistrer</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->

android/app/src/main/res/values-ga/strings.xml

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="kilometres">Ciliméadar</string>
+</resources>

android/app/src/main/res/values-it/strings.xml

@@ -70,9 +70,9 @@
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Nome dell\'elenco</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Luoghi preferiti</string>
+    <string name="bookmarks">Luoghi</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Preferiti</string>
+    <string name="bookmarks_and_tracks">Luoghi preferiti</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -145,11 +145,11 @@
     <string name="description">Informazioni</string>
     <!-- Email Subject when sharing bookmark list -->
     <string name="share_bookmarks_email_subject">I miei luoghi preferiti su CoMaps</string>
-    <string name="share_bookmarks_email_body">Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato CoMaps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://www.comaps.app/\n\nDivertiti a viaggiare con CoMaps!</string>
+    <string name="share_bookmarks_email_body">Ciao!\n\nIn allegato ci sono i miei luoghi preferiti; aprili con CoMaps. Se non hai installato l\'applicazione puoi farlo da qui: https://www.comaps.app/download/\n\nDivertiti a viaggiare con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Caricamento luoghi preferiti</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Luoghi preferiti caricati con successo! Puoi trovarli sulla mappa o nella schermata Gestione Luoghi preferiti.</string>
+    <string name="load_kmz_successful">Luoghi preferiti caricati con successo! Puoi trovarli sulla mappa o nella schermata di gestione dei luoghi preferiti.</string>
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">Caricamento dei luoghi preferiti fallito. Il file potrebbe essere corrotto o difettoso.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
@@ -560,7 +560,7 @@
     <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simula memoria danneggiata</string>
     <string name="error_enter_correct_name">Inserire un nome corretto</string>
-    <string name="bookmark_lists">Elenchi</string>
+    <string name="bookmark_lists">Elenco dei preferiti</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Nascondi tutto</string>
     <string name="bookmark_lists_show_all">Mostra tutto</string>
@@ -602,7 +602,7 @@
     <string name="subway">Metropolitana</string>
     <string name="layers_title">Stili e livelli della mappa</string>
     <string name="bookmarks_empty_list_title">Questo elenco è vuoto</string>
-    <string name="bookmarks_empty_list_message">Per aggiungere un luogo preferito, tocca un punto sulla mappa e poi tocca l\'icona a forma di stella</string>
+    <string name="bookmarks_empty_list_message">Per salvare un luogo preferito, tocca un punto sulla mappa e poi l\'icona a forma di stella</string>
     <string name="category_desc_more">…altro</string>
     <string name="export_file">Esporta KMZ</string>
     <string name="export_file_gpx">Esporta GPX</string>
@@ -803,7 +803,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Continua a registrare</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Salvare in Preferiti?</string>
+    <string name="track_recording_alert_title">Salvare in Luoghi preferiti e tracce?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">La traccia è vuota - non c\'è nulla da salvare</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -906,9 +906,12 @@
     <string name="navigation_start_tts_disabled_message">Istruzioni vocali disabilitate: TTS non disponibile</string>
     <string name="prefs_speed_cameras_information">Gli avvisi di Autovelox sono disabilitati dove proibito dalla legge locale.</string>
     <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
-    <string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string>
+    <string name="download_resources_custom_url_error_scheme">Inserisci un URL che inizia con http:// o https://</string>
     <string name="download_resources_custom_url_summary_none">Non impostato</string>
     <string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string>
     <string name="download_resources_custom_url_title">Server mappe personalizzato</string>
     <string name="advanced">Avanzate</string>
+    <string name="opens_at">Apre alle %s</string>
+    <string name="closes_at">Chiude alle %s</string>
+    <string name="pref_maplanguage_local">Lingua locale</string>
 </resources>

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">Agas Tyller</string>
+    <string name="p2p_your_location">Dha 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">Agas istori golegyans</string>
-    <string name="editor_osm_notes">Agas notennow mappow</string>
+    <string name="editor_osm_history">Dha istori golegyans</string>
+    <string name="editor_osm_notes">Dha 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">Ya</string>
+    <string name="yes">Ea</string>
     <string name="no">Na</string>
-    <string name="yes_available">Ya</string>
+    <string name="yes_available">Ea</string>
     <string name="no_available">Na</string>
     <string name="capacity">Dalghuster: %s</string>
     <string name="network">Rosweyth: %s</string>
@@ -509,7 +509,7 @@
     <string name="download_over_mobile_message">Y re bos kostek meur lowr war nebes towlow po a tramor</string>
     <string name="error_enter_correct_storey_number">An niver a leuryow res na eksedya %d</string>
     <string name="editor_note_hint">Deskrifa errors war an mappa po pyth may na golegys yn CoMaps</string>
-    <string name="editor_about_osm">Gas chanjyow yw ughkargys dhe an sel dherivadow <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> poblek. Mar pleg, addya kudhlow privedh po gwirbryntys vyth.</string>
+    <string name="editor_about_osm">Gas chanjyow yw ughkargys dhe an sel dherivadow <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> poblek. Mar pleg, addya kedhlow privedh po gwirbryntys vyth.</string>
     <string name="editor_category_unsuitable_title">Na gallos kavos unn klass fytti?</string>
     <string name="editor_category_unsuitable_text">CoMaps alowa hwi addya klassys sempel hepken, rag henna trevow, fordhow, lynnyn, drehevyansow, h.e. vyth. Mar pleg, addya a\'n par na klassys dhe <a href="https://www.openstreetmap.org">OpenStreetMap</a>. Checkya agan <a href="https://www.openstreetmap.org">kowethlyver</a> rag danvonadow kamm ha kamm manylys.</string>
     <string name="downloader_no_downloaded_maps_title">Hwi na iskargys neb mappys</string>
@@ -523,9 +523,9 @@
     <string name="place_page_app_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an app CoMaps.</string>
     <string name="place_page_update_too_old_map">Nowedhi pow mappa</string>
     <string name="place_page_too_old_to_edit">Ow golegi OpenStreetMap yw ungallosegi dre reson an data mappa yw re koth.</string>
-    <string name="editor_share_to_all_dialog_message_1">Surhe hwi na ynworra neb kudhlow privedh po personel.</string>
+    <string name="editor_share_to_all_dialog_message_1">Surhe hwi na ynworra neb kedhlow privedh po personel.</string>
     <string name="editor_share_to_all_dialog_message_2">Pennskriforyon OpenStreetMap a wra checkya an chanjyow ha kestava hwi a i kavos neb kwestyons.</string>
-    <string name="mobile_data_dialog">Devnydhya junyans kellgowser dhe diskwedhes kudhlow manylys?</string>
+    <string name="mobile_data_dialog">Devnydhya junyans kellgowser dhe diskwedhes kedhlow manylys?</string>
     <string name="mobile_data_option_always">Devnydhya Pub Prys</string>
     <string name="mobile_data_option_not_today">Na Devnydhya Hedhyw</string>
     <string name="mobile_data">Junyans Kellgowser</string>
@@ -538,7 +538,7 @@
     <string name="enable_logging">Gallosegi kovadhow</string>
     <string name="prefs_languages_information">Ni devnydhya lev system rag danvonadow a dros. Lies devisyow Android devnydhya TTS Google, hwi gallos iskarga po nowedhi y yn Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Rag nebes yethow, hwi res lea unn synthesyer kows po unn fardel yeth keworransel yn an gwerthji appys (Google Play, Galaxy Store, App Gallery, FDroid). \nYgeri gas settyansyow devis → Yeth ha ynworrans → Areth → Eskorrans tekst dhe areth. \nHwi gallos dyghtya omma settyansow rag synthesyans kows (rag ensampel, iskarga fardel yeth dhe devnydh dhywarlinen) ha dewis jynn tekst-dhe-areth aral.</string>
-    <string name="prefs_languages_information_off_link">Rag moy kudhlow checkya an kowethlyver ma</string>
+    <string name="prefs_languages_information_off_link">Rag moy kedhlow checkya an kowethlyver ma</string>
     <string name="prefs_speed_cameras_information">Gwarnyans kamera tooth yw marow yn broyow le may gwarnyansow yw difennys erbynn lagha leel.</string>
     <string name="transliteration_title">Treylya yn lytherennans Latin</string>
     <string name="routing_add_start_point">Devnydhya hwithrans po tava war an mappa rag addya unn tyller dalleth</string>
@@ -585,7 +585,7 @@
     <string name="power_managment_setting_never">Bynner</string>
     <string name="power_managment_setting_auto">Pan batri yw isel</string>
     <string name="power_managment_setting_manual_max">Pub prys</string>
-    <string name="enable_logging_warning_message">Gallosegi yn servadow an dewis ma rag rekordya ha danvon dre dhorn kovadhow manylys a-dro gas kudyn dhe ni gans \"Derivas unn kudyn\" yn an folen Gweres. Kovadhow re komprehendya kudhlow GPS.</string>
+    <string name="enable_logging_warning_message">Gallosegi yn servadow an dewis ma rag rekordya ha danvon dre dhorn kovadhow manylys a-dro gas kudyn dhe ni gans \"Derivas unn kudyn\" yn an folen Gweres. Kovadhow re komprehendya kedhlow GPS.</string>
     <string name="driving_options_title">Dewisyow kerdh</string>
     <string name="avoid_tolls">Goheles tollow</string>
     <string name="avoid_unpaved">Goheles fordh ankonsys</string>

android/app/src/main/res/values-night/colors.xml

@@ -16,8 +16,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
-  <color name="bg_editor">#161b14</color>
-  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -898,4 +898,5 @@
     <string name="download_resources_custom_url_message">Substitua o servidor padrão usado para baixar mapas. Deixe em branco para usar o servidor padrão do CoMaps.</string>
     <string name="download_resources_custom_url_summary_none">Não definido</string>
     <string name="download_resources_custom_url_error_scheme">Insira uma URL começando com http:// ou https://</string>
+    <string name="pref_maplanguage_local">Linguagem Local</string>
 </resources>

android/app/src/main/res/values-pt/strings.xml

@@ -68,7 +68,7 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Adicionar conjunto novo</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nome da Lista</string>
+    <string name="bookmark_set_name">Nome do Conjunto</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Lugares</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -147,7 +147,7 @@
     <string name="share_bookmarks_email_subject">Os meus Favoritos do CoMaps</string>
     <string name="share_bookmarks_email_body">Olá! \n \nSegue em anexo os meus favoritos; por favor abra-os com o CoMaps. Caso não tenha, descarregue a aplicação aqui: https://www.comaps.app/download/ \n \nDivirta-se a viajar com o CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Carregando Favoritos</string>
+    <string name="load_kmz_title">A Carregar Favoritos</string>
     <!-- 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 -->
@@ -491,7 +491,7 @@
     <string name="minute">min</string>
     <string name="day">dia</string>
     <string name="placepage_more_button">Mais</string>
-    <string name="placepage_edit_bookmark_button">Editar favorito</string>
+    <string name="placepage_edit_bookmark_button">Editar Lugar Guardado</string>
     <string name="placepage_personal_notes_hint">Notas pessoais (texto ou html)</string>
     <string name="editor_reset_edits_message">Eliminar todas as alterações locais?</string>
     <string name="editor_reset_edits_button">Descartar alterações</string>
@@ -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</string>
+    <string name="bookmark_lists">Listas de Favoritos</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 e trajetos</string>
+    <string name="bookmarks_import">Importar Favoritos</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 em Favoritos e Trajetos?</string>
+    <string name="track_recording_alert_title">Guardar nos Favoritos?</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 marcador</string>
+    <string name="bookmark_color">Cor do Favorito</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 marcadores e trajetos</string>
+    <string name="pref_backup_title">Backup dos Favoritos</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,4 +914,5 @@
     <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>

android/app/src/main/res/values-ro/strings.xml

@@ -878,7 +878,7 @@
     <string name="editor_submit">Trimite</string>
     <string name="avoid_paved">Evitați drumurile asfaltate sau pavate</string>
     <string name="avoid_steps">Evitați treptele</string>
-    <string name="offline_explanation_text">O hartă trebuie descărcată ca să vezi și si să nevighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi.</string>
+    <string name="offline_explanation_text">O hartă trebuie descărcată ca să vezi și si să navighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi.</string>
     <string name="offline_explanation_title">Hărti Offline</string>
     <string name="unknown_power_output">necunoscut</string>
     <string name="power_management">Economisire energie</string>

android/app/src/main/res/values-ru/strings.xml

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Метки</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Метки и треки</string>
+    <string name="bookmarks_and_tracks">Избранное</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Название</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->

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">Obnovi</string>
+    <string name="restore">Povrni</string>
     <plurals name="tracks">
         <item quantity="one">%d pot</item>
         <item quantity="two">%d poti</item>

android/app/src/main/res/values-sr/strings.xml

@@ -66,7 +66,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Места</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Фаворити</string>
+    <string name="bookmarks_and_tracks">Маркери</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Назив</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -145,11 +145,11 @@
     <string name="share_bookmarks_email_subject">CoMaps фаворити</string>
     <string name="share_bookmarks_email_body">Здраво! \n \nУ прилогу су моји фаворити; молим те да их отвориш у CoMaps-у. Ако га немаш већ инсталираног, можеш да га преузмеш одавде: https://www.comaps.app/download/ \n \nУживај у путовању са CoMaps-ом!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Учитавање фаворита</string>
+    <string name="load_kmz_title">Учитавање маркера</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Фаворити су успешно учитани! Можете их проначи на мапи помоћу Менаџера фаворита.</string>
+    <string name="load_kmz_successful">Маркери су успешно учитани! Можете их проначи на мапи помоћу Менаџера маркера.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Неуспешно учитавање фаворита. Могуће да је фајл оштећен или неисправан.</string>
+    <string name="load_kmz_failed">Неуспешно учитавање маркера. Могуће да је фајл оштећен или неисправан.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Апликација не препознаје ову врсту фајла: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -492,7 +492,7 @@
     <string name="minute">мин</string>
     <string name="day">д</string>
     <string name="placepage_more_button">Више</string>
-    <string name="placepage_edit_bookmark_button">Измени снимљено место</string>
+    <string name="placepage_edit_bookmark_button">Измени место</string>
     <string name="editor_reset_edits_message">Брисање свих измена које нису послате?</string>
     <string name="editor_reset_edits_button">Одбаци промене</string>
     <string name="editor_remove_place_message">Брисање додатог места?</string>
@@ -567,7 +567,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Креирај нову листу</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Увези фаворите</string>
+    <string name="bookmarks_import">Увези маркере</string>
     <string name="bookmarks_error_message_share_general">Дељење није могуће због грешке у апликацији</string>
     <string name="bookmarks_error_title_share_empty">Грешка приликом дељења</string>
     <string name="bookmarks_error_message_share_empty">Не може се поделити празна листа</string>
@@ -789,7 +789,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Настави снимање</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Сачувати у фаворитима?</string>
+    <string name="track_recording_alert_title">Сачувати у маркерима?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Путања је празна, нема шта да се сачува</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->

android/app/src/main/res/values-sv/strings.xml

@@ -851,4 +851,12 @@
     <string name="pedestrian">Gående</string>
     <string name="error_enter_correct_line_page">Ange en giltig webbadress</string>
     <string name="move_maps_error">Kunde inte flytta kartfiler</string>
+    <string name="opens_at">Öppnar kl. %s</string>
+    <string name="closes_at">Stänger kl. %s</string>
+    <string name="opens_day_at">Öppnar på %1$s kl. %2$s</string>
+    <string name="closes_day_at">Stänger på %1$s kl. %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
 </resources>

android/app/src/main/res/values-ta/strings.xml

@@ -9,7 +9,7 @@
     <string name="kilometres">கிலோமீட்டர்கள்</string>
     <string name="miles">மைல்கள்</string>
     <string name="search">தேடல்</string>
-    <string name="bookmarks_and_tracks">புக்மார்க்குகள் மற்றும் தடங்கள்</string>
+    <string name="bookmarks_and_tracks">பிடித்தவை</string>
     <string name="later">பிறகு</string>
     <string name="zoom_to_country">வரைபடத்தில் காட்டு</string>
     <string name="country_status_download_failed">பதிவிறக்கம் தோல்வியடைந்தது</string>

android/app/src/main/res/values-uk/strings.xml

@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Мітки</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Мітки та маршрути</string>
+    <string name="bookmarks_and_tracks">Обране</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Iм\'я</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -834,4 +834,14 @@
     <string name="panoramax">Фото Panoramax</string>
     <string name="app_site_url">https://comaps.app/uk/</string>
     <string name="saved">Збережено</string>
+    <string name="opens_at">Відкриття о %@</string>
+    <string name="unknown_power_output">невідомо</string>
+    <string name="charge_socket_count">Кількість</string>
+    <string name="unknown_count">невідомо</string>
+    <string name="editor_submit">Надіслати</string>
+    <string name="pref_left_button_disable">Вимкнути</string>
+    <string name="clear">Очистити</string>
+    <string name="vehicle">Транспортний засіб</string>
+    <string name="bicycle">Велосипед</string>
+    <string name="backup_interval_every_day">Щоденно</string>
 </resources>

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>

android/app/src/main/res/values/colors.xml

@@ -65,8 +65,6 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
-  <color name="bg_editor">#ebefe4</color>
-  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>

android/app/src/main/res/values/dimens.xml

@@ -8,6 +8,7 @@
 
   <!-- margins -->
   <dimen name="margin_eighth">2dp</dimen>
+  <dimen name="margin_eighth_plus">3dp</dimen>
   <dimen name="margin_quarter">4dp</dimen>
   <dimen name="margin_quarter_plus">6dp</dimen>
   <dimen name="margin_half">8dp</dimen>

android/app/src/main/res/values/styles-editor.xml

@@ -89,7 +89,7 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">@color/fg_editor</item>
+    <item name="cardBackgroundColor">?appBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531

android/sdk/build.gradle

@@ -153,7 +153,7 @@ project.afterEvaluate {
 
   final taskName = gradle.startParameter.taskNames
 
-  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'lint', 'publish', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
     exec {
       workingDir '../..'
 

android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml

@@ -149,7 +149,6 @@
     <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>

android/sdk/src/main/res/values-bg/types_strings.xml

@@ -587,7 +587,6 @@
     <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>

android/sdk/src/main/res/values-cs/types_strings.xml

@@ -144,7 +144,7 @@
     <string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
     <string name="type.amenity.vending_machine.drinks">Automat na nápoje</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkovací automat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky MHD</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky veřejné dopravy</string>
     <string name="type.amenity.vehicle_inspection">Kontrola vozidla</string>
     <string name="type.amenity.veterinary">Veterinář</string>
     <string name="type.amenity.waste_basket">Odpadkový koš</string>
@@ -1504,5 +1504,5 @@
     <string name="type.amenity.charging_station.motorcycle">Motocykly</string>
     <string name="type.amenity.charging_station.small">Omezená kapacita</string>
     <string name="type.emergency.disaster_help_point">Nouzové centrum pomoci při katastrofách</string>
-    <string name="type.emergency.access_point.address">Nouzová adresa záchrany</string>
+    <string name="type.emergency.access_point.address">Adresa pro nouzové záchranné služby</string>
 </resources>

android/sdk/src/main/res/values-da/types_strings.xml

@@ -957,7 +957,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">Døgnbutik</string>
+    <string name="type.shop.convenience">Nærbutik</string>
     <string name="type.shop.copyshop">Kopieringsbutik</string>
     <string name="type.shop.cosmetics">Kosmetiker</string>
     <string name="type.shop.curtain">Gardinhandel</string>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -130,7 +130,7 @@
     <string name="type.amenity.pub">Kneipe</string>
     <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.centre">Recyclingzentrum</string>
     <string name="type.amenity.recycling.container">Wertstoffcontainer</string>
     <string name="type.recycling.batteries">Batterien</string>
     <string name="type.recycling.clothes">Altkleider</string>
@@ -154,7 +154,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Lean-to Schlafunterstand</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Schlafschutz</string>
     <string name="type.amenity.public_bath">Öffentliches Bad</string>
     <string name="type.amenity.shower">Dusche</string>
     <string name="type.amenity.stripclub">Stripclub</string>

android/sdk/src/main/res/values-el/types_strings.xml

@@ -1315,7 +1315,9 @@
     <string name="type.leisure.common">Δημόσια γη</string>
     <string name="type.landuse.military">Στρατιωτική περιοχή</string>
     <string name="type.landuse.industrial">Βιομηχανική περιοχή</string>
-    <string name="type.amenity.bench.backless">Παγκάκι χωρίς πλάτη</string>
+    <string name="type.amenity.bench.backless">Χωρίς πλάτη</string>
     <string name="type.amenity.boat_rental">Ενοικίαση σκαφών</string>
     <string name="type.amenity.flight_school">Σχολή πιλότων</string>
+    <string name="type.amenity.sailing_school">Σχολή ιστιοπλοΐας</string>
+    <string name="type.amenity.prep_school">Φροντιστήριο</string>
 </resources>

android/sdk/src/main/res/values-es/types_strings.xml

@@ -131,7 +131,6 @@
     <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>
@@ -785,7 +784,7 @@
     <string name="type.place.state.USA">Estado</string>
     <!-- Named part of a city or town, bigger than place=quarter (Wiki: https://wiki.openstreetmap.org/wiki/Tag:place%3Dsuburb) -->
     <string name="type.place.suburb">Suburbio</string>
-    <string name="type.place.town">Pueblo</string>
+    <string name="type.place.town">Pueblo o ciudad</string>
     <string name="type.place.village">Pueblo</string>
     <string name="type.power">Energía</string>
     <string name="type.power.generator">Generador</string>
@@ -1382,7 +1381,7 @@
     <string name="type.post_office.post_partner">Asociado de Correo</string>
     <string name="type.natural.wetland.tidalflat">Llanura mareal</string>
     <string name="type.natural.wetland.swamp">Pantano</string>
-    <string name="type.amenity.ranger_station">Estación de guardabosques</string>
+    <string name="type.amenity.ranger_station">Estación de guardaparque</string>
     <string name="type.amenity.luggage_locker">Consigna de equipaje</string>
     <string name="type.natural.wetland.mangrove">Manglares</string>
     <string name="type.landuse.religious">Terrenos religiosos</string>
@@ -1398,7 +1397,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">Banco sin respaldo</string>
+    <string name="type.amenity.bench.backless">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>
@@ -1509,4 +1508,5 @@
     <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>

android/sdk/src/main/res/values-et/types_strings.xml

@@ -1395,7 +1395,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 pink</string>
+    <string name="type.amenity.bench.backless">Ilma seljatoeta</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,4 +1507,5 @@
     <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>

android/sdk/src/main/res/values-fr/types_strings.xml

@@ -25,7 +25,7 @@
     <string name="type.amenity.bank">Banque</string>
     <string name="type.amenity.bbq">Grille de barbecue</string>
     <string name="type.amenity.bench">Banc</string>
-    <string name="type.amenity.bicycle_parking">Parking à vélo</string>
+    <string name="type.amenity.bicycle_parking">Stationnement vélo</string>
     <string name="type.amenity.bicycle_rental">Location de vélos</string>
     <string name="type.amenity.bicycle_repair_station">Station de réparation de vélos</string>
     <string name="type.amenity.brothel">Maison close</string>
@@ -124,7 +124,6 @@
     <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>
@@ -1397,7 +1396,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">Banc sans dossier</string>
+    <string name="type.amenity.bench.backless">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>

android/sdk/src/main/res/values-hr/types_strings.xml

@@ -151,7 +151,6 @@
     <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>

android/sdk/src/main/res/values-it/types_strings.xml

@@ -131,7 +131,6 @@
     <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>
@@ -637,7 +636,7 @@
     <string name="type.leisure.slipway">Scivolo per navi</string>
     <string name="type.leisure.sports_centre">Centro sportivo</string>
     <string name="type.sport.climbing">Centro di arrampicata</string>
-    <string name="type.sport.yoga">Centro Yoga</string>
+    <string name="type.sport.yoga">Centro yoga</string>
     <string name="type.leisure.stadium">Stadio</string>
     <string name="type.leisure.swimming_pool">Piscina</string>
     <string name="type.leisure.swimming_pool.private">Piscina privata</string>
@@ -1199,7 +1198,7 @@
     <string name="type.sport.handball">Palla a mano</string>
     <string name="type.sport.multi">Sport vari</string>
     <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Immersioni in subacquea</string>
+    <string name="type.sport.scuba_diving">Immersioni subacquee</string>
     <string name="type.sport.shooting">Tiro</string>
     <string name="type.sport.skateboard">Skateboard</string>
     <string name="type.sport.skiing">Sciare</string>
@@ -1435,4 +1434,18 @@
     <string name="type.leisure.sports_centre.sport.volleyball">Centro sportivo</string>
     <string name="type.leisure.sports_centre.sport.yoga">Centro sportivo</string>
     <string name="type.amenity.hydrant">Idrante per irrigazione</string>
+    <string name="type.amenity.boat_rental">Noleggio imbarcazioni</string>
+    <string name="type.man_made.telescope.radio">Radiotelescopio</string>
+    <string name="type.amenity.sailing_school">Scuola di navigazione</string>
+    <string name="type.emergency.life_ring">Salvagente</string>
+    <string name="type.entrance.emergency">Uscita di emergenza</string>
+    <string name="type.natural.sand">Sabbia</string>
+    <string name="type.natural.tree">Albero</string>
+    <string name="type.railway.disused.bridge">Ponte ferroviario in disuso</string>
+    <string name="type.railway.disused.tunnel">Tunnel ferroviario in disuso</string>
+    <string name="type.shop.telecommunication">Negozio di telecomunicazioni</string>
+    <string name="type.disusedbusiness">Negozio libero</string>
+    <string name="type.tourism.information.tactile_map">Mappa tattile</string>
+    <string name="type.social_facility.food_bank">Banco alimentare</string>
+    <string name="type.xmas.tree">Albero di Natale</string>
 </resources>

android/sdk/src/main/res/values-ja/types_strings.xml

@@ -130,7 +130,6 @@
     <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>

android/sdk/src/main/res/values-kw/types_strings.xml

@@ -97,7 +97,6 @@
     <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>
@@ -865,7 +864,7 @@
     <string name="type.aerialway.station">Gorsav Hyns Ayrel</string>
     <string name="type.aeroway">Isframweyth Ayrel</string>
     <string name="type.aeroway.taxiway">Hyns Ayrennow</string>
-    <string name="type.amenity.bench.backless">Bynk heb Keyn</string>
+    <string name="type.amenity.bench.backless">Heb Keyn</string>
     <string name="type.amenity.car_sharing">Kevrennewgh Karr</string>
     <string name="type.man_made.telescope.optical">Pellweler (Optek)</string>
     <string name="type.man_made.telescope.gamma">Pellweler (Gamma)</string>
@@ -1413,4 +1412,6 @@
     <string name="type.amenity.charging_station.small">Dalghuster Strothys</string>
     <string name="type.railway.disused.bridge">Pons Hyns Horn Andevnydhys</string>
     <string name="type.railway.disused.tunnel">Kowfordh Hyns Horn Andevnydhys</string>
+    <string name="type.emergency.access_point.address">Trigva Sawyans Goredhom</string>
+    <string name="type.emergency.disaster_help_point">Poynt Gweres Goredhom</string>
 </resources>

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">Suolas be atramos</string>
+    <string name="type.amenity.bench.backless">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">Elektrinių dviračių krovimo stotelė</string>
-    <string name="type.amenity.charging_station.motorcar">Elektromobilių 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.childcare">Lopšelis</string>
     <string name="type.amenity.cinema">Kino teatras</string>
     <string name="type.leisure.bowling_alley">Boulingo klubas</string>
@@ -225,7 +225,6 @@
     <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>
@@ -1433,4 +1432,8 @@
     <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>

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">Sols bez atzveltnes</string>
+    <string name="type.amenity.bench.backless">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>

android/sdk/src/main/res/values-nb/types_strings.xml

@@ -120,7 +120,6 @@
     <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>
@@ -689,7 +688,7 @@
     <string name="type.power.plant.gas">Gassturbinkraftverk</string>
     <string name="type.power.plant.hydro">Vannkraftverk</string>
     <string name="type.power.plant.solar">Solkraftverk</string>
-    <string name="type.power.plant.wind">Vindkraftverk</string>
+    <string name="type.power.plant.wind">Vindkraftpark</string>
     <string name="type.power.substation">Trafo</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Strømmast</string>
@@ -1333,7 +1332,7 @@
     <string name="type.railway.abandoned">Nedlagt jernbane</string>
     <string name="type.shop.lighting">Lampebutikk</string>
     <string name="type.leisure.sports_centre.sport.swimming">Svømmesenter</string>
-    <string name="type.amenity.bench.backless">Benk uten rygg</string>
+    <string name="type.amenity.bench.backless">Uten rygg</string>
     <string name="type.waterway.dam">Demning</string>
     <string name="type.tourism.museum">Museum</string>
     <string name="type.barrier.chain">Kjetting</string>

android/sdk/src/main/res/values-nl/types_strings.xml

@@ -129,7 +129,7 @@
     <string name="type.amenity.pub">Kroeg</string>
     <string name="type.amenity.public_bookcase">Boekenkast</string>
     <!-- SECTION: Types: Recycling -->
-    <string name="type.amenity.recycling.centre">Milieustraat</string>
+    <string name="type.amenity.recycling.centre">Recyclestation|Millieustraat</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 +1395,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">Bankje</string>
+    <string name="type.amenity.bench.backless">Zonder 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>
@@ -1497,15 +1497,15 @@
     <string name="type.amenity.food_sharing">Voedsel delen</string>
     <string name="type.amenity.give_box">Giftenkist</string>
     <string name="type.amenity.hydrant">Watertappunt|waterkraan</string>
-    <string name="type.railway.miniature">Miniatuurspoorweg</string>
-    <string name="type.railway.miniature.bridge">Miniatuurspoorbrug</string>
-    <string name="type.railway.miniature.tunnel">Miniatuurspoortunnel</string>
-    <string name="type.railway.turntable">Spoorwegdraaischijf</string>
-    <string name="type.tourism.information.tactile_map">Reliëfkaart</string>
-    <string name="type.railway.disused.bridge">Niet meer gebruikte spoorbrug</string>
-    <string name="type.railway.disused.tunnel">Niet meer gebruikte spoortunnel</string>
+    <string name="type.railway.miniature">Miniatuur spoorweg</string>
+    <string name="type.railway.miniature.bridge">Miniatuur spoorbrug</string>
+    <string name="type.railway.miniature.tunnel">Miniatuur spoortunnel</string>
+    <string name="type.railway.turntable">Spoorweg-keerpunt</string>
+    <string name="type.tourism.information.tactile_map">Tactiele kaart</string>
+    <string name="type.railway.disused.bridge">Ongebruikte spoorbrug</string>
+    <string name="type.railway.disused.tunnel">Ongebruikte spoortunnel</string>
     <string name="type.amenity.charging_station.motorcycle">Motorfietsen</string>
     <string name="type.amenity.charging_station.small">Beperkte capaciteit</string>
-    <string name="type.emergency.disaster_help_point">Hulppunt voor noodrampen</string>
-    <string name="type.emergency.access_point.address">Noodreddingsadres</string>
+    <string name="type.emergency.disaster_help_point">Noodhulppost</string>
+    <string name="type.emergency.access_point.address">Noodhulppost adres</string>
 </resources>

android/sdk/src/main/res/values-pt/types_strings.xml

@@ -45,7 +45,7 @@
     <string name="type.leisure.amusement_arcade">Salão de jogos</string>
     <string name="type.amenity.charging_station">Posto de carregamento elétrico</string>
     <string name="type.amenity.charging_station.bicycle">Bicicletas</string>
-    <string name="type.amenity.charging_station.motorcar">Automóveis</string>
+    <string name="type.amenity.charging_station.motorcar">Carros</string>
     <string name="type.amenity.childcare">Creche</string>
     <string name="type.amenity.cinema">Cinema</string>
     <string name="type.leisure.bowling_alley">Pista de bowling</string>
@@ -131,7 +131,6 @@
     <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>
@@ -1397,7 +1396,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">Banco sem Encosto</string>
+    <string name="type.amenity.bench.backless">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>
@@ -1508,4 +1507,6 @@
     <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>

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">Klop brez naslonjala</string>
+    <string name="type.amenity.bench.backless">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,7 +309,6 @@
     <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>
@@ -1221,7 +1220,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 mešanim blagom</string>
+    <string name="type.shop.convenience">Trgovina z osnovnimi potrebščinami</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>
@@ -1321,7 +1320,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">Gostišče</string>
+    <string name="type.tourism.hostel">Hostel</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>
@@ -1331,6 +1330,88 @@
     <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">Preproge</string>
+    <string name="type.aerialway.magic_carpet">Tekoči trak</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>

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>
@@ -154,7 +154,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Преноћиште / Бивак</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Склониште типа отворене шупе</string>
+    <string name="type.amenity.shelter.lean_to">Настрешница за спавање</string>
     <string name="type.amenity.public_bath">Јавно купатило</string>
     <string name="type.amenity.shower">Туш</string>
     <string name="type.amenity.stripclub">Стриптиз клуб</string>
@@ -193,7 +193,7 @@
     <string name="type.barrier.chain">Ланац</string>
     <string name="type.barrier.city_wall">Градски зид / Бедем</string>
     <string name="type.barrier.cycle_barrier">Баријера за бицикле</string>
-    <string name="type.waterway.ditch">Канал за дренажу</string>
+    <string name="type.waterway.ditch">Јарак за дренажу</string>
     <string name="type.natural.water.moat">Шанац</string>
     <string name="type.natural.water.wastewater">Отпадна вода</string>
     <string name="type.barrier.entrance">Улаз</string>
@@ -1270,7 +1270,7 @@
     <string name="type.tourism.information.map">Turistička mapa</string>
     <string name="type.tourism.information.office">Turistički biro</string>
     <string name="type.tourism.information.visitor_centre">Центар за посетиоце</string>
-    <string name="type.tourism.motel">Motel</string>
+    <string name="type.tourism.motel">Мотел</string>
     <string name="type.tourism.museum">Muzej</string>
     <string name="type.tourism.picnic_site">Piknik</string>
     <string name="type.leisure.resort">Resort hotel</string>
@@ -1283,26 +1283,26 @@
     <string name="type.traffic_calming">Pešački prelaz</string>
     <string name="type.traffic_calming.bump">Ležeći policajac (grba)</string>
     <string name="type.traffic_calming.hump">Ležeći policajac</string>
-    <string name="type.waterway">Vodeni tok</string>
+    <string name="type.waterway">Водени ток</string>
     <string name="type.waterway.canal">Канал</string>
-    <string name="type.waterway.canal.tunnel">Тунел у каналу</string>
-    <string name="type.waterway.fish_pass">Riblji put</string>
+    <string name="type.waterway.canal.tunnel">Тунел канала</string>
+    <string name="type.waterway.fish_pass">Рибљи пут</string>
     <string name="type.waterway.dam">Брана</string>
     <string name="type.barrier.ditch">Jarak</string>
     <string name="type.natural.water.ditch">Канал</string>
-    <string name="type.waterway.ditch.tunnel">Канал</string>
-    <string name="type.waterway.dock">Prevodnica</string>
-    <string name="type.waterway.drain">Канал</string>
+    <string name="type.waterway.ditch.tunnel">Тунел јарка</string>
+    <string name="type.waterway.dock">Пристаниште</string>
+    <string name="type.waterway.drain">Одвод</string>
     <string name="type.natural.water.drain">Канал</string>
-    <string name="type.waterway.drain.tunnel">Канал</string>
+    <string name="type.waterway.drain.tunnel">Тунел одвода</string>
     <string name="type.waterway.lock_gate">Бродска преводница</string>
-    <string name="type.waterway.river">Reka</string>
-    <string name="type.waterway.river.tunnel">Reka</string>
-    <string name="type.waterway.stream">Potok</string>
-    <string name="type.waterway.stream.ephemeral">Povremeni potok</string>
-    <string name="type.waterway.stream.intermittent">Povremeni potok</string>
-    <string name="type.waterway.stream.tunnel">Potok</string>
-    <string name="type.waterway.waterfall">Vodopad</string>
+    <string name="type.waterway.river">Река</string>
+    <string name="type.waterway.river.tunnel">Тунел реке</string>
+    <string name="type.waterway.stream">Поток</string>
+    <string name="type.waterway.stream.ephemeral">Бујични / повремени ток</string>
+    <string name="type.waterway.stream.intermittent">Сезонски / повремени ток</string>
+    <string name="type.waterway.stream.tunnel">Тунел потока</string>
+    <string name="type.waterway.waterfall">Водопад</string>
     <string name="type.waterway.weir">Брана</string>
     <string name="type.wheelchair">Pristup invalidskim kolicima</string>
     <string name="type.wheelchair.limited">Limitirani pristup invalidskim kolicima</string>
@@ -1337,9 +1337,9 @@
     <string name="type.shop.auction">Аукција</string>
     <string name="type.shop.collector">Kolekcionarstvo</string>
     <string name="type.self_service.yes">Доступно самопослужење</string>
-    <string name="type.self_service.only">Samoposluživanje</string>
+    <string name="type.self_service.only">Искључиво самопослуживање</string>
     <string name="type.self_service.partially">Делимично самопослуживање</string>
-    <string name="type.self_service.no">Nema samoposluživanja</string>
+    <string name="type.self_service.no">Без самопослуживања</string>
     <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
     <string name="type.amenity.social_facility">Socijalna ustanova</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
@@ -1387,7 +1387,7 @@
     <string name="type.amenity.luggage_locker">Ормар за пртљаг</string>
     <string name="type.post_office.post_partner">Поштански партнер</string>
     <string name="type.amenity.bicycle_parking.covered">Покривени паркинг за бицикле</string>
-    <string name="type.amenity.ranger_station">Stanica za rendžer</string>
+    <string name="type.amenity.ranger_station">Ренџерска станица</string>
     <string name="type.leisure.escape_game">Soba za bekstvo (Escape Room)</string>
     <string name="type.barrier.wicket_gate">Вратница</string>
     <string name="type.amenity.animal_shelter">Азил за животиње</string>
@@ -1498,14 +1498,14 @@
     <string name="type.man_made.mast.communication">Антенски стуб</string>
     <string name="type.amenity.hydrant">Хидрант за наводњавање</string>
     <string name="type.railway.miniature">Минијатурни пруга</string>
-    <string name="type.railway.miniature.bridge">Мост минијатурне пруге</string>
-    <string name="type.railway.miniature.tunnel">Тунел минијатурне пруге</string>
+    <string name="type.railway.miniature.bridge">Минијатурни железнички мост</string>
+    <string name="type.railway.miniature.tunnel">Минијатурни железнички тунел</string>
     <string name="type.railway.turntable">Железничка окретница</string>
     <string name="type.tourism.information.tactile_map">Тактилна мапа</string>
     <string name="type.railway.disused.bridge">Напуштени железнички мост</string>
     <string name="type.railway.disused.tunnel">Напуштени железнички тунел</string>
     <string name="type.amenity.charging_station.motorcycle">Мотоцикли</string>
     <string name="type.amenity.charging_station.small">Ограничен капацитет</string>
-    <string name="type.emergency.disaster_help_point">Тачка за помоћ у хитним случајевима</string>
-    <string name="type.emergency.access_point.address">Адреса за хитно спашавање</string>
+    <string name="type.emergency.disaster_help_point">Тачка за помоћ у случају катастрофе</string>
+    <string name="type.emergency.access_point.address">Адреса службе хитне помоћи</string>
 </resources>

android/sdk/src/main/res/values-uk/strings.xml

@@ -37,4 +37,5 @@
     <string name="not_shared">Особистий</string>
     <string name="access_rules_author_only">Редагується онлайн</string>
     <string name="today">Сьогодні</string>
+    <string name="yesterday">Вчора</string>
 </resources>

android/sdk/src/main/res/values-uk/types_strings.xml

@@ -1390,4 +1390,41 @@
     <string name="type.natural.wetland.tidalflat">Припливна мілина</string>
     <string name="type.railway.station.subway.qingdao">Станція метро</string>
     <string name="type.leisure.escape_game">Квест-кімната</string>
+    <string name="type.amenity.animal_shelter">Притулок для тварин</string>
+    <string name="type.lateral.port">Порт</string>
+    <string name="type.cardinal.east">Схід</string>
+    <string name="type.cardinal.north">Північ</string>
+    <string name="type.cardinal.south">Південь</string>
+    <string name="type.cardinal.west">Захід</string>
+    <string name="type.natural.tree">Дерево</string>
+    <string name="type.natural.sand">Пісок</string>
+    <string name="type.man_made.telescope">Телескоп</string>
+    <string name="type.leisure.sports_centre.sport.basketball">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.beachvolleyball">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.bowls">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.climbing">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.cricket">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.curling">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.equestrian">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.field_hockey">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.futsal">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.golf">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.gymnastics">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.handball">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.ice_hockey">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.padel">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.australian_football">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.badminton">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.baseball">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.pelota">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.scuba_diving">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.shooting">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.skateboard">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.skiing">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.soccer">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.table_tennis">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.tennis">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.volleyball">Спортивний центр</string>
+    <string name="type.leisure.sports_centre.sport.yoga">Спортивний центр</string>
+    <string name="type.leisure.fitness_centre.sport.yoga">Студія йоги</string>
 </resources>

android/sdk/src/main/res/values-zh-rHK/types_strings.xml

@@ -131,7 +131,6 @@
     <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>

android/sdk/src/main/res/values-zh-rTW/types_strings.xml

@@ -269,7 +269,6 @@
     <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>

android/sdk/src/main/res/values-zh/types_strings.xml

@@ -131,7 +131,6 @@
     <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>
@@ -355,7 +354,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>
@@ -1393,8 +1392,36 @@
     <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>

data/categories-strings/de.json/localize.json

@@ -185,7 +185,7 @@
 "amenity-school": "3Schule|Schulgebäude",
 "amenity-shelter": "5Unterstand|Wetterschutz|Schutzhütte",
 "amenity-shelter-basic_hut": "3Biwakschachtel|4Schutzhütte|5Schlafunterkunft|3Notunterkunft|3Biwak|U+1F634|U+1F4A4|U+1F6D6|U+1F6CF|U+1F6CC",
-"amenity-shelter-lean_to": "3Lean-to Schlafunterstand|Lean-to|3A-Frame Shelter|4Wetterschutz|4Schutzhütte|U+1F6D6",
+"amenity-shelter-lean_to": "3Lean-to Schlafunterstand|3Lean-to|3A-Frame Shelter|4Wetterschutz|4Schutzhütte|U+1F6D6",
 "amenity-stripclub": "5Stripclub|5Striptease|5Strip Club|4Tabledance|5Striplokal|5Strip Lokal|5Striptease|5Nachtklub|5Stripklub|5Nachtclub|U+1F46F|U+1F459|U+1F460|U+1F51E",
 "amenity-telephone": "2Telefon|Fernsprecher",
 "@category_toilet": "3Toilette|WC|3Klosett|Pissoir|Null-Null|00",
@@ -224,7 +224,7 @@
 "leisure-stadium": "4Stadion|5Sport|4Olympiastadion|5Sportanlage|5Sportstadion|5Sportkomplex|5Sporthalle|3Arena|U+26BD|U+26BE|U+1F3BE|U+1F3C0|U+1F3C8|U+1F4AA|U+1F3C9|U+1F3DF",
 "leisure-playground|@category_children": "Spielplatz",
 "leisure-sports_centre|leisure-sports_centre-sport-american_football|leisure-sports_centre-sport-archery|leisure-sports_centre-sport-athletics|leisure-sports_centre-sport-australian_football|leisure-sports_centre-sport-badminton|leisure-sports_centre-sport-baseball|leisure-sports_centre-sport-basketball|leisure-sports_centre-sport-beachvolleyball|leisure-sports_centre-sport-bowls|leisure-sports_centre-sport-climbing|leisure-sports_centre-sport-cricket|leisure-sports_centre-sport-curling|leisure-sports_centre-sport-equestrian|leisure-sports_centre-sport-field_hockey|leisure-sports_centre-sport-futsal|leisure-sports_centre-sport-golf|leisure-sports_centre-sport-gymnastics|leisure-sports_centre-sport-handball|leisure-sports_centre-sport-ice_hockey|leisure-sports_centre-sport-multi|leisure-sports_centre-sport-padel|leisure-sports_centre-sport-pelota|leisure-sports_centre-sport-scuba_diving|leisure-sports_centre-sport-shooting|leisure-sports_centre-sport-skateboard|leisure-sports_centre-sport-skiing|leisure-sports_centre-sport-soccer|leisure-sports_centre-sport-table_tennis|leisure-sports_centre-sport-tennis|leisure-sports_centre-sport-volleyball|leisure-sports_centre-sport-yoga": "4Sportzentrum|4Sport|4Fitness-Zentrum|4Fitness-Center|4Sportkomplex|5Sportforum|5Sporthalle|4Sportanlage|U+26BD|U+26BE|U+1F3BE|U+1F4AA|U+1F3C8|U+1F3C0|U+1F3C9",
-"leisure-sports_centre-sport-swimming": "4Schwimmbad|Freibad|Hallenbad|Schwimmhalle",
+"leisure-sports_centre-sport-swimming": "4Schwimmbad|4Freibad|4Hallenbad|4Schwimmhalle",
 "leisure-fitness_centre-sport-yoga": "Yoga-Studio",
 "leisure-golf_course": "3Golfplatz|2Golf|3Golfanlage|U+26F3|U+1F3CC",
 "leisure-miniature_golf": "4Minigolf|5Miniaturgolf|4Golf|3Pitch und Putt|4Mini Golf |4Mini-Golf|U+26F3|U+1F3CC",
@@ -330,7 +330,7 @@
 "shop-tyres|@shop": "4Reifenhändler|4Autoreifen|4Reifen|4Reifenwechsel|U+1F6DE",
 "amenity-car_wash": "4Autowaschanlage|Autowäsche",
 "amenity-veterinary": "4Tierarzt|4Tierärztin|4Tierarztpraxis|4Tierpraxis|4Tierdoktor|5Hundearzt|5Katzenarzt|4Haustiere|U+2695",
-"@charging_station": "4Ladestation|aufladen",
+"@charging_station": "4Ladestation|4aufladen",
 "amenity-charging_station-bicycle|@charging_station": "5Fahrradladestation|Fahrrad aufladen|E-Bike aufladen|Fahrrad laden|E-Bike laden",
 "amenity-charging_station-motorcycle|@charging_station": "6Motorradladestation|Motorrad aufladen|Motorrad laden",
 "amenity-charging_station-motorcar|@charging_station": "4Autoladestation|5Autoladegerät|Auto aufladen|Auto laden",
@@ -535,5 +535,6 @@
 "social_facility-food_bank": "3Tafel|5Lebensmitteltafel|3Essen",
 "amenity-food_sharing": "3Food Sharing|3Essen|3Essensspende",
 "amenity-give_box": "Spendenbox|spenden",
-"amenity-hydrant": "5Hydrant|5Wasserhydrant|4Nutzwasser|4Bewässerungshydrant|4Reinigungshydrant|4Zapfstelle"
+"amenity-hydrant": "5Hydrant|5Wasserhydrant|4Nutzwasser|4Bewässerungshydrant|4Reinigungshydrant|4Zapfstelle",
+"tourism-information-tactile_map": "3Taktile-Karte|3Karte|4Sehbehinderung|3Barrierefreiheit|5Information"
 }

data/categories-strings/es.json/localize.json

@@ -249,7 +249,7 @@
 "sport-golf": "Golf",
 "sport-gymnastics": "Gimnasia",
 "sport-handball": "Balonmano",
-"sport-scuba_diving": "Submarinismo|buceo",
+"sport-scuba_diving": "Submarinismo|buceo|snorkel",
 "sport-shooting": "Campo de tiro|Club de tiro",
 "sport-skateboard": "4Skatepark|Skate park|Monopatinaje|skate|patineta|skateboard|patinar|parque de patineta",
 "sport-skiing": "4Esquí|Ski|Esquiar",

data/categories-strings/nl.json/localize.json

@@ -315,8 +315,8 @@
 "shop-tyres|@shop": "4Banden|band|bandenverkoop",
 "amenity-car_wash": "3Car wash|autowasstraat|wasstraat",
 "amenity-veterinary": "4Dierenarts|3Veterinair|3veearts",
-"@charging_station": "Oplaadstation|opladen",
-"amenity-charging_station-bicycle|@charging_station": "Fiets opladen",
+"@charging_station": "Oplaadstation|opladen|lader",
+"amenity-charging_station-bicycle|@charging_station": "Fiets-laadstation|Fiets opladen",
 "amenity-childcare": "Crèche|kinderopvang|kinderzorg",
 "amenity-bicycle_parking": "Fietsenstalling",
 "amenity-waste_basket": "7Vuilnisbak|5afvalbak|4prullenmand|mand",
@@ -328,15 +328,15 @@
 "shop-pet|@shop": "Dierenwinkel",
 "tourism-zoo|@category_tourism|@category_children": "Dierentuin|zoo",
 "attraction-animal": "Dierenverblijf",
-"tourism-information-office|amenity-ranger_station|@category_tourism": "4Toeristische informatie|vvv|5Boswachterskantoor",
-"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "5Bezoekerscentrum|5Boswachterij",
+"tourism-information-office|amenity-ranger_station|@category_tourism": "4Toeristische informatie|vvv|5Boswachterskantoor|Informatie",
+"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "5Bezoekerscentrum|5Boswachterij|Informatie",
 "amenity-community_centre": "4Wijkcentrum|6gemeenschapscentrum",
 "amenity-compressed_air": "4Perslucht|lucht",
 "amenity-courthouse": "Rechtban|gerechtsgebouw",
-"amenity-vending_machine-cigarettes": "4Sigarettenautomaat",
-"amenity-vending_machine-drinks": "4Drankautomaat|4Frisdrank",
+"amenity-vending_machine-cigarettes": "4Sigarettenautomaat|Verkoopautomaat",
+"amenity-vending_machine-drinks": "4Drankautomaat|4Frisdrank|Verkoopautomaat",
 "amenity-vending_machine-parking_tickets|@category_parking": "4Parkeerautomaat|Betaalautomaat parkeergarage",
-"amenity-vending_machine-public_transport_tickets|@category_transport": "6Kaartjesautomaat voor openbaar vervoer|2OV-kaartjes|7Vervoersbewijzen|Kaartjes|5Betaalautomaat|3Buskaartjes|5Treinkaartjes",
+"amenity-vending_machine-public_transport_tickets|@category_transport": "6Kaartjesautomaat voor openbaar vervoer|2OV-kaartjes|7Vervoersbewijzen|Kaartjes|5Betaalautomaat|3Buskaartjes|5Treinkaartjes|Verkoopautomaat",
 "shop-outpost": "Ophaalpunt",
 "building-garage": "Garage",
 "highway-rest_area|highway-services": "Snelweg rustplaats|5Parkeerplaats|4Servicegebied",
@@ -396,7 +396,7 @@
 "shop-tattoo": "4Tatoeagezaak|Tattoosalon|Tattoo Studio|Tattoo Shop|tatoeage",
 "shop-variety_store|@category_shopping|@shop": "4Bazaar",
 "shop-video|@shop": "4Video|3DVD|4videoshop|videoverhuur",
-"shop-video_games|@shop": "4Videospellen|4videogames|videospellen|3gaming|games",
+"shop-video_games|@shop": "4Videospellen|4videogames|videospellen|3gaming|games|videogame|game",
 "tourism-wilderness_hut|@category_hotel": "Wildernishut",
 "tourism-gallery|@category_tourism": "3Galerij|museum",
 "tourism-theme_park|@category_tourism|@category_children": "5Attractiepark|4Pretpart",
@@ -471,16 +471,16 @@
 "highway-elevator": "Lift|Elevator",
 "natural-saddle|mountain_pass": "4Doorgang|Pas",
 "amenity-animal_shelter": "6Dierenopvang|dierenasiel",
-"amenity-vending_machine-condoms": "4Condoomautomaat|Condooms",
-"amenity-vending_machine-food|@category_food": "5Snoepautomaat|Snoep|5Snacks",
+"amenity-vending_machine-condoms": "4Condoomautomaat|Condooms|Verkoopautomaat",
+"amenity-vending_machine-food|@category_food": "5Snoepautomaat|Snoep|5Snacks|Verkoopautomaat",
 "amenity-vending_machine-newspapers": "4Krantenmachine|Kranten",
-"amenity-vending_machine-sweets": "4Snoepmachine|Snoep",
+"amenity-vending_machine-sweets": "4Snoepmachine|Snoep|Verkoopautomaat",
 "amenity-vending_machine-excrement_bags": "5Uitwerpselenzakjes|4Poepzakjes|3Hondenpoepzakjes|Dierenafval",
 "amenity-vending_machine-fuel|@category_fuel": "Brandstofpomp",
 "man_made-chimney": "Schoorsteen",
 "man_made-crane": "Kraan",
 "leisure-marina": "5Jachthaven",
-"amenity-vending_machine-coffee": "4Koffieautomaat|Koffie",
+"amenity-vending_machine-coffee": "4Koffieautomaat|Koffie|Verkoopautomaat",
 "attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "4Attractie|4Doolhof|4Amusement",
 "shop-money_lender": "5Geldlener|Geldschieter",
 "shop-lighting|@shop": "4Verlichting|Verlichtingsarmaturen|4Lampen",
@@ -489,7 +489,7 @@
 "building-guardhouse": "4Wachtpost",
 "amenity-studio": "5Mediastudio|studio",
 "shop-grocery|@category_food|@shop": "5Kruidenier|4winkel",
-"shop-health_food|@category_food|@shop": "6Gezondheidsvoeding|6Gezonde voeding|6healthfood|3organisch|3ecologisch|3vegan|veganistisch|vegetarisch",
+"shop-health_food|@category_food|@shop": "6Gezondheidsvoeding|6Gezonde voeding|6healthfood|3organisch|3ecologisch",
 "shop-beauty-nails": "5Nagelsalon|nagelverzorging|vingernagels|teennagels|nagels",
 "amenity-mobile_money_agent": "6Mobiel geldkantoor|mobiel geld",
 "shop-caravan|@category_rv|@shop": "6Camperdealer|campers|5Caravandealer|caravans",
@@ -526,5 +526,15 @@
 "shop-craft|@shop": "3Ambacht",
 "shop-farm|@category_food|@shop": "Boerderijvoedsel",
 "man_made-cross": "Kruis",
-"leisure-hackerspace": "Hackerspace"
+"leisure-hackerspace": "Hackerspace",
+"tourism-artwork-sculpture": "Sculptuur|Beeldhouwwerk|Kunstwerk",
+"tourism-artwork-statue": "Standbeeld|Kunstwerk",
+"tourism-artwork-painting": "Schilderij|Kunstwerk",
+"amenity-charging_station-motorcycle|@charging_station": "Motorfiets-laadstation|Motorfiets opladen",
+"amenity-charging_station-motorcar|@charging_station": "Auto-laadstation|Oplaadstation|Autolader",
+"amenity-vending_machine": "Verkoopautomaat|automaat",
+"tourism-information-tactile_map": "Tactiele kaart|kaart|4Informatie",
+"tourism-information-guidepost": "Wegwijzer",
+"emergency-disaster_help_point": "4Noodhulppost",
+"power-generator-wind": "Windgenerator"
 }

data/countries-strings/de.json/localize.json

@@ -906,7 +906,7 @@
 "Singapore":"Singapur",
 "Slovakia":"Slowakei",
 "Slovakia_Region of Banska Bystrica":"Neusohler Landschaftsverband",
-"Slovakia_Region of Bratislava":"Region Bratislava",
+"Slovakia_Region of Bratislava":"Bratislavaer Landschaftsverband",
 "Slovakia_Region of Kosice":"Kaschauer Landschaftsverband",
 "Slovakia_Region of Nitra":"Neutraer Landschaftsverband",
 "Slovakia_Region of Presov":"Eperieser Landschaftsverband",
@@ -1553,21 +1553,21 @@
 "Croatia_West Description":"Opatija, Rijeka, Split",
 "Cuba Description":"Cienfuegos, Havanna, Santiago de Cuba",
 "Cyprus Description":"Nikosia, Limassol, Larnaca, Paphos",
-"Czech_Jihovychod_Jihomoravsky kraj Description":"Břeclav, Brno (ehem. Brünn), Znojmo",
-"Czech_Jihovychod_Kraj Vysocina Description":"Havlíčkův Brod, Jihlava, Třebíč",
-"Czech_Jihozapad_Jihocesky kraj Description":"České Budějovice (ehem. Budweis), Písek, Tábor",
+"Czech_Jihovychod_Jihomoravsky kraj Description":"Brno (ehem. Brünn), Znojmo, Břeclav",
+"Czech_Jihovychod_Kraj Vysocina Description":"Jihlava, Třebíč, Havlíčkův Brod",
+"Czech_Jihozapad_Jihocesky kraj Description":"České Budějovice (ehem. Budweis), Tábor, Písek",
 "Czech_Jihozapad_Plzensky kraj Description":"Plzeň (ehem. Pilsen), Klatovy, Rokycany",
-"Czech_Karlovasky kraj Description":"Cheb, Karlovy Vary (ehem. Karlsbad), Sokolov",
-"Czech_Moravskoslezsko Description":"Havířov, Opava, Ostrava (ehem. Ostrau)",
-"Czech_Olomoucky kraj Description":"Olomouc (ehem. Olmütz), Přerov, Prostějov",
+"Czech_Karlovasky kraj Description":"Karlovy Vary (ehem. Karlsbad), Cheb, Sokolov",
+"Czech_Moravskoslezsko Description":"Ostrava (ehem. Ostrau), Havířov, Opava",
+"Czech_Olomoucky kraj Description":"Olomouc (ehem. Olmütz), Prostějov, Přerov",
 "Czech_Praha Description":"Prag",
-"Czech_Severovychod_Kralovehradecky kraj Description":"Náchod, Hradec Králové (ehem. Königgrätz), Trutnov",
-"Czech_Severovychod_Liberecky kraj Description":"Česká Lípa, Jablonec nad Nisou, Liberec",
-"Czech_Severovychod_Pardubicky kraj Description":"Chrudim, Pardubice, Svitavy",
-"Czech_Stredni Cechy_East Description":"Kolín, Kutná Hora, Příbram",
-"Czech_Stredni Cechy_West Description":"Beroun, Kladno, Mladá Boleslav",
-"Czech_Ustecky kraj Description":"Most, Teplice, Ústí nad Labem",
-"Czech_Zlinsky Kraj Description":"Kroměříž, Vsetín, Zlín",
+"Czech_Severovychod_Kralovehradecky kraj Description":"Hradec Králové (ehem. Königgrätz), Trutnov, Náchod",
+"Czech_Severovychod_Liberecky kraj Description":"Liberec, Jablonec nad Nisou, Česká Lípa",
+"Czech_Severovychod_Pardubicky kraj Description":"Pardubice, Chrudim, Svitavy",
+"Czech_Stredni Cechy_East Description":"Kolín, Příbram, Kutná Hora",
+"Czech_Stredni Cechy_West Description":"Kladno, Mladá Boleslav, Beroun",
+"Czech_Ustecky kraj Description":"Ústí nad Labem, Most, Teplice",
+"Czech_Zlinsky Kraj Description":"Zlín, Kroměříž, Vsetín",
 "Denmark_Capital Region of Denmark Description":"Kopenhagen, Skovlunde, Virum",
 "Denmark_Central Denmark Region Description":"Aarhus, Brabrand, Juelsminde",
 "Denmark_North Denmark Region Description":"Aalborg, Hjörring, Frederikshavn",
@@ -1593,18 +1593,18 @@
 "Finland_Eastern Finland_North Description":"Alapitkä, Koli, Kajaani",
 "Finland_Eastern Finland_South Description":"Kuopio, Joensuu, Mikkeli",
 "Finland_Northern Finland Description":"Oulu, Rovaniemi, Kokkola",
-"Finland_Southern Finland_Helsinki Description":"Helsinki",
+"Finland_Southern Finland_Helsinki Description":"Helsinki, Espoo, Vantaa",
 "Finland_Southern Finland_Lappeenranta Description":"Kouvola, Lappeenranta, Kotka",
 "Finland_Southern Finland_West Description":"Turku, Hämeenlinna, Salo",
 "Finland_Western Finland_Jyvaskyla Description":"Jyväskylä, Lehtimäki, Kuorevesi",
 "Finland_Western Finland_Tampere Description":"Tampere, Pori, Vaasa",
-"France_Alsace_Bas-Rhin Description":"Straßburg, Hagenau",
+"France_Alsace_Bas-Rhin Description":"Straßburg, Hagenau, Schiltigheim",
 "France_Alsace_Haut-Rhin Description":"Mülhausen, Kolmar, Sankt Ludwig",
 "France_Aquitaine_Dordogne Description":"Périgueux, Bergerac, Boulazac Isle Manoire",
 "France_Aquitaine_Gironde Description":"Bordeaux, Mérignac, Pessac",
 "France_Aquitaine_Landes Description":"Mont-de-Marsan, Dax, Saint-Paul-lès-Dax",
 "France_Aquitaine_Lot-et-Garonne Description":"Agen, Villeneuve-sur-Lot, Marmande",
-"France_Aquitaine_Pyrenees-Atlantiques Description":"Bayonne",
+"France_Aquitaine_Pyrenees-Atlantiques Description":"Pau, Bayonne, Anglet",
 "France_Auvergne_Allier Description":"Montluçon, Vichy, Moulins",
 "France_Auvergne_Cantal Description":"Aurillac, Saint-Flour, Arpajon-sur-Cère",
 "France_Auvergne_Haute-Loire Description":"Le Puy-en-Velay, Monistrol-sur-Loire, Yssingeaux",
@@ -1625,7 +1625,7 @@
 "France_Centre-Val de Loire_Loiret Description":"Orléans, Olivet, Saint-Jean-de-Braye",
 "France_Champagne-Ardenne Description":"Reims, Troyes, Charleville-Mézières",
 "France_Corsica Description":"Ajaccio, Bastia, Porto-Vecchio",
-"France_Free County_North Description":"Montbéliard",
+"France_Free County_North Description":"Besançon, Belfort, Montbéliard",
 "France_Free County_South Description":"Pontarlier, Lons-le-Saunier, Saint-Claude",
 "France_French Guiana Description":"Cayenne, Saint-Laurent-du-Maroni, Matoury",
 "France_Ile-de-France_Essonne Description":"Évry, Corbeil-Essonnes, Massy",
@@ -1638,14 +1638,14 @@
 "France_Ile-de-France_Yvelines Description":"Versailles, Sartrouville, Saint-Germain-en-Laye",
 "France_Languedoc-Roussillon_Aude Description":"Narbonne, Carcassonne, Castelnaudary",
 "France_Languedoc-Roussillon_Gard Description":"Nîmes, Alès, Bagnols-sur-Cèze",
-"France_Languedoc-Roussillon_Herault Description":"Béziers",
+"France_Languedoc-Roussillon_Herault Description":"Montpellier, Béziers, Sète",
 "France_Languedoc-Roussillon_Lozere Description":"Mende, Marvejols, Saint-Chély-d'Apcher",
 "France_Languedoc-Roussillon_Pyrenees-Orientales Description":"Perpignan, Canet-en-Roussillon, Saint-Estève",
 "France_Limousin Description":"Limoges, Brive-la-Gaillarde, Tulle",
-"France_Lorraine_Meurthe-et-Moselle Description":"Lünstadt",
+"France_Lorraine_Meurthe-et-Moselle Description":"Nancy, Vandœuvre-lès-Nancy, Lunéville",
 "France_Lorraine_Meuse Description":"Verdun, Bar-le-Duc, Commercy",
-"France_Lorraine_Moselle Description":"Diedenhofen",
-"France_Lorraine_Vosges Description":"Sankt Didel, Gerdsee",
+"France_Lorraine_Moselle Description":"Metz, Thionville, Montigny-lès-Metz",
+"France_Lorraine_Vosges Description":"Épinal, Saint-Dié-des-Vosges, Gérardmer",
 "France_Lower Normandy_Calvados Description":"Caen, Hérouville-Saint-Clair, Lisieux",
 "France_Lower Normandy_Manche Description":"Cherbourg-en-Cotentin, Saint-Lô, Granville",
 "France_Lower Normandy_Orne Description":"Alençon, Flers, Argentan",
@@ -1657,10 +1657,10 @@
 "France_Midi-Pyrenees_Lot Description":"Cahors, Figeac, Gourdon",
 "France_Midi-Pyrenees_Tarn Description":"Albi, Castres, Gaillac",
 "France_Midi-Pyrenees_Tarn-et-Garonne Description":"Montauban, Castelsarrasin, Moissac",
-"France_New Caledonia Description":"Noumea",
+"France_New Caledonia Description":"Poindimié, Nouméa, Ponérihouen",
 "France_Nord-Pas-de-Calais_Lille Description":"Lille, Roubaix, Tourcoing",
 "France_Nord-Pas-de-Calais_Nord Description":"Valenciennes, Douai, Cambrai",
-"France_Nord-Pas-de-Calais_Pas-de-Calais Description":"Atrecht",
+"France_Nord-Pas-de-Calais_Pas-de-Calais Description":"Calais, Boulogne-sur-Mer, Arras",
 "France_Pays de la Loire_Loire-Atlantique_Nantes Description":"Nantes, Saint-Herblain, Rezé",
 "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire Description":"Saint-Nazaire, Guérande, La Baule-Escoublac",
 "France_Pays de la Loire_Maine-et-Loire Description":"Angers, Cholet, Saumur",
@@ -1675,9 +1675,9 @@
 "France_Poitou-Charentes_Deux-Sevres Description":"Niort, Bressuire, Thouars",
 "France_Poitou-Charentes_Vienne Description":"Poitiers, Châtellerault, Buxerolles",
 "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence Description":"Manosque, Digne-les-Bains, Sisteron",
-"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone Description":"Marseille",
+"France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone Description":"Marseille, Aix-en-Provence, Arles",
 "France_Provence-Alpes-Cote dAzur_Hautes-Alpes Description":"Gap, Briançon, Embrun",
-"France_Provence-Alpes-Cote dAzur_Maritime Alps Description":"Nizza",
+"France_Provence-Alpes-Cote dAzur_Maritime Alps Description":"Nizza, Antibes, Cannes",
 "France_Provence-Alpes-Cote dAzur_Var Description":"Toulon, La Seyne-sur-Mer, Fréjus",
 "France_Provence-Alpes-Cote dAzur_Vaucluse Description":"Avignon, Carpentras, Orange",
 "France_Rhone-Alpes_Ain Description":"Bourg-en-Bresse, Oyonnax, Valserhône",
@@ -1699,27 +1699,27 @@
 "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart Description":"Stuttgart, Esslingen am Neckar, Ludwigsburg",
 "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen Description":"Ulm, Reutlingen, Tübingen",
 "Germany_Berlin Description":"Berlin, Falkenberg, Siedlung Grüneck",
-"Germany_Brandenburg_North Description":"Brandenburg an der Havel, Potsdam",
-"Germany_Brandenburg_South Description":"Frankfurt (Oder), Cottbus",
+"Germany_Brandenburg_North Description":"Potsdam, Brandenburg an der Havel, Oranienburg",
+"Germany_Brandenburg_South Description":"Cottbus, Frankfurt (Oder), Königs Wusterhausen",
 "Germany_Free State of Bavaria_Lower Bavaria Description":"Landshut, Passau, Straubing",
 "Germany_Free State of Bavaria_Lower Franconia Description":"Würzburg, Aschaffenburg, Schweinfurt",
 "Germany_Free State of Bavaria_Middle Franconia Description":"Nürnberg, Fürth, Erlangen",
 "Germany_Free State of Bavaria_Swabia Description":"Augsburg, Kempten (Allgäu), Neu-Ulm",
-"Germany_Free State of Bavaria_Upper Bavaria_East Description":"Rosenheim",
+"Germany_Free State of Bavaria_Upper Bavaria_East Description":"Rosenheim, Erding, Waldkraiburg",
 "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt Description":"Ingolstadt, Freising, Neuburg an der Donau",
-"Germany_Free State of Bavaria_Upper Bavaria_Munchen Description":"München, Dachau",
+"Germany_Free State of Bavaria_Upper Bavaria_Munchen Description":"München, Dachau, Germering",
 "Germany_Free State of Bavaria_Upper Bavaria_South Description":"Pfistern, Schongau, Hohenpeißenberg",
 "Germany_Free State of Bavaria_Upper Franconia Description":"Bayreuth, Bamberg, Hof",
 "Germany_Free State of Bavaria_Upper Palatinate Description":"Regensburg, Amberg, Weiden in der Oberpfalz",
-"Germany_Hamburg_main Description":"Hamburg, Nettelnburg, Fünfhausen",
+"Germany_Hamburg_main Description":"Wandsbek, Hamburg-Nord, Hamburg-Mitte",
 "Germany_Hesse_Regierungsbezirk Darmstadt Description":"Frankfurt am Main, Wiesbaden, Darmstadt",
-"Germany_Hesse_Regierungsbezirk Giessen Description":"Lauterbach, Gießen, Marburg",
-"Germany_Hesse_Regierungsbezirk Kassel Description":"Kassel, Fulda, Vöhl",
-"Germany_Lower Saxony_Braunschweig Description":"Braunschweig, Göttingen, Wolfsburg",
+"Germany_Hesse_Regierungsbezirk Giessen Description":"Gießen, Marburg, Wetzlar",
+"Germany_Hesse_Regierungsbezirk Kassel Description":"Kassel, Fulda, Bad Hersfeld",
+"Germany_Lower Saxony_Braunschweig Description":"Braunschweig, Wolfsburg, Göttingen",
 "Germany_Lower Saxony_Bremen_Bremen Description":"Bremen und Bremerhaven, Delmenhorst, Cuxhaven",
-"Germany_Lower Saxony_Bremen_Munster Description":"Rotenburg (Wümme), Winsen (Luhe), Buxtehude",
-"Germany_Lower Saxony_Hannover Description":"Hannover, Hildesheim, Bad Nenndorf",
-"Germany_Lower Saxony_Oldenburg Description":"Osnabrück, Oldenburg, Nordhorn",
+"Germany_Lower Saxony_Bremen_Munster Description":"Lüneburg, Celle, Stade",
+"Germany_Lower Saxony_Hannover Description":"Hannover, Hildesheim, Garbsen",
+"Germany_Lower Saxony_Oldenburg Description":"Oldenburg (Oldb), Osnabrück, Wilhelmshaven",
 "Germany_Mecklenburg-Vorpommern Description":"Rostock, Schwerin, Wismar",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg Description":"Siegen, Arnsberg, Lüdenscheid",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund Description":"Dortmund, Bochum, Hagen",
@@ -1727,13 +1727,13 @@
 "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf Description":"Düsseldorf, Wuppertal, Mönchengladbach",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim Description":"Essen, Duisburg, Krefeld",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel Description":"Wesel, Kleve, Geldern",
-"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen Description":"Aachen, Düren, Simmerath",
+"Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen Description":"Aachen, Düren, Euskirchen",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln Description":"Köln, Bonn, Leverkusen",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster Description":"Münster, Rheine, Ahlen",
 "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen Description":"Gelsenkirchen, Bottrop, Recklinghausen",
-"Germany_Rhineland-Palatinate_Koblenz Description":"Koblenz, Trier",
+"Germany_Rhineland-Palatinate_Koblenz Description":"Koblenz, Trier, Neuwied",
 "Germany_Rhineland-Palatinate_South Description":"Mainz, Ludwigshafen am Rhein, Kaiserslautern",
-"Germany_Saarland Description":"Saarbrücken, Neunkirchen (Saar), Homburg",
+"Germany_Saarland Description":"Saarbrücken, Neunkirchen, Homburg",
 "Germany_Saxony-Anhalt_Halle Description":"Halle (Saale), Dessau-Roßlau, Zerbst/Anhalt",
 "Germany_Saxony-Anhalt_Magdeburg Description":"Magdeburg, Halberstadt, Aschersleben",
 "Germany_Saxony_Dresden Description":"Dresden, Görlitz, Schirgiswalde-Kirschau",
@@ -2042,22 +2042,22 @@
 "Philippines_Mindanao Description":"Zamboanga City, General Santos, Koronadal",
 "Philippines_Visayas Description":"Bacolod City, Cebu City",
 "Pitcairn Islands Description":"Adamstown",
-"Poland_Greater Poland Voivodeship Description":"Posen, Kalisch",
-"Poland_Kuyavian-Pomeranian Voivodeship Description":"Bromberg, Thorn, Leslau",
-"Poland_Lesser Poland Voivodeship Description":"Krakau, Tarnau, Neu Sandez",
-"Poland_Lodz Voivodeship Description":"Lodz, Petrikau, Pabianitz",
-"Poland_Lower Silesian Voivodeship Description":"Breslau, Waldenburg",
-"Poland_Lublin Voivodeship Description":"Zamosch",
-"Poland_Lubusz Voivodeship Description":"Grünberg in Schlesien, Königswalde, Landsberg an der Warthe",
-"Poland_Masovian Voivodeship Description":"Warschau, Plock",
-"Poland_Opole Voivodeship Description":"Oppeln, Zülz, Bauerwitz",
-"Poland_Podlaskie Voivodeship Description":"Bialystok, Suwalken",
-"Poland_Pomeranian Voivodeship Description":"Danzig, Gdingen, Stolp",
-"Poland_Silesian Voivodeship Description":"Kattowitz, Tschenstochau, Sosnowitz",
-"Poland_Subcarpathian Voivodeship Description":"Dünhof",
+"Poland_Greater Poland Voivodeship Description":"Poznan (ehem. Posen), Kalisz (ehem. Kalisch), Piła (ehem. Schneidemühl)",
+"Poland_Kuyavian-Pomeranian Voivodeship Description":"Bydgoszcz (ehem. Bromberg), Toruń (ehem. Thorn), Włocławek (ehem. Leslau)",
+"Poland_Lesser Poland Voivodeship Description":"Krakau, Tarnów, Nowy Sącz (ehem. Neu Sandez)",
+"Poland_Lodz Voivodeship Description":"Łódź, Piotrków Trybunalski (ehem. Petrikau), Pabianice",
+"Poland_Lower Silesian Voivodeship Description":"Wrocław (ehem. Breslau), Wałbrzych (ehem. Waldenburg), Legnica",
+"Poland_Lublin Voivodeship Description":"Lublin, Zamość, Chełm",
+"Poland_Lubusz Voivodeship Description":"Zielona Góra (ehem. Grünberg), Gorzów Wielkopolski (ehem. Landsberg an der Warthe), Nowa Sól",
+"Poland_Masovian Voivodeship Description":"Warschau, Radom, Płock",
+"Poland_Opole Voivodeship Description":"Opole (ehem. Oppeln), Kędzierzyn-Koźle (ehem Kandrzin-Cosel), Nysa (ehem. Neisse)",
+"Poland_Podlaskie Voivodeship Description":"Białystok, Suwałki, Łomża",
+"Poland_Pomeranian Voivodeship Description":"Danzig, Gdingen, Słupsk (ehem. Stolp)",
+"Poland_Silesian Voivodeship Description":"Katowice, Częstochowa (ehem. Tschenstochau), Sosnowiec",
+"Poland_Subcarpathian Voivodeship Description":"Rzeszów, Mielec, Przemyśl (ehem. Premissel)",
 "Poland_Swietokrzyskie Voivodeship Description":"Kielce, Ostrowiec Świętokrzyski, Starachowice",
-"Poland_Warmian-Masurian Voivodeship Description":"Allenstein, Elbing, Lyck",
-"Poland_West Pomeranian Voivodeship Description":"Stettin, Köslin, Pflugrade",
+"Poland_Warmian-Masurian Voivodeship Description":"Olsztyn (ehem. Allenstein), Elbląg, Ełk",
+"Poland_West Pomeranian Voivodeship Description":"Szczecin (ehem. Stettin), Koszalin (ehem. Köslin), Stargard",
 "Portugal_Islands Description":"Funchal, Madalena, Calheta",
 "Portugal_Porto Description":"Vila Nova de Gaia, Porto, Braga",
 "Portugal_South Description":"Lissabon",
@@ -2180,14 +2180,14 @@
 "Seychelles Description":"Victoria, Port Launay, Bel Ombre",
 "Sierra Leone Description":"Bo, Freetown, Kambia",
 "Singapore Description":"Singapur, Ladang, Rocky Hill",
-"Slovakia_Region of Banska Bystrica Description":"Neusohl, Altsohl, Lizenz",
-"Slovakia_Region of Bratislava Description":"Bratislava, Engerau, Rosenheim",
-"Slovakia_Region of Kosice Description":"Kaschau, Großmichel",
-"Slovakia_Region of Nitra Description":"Neutra, Neuhäusel",
-"Slovakia_Region of Presov Description":"Preschau, Deutschendorf, Homenau",
-"Slovakia_Region of Trencin Description":"Trentschin, Priwitz, Waagbistritz",
-"Slovakia_Region of Trnava Description":"Tyrnau, Pistyan",
-"Slovakia_Region of Zilina Description":"Sillein, Sankt Martin, Liptau-Sankt-Nikolaus",
+"Slovakia_Region of Banska Bystrica Description":"Banská Bystrica (ehem. Neusohl), Zvolen, Lučenec",
+"Slovakia_Region of Bratislava Description":"Bratislava, Pezinok, Senec",
+"Slovakia_Region of Kosice Description":"Košice (ehem. Kaschau), Michalovce, Spišská Nová Ves",
+"Slovakia_Region of Nitra Description":"Nitra, Nové Zámky, Komárno",
+"Slovakia_Region of Presov Description":"Prešov, Poprad, Bardejov",
+"Slovakia_Region of Trencin Description":"Trenčín, Prievidza, Považská Bystrica (ehem. Waagbistritz)",
+"Slovakia_Region of Trnava Description":"Trnava (ehem. Tyrnau), Piešťany (ehem. Pistyan), Dunajská Streda (ehem. Niedermarkt)",
+"Slovakia_Region of Zilina Description":"Žilina, Martin, Liptovský Mikuláš",
 "Slovenia_East Description":"Marburg an der Drau",
 "Slovenia_West Description":"Laibach",
 "Solomon Islands Description":"Honiara",

data/mapcss-mapping.csv

@@ -475,6 +475,7 @@ amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_n
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
 deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
+# Workaround for (mis)uses of emergency access points to provide kind of an additional emergency address to each house, which without this would completely clutter the map. See https://codeberg.org/comaps/comaps/pulls/3220.
 emergency|access_point|address;[emergency=access_point][operator=helpbidea];;name;;362;
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;

data/sound-strings/ar.json/localize.json

@@ -49,7 +49,7 @@
 "in_3_kilometers":"بعد ثلاثة كيلومترات",
 "then":"ثم",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"اسلك المخرج الأول.",
+"take_the_1_exit":"خذ أول مخرج",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
 "take_the_2_exit":"اسلك المخرج الثاني.",

data/sound-strings/de.json/localize.json

@@ -23,7 +23,7 @@
 "make_a_u_turn_street":"NULL",
 "make_a_u_turn_street_verb":"NULL",
 "go_straight":"Fahre geradeaus.",
-"exit":"Beenden.",
+"exit":"Nimm die Ausfahrt.",
 "onto":"auf",
 "take_exit_number":"Nehme die Ausfahrt auf",
 "take_exit_number_street_verb":"NULL",

data/sound-strings/eu.json/localize.json

@@ -61,7 +61,7 @@
 "take_the_4_exit":"Hartu laugarren irteera.",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"Hartu bosgarren irteera.",
+"take_the_5_exit":"Hartu bosgarren irteera",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
 "take_the_6_exit":"Hartu seigarren irteera.",

data/sound-strings/pt.json/localize.json

@@ -49,28 +49,28 @@
 "in_3_kilometers":"A três quilómetros",
 "then":"Depois",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"Saia na primeira saída.",
+"take_the_1_exit":"Tome a primeira saída.",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"Saia na segunda saída.",
+"take_the_2_exit":"Tome a segunda saída.",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"Saia na terceira saída.",
+"take_the_3_exit":"Tome a terceira saída.",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"Saia na quarta saída.",
+"take_the_4_exit":"Tome a quarta saída.",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"Saia na quinta saída.",
+"take_the_5_exit":"Tome a quinta saída.",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"Saia na sexta saída.",
+"take_the_6_exit":"Tome a sexta saída.",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"Saia na sétima saída.",
+"take_the_7_exit":"Tome a sétima saída.",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"Saia na oitava saída.",
+"take_the_8_exit":"Tome a oitava saída.",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
 "take_the_9_exit":"Saia na nona saída.",

data/sound-strings/zh-Hans.json/localize.json

@@ -49,37 +49,37 @@
 "in_3_kilometers":"在三公里后",
 "then":"然后",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"从第一个出口驶出。",
+"take_the_1_exit":"从第一个出口驶出环岛。",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"从第二个出口驶出。",
+"take_the_2_exit":"从第二个出口驶出环岛。",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"从第三个出口驶出。",
+"take_the_3_exit":"从第三个出口驶出环岛。",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"从第四个出口驶出。",
+"take_the_4_exit":"从第四个出口驶出环岛。",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"从第五个出口驶出。",
+"take_the_5_exit":"从第五个出口驶出环岛。",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"从第六个出口驶出。",
+"take_the_6_exit":"从第六个出口驶出环岛。",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"从第七个出口驶出。",
+"take_the_7_exit":"从第七个出口驶出环岛。",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"从第八个出口驶出。",
+"take_the_8_exit":"从第八个出口驶出环岛。",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"从第九个出口驶出。",
+"take_the_9_exit":"从第九个出口驶出环岛。",
 "take_the_9_exit_street":"NULL",
 "take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"从第十个出口驶出。",
+"take_the_10_exit":"从第十个出口驶出环岛。",
 "take_the_10_exit_street":"NULL",
 "take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"从第十一个出口驶出。",
+"take_the_11_exit":"从第十一个出口驶出环岛。",
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"在五十英尺后",

data/styles/default/dark/symbols/tram-m.svg

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#000"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/tram-s.svg

@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#000"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#000"/></g></svg>

data/styles/default/dark/symbols/tree-special-m.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0562 .4152)"><path d="m7.76536687 1.02582924 2.91781373 1.20859801c.4900562.20298792.8794043.59233606 1.0823922 1.08239221l1.208598 2.91781372c.2029879.49005615.2029879 1.04067751 0 1.5307337l-1.208598 2.91781362c-.2029879.4900562-.5923361.8794044-1.0823922 1.0823923l-2.91781376 1.208598c-.49005615.2029879-1.04067751.2029879-1.53073369 0l-2.91781366-1.208598c-.49005618-.2029879-.87940432-.592336-1.08239223-1.0823922l-1.20859802-2.91781373c-.2029879-.49005617-.2029879-1.04067755.00000001-1.53073373l1.208598-2.91781368c.20298791-.49005618.59233603-.8794043 1.0823922-1.0823922l2.9178137-1.20859802c.49005617-.2029879 1.04067755-.2029879 1.53073372 0z" fill="#181715"/><path d="m7.57402516 1.48776901 2.91781374 1.20859801c.3675421.15224093.6595532.44425202.8117941.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781374c-.1522409.3675421-.444252.6595532-.8117941.8117941l-2.91781374 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.444252-.81179415-.8117941l-1.20859801-2.91781374c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="202510" fill-rule="evenodd"/></g></svg>

data/styles/default/include/Icons.mapcss

@@ -70,6 +70,7 @@ node|z14-[natural=geyser],
 node|z16-[natural=beach],
 area|z14-[natural=bare_rock],
 node|z17-[natural=rock],
+node|z17-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
 
 node|z13-[natural=peak][!name],
@@ -206,7 +207,9 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
-node|z18-[natural=tree],
+node|z17-[natural=tree][name],
+{icon-image: tree-special-m.svg;}
+node|z18-[natural=tree][!name],
 {icon-image: tree-m.svg;}
 
 node|z18-[xmas:feature=tree],

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -2460,7 +2460,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18-
+natural-tree                                        # icon z17- (also has caption(optional) z17-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2499,6 +2499,7 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z17- (also has icon z17-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)

data/styles/default/light/symbols/subway-vienna-m.svg

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#1267CE"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>

data/styles/default/light/symbols/subway-vienna-s.svg

@@ -2,7 +2,7 @@
 <svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <g stroke-width=".75">
   <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
-  <circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
+  <circle cx="9" cy="9" r="8.25" fill="#1267CE"/>
   <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" fill="#fff"/>
  </g>
 </svg>

data/styles/default/light/symbols/tram-m.svg

@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#fff"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/tram-s.svg

@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#fff"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#fff"/></g></svg>

data/styles/default/light/symbols/tree-special-m.svg

@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0562 .4152)"><path d="m7.76536687 1.02582924 2.91781373 1.20859801c.4900562.20298792.8794043.59233606 1.0823922 1.08239221l1.208598 2.91781372c.2029879.49005615.2029879 1.04067751 0 1.5307337l-1.208598 2.91781362c-.2029879.4900562-.5923361.8794044-1.0823922 1.0823923l-2.91781376 1.208598c-.49005615.2029879-1.04067751.2029879-1.53073369 0l-2.91781366-1.208598c-.49005618-.2029879-.87940432-.592336-1.08239223-1.0823922l-1.20859802-2.91781373c-.2029879-.49005617-.2029879-1.04067755.00000001-1.53073373l1.208598-2.91781368c.20298791-.49005618.59233603-.8794043 1.0823922-1.0823922l2.9178137-1.20859802c.49005617-.2029879 1.04067755-.2029879 1.53073372 0z" fill="#f5eada"/><path d="m7.57402516 1.48776901 2.91781374 1.20859801c.3675421.15224093.6595532.44425202.8117941.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781374c-.1522409.3675421-.444252.6595532-.8117941.8117941l-2.91781374 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.444252-.81179415-.8117941l-1.20859801-2.91781374c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></g></svg>

data/styles/outdoors/include/Icons.mapcss

@@ -31,6 +31,7 @@ node|z15-[natural=hot_spring],
 node|z12-[natural=geyser],
 node|z14-[natural=beach],
 area|z13-[natural=bare_rock][name],
+node|z16-[natural=tree],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
 node|z11-[natural=peak][!name],
 area|z13-[natural=bare_rock][!name],
@@ -148,6 +149,11 @@ node|z15-[man_made=water_well][drinking_water=not],
 node|z15-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
+node|z16-[natural=tree][name],
+{icon-image: tree-special-m.svg;}
+node|z18-[natural=tree][!name],
+{icon-image: tree-m.svg;}
+
 
 /* 3.5 Ferry terminal & seamarks */
 

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -2466,7 +2466,7 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z18-
+natural-tree                                        # icon z16- (also has caption(optional) z16-)
 === -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2505,6 +2505,7 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z16- (also has icon z16-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)

docs/CONTRIBUTING.md

@@ -4,7 +4,6 @@ Thank you for your interest in contributing to CoMaps!
 
 ## How Can I Contribute?
 
-- [Donate](https://opencollective.com/comaps/donate)
 - [Submit a bug report or a feature request](#bug-reports-and-feature-requests)
 
 There are things to do for everyone:
@@ -16,6 +15,8 @@ There are things to do for everyone:
 
 If you'd like to help in any other way or if there are any related questions - please [contact us](https://codeberg.org/comaps#keep-connected).
 
+If none of those ways of contributing seem to be a good fit, and you'd like to help out in another way, you could also [donate](https://www.comaps.app/donate/)
+
 ### Bug Reports and Feature Requests
 
 [Submit an issue](https://codeberg.org/comaps/comaps/issues) and describe your feature idea or report a bug.
@@ -47,13 +48,11 @@ Check the [map styling instructions](STYLES.md) and work on adding new map featu
 Please follow instructions in [INSTALL.md](INSTALL.md) to set up your development environment.
 You will find a list of issues for new contributors [here](https://codeberg.org/comaps/comaps/issues?labels=393881) to help you get started with simple tasks.
 
-**We do not assign issues to first-time contributors.** Any such request notifies our contributors and the development team, and creates unnecessary noise that distracts us from the work. Just make a PR - and it will be reviewed.
-
 Sometimes it's better to discuss and confirm your vision of the fix or implementation before working on an issue. Our main focus is on simplicity and convenience for everyone, not only for geeks.
 
 Please [learn how to use `git rebase`](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) (or rebase via any git tool with a graphical interface, e.g. [Fork for Mac](https://git-fork.com/) is quite good) to amend your commits in the PR and maintain a clean logical commit history for your changes/branches.
 
-We strive to help onboard new developers but we don't always have enough time to guide newcomers step-by-step and explain everything in detail. For that reason we might ask you to read lots of the documentation and study the existing code.
+We strive to help onboard new developers, but we don't always have enough time to guide newcomers step-by-step and explain everything in detail. So please make sure your changes follow these different guidelines when submitting a pull request:
 
 - [Pull Request Guide](PR_GUIDE.md).
 - [Directories structure](STRUCTURE.md)
@@ -71,7 +70,6 @@ Please help us:
 - reproducing and triaging reported bugs
 - [testing upcoming features and bug fixes for Android, iOS and desktop versions](TESTING.md)
 - keeping [issues](https://codeberg.org/comaps/comaps/issues) in order (check for duplicates, organize, assign labels, link related issues, etc.)
-- composing nice user-centric release notes and news items
 - etc.
 
 You can also contribute in [other ways](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md).

docs/ECLIPSE.md

@@ -0,0 +1,150 @@
+# Eclipse
+
+As mentioned in [Building](INSTALL.md), there are several IDEs which can be used for CoMaps development. With the refactoring of the code that happened in August 2025, Eclipse finally can be used to work with the CoMaps C++ and Java codebase. (Code in other languages is untested.)
+
+Eclipse natively supports Java, thus it can be used to edit the entire Android codebase. However, although Eclipse was once the tool for Android development, the Android plug-ins (ADT and its fork, Andmore) are no longer being actively developed. Therefore, although you can edit Java code for Android in Eclipse, you will get warnings about missing Android-specific dependencies. Building and debugging the Android app is not possible (or will require a lot of tinkering to get it to work).
+
+## Prerequisites
+
+You need Eclipse with CDT (C/C++ developer tools).
+
+## Import the code
+
+**Do not** import the entire source directory – the code indexer will choke on `3party`. Instead, import the following directories as individual projects:
+
+* `libs` – this should be the first dir to import
+* `qt` if you want to work on the desktop app
+* `tools` if you want to work on tools which are not part of the main app
+
+If you want to work on the Android app from within Eclipse, you can also import `android`. We don’t have instructions for that yet (feel free to contribute yours) but have been able to import that portion of the code into Eclipse. There are three main caveats:
+
+* You need to import C++ and Java code separately
+* In Java, Eclipse may not be able to find Android-specific dependencies which are not part of the standard Java API
+* The code has been refactored since this was last tried successfully; Android code has been split into an app and an SDK portion; you may need to import each of these separately
+
+## Import code dirs
+
+Repeat these steps for each subdir you want to work with (`libs`, `qt`, `android`, tools` etc.).
+
+From the menu, choose **File > Import**.
+
+In the dialog that opens, select **C/C++ > Existing Code as Makefile Project** and click **Next**.
+
+In the next dialog:
+
+* Set the **Project Name** (we recommend using the name of the subdir)
+* Set the path for the **Existing Code Location** (a subdir of the CoMaps code dir, such as `libs`, `qt` or `tools`)
+* Ensure both C and C++ are selected under **Languages**
+* Under **Toolchain for Indexer Settings**, select **CMake driven**.
+* Click **Finish**.
+
+After you have imported the code and open the first source files, Eclipse will flag lots of errors in the code, as it cannot find any of the included header files outside the project. We will rectify that in the next steps.
+
+## Header files in project root
+
+Some header files are located in the root dir of the source tree. You to import them into a location where Eclipse can find them.
+
+Right-click the `libs` project and choose **Import** from the context menu.
+
+In the dialog that opens, select **General > File System** and click **Next**.
+
+In the **File System** dialog:
+
+* In **From Directory**, enter (or browse to) the root dir of the CoMaps sources.
+* In the list of files below, check all header files (at the time of this writing, `defines.hpp`, `omim_config.h`, `precompiled_headers.hpp` and `private.h`).
+* Under **Options**, click **Advanced**.
+* Check **Create links in workspace**.
+* Click **Finish**.
+
+The header files will now appear at the root of `libs`. These are links that point to the files in their original location.
+
+Should any additional header files ever get added to the root dir, you will have to repeat this step.
+
+## Dependencies
+
+Right-click the project root in Package Explorer and select **Properties** from the context menu.
+
+In the dialog that opens, select **C/C++ General > Paths and Symbols** from the tree on the left.
+
+Click the **Includes** tab and add the following paths:
+
+* The standard include paths of your system (these can be obtained by running `echo | g++ -v -x c++ -E -` and looking for the line which reads `#include <...> search starts here:`)
+* The following subdirs of `3party` (in the CoMaps source dir):
+  * `boost`
+  * `pugixml/pugixml/src`
+  * For other dependencies, figure out where the header files are and how they are included – for example, if one of the source files includes `<foo/foo_base.hpp>` and you find the file in `3party/libfoo/headers/foo/foo_base.hpp`, include `3party/libfo/headers`
+* Qt6 headers – on Ubuntu 24.04, they are found in `/usr/include/x86_64-linux-gnu/qt6`. (Only for needed for `qt`; also for `tools` if you’re working on GUI tools.) You will also need at least the following subdirs:
+  * `QtCore`
+  * `QtGui`
+  * `QtOpenGL`
+  * `QtOpenGLWidgets`
+  * `QtWidgets`
+* This list may be incomplete – if you spot anything missing and know how to add it, please add it here
+
+On the **References** tab, check `libs` (except in the `libs` project itself, where this is not available and not needed).
+
+## Building
+
+> [!NOTE]
+> So far, we haven’t found a way to configure our toolchain as a builder in Eclipse (which would allow us to have Eclipse build the artifact as needed before running it)  – if you know how to do this, your input is appreciated. Until then, the workaround is to configure the build command as an external tool. The build command must then be launched manually after making changes to the code. After that you can launch the build artifact using Run.
+
+Build and run configurations are relative to a project. Since the code is spread across multiple projects, the recommendation is to configure the build for the project where the frontend resides – `qt` for the desktop app, `tools` for any tools.
+
+### Configure the build command as an external command
+
+From the menu, choose **Run > External Tools > External Tools Configurations...***
+
+Right-click **Program** in the left pane and select **New configuration**. (One blank configuration may already have been created, which you can adapt to your needs.)
+
+* Set a name for the external command (e.g. `Build`, followed by the artifact name and release or debug)
+* On the **Main** tab:
+  * **Location**: `${workspace_loc:/tools/unix/build_omim.sh}`
+  * **Working Directory**: `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`
+  * **Arguments**: arguments to the build script (e.g. `-r desktop` for a desktop release build)
+* On the **Refresh** tab, uncheck **Refresh resources upon completion**.
+* On the **Build** tab, uncheck **Build before launch**.
+
+### Configure a builder
+
+> [!WARNING]
+> **This currently does not work, see above.**
+> * The prebuilt binary gets launched but no build happens, not even after changes.
+> * When explicitly starting a build, it fails with an error.
+> * Changes to the build config do not seem to take effect.
+> The steps here are for reference only; any input on getting this to work is welcome.
+
+Right-click the project root in Package Explorer and select **Properties** from the context menu.
+
+In the dialog that opens, select **C/C++ Build** from the tree on the left.
+
+* Click **Manage Configurations** and create a new build configuration.
+* Make sure the new configuration is selected in the **Configuration** drop-down list.
+* On the **Builder Settings** tab:
+  * Uncheck **Use default build command** and set the build command to `./tools/unix/build_omim.sh`.
+  * Set the build directory to `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`.
+* On the **Behavior** tab:
+  * Select **Use custom build arguments** and supply the arguments to the build script (e.g. `-r desktop` for a desktop release build).
+  * Uncheck **Build (Incremental build)** and **Clean**
+  
+### Create a run configuration
+
+To run the artifact, choose **Run > Run Configurations...** from the menu. In the dialog that opens, right-click **C/C++ Application** in the pane on the left and choose **New Configuration**. Make the following settings:
+* In the **Main** tab:
+  * **Project**: one of the projects in the workspace, see recommendation above
+  * **C/C++ Application**: path where the build artifact (the finished binary) resides
+  * **Build Configuration**: choose the appropriate build configuration (see above)
+* In the **Arguments** tab, you can choose the working directory from which to launch the binary, and specify command line arguments.
+* In the **Environment** tab, you can set environment variables if you need this for your artifact.
+
+### Building with CMake
+
+The recommended toolchain is `build_omim.sh`. If nonetheless you need to build with CMake for some reason:
+* Specify `cmake` (with full path, as returned by `which cmake`) as the build command in the build configuration
+* Use the same build directory as you would for `build_omim.sh`, i.e. `${workspace_loc:/qt}/..` or `${workspace_loc:/tools}/..`.
+* Specify the build arguments for CMake. This would also include the `--build` dir. You will also need `--target` to specify the build target.
+
+### Building for Android
+
+Although we have not tested it yet, triggering an Android build from within Eclipse should be possible in the same way if you specify the `gradlew` script as the build tool. This should be pretty straightforward with the external tool workaround described above.
+
+Installing, launching and debugging the Android app from Eclipse might be more difficult or not even possible, as there is no longer an actively maintained toolchain for Android development with Eclipse.