WIP: Modes

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

.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

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/AndroidManifest.xml

@@ -346,60 +346,6 @@
         <data android:mimeType="text/xml" />
       </intent-filter>
 
-      <!-- Custom MWM map files -->
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="content"/>
-        <data android:scheme="file"/>
-        <data android:host="*"/>
-        <data android:mimeType="*/*"/>
-        <!-- See http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i -->
-        <data android:pathPattern="/.*\\.mwm" />
-        <data android:pathPattern="/.*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-      </intent-filter>
-
-      <!-- Duplicate without mimeType for MWM files -->
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="content"/>
-        <data android:scheme="file"/>
-        <data android:host="*"/>
-        <data android:pathPattern="/.*\\.mwm" />
-        <data android:pathPattern="/.*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.mwm" />
-        <data android:pathPattern="/.*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.MWM" />
-      </intent-filter>
-
     </activity>
 
     <activity

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -331,7 +331,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     final IntentProcessor[] mIntentProcessors = {
-        new Factory.MwmFileProcessor(),
         new Factory.UrlProcessor(),
         new Factory.KmzKmlProcessor(),
     };

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

@@ -473,16 +473,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         mName.setText(mItem.name);
         if (!mItem.isExpandable())
-        {
-          // Show version info for downloaded maps (in "My Maps" mode)
-          String subtitle = mItem.description;
-          if (mMyMapsMode && mItem.present && mItem.localVersion > 0)
-          {
-            String versionStr = formatVersion(mItem.localVersion);
-            subtitle = TextUtils.isEmpty(subtitle) ? "v" + versionStr : subtitle + " • v" + versionStr;
-          }
-          UiUtils.setTextAndHideIfEmpty(mSubtitle, subtitle);
-        }
+          UiUtils.setTextAndHideIfEmpty(mSubtitle, mItem.description);
       }
 
       if (mItem.isExpandable())
@@ -518,21 +509,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       }
       return size;
     }
-
-    /**
-     * Formats a version number (YYMMDD) into a readable date string (YY.MM.DD).
-     */
-    private String formatVersion(long version)
-    {
-      if (version <= 0)
-        return "";
-      String v = String.valueOf(version);
-      // Pad with leading zeros if needed
-      while (v.length() < 6)
-        v = "0" + v;
-      // Format as YY.MM.DD
-      return v.substring(0, 2) + "." + v.substring(2, 4) + "." + v.substring(4, 6);
-    }
   }
 
   static class HeaderViewHolder extends BaseInnerViewHolder<String>

android/app/src/main/java/app/organicmaps/intent/Factory.java

@@ -23,12 +23,10 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
-import app.organicmaps.sdk.downloader.CustomMwmManager;
 import app.organicmaps.search.SearchActivity;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 public class Factory
 {
@@ -67,92 +65,6 @@ public class Factory
     }
   }
 
-  public static class MwmFileProcessor implements IntentProcessor
-  {
-    private static final String MWM_EXTENSION = ".mwm";
-
-    @Override
-    public boolean process(@NonNull Intent intent, @NonNull MwmActivity activity)
-    {
-      if (!Intent.ACTION_VIEW.equals(intent.getAction()))
-        return false;
-
-      final Uri uri = intent.getData();
-      if (uri == null)
-        return false;
-
-      // Check if this is an MWM file
-      if (!isMwmFile(activity, uri))
-        return false;
-
-      // Import the MWM file on a background thread
-      ThreadPool.getStorage().execute(() -> {
-        CustomMwmManager.ImportResult result = CustomMwmManager.importMwmFile(activity, uri);
-
-        // Show result on UI thread
-        activity.runOnUiThread(() -> {
-          switch (result)
-          {
-            case SUCCESS:
-              android.widget.Toast.makeText(activity,
-                  activity.getString(app.organicmaps.R.string.custom_mwm_import_success),
-                  android.widget.Toast.LENGTH_LONG).show();
-              // Reload maps to include the new custom map
-              Framework.nativeReloadWorldMaps();
-              break;
-            case ERROR_INVALID_FILE:
-              android.widget.Toast.makeText(activity,
-                  activity.getString(app.organicmaps.R.string.custom_mwm_import_invalid),
-                  android.widget.Toast.LENGTH_LONG).show();
-              break;
-            case ERROR_IO:
-            case ERROR_STORAGE:
-              android.widget.Toast.makeText(activity,
-                  activity.getString(app.organicmaps.R.string.custom_mwm_import_error),
-                  android.widget.Toast.LENGTH_LONG).show();
-              break;
-          }
-        });
-      });
-
-      return true;
-    }
-
-    private boolean isMwmFile(@NonNull MwmActivity activity, @NonNull Uri uri)
-    {
-      String fileName = null;
-
-      // Try to get filename from content resolver
-      if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()))
-      {
-        try (android.database.Cursor cursor = activity.getContentResolver().query(
-            uri, new String[]{android.provider.OpenableColumns.DISPLAY_NAME}, null, null, null))
-        {
-          if (cursor != null && cursor.moveToFirst())
-          {
-            int nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME);
-            if (nameIndex >= 0)
-              fileName = cursor.getString(nameIndex);
-          }
-        }
-        catch (Exception ignored) {}
-      }
-
-      // Fallback to URI path
-      if (fileName == null)
-      {
-        String path = uri.getPath();
-        if (path != null)
-        {
-          int lastSlash = path.lastIndexOf('/');
-          fileName = lastSlash >= 0 ? path.substring(lastSlash + 1) : path;
-        }
-      }
-
-      return fileName != null && fileName.toLowerCase(Locale.US).endsWith(MWM_EXTENSION);
-    }
-  }
-
   public static class UrlProcessor implements IntentProcessor
   {
     private static final int SEARCH_IN_VIEWPORT_ZOOM = 16;

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

@@ -3,8 +3,9 @@
   android:width="74dp"
   android:height="57dp"
   android:viewportWidth="74"
-  android:viewportHeight="57">
+  android:viewportHeight="57"
+  android:tint="?iconTint">
   <path
-    android:fillColor="#757575"
-    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    android: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,9 +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="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
+      android: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/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

@@ -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-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,11 +147,11 @@
     <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 -->
-    <string name="load_kmz_failed">Impossível carregar favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
+    <string name="load_kmz_failed">Surgiu uma falha ao enviar os favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">O tipo de ficheiro não é reconhecido pela aplicação: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -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>
@@ -560,7 +560,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Criar nova lista</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar favoritos</string>
+    <string name="bookmarks_import">Importar Favoritos</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>

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-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/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/strings.xml

@@ -975,8 +975,4 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
-    <!-- Custom MWM file import messages -->
-    <string name="custom_mwm_import_success">Custom map imported successfully. Restart the app to load it.</string>
-    <string name="custom_mwm_import_invalid">Invalid MWM file. Please select a valid map file.</string>
-    <string name="custom_mwm_import_error">Failed to import the map file. Please try again.</string>
 </resources>

android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp

@@ -67,8 +67,8 @@ struct CountryItemBuilder
   jclass m_class;
   jmethodID m_ctor;
   jfieldID m_Id, m_Name, m_DirectParentId, m_TopmostParentId, m_DirectParentName, m_TopmostParentName, m_Description,
-      m_Size, m_EnqueuedSize, m_TotalSize, m_LocalVersion, m_ChildCount, m_TotalChildCount, m_Present, m_Progress,
-      m_DownloadedBytes, m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
+      m_Size, m_EnqueuedSize, m_TotalSize, m_ChildCount, m_TotalChildCount, m_Present, m_Progress, m_DownloadedBytes,
+      m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
 
   CountryItemBuilder(JNIEnv * env)
   {
@@ -85,7 +85,6 @@ struct CountryItemBuilder
     m_Size = env->GetFieldID(m_class, "size", "J");
     m_EnqueuedSize = env->GetFieldID(m_class, "enqueuedSize", "J");
     m_TotalSize = env->GetFieldID(m_class, "totalSize", "J");
-    m_LocalVersion = env->GetFieldID(m_class, "localVersion", "J");
     m_ChildCount = env->GetFieldID(m_class, "childCount", "I");
     m_TotalChildCount = env->GetFieldID(m_class, "totalChildCount", "I");
     m_Present = env->GetFieldID(m_class, "present", "Z");
@@ -222,9 +221,6 @@ static void UpdateItem(JNIEnv * env, jobject item, storage::NodeAttrs const & at
   env->SetLongField(item, ciBuilder.m_EnqueuedSize, attrs.m_downloadingMwmSize);
   env->SetLongField(item, ciBuilder.m_TotalSize, attrs.m_mwmSize);
 
-  // Local version (YYMMDD format)
-  env->SetLongField(item, ciBuilder.m_LocalVersion, attrs.m_localMwmVersion);
-
   // Child counts
   env->SetIntField(item, ciBuilder.m_ChildCount, attrs.m_downloadingMwmCounter);
   env->SetIntField(item, ciBuilder.m_TotalChildCount, attrs.m_mwmCounter);

android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java

@@ -53,9 +53,6 @@ public final class CountryItem implements Comparable<CountryItem>
   public long enqueuedSize;
   public long totalSize;
 
-  // Local MWM file version (YYMMDD format, e.g. 251231). 0 if not downloaded.
-  public long localVersion;
-
   public int childCount;
   public int totalChildCount;
 
@@ -158,7 +155,7 @@ public final class CountryItem implements Comparable<CountryItem>
   + "\", category: \"" + category + "\", name: \"" + name + "\", directParentName: \"" + directParentName
   + "\", topmostParentName: \"" + topmostParentName + "\", present: " + present + ", status: " + status
   + ", errorCode: " + errorCode + ", headerId: " + headerId + ", size: " + size + ", enqueuedSize: " + enqueuedSize
-  + ", totalSize: " + totalSize + ", localVersion: " + localVersion + ", childCount: " + childCount
-  + ", totalChildCount: " + totalChildCount + ", progress: " + StringUtils.formatUsingUsLocale("%.2f", progress) + "% }";
+  + ", totalSize: " + totalSize + ", childCount: " + childCount + ", totalChildCount: " + totalChildCount
+  + ", progress: " + StringUtils.formatUsingUsLocale("%.2f", progress) + "% }";
   }
 }

android/sdk/src/main/java/app/organicmaps/sdk/downloader/CustomMwmManager.java

@@ -1,359 +0,0 @@
-package app.organicmaps.sdk.downloader;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import app.organicmaps.sdk.Framework;
-import app.organicmaps.sdk.util.StorageUtils;
-import app.organicmaps.sdk.util.log.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Manages custom MWM map files that are manually imported by the user.
- * Custom maps are stored in dated folders (YYMMDD format) and take precedence
- * over downloaded maps when loading.
- */
-public class CustomMwmManager
-{
-  private static final String TAG = CustomMwmManager.class.getSimpleName();
-  private static final String CUSTOM_MAPS_DIR = "custom_maps";
-  private static final String MWM_EXTENSION = ".mwm";
-  private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyMMdd", Locale.US);
-
-  public enum ImportResult
-  {
-    SUCCESS,
-    ERROR_INVALID_FILE,
-    ERROR_IO,
-    ERROR_STORAGE
-  }
-
-  /**
-   * Represents a custom MWM file with its metadata.
-   */
-  public static class CustomMwmFile
-  {
-    public final String name;       // e.g., "Portland"
-    public final String path;       // Full path to the file
-    public final long version;      // Date version as YYMMDD number
-    public final long fileSize;
-
-    public CustomMwmFile(String name, String path, long version, long fileSize)
-    {
-      this.name = name;
-      this.path = path;
-      this.version = version;
-      this.fileSize = fileSize;
-    }
-  }
-
-  /**
-   * Gets the custom maps root directory path.
-   */
-  @NonNull
-  public static String getCustomMapsDir(@NonNull Context context)
-  {
-    String writableDir = Framework.nativeGetWritableDir();
-    return StorageUtils.addTrailingSeparator(writableDir) + CUSTOM_MAPS_DIR;
-  }
-
-  /**
-   * Gets or creates the custom maps directory for today's date.
-   * @return The directory path, or null if creation failed.
-   */
-  @Nullable
-  public static String getTodayCustomMapsDir(@NonNull Context context)
-  {
-    String customMapsDir = getCustomMapsDir(context);
-    String today = DATE_FORMAT.format(new Date());
-    String todayDir = StorageUtils.addTrailingSeparator(customMapsDir) + today;
-
-    File dir = new File(todayDir);
-    if (!dir.exists() && !dir.mkdirs())
-    {
-      Logger.e(TAG, "Failed to create custom maps directory: " + todayDir);
-      return null;
-    }
-
-    return todayDir;
-  }
-
-  /**
-   * Imports an MWM file from a content URI into the custom maps directory.
-   * The file is saved in a dated folder based on today's date.
-   *
-   * @param context Application context
-   * @param uri     Content URI of the MWM file
-   * @return ImportResult indicating success or the type of error
-   */
-  @NonNull
-  public static ImportResult importMwmFile(@NonNull Context context, @NonNull Uri uri)
-  {
-    String fileName = getFileNameFromUri(context, uri);
-    if (fileName == null || !fileName.toLowerCase(Locale.US).endsWith(MWM_EXTENSION))
-    {
-      Logger.e(TAG, "Invalid file name or not an MWM file: " + fileName);
-      return ImportResult.ERROR_INVALID_FILE;
-    }
-
-    String destDir = getTodayCustomMapsDir(context);
-    if (destDir == null)
-    {
-      return ImportResult.ERROR_STORAGE;
-    }
-
-    File destFile = new File(destDir, fileName);
-    Logger.i(TAG, "Importing MWM file to: " + destFile.getAbsolutePath());
-
-    try
-    {
-      ContentResolver resolver = context.getContentResolver();
-      if (!StorageUtils.copyFile(resolver, uri, destFile))
-      {
-        Logger.e(TAG, "Failed to copy MWM file");
-        return ImportResult.ERROR_IO;
-      }
-
-      Logger.i(TAG, "Successfully imported MWM file: " + fileName);
-      return ImportResult.SUCCESS;
-    }
-    catch (IOException e)
-    {
-      Logger.e(TAG, "IOException while importing MWM file", e);
-      return ImportResult.ERROR_IO;
-    }
-  }
-
-  /**
-   * Gets the file name from a content URI.
-   */
-  @Nullable
-  private static String getFileNameFromUri(@NonNull Context context, @NonNull Uri uri)
-  {
-    String fileName = null;
-
-    if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()))
-    {
-      try (android.database.Cursor cursor = context.getContentResolver().query(
-          uri, new String[]{android.provider.OpenableColumns.DISPLAY_NAME}, null, null, null))
-      {
-        if (cursor != null && cursor.moveToFirst())
-        {
-          int nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME);
-          if (nameIndex >= 0)
-          {
-            fileName = cursor.getString(nameIndex);
-          }
-        }
-      }
-      catch (Exception e)
-      {
-        Logger.e(TAG, "Failed to get file name from URI", e);
-      }
-    }
-
-    if (fileName == null)
-    {
-      // Try to get from path
-      String path = uri.getPath();
-      if (path != null)
-      {
-        int lastSlash = path.lastIndexOf('/');
-        fileName = lastSlash >= 0 ? path.substring(lastSlash + 1) : path;
-      }
-    }
-
-    return fileName;
-  }
-
-  /**
-   * Lists all custom MWM files, grouped by map name with the newest version taking precedence.
-   * @return Map from country name to CustomMwmFile (newest version)
-   */
-  @NonNull
-  public static Map<String, CustomMwmFile> getCustomMwmFiles(@NonNull Context context)
-  {
-    Map<String, CustomMwmFile> result = new HashMap<>();
-    String customMapsDir = getCustomMapsDir(context);
-    File rootDir = new File(customMapsDir);
-
-    if (!rootDir.exists() || !rootDir.isDirectory())
-    {
-      return result;
-    }
-
-    File[] versionDirs = rootDir.listFiles(File::isDirectory);
-    if (versionDirs == null)
-    {
-      return result;
-    }
-
-    // Sort by version descending (newest first)
-    Arrays.sort(versionDirs, (a, b) -> {
-      long versionA = parseVersion(a.getName());
-      long versionB = parseVersion(b.getName());
-      return Long.compare(versionB, versionA);
-    });
-
-    for (File versionDir : versionDirs)
-    {
-      long version = parseVersion(versionDir.getName());
-      if (version <= 0)
-      {
-        continue;
-      }
-
-      File[] mwmFiles = versionDir.listFiles((dir, name) ->
-          name.toLowerCase(Locale.US).endsWith(MWM_EXTENSION));
-
-      if (mwmFiles == null)
-      {
-        continue;
-      }
-
-      for (File mwmFile : mwmFiles)
-      {
-        String name = mwmFile.getName();
-        // Remove .mwm extension to get country name
-        String countryName = name.substring(0, name.length() - MWM_EXTENSION.length());
-
-        // Only add if we don't already have a newer version
-        if (!result.containsKey(countryName))
-        {
-          result.put(countryName, new CustomMwmFile(
-              countryName,
-              mwmFile.getAbsolutePath(),
-              version,
-              mwmFile.length()
-          ));
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets all version directories in the custom maps folder, sorted by version descending.
-   * @return List of version directory paths
-   */
-  @NonNull
-  public static List<String> getCustomMapVersionDirs(@NonNull Context context)
-  {
-    List<String> result = new ArrayList<>();
-    String customMapsDir = getCustomMapsDir(context);
-    File rootDir = new File(customMapsDir);
-
-    if (!rootDir.exists() || !rootDir.isDirectory())
-    {
-      return result;
-    }
-
-    File[] versionDirs = rootDir.listFiles(File::isDirectory);
-    if (versionDirs == null)
-    {
-      return result;
-    }
-
-    // Sort by version descending (newest first)
-    Arrays.sort(versionDirs, (a, b) -> {
-      long versionA = parseVersion(a.getName());
-      long versionB = parseVersion(b.getName());
-      return Long.compare(versionB, versionA);
-    });
-
-    for (File versionDir : versionDirs)
-    {
-      if (parseVersion(versionDir.getName()) > 0)
-      {
-        result.add(StorageUtils.addTrailingSeparator(versionDir.getAbsolutePath()));
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Checks if a custom version of a map exists.
-   * @param countryName The country/map name (without .mwm extension)
-   * @return The CustomMwmFile if found, null otherwise
-   */
-  @Nullable
-  public static CustomMwmFile getCustomMwmFile(@NonNull Context context, @NonNull String countryName)
-  {
-    Map<String, CustomMwmFile> customFiles = getCustomMwmFiles(context);
-    return customFiles.get(countryName);
-  }
-
-  /**
-   * Deletes a custom MWM file.
-   * @param file The CustomMwmFile to delete
-   * @return true if deletion was successful
-   */
-  public static boolean deleteCustomMwmFile(@NonNull CustomMwmFile file)
-  {
-    File f = new File(file.path);
-    boolean deleted = f.delete();
-
-    if (deleted)
-    {
-      Logger.i(TAG, "Deleted custom MWM file: " + file.path);
-
-      // Clean up empty version directories
-      File parentDir = f.getParentFile();
-      if (parentDir != null)
-      {
-        String[] remaining = parentDir.list();
-        if (remaining != null && remaining.length == 0)
-        {
-          if (parentDir.delete())
-          {
-            Logger.i(TAG, "Deleted empty version directory: " + parentDir.getPath());
-          }
-        }
-      }
-    }
-    else
-    {
-      Logger.e(TAG, "Failed to delete custom MWM file: " + file.path);
-    }
-
-    return deleted;
-  }
-
-  /**
-   * Parses a version string (YYMMDD format) to a long.
-   * @return The version number, or 0 if parsing failed
-   */
-  private static long parseVersion(String versionStr)
-  {
-    if (versionStr == null || versionStr.length() != 6)
-    {
-      return 0;
-    }
-
-    try
-    {
-      return Long.parseLong(versionStr);
-    }
-    catch (NumberFormatException e)
-    {
-      return 0;
-    }
-  }
-
-}

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-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

@@ -784,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>
@@ -1381,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>

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>

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

@@ -636,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>
@@ -1198,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>
@@ -1434,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-kw/types_strings.xml

@@ -864,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>
@@ -1412,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-nb/types_strings.xml

@@ -688,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>
@@ -1332,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>
@@ -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>

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

@@ -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>

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",
@@ -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/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/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/styles/cycling/dark/colors.mapcss

@@ -1,2 +1,2 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/Subways.mapcss");
+@import("../../default/dark/colors.mapcss");

data/styles/cycling/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/transit_systems.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/cycling/include/basemap.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap.mapcss");

data/styles/cycling/include/basemap_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap_label.mapcss");

data/styles/cycling/include/icons.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons.mapcss");

data/styles/cycling/include/icons_label_colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/icons_label_colors.mapcss");

data/styles/cycling/include/priorities_1_BG-by-size.prio.txt

@@ -0,0 +1 @@
+@import("../../default/include/priorities_1_BG-by-size.prio.txt")

data/styles/cycling/include/priorities_2_BG-top.prio.txt

@@ -0,0 +1 @@
+@import("../../default/include/priorities_2_BG-top.prio.txt")

data/styles/cycling/include/priorities_3_FG.prio.txt

@@ -0,0 +1,10 @@
+@import("../../default/include/priorities_3_FG.prio.txt")
+
+highway-tertiary
+highway-tertiary-bridge
+highway-tertiary-tunnel
+highway-unclassified
+highway-unclassified-area
+highway-unclassified-bridge
+highway-unclassified-tunnel
+=== 400

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

@@ -0,0 +1 @@
+@import("../../default/include/priorities_4_overlays.prio.txt")

data/styles/cycling/include/transit_systems.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/transit_systems.mapcss");

data/styles/cycling/include/ways.mapcss

@@ -0,0 +1,52 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways.mapcss");
+
+line|z12-[highway=cycleway],
+line|z13-[highway=path][bicycle=designated]::cycleline,
+line|z14-[highway=footway][bicycle=designated]::cycleline,
+{color: @cycleway;}
+
+line|z12[highway=cycleway]
+{width: 1.9;}
+line|z13[highway=cycleway]
+{width: 2.0;}
+line|z14[highway=cycleway],
+{width: 2.2;}
+line|z15[highway=cycleway],
+{width: 2.5;}
+line|z16[highway=cycleway],
+{width: 3;}
+line|z17[highway=cycleway],
+{width: 3.4;}
+line|z18[highway=cycleway],
+{width: 4.2;}
+line|z19-[highway=cycleway],
+{width: 5.2;}
+
+line|z13[highway=path][bicycle=designated]::cycleline,
+{width: 1.4;}
+line|z14[highway=path][bicycle=designated]::cycleline,
+{width: 1.5;}
+line|z15[highway=path][bicycle=designated]::cycleline,
+{width: 1.6;}
+line|z16[highway=path][bicycle=designated]::cycleline,
+{width: 2.2;}
+line|z17[highway=path][bicycle=designated]::cycleline,
+{width: 2;}
+line|z18[highway=path][bicycle=designated]::cycleline,
+{width: 2.4;}
+line|z19-[highway=path][bicycle=designated]::cycleline,
+{width: 2.8;}
+
+line|z14[highway=footway][bicycle=designated]::cycleline,
+{width: 1.6;}
+line|z15[highway=footway][bicycle=designated]::cycleline,
+{width: 1.7;}
+line|z16[highway=footway][bicycle=designated]::cycleline,
+{width: 1.8;}
+line|z17[highway=footway][bicycle=designated]::cycleline,
+{width: 2.1;}
+line|z18[highway=footway][bicycle=designated]::cycleline,
+{width: 2.4;}
+line|z19-[highway=footway][bicycle=designated]::cycleline,
+{width: 3.0;}

data/styles/cycling/include/ways_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/ways_label.mapcss");

data/styles/cycling/light/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/light/colors.mapcss");

data/styles/cycling/light/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/transit_systems.mapcss");
+@import("../../default/light/dynamic_colors.mapcss");

data/styles/default/dark/dynamic_colors.mapcss

@@ -1,12 +1,3 @@
-@import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
 colors
 {
   GuiText-color: #FFFFFF;
@@ -113,8 +104,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;

data/styles/default/dark/style.mapcss

@@ -1,134 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-colors
-{
-  GuiText-color: #FFFFFF;
-  GuiText-opacity: 0.7;
-  MyPositionAccuracy-color: #FFFFFF;
-  MyPositionAccuracy-opacity: 0.06;
-  Selection-color: #FFFFFF;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #5E0F0D;
-  RouteTrafficG1-color: #7F1311;
-  RouteTrafficG2-color: #7F1311;
-  RouteTrafficG3-color: #9E8216;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #FFB94B;
-  RoutePedestrian-opacity: 0.7;
-  RouteBicycle-color: #FF4B8C;
-  RouteBicycle-opacity: 0.7;
-  RouteRuler-color: #924ab5;
-  RouteRuler-opacity: 0.7;
-  RoutePreview-color: #FFFFFF;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #055FCD;
-  RouteArrowsMaskCar-opacity: 0.3;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #FF4B8C;
-  RouteArrowsMaskBicycle-opacity: 0.5;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #41C8FF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #FF9800;
-  TrackCarSpeed-color: #FFCA28;
-  TrackPlaneSpeed-color: #FFF5A0;
-  TrackUnknownDistance-color: #969696;
-  TrafficG0-color: #4C120F;
-  TrafficG1-color: #731816;
-  TrafficG2-color: #731816;
-  TrafficG3-color: #8C7012;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #376222;
-  TrafficG5-color: #376222;
-  TrafficTempBlock-color: #232323;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #C4C4C4;
-  TrafficArrowDark-color: #191919;
-  TrafficOutline-color: #383838;
-  RoadShieldBlackText-color: #212121;
-  RoadShieldWhiteText-color: #B7B6B6;
-  RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldWhiteBackground-color: #999999;
-  RoadShieldGreenBackground-color: #136C30;
-  RoadShieldBlueBackground-color: #294C88;
-  RoadShieldRedBackground-color: #9F1A17;
-  RoadShieldOrangeBackground-color: #B58E1B;
-  PoiHotelTextOutline-color: #000000;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #888888;
-  RouteMarkPrimaryTextOutline-color: #000000;
-  RouteMarkSecondaryText-color: #888888;
-  RouteMarkSecondaryTextOutline-color: #000000;
-  TransitMarkPrimaryText-color: #888888;
-  TransitMarkPrimaryTextOutline-color: #000000;
-  TransitMarkSecondaryText-color: #888888;
-  TransitMarkSecondaryTextOutline-color: #000000;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #888888;
-  TransitStopInnerMarker-color: #000000;
-  LocalAdsPrimaryText-color: #888888;
-  LocalAdsPrimaryTextOutline-color: #000000;
-  LocalAdsSecondaryText-color: #888888;
-  LocalAdsSecondaryTextOutline-color: #000000;
-  TransitBackground-color: #000000;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #8C4E39;
-  BookmarkGray-color: #808080;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #B8B8B8;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/transit_systems.mapcss");
+@import("dynamic_colors.mapcss");

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/basemap.mapcss

@@ -1,6 +1,6 @@
 /* ~~~~ CONTENT OF BASEMAP ~~~~~
 
-1.Z-INDEX of BASEMAP
+1.BASICS
 2.LAND
 3.BOUNDARY
   3.1 Countries
@@ -28,6 +28,35 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
+
+/* 1. BASICS */
+
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}
+
+
 /* 2.LAND */
 
 area|z0-[natural=coastline],

data/styles/default/include/defaults_new.mapcss

@@ -1,24 +0,0 @@
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}

data/styles/default/include/icons.mapcss

@@ -22,7 +22,6 @@
  6.1 Craft
 7.CAR
  7.1 Parking
-8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -70,6 +69,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 +206,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],
@@ -2374,16 +2376,16 @@ area|z14-[highway=services],
 area|z15-[highway=rest_area],
 {text-position: center;}
 
-node|z14-[amenity=fuel],
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-node|z14-[amenity=charging_station][motorcar?][capacity?],
+node|z15-[amenity=fuel],
+node|z17-[amenity=charging_station][motorcar?][!capacity],
+node|z17-[amenity=charging_station][motorcar?][capacity=1],
+node|z17-[amenity=charging_station][motorcar?][capacity=2],
+node|z16-[amenity=charging_station][motorcar?][capacity?],
 area|z14-[highway=services],
 area|z15-[highway=rest_area],
 area|z15-[landuse=garages],
 node|z15-[amenity=sanitary_dump_station],
-node|z16-[amenity=charging_station],
+node|z18-[amenity=charging_station],
 node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
@@ -2396,46 +2398,30 @@ node|z18-[amenity=car_sharing],
 area|z18-[landuse=garages],
 {font-size: 11;}
 
-node|z14[amenity=fuel],
-{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
-node|z15[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 20;}
-node|z16[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 10;}
-node|z17-[amenity=fuel],
-{icon-image: fuel-m.svg;}
-node|z18-[amenity=fuel],
-{font-size: 11;}
+node|z15-[amenity=fuel],
+{icon-image: fuel-m.svg; text-offset: 1;}
 
-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
-node|z16-[amenity=charging_station],
+node|z17-[amenity=charging_station][motorcar?],
+node|z18-[amenity=charging_station][motorcycle?],
+node|z18-[amenity=charging_station][bicycle?],
+node|z18-[amenity=charging_station][motorcar=not],
+node|z18-[amenity=charging_station],
 {icon-image: charging_station-small-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
+node|z16-[amenity=charging_station][motorcar?][capacity?],
 {icon-image: charging_station-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
+node|z16[amenity=charging_station][motorcar?][!capacity],
+node|z16[amenity=charging_station][motorcar?][capacity=1],
+node|z16[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: none;}
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z17-[amenity=charging_station][motorcar?][!capacity],
+node|z17-[amenity=charging_station][motorcar?][capacity=1],
+node|z17-[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: charging_station-small-m.svg;}
 
-node|z14[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;icon-min-distance: 20;}
-node|z15[amenity=charging_station][motorcar?],
-{icon-min-distance: 20;}
-node|z16[amenity=charging_station],
-{icon-min-distance: 10;}
-node|z18-[amenity=charging_station],
-{font-size: 11;}
+node|z16[amenity=charging_station][motorcar?],
+{text-offset: 1;font-size: 10;}
 
 area|z14[highway=services],
 {icon-image: car-repair-s.svg; icon-min-distance: 20;}
@@ -2536,8 +2522,4 @@ node|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}
 
 node|z18-[amenity=parking_space][parking_space=disabled],
-{icon-image: parking-disabled-m.svg;}
-
-/* 8. Colored Labels */
-
-@import("../../default/include/Icons_Label_Colors.mapcss");
+{icon-image: parking-disabled-m.svg;}

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -85,15 +85,15 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 180
 
 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
+amenity-charging_station                            # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-bicycle                    # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-carless                    # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-charging_station-motorcycle                 # area z16- (also has icon z18-, caption(optional) z18-)
+amenity-charging_station-small                      # area z15- (also has icon z17-, caption(optional) z18-)
 amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-fuel                                        # area z15- (also has icon z15-, caption(optional) z15-)
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
@@ -192,12 +192,12 @@ natural-shingle                                     # area z12-
 === 80
 
 landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
+leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-, caption z17-)
 leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
+leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
+leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
+leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
+leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
 === 70
 
 landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
@@ -234,7 +234,7 @@ amenity-college                                     # area z13- (also has icon z
 amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
 amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-, caption z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)

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

@@ -114,7 +114,7 @@ natural-water-reservoir                             # caption z10- (also has are
 barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600
 
-historic-ruins                                      # icon z17- (also has caption(optional) z17-)
+historic-ruins                                      # icon z17- and caption z17- (also has caption(optional) z17-)
 === 6551
 
 historic-castle                                     # icon z12- (also has caption(optional) z12-)
@@ -326,13 +326,13 @@ tourism-zoo                                         # icon z13- (also has captio
 === 5200
 
 amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
-amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-university                                  # icon z14- and caption z14- (also has caption(optional) z14-, area z13-)
 leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
-leisure-park                                        # icon z14- (also has caption(optional) z14-, area z10-)
-leisure-park-permissive                             # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park                                        # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park-permissive                             # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
 mountain_pass                                       # icon z14- (also has caption(optional) z15-)
 place-square                                        # caption z16-
 === 5050
@@ -374,11 +374,11 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
+amenity-charging_station-small                      # icon z17- (also has caption(optional) z18-, area z15-)
 === 4280
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-charging_station-motorcar                   # icon z16- (also has caption(optional) z16-, area z15-)
+amenity-fuel                                        # icon z15- (also has caption(optional) z15-, area z15-)
 === 4270
 
 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
@@ -429,16 +429,16 @@ tourism-chalet                                      # icon z16- (also has captio
 shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800
 
-amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-motorcycle                 # icon z18- (also has caption(optional) z18-, area z16-)
 === 3752
 
-amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-bicycle                    # icon z18- (also has caption(optional) z18-, area z16-)
 === 3751
 
-amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station                            # icon z18- (also has caption(optional) z18-, area z16-)
 === 3750
 
-amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
+amenity-charging_station-carless                    # icon z18- (also has caption(optional) z18-, area z16-)
 === 3749
 
 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
@@ -838,7 +838,7 @@ highway-living_street-bridge                        # pathtext z14- (also has li
 highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
-leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
+leisure-garden                                      # icon z16- and caption z17- (also has caption(optional) z16-, area z12-)
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
 office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
@@ -1396,8 +1396,8 @@ amenity-parking-private                             # icon z18- (also has captio
 amenity-parking-street_side-private                 # icon z18- (also has caption(optional) z18-, area z17-)
 amenity-parking-underground-private                 # icon z18- (also has caption(optional) z18-)
 amenity-parking_entrance-private                    # icon z19- (also has caption(optional) z19-)
-leisure-park-no-access                              # icon z14- (also has caption(optional) z14-, area z10-)
-leisure-park-private                                # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park-no-access                              # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park-private                                # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
 leisure-swimming_pool-private                       # icon z17- (also has caption(optional) z17-, area z13-)
 === 100
 
@@ -1434,7 +1434,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400
 
-# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-, caption z17-)
 # === -3449
 
 # historic-castle                                   # caption(optional) z12- (also has icon z12-)
@@ -1604,13 +1604,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -4800
 
 # amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, caption z14-, area z13-)
 # leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
-# leisure-park                                      # caption(optional) z14- (also has icon z14-, area z10-)
-# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park                                      # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
 # mountain_pass                                     # caption(optional) z15- (also has icon z14-)
 # === -4950
 
@@ -1650,11 +1650,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
+# amenity-charging_station-small                    # caption(optional) z18- (also has icon z17-, area z15-)
 # === -5720
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-charging_station-motorcar                 # caption(optional) z16- (also has icon z16-, area z15-)
+# amenity-fuel                                      # caption(optional) z15- (also has icon z15-, area z15-)
 # === -5730
 
 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
@@ -1705,16 +1705,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200
 
-# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-motorcycle               # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6248
 
-# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6249
 
-# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station                          # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6250
 
-# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
+# amenity-charging_station-carless                  # caption(optional) z18- (also has icon z18-, area z16-)
 # === -6251
 
 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
@@ -1934,7 +1934,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # attraction-roller_coaster                         # caption(optional) z17- (also has icon z17-)
 # landuse-plant_nursery                             # caption(optional) z17- (also has icon z17-, area z12-)
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
-# leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
+# leisure-garden                                    # caption(optional) z16- (also has icon z16-, caption z17-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
 # office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # tourism-zoo-petting                               # caption(optional) z15- (also has icon z15-)
@@ -2394,8 +2394,8 @@ xmas-tree                                           # icon z18-
 # amenity-parking-street_side-private               # caption(optional) z18- (also has icon z18-, area z17-)
 # amenity-parking-underground-private               # caption(optional) z18- (also has icon z18-)
 # amenity-parking_entrance-private                  # caption(optional) z19- (also has icon z19-)
-# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, area z10-)
-# leisure-park-private                              # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park-private                              # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
 # leisure-swimming_pool-private                     # caption(optional) z17- (also has icon z17-, area z13-)
 # === -9900
 
@@ -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- and caption 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-, caption 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/dynamic_colors.mapcss

@@ -1,14 +1,3 @@
-@import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-/* TODO: move to a separete base file */
-
 colors
 {
   GuiText-color: #4D4D4D;

data/styles/default/light/style.mapcss

@@ -1,134 +1,9 @@
 @import("colors.mapcss");
-@import("../include/defaults_new.mapcss");
-@import("../include/Basemap.mapcss");
-@import("../include/Basemap_label.mapcss");
-@import("../include/Roads.mapcss");
-@import("../include/Roads_label.mapcss");
-@import("../include/Icons.mapcss");
-@import("../include/Subways.mapcss");
-
-colors
-{
-  GuiText-color: #4D4D4D;
-  GuiText-opacity: 0.86;
-  MyPositionAccuracy-color: #000000;
-  MyPositionAccuracy-opacity: 0.08;
-  Selection-color: #1E96F0;
-  Selection-opacity: 0.64;
-  Route-color: #0087FF;
-  RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #9B2300;
-  RouteTrafficG1-color: #E82705;
-  RouteTrafficG2-color: #E82705;
-  RouteTrafficG3-color: #FFE500;
-  RouteTrafficG3-opacity: 0.0;
-  RoutePedestrian-color: #1D339E;
-  RoutePedestrian-opacity: 0.8;
-  RouteBicycle-color: #9C27B0;
-  RouteBicycle-opacity: 0.8;
-  RouteRuler-color: #66347F;
-  RouteRuler-opacity: 0.9;
-  RoutePreview-color: #000000;
-  RoutePreview-opacity: 0.3;
-  RouteMaskCar-color: #000000;
-  RouteMaskCar-opacity: 0.3;
-  RouteFirstSegmentArrowsMaskCar-color: #033B80;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
-  RouteArrowsMaskCar-color: #033B80;
-  RouteArrowsMaskCar-opacity: 0.2;
-  RouteMaskBicycle-color: #000000;
-  RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
-  RouteArrowsMaskBicycle-color: #9C27B0;
-  RouteArrowsMaskBicycle-opacity: 0.2;
-  RouteMaskPedestrian-color: #000000;
-  RouteMaskPedestrian-opacity: 0.5;
-  RouteFake-color: #A8A8A8;
-  RouteFakeOutline-color: #717171;
-  Arrow3D-color: #50AAFF;
-  Arrow3DObsolete-color: #82AAC8;
-  Arrow3DObsolete-opacity: 0.72;
-  Arrow3DShadow-color: #3C3C3C;
-  Arrow3DShadow-opacity: 0.24;
-  Arrow3DOutline-color: #FFFFFF;
-  TrackHumanSpeed-color: #1D339E;
-  TrackCarSpeed-color: #7C8EDE;
-  TrackPlaneSpeed-color: #A8B7ED;
-  TrackUnknownDistance-color: #616161;
-  TrafficG0-color: #7E1712;
-  TrafficG1-color: #E42300;
-  TrafficG2-color: #E42300;
-  TrafficG3-color: #FCDE00;
-  TrafficG3-opacity: 0.0;
-  TrafficG4-color: #39962E;
-  TrafficG5-color: #39962E;
-  TrafficTempBlock-color: #525252;
-  TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #FFFFFF;
-  TrafficArrowDark-color: #473635;
-  TrafficOutline-color: #E8E6DC;
-  RoadShieldBlackText-color: #000000;
-  RoadShieldWhiteText-color: #FFFFFF;
-  RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldWhiteBackground-color: #FFFFFF;
-  RoadShieldGreenBackground-color: #309302;
-  RoadShieldBlueBackground-color: #1A5EC1;
-  RoadShieldRedBackground-color: #E63534;
-  RoadShieldOrangeBackground-color: #FFBE00;
-  PoiHotelTextOutline-color: #FFFFFF;
-  PoiHotelTextOutline-opacity: 0.6;
-  PoiDeletedMask-color: #FFFFFF;
-  PoiDeletedMask-opacity: 0.3;
-  PoiVisitedMask-color: #FFFFFF;
-  PoiVisitedMask-opacity: 0.7;
-  DefaultTrackColor-color: #1E96F0;
-  RouteMarkPrimaryText-color: #000000;
-  RouteMarkPrimaryTextOutline-color: #FFFFFF;
-  RouteMarkSecondaryText-color: #000000;
-  RouteMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitMarkPrimaryText-color: #000000;
-  TransitMarkPrimaryTextOutline-color: #FFFFFF;
-  TransitMarkSecondaryText-color: #000000;
-  TransitMarkSecondaryTextOutline-color: #FFFFFF;
-  TransitTransferOuterMarker-color: #000000;
-  TransitTransferInnerMarker-color: #FFFFFF;
-  TransitStopInnerMarker-color: #FFFFFF;
-  LocalAdsPrimaryText-color: #000000;
-  LocalAdsPrimaryTextOutline-color: #FFFFFF;
-  LocalAdsSecondaryText-color: #000000;
-  LocalAdsSecondaryTextOutline-color: #FFFFFF;
-  TransitBackground-color: #FFFFFF;
-  TransitBackground-opacity: 0.4;
-  BookmarkRed-color: #E51B23;
-  BookmarkPink-color: #FF4182;
-  BookmarkPurple-color: #9B24B2;
-  BookmarkDeepPurple-color: #6639BF;
-  BookmarkBlue-color: #0066CC;
-  BookmarkLightBlue-color: #249CF2;
-  BookmarkCyan-color: #14BECD;
-  BookmarkTeal-color: #00A58C;
-  BookmarkGreen-color: #3C8C3C;
-  BookmarkLime-color: #93BF39;
-  BookmarkYellow-color: #FFC800;
-  BookmarkOrange-color: #FF9600;
-  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
-  BookmarkBlueGray-color: #597380;
-  SearchmarkPreparing-color: #597380;
-  SearchmarkNotAvailable-color: #597380;
-  SearchmarkSelectedNotAvailable-color: #F06432;
-  RatingBad-color: #F06432;
-  RatingGood-color: #3C8C3C;
-  RatingNone-color: #249CF2;
-  SearchmarkDefault-color: #249CF2;
-  RatingText-color: #FFFFFF;
-  UGCRatingText-color: #000000;
-  SpeedCameraMarkText-color: #FFFFFF;
-  SpeedCameraMarkBg-color: #F51E30;
-  SpeedCameraMarkOutline-color: #FFFFFF;
-  GuideCityMarkText-color: #6639BF;
-  GuideOutdoorMarkText-color: #3C8C3C;
-  HotelPriceText-color: #000000;
-}
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/transit_systems.mapcss");
+@import("dynamic_colors.mapcss");

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/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/driving/dark/colors.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/dark/colors.mapcss");

data/styles/driving/dark/style.mapcss

@@ -0,0 +1,9 @@
+@import("colors.mapcss");
+@import("../include/basemap.mapcss");
+@import("../include/basemap_label.mapcss");
+@import("../include/ways.mapcss");
+@import("../include/ways_label.mapcss");
+@import("../include/icons.mapcss");
+@import("../include/icons_label_colors.mapcss");
+@import("../include/transit_systems.mapcss");
+@import("../../default/dark/dynamic_colors.mapcss");

data/styles/driving/include/basemap.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap.mapcss");

data/styles/driving/include/basemap_label.mapcss

@@ -0,0 +1,2 @@
+/* Keep here changes of the base map style file only. */
+@import("../../default/include/basemap_label.mapcss");