[styles] Fix Vienna U-Bahn Icon, using colors by PTA

Wrong colors were used for Vienna subway icons. Now light mode does use official color submitted by the PTA, dark mode was surveyed and confirmed with photos.
This PR also adjusts the Icon in the middle a bit, so the shape looks closer to the one submitted by the PTA.

Co-authored-by: vikiawv <vikiawv@noreply.codeberg.org>
Co-committed-by: vikiawv <vikiawv@noreply.codeberg.org>

android/app/build.gradle

@@ -256,17 +256,18 @@ android {
     noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
     // Some languages not supported by Android require to be specified here to be applied
     localeFilters += [
+            "en",
             "af",
             "ar",
             "az",
             "be",
             "bg",
+            "bn",
             "ca",
             "cs",
             "da",
             "de",
             "el",
-            "en",
             "en-rGB",
             "es",
             "es-rMX",
@@ -276,11 +277,16 @@ android {
             "fi",
             "fr",
             "fr-rCA",
-            "iw",
+            "gl",
+            "gsw",
+            "he",
             "hi",
             "hu",
+            "id",
             "in",
+            "is",
             "it",
+            "iw",
             "ja",
             "kw",
             "ko",
@@ -289,16 +295,20 @@ android {
             "mr",
             "mt",
             "nb",
+            "nb-rNO",
             "nl",
             "pl",
             "pt",
             "pt-rBR",
             "ro",
             "ru",
+            "sl",
             "sk",
             "sr",
+            "b+sr+Latn",
             "sv",
             "sw",
+            "ta",
             "th",
             "tr",
             "uk",

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

@@ -0,0 +1,32 @@
+A community led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
+
+Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
+Join the community there and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+‣ <b>Offline focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - it does not identify people, does not track, and does not collect personal information. Ad free.
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!

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

@@ -0,0 +1,32 @@
+Unn app mappys rydh hag ygor selys war an kemeneth, selys war data OpenStreetMap ha krefhys gans omrians dhe klerder, privetter, ha heb budh. CoMaps yw unn forgh a Organic Maps, unn forgh a Maps.ME.
+
+Redya ma a-dro resons rag an ragdres hag y tu yn <b><i>codeberg.org/comaps</i></b>.
+Omjunya an kemeneth ena ha gweres gul an app mappys gwella
+• Devnydhya an app ha kevrenna y'n
+• Dasliva ha derivas kudynnow
+• 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>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.
+‣ <b>Erviransow hag Arghansereth Ygor ha Treusweladow, Heb Budh, ha Kod Ygor yn Leun</b>
+
+<b>Nasyow Chif</b>
+• Mappys manylys iskargadow gans leos ankavadow war Google Maps
+• Fordh Yn-Mes gans olow gwandrans, kampvaow, pennfentynnyow dowr, menydhyow, linennow kettres, h.e.
+• Hensyow kerdhyans ha diwrosyans
+• Leow kepar ha bostiow, petrolvaow, ostelyow, gwethjiow, troyll gwelyow, ha moy
+• Hwilas gans hanow po unn trigva po gans klass leow
+• Navigacyon gans gwarnyansow kewsys rag ow walkya, ow diwrosa, po ow lewa
+• Lyververkya dha leow drudh gans unn tava unnik
+• Artiklow dhywarlinen Wikipedya
+• Gwiskas metro ha tuyow
+• Helerghyans lerghow
+• Esperthi hag ynperthi lyververkys ha lerghow yn furvasow KML, KMZ, GPX
+• Unn fordh du rag an nos
+• Gwellhe data mappa rag peub ow devnydhya unn chanjyell selyek
+
+<b>Rydhses Yw Omma</b>
+Trovya dha viaj, viajya an nor gans privetter ha kemeneth a-talenebek!

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

@@ -0,0 +1 @@
+Navigacyon mappa es - Trovya moy a dha kerdh - Selys war an kemeneth

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

@@ -0,0 +1 @@
+CoMaps - Viajya gans Privetter

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

@@ -0,0 +1,32 @@
+Besplatna aplikacija otvorenog koda koju održava zajednica i koja se zasniva na OpenStreetMap podacima. Neprofitna, transparentna i ceni vašu privatnost. CoMaps je nastala od aplikacije Organic Maps, koja je nastala od aplikacije Maps.ME.
+
+Pročitajte o razlozima projekta i njegovog pravca na <b><i>codeberg.org/comaps</i></b>
+Pridružite se otvorenoj zajednici i pomozite da napravimo najbolju aplikaciju za mape
+• Koristite aplikaciju i proširite glas o tome
+• Dajte povratne informacije i prijavite probleme
+• Ažurirajte podatke na mapi u aplikaciji ili na sajtu OpenStreetMap
+
+‣ <b>Fokusirano na oflajn rad</b>: Planirajte i upravljajte putovanjem u inostranstvu bez potrebe za mobilnim internetom, tražite usputne tačke dok ste na zabačenom planinskom putu, itd. Sve funkcionalnosti su dizajnirane za rad bez interneta.
+‣ <b>Poštovanje privatnosti</b>: Aplikacija je osmišljena sa privatnošću korisnika na umu - ne identifikuje ljude, ne prati ili prikuplja lične podatke. Nema reklama.
+‣ <b>Jednostavno i elegantno</b>: Aplikacija je laka za upotrebu i jednostavno funkcioniše.
+‣ <b>Čuva vašu bateriju i prostor</b>: Ne troši bateriju kao ostale aplikacije za navigaciju. Kompaktne mape čuvaju dragoceni prostor na vašem telefonu.
+‣ <b>Otvoreno i napravljeno od strane zajednice</b>: Ljudi poput vas su doprineli razvoju aplikacije dodavanjem lokacija na OpenStreetMap, testiranjem, davanjem povratnih informacija o aplikaciji i pomogli su svojim programerskim veštinama i donacijama.
+‣ <b>Otvoreno i transparentno donošenje odluka i upotreba donacija, neprofitna i potpuno otvorenog koda.</b>
+
+<b> Glavne karakteristike </b>:
+• Preuzmimanje detaljne mape sa lokacijama koje nisu dostupne sa Google mapama
+• Režim za izlete sa istaknutim planinarskim stazama, kampovima, izvorima vode, planinskim vrhovima, izohipsama itd.
+• Staze za planinarenje i bicikle
+• Tačke interesa kao što su restorani, benzinske pumpe, hoteli, prodavnice, znamenitosti i još mnogo toga
+• Pretraga po nazivu, adresi ili kategorijama
+• Navigacija sa glasovnim instrukcijama za hodanje, vožnju bicikla ili automobila
+• Označivanje omiljenih mesta jednim dodirom
+• Oflajn članci Vikipedije
+• Tranzitni sloj podzemne železnice sa navigacijom
+• Snimanje GPS putanja
+• Uvoz i uvoz markera i putanja u KML, KMZ, GPX formate
+• Tamni režim za upotrebu tokom noći
+• Poboljšajte kartu za sve korisnike, koristeći osnovni editor za mape
+
+<b> Sloboda je ovde </b>
+Otkrijte svoje putovanje, krećete se sa svetom sa privatnošću i zajednicom na prvom mestu!

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

@@ -0,0 +1 @@
+Jednostavna navigacija - Saznajte više o svom putovanju - Održava zajednica

android/app/src/fdroid/play/listings/sr-Latn/title.txt

@@ -0,0 +1 @@
+CoMaps - pešačenje, bicikl, vožnja sa privatnošću

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

@@ -0,0 +1,36 @@
+A community led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit.
+
+Join the community and help make the best maps app
+• Use the app and spread the word about it
+• Give feedback and report issues
+• Update map data in the app or on the OpenStreetMap website
+
+<i>Your feedback and 5-star reviews are the best support for us!</i>
+
+‣ <b>Simple and Polished</b>: essential easy to use features that just work.
+‣ <b>Offline focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
+‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - it does not identify people, does not track, and does not collect personal information. Ad free.
+‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
+‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
+‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
+
+<b>Main Features</b>:
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, biking, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+• Android Auto support
+
+Please report app issues, suggest ideas and join our community at <b><i>comaps.app</i></b> website.
+
+<b>Freedom Is Here</b>
+Discover your journey, navigate the world with privacy and community at the forefront!

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

@@ -114,7 +114,6 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onCreate(@NonNull LifecycleOwner owner)
   {
     Logger.d(TAG);
-    Framework.nativeSetCarScreenMode(true);
     mSensorsManager = new CarSensorsManager(getCarContext());
     mDisplayManager = MwmApplication.from(getCarContext()).getDisplayManager();
     mDisplayManager.addListener(DisplayType.Car, this);
@@ -160,7 +159,6 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
     mDisplayManager.removeListener(DisplayType.Car);
-    Framework.nativeSetCarScreenMode(false);
   }
 
   private void init()

android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java

@@ -53,7 +53,6 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
   public void onResume()
   {
     super.onResume();
-    refreshTimetables();
   }
 
   private void initViews(View view)

android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java

@@ -296,7 +296,7 @@ public class MapButtonsController extends Fragment
       mBadgeDrawable.setMaxCharacterCount(0);
       mBadgeDrawable.setHorizontalOffset(verticalOffset);
       mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.active_track_recording));
       mBadgeDrawable.setVisible(enable);
       BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
     }

android/app/src/main/java/app/organicmaps/util/Utils.java

@@ -184,20 +184,6 @@ public class Utils
     }
   }
 
-  public static void showFacebookPage(Activity activity)
-  {
-    try
-    {
-      // Exception is thrown if we don't have installed Facebook application.
-      getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
-    }
-    catch (final Exception e)
-    {
-      activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_HTTP)));
-    }
-  }
-
   public static void openUrl(@NonNull Context context, @Nullable String url)
   {
     if (TextUtils.isEmpty(url))

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java

@@ -65,8 +65,6 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
       iv.setImageResource(R.drawable.ic_track_recording_on);
       iv.setImageTintMode(null);
       viewHolder.getTitleTextView().setText(R.string.stop_track_recording);
-      badge.setBackgroundResource(R.drawable.track_recorder_badge);
-      badge.setVisibility(View.VISIBLE);
     }
   }
 

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java

@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
   @Override
   public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
   {
-    return new BottomSheetDialog(requireContext(), getTheme()) {
+    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
       @Override
       public void onAttachedToWindow()
       {

android/app/src/main/res/drawable-night/ic_category_atm.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M20,8 C20.82725,8 21.5,8.67275 21.5,9.5 L21.5,18.5 C21.5,19.32725 20.82725,20 20,20 L8,20 C7.17275,20 6.5,19.32725 6.5,18.5 L6.5,9.5 C6.5,8.67275 7.17275,8 8,8 L20,8 Z M20.00075,14 L8,14 L8,18.5 L20.0015,18.5 L20.00075,14 Z M14,15.5 L14,17 L9.5,17 L9.5,15.5 L14,15.5 Z M20,9.5 L8,9.5 L8,11 L20,11 L20,9.5 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_bank.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M7,9.53073333 L14,6.3 L21,9.53073333 L21,10.60766 L19.9230733,10.60766 L19.9230733,18.68461 L21,18.68461 L21,20.2999767 L7,20.2999767 L7,18.68461 L8.07692667,18.68461 L8.07692667,10.60766 L7,10.60766 L7,9.53073333 Z M16.6923167,15.2756333 C16.6923167,14.0852833 15.4814333,13.1208 13.9976667,13.1208 C13.50468,13.1208 13.09784,12.7993017 13.09784,12.4012583 C13.09784,12.003215 13.4998967,11.6817167 13.9976667,11.6817167 C14.4954483,11.6817167 14.8974933,12.0070417 14.8974933,12.4012583 L16.69241,12.4012583 C16.69241,11.4673883 15.94096,10.6789083 14.8974933,10.3803583 L14.8974933,9.53068667 L13.1025767,9.53068667 L13.1025767,10.3803583 C12.0591567,10.6788967 11.30766,11.46733 11.30766,12.4012583 C11.30766,13.5916083 12.5185433,14.5560917 14.00231,14.5560917 C14.5000917,14.5560917 14.9021367,14.87759 14.9021367,15.2756333 C14.9021367,15.6736767 14.50008,15.995175 14.00231,15.995175 C13.5045283,15.995175 13.1024833,15.66985 13.1024833,15.2756333 L11.3075667,15.2756333 C11.3075667,16.2095033 12.0590167,16.9979833 13.1024833,17.2965333 L13.1024833,18.146205 L14.8974,18.146205 L14.8974,17.2965333 C15.94082,16.997995 16.6923167,16.2095617 16.6923167,15.2756333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_children.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-          android:width="40dp"
-          android:height="40dp" />
-      <solid android:color="#802D19" />
-    </shape>
-  </item>
-  <item>
-    <vector
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="28"
-        android:viewportHeight="28">
-      <group
-          android:pivotX="12"
-          android:pivotY="12">
-  <path
-      android:pathData="M10.7398398,14.5988166 C11.2766539,14.5988166 11.7741396,14.7668787 12.1823664,15.0532612 C11.7724801,15.4914625 11.5235582,16.0775925 11.5235582,16.7240712 L11.529303,16.8892426 L11.5491056,17.0705775 C11.6012609,17.429281 11.7280184,17.7632492 11.9167798,18.0556079 L11.9546499,18.1104694 L11.9142567,18.13405 C11.1417478,18.5947243 10.6376499,19.4380664 10.6376499,20.3887564 L10.637,21.073 L5.952,21.073 L5.95232411,17.1079171 C5.95232411,15.7221656 7.06098553,14.5988166 8.46443574,14.5988166 L10.7398398,14.5988166 Z M14.7363802,18.7647355 C15.6343829,18.7647355 16.3623501,19.4913492 16.3623501,20.3887564 L16.362,21.073 L11.637,21.073 L11.6376499,20.3887564 C11.6376499,19.4918257 12.3552335,18.7647355 13.2636198,18.7647355 L14.7363802,18.7647355 Z M19.4916069,12.4068343 C20.8792516,12.4068343 22.0041478,13.5296391 22.0041478,14.9163636 L22.004,21.073 L17.362,21.073 L17.3623501,20.3887564 L17.3567032,20.2194334 L17.3385166,20.043376 C17.2273964,19.2299207 16.7526866,18.5346787 16.0784713,18.1328785 L16.0416499,18.1124694 L16.0806774,18.0575117 C16.336328,17.665886 16.4764418,17.2070581 16.4764418,16.7240712 C16.4764418,15.6254025 15.757471,14.7010059 14.7609634,14.3838791 C15.0006762,13.2537372 15.9971232,12.4068343 17.215814,12.4068343 L19.4916069,12.4068343 Z M14,15.2664694 C14.8194057,15.2664694 15.4764418,15.9151249 15.4764418,16.7240712 C15.4764418,17.5330608 14.819449,18.1816731 14,18.1816731 C13.1805943,18.1816731 12.5235582,17.5330175 12.5235582,16.7240712 C12.5235582,15.9150816 13.1805943,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C10.8681135,9.19402109 11.8832295,10.1961892 11.8832295,11.4460053 C11.8832295,12.6958883 10.8681805,13.6979895 9.60213775,13.6979895 C8.33616197,13.6979895 7.32104605,12.6958214 7.32104605,11.4460053 C7.32104605,10.1961223 8.33616197,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C19.6199026,7.00111521 20.635192,8.00345456 20.635192,9.25348422 C20.635192,10.5035808 19.6199695,11.5058532 18.3537105,11.5058532 C17.0875184,11.5058532 16.072229,10.5035139 16.072229,9.25348422 C16.072229,8.00338763 17.0875184,7.00111521 18.3537105,7.00111521 Z"
-      android:fillColor="#000" />
-      </group>
-</vector>
-  </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_eat.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#8C491C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:pathData="M12.5416667,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,11.1416783 Z M16.3333333,14.933345 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L16.3333333,14.933345 Z"
-                    android:fillColor="#000" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_entertainment.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#802D19" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:pathData="M14.8166667,12.2166667 L14.8166667,17.525 C14.8166667,20.0076667 12.8076667,22.0166667 10.325,22.0166667 C7.84233333,22.0166667 5.83333333,20.0076667 5.83333333,17.525 L5.83333333,12.2166667 L14.8166667,12.2166667 Z M12.3666667,17.9333333 L8.28333333,17.9333333 C8.28333333,18.6111667 9.198,19.1583333 10.325,19.1583333 C11.452,19.1583333 12.3666667,18.6111667 12.3666667,17.9333333 Z M22.1666667,6.5 L22.1666667,11.8083333 C22.1666667,14.291 20.1576667,16.3 17.675,16.3 C16.94,16.3 16.2458333,16.1121667 15.6333333,15.8018333 L15.6333333,11.4 L13.1833333,11.4 L13.1833333,6.5 L22.1666667,6.5 Z M12.3666667,14.6666667 C11.9175,14.6666667 11.55,15.0341667 11.55,15.4833333 C11.55,15.9325 11.9175,16.3 12.3666667,16.3 C12.8158333,16.3 13.1833333,15.9325 13.1833333,15.4833333 C13.1833333,15.0341667 12.8158333,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C7.83416667,14.6666667 7.46666667,15.0341667 7.46666667,15.4833333 C7.46666667,15.9325 7.83416667,16.3 8.28333333,16.3 C8.7325,16.3 9.1,15.9325 9.1,15.4833333 C9.1,15.0341667 8.7325,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C16.548,12.2166667 15.6333333,12.7638333 15.6333333,13.4416667 L19.7166667,13.4416667 C19.7166667,12.7638333 18.802,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C15.1841667,9.01533333 14.8166667,9.38283333 14.8166667,9.832 C14.8166667,10.2811667 15.1841667,10.6486667 15.6333333,10.6486667 C16.0825,10.6486667 16.45,10.2893333 16.45,9.832 C16.45,9.38283333 16.0825,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C19.2675,9.01533333 18.9,9.38283333 18.9,9.832 C18.9,10.2811667 19.2675,10.6486667 19.7166667,10.6486667 C20.1658333,10.6486667 20.5333333,10.2893333 20.5333333,9.832 C20.5333333,9.38283333 20.1658333,9.01533333 19.7166667,9.01533333 Z"
-                    android:fillColor="#000" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_food.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M6.8,7.48804933 C6.8,7.813281 7.06993167,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.55654167,14.5385077 8.9539,15.3205827 8.9539,16.286291 L8.9539,16.0215277 C8.9539,16.9867927 9.739055,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.1352133,17.769311 19.4000583,17.5195393 19.4000583,17.180436 L19.4000583,17.2812663 C19.4000583,16.9560347 19.129765,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.29328,16.6923913 10.030885,16.4426197 10.030885,16.1035163 L10.030885,16.2043467 C10.030885,15.879115 10.2980983,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 L7.37395333,7 C7.05702833,7 6.8,7.24977167 6.8,7.588875 L6.8,7.48804467 L6.8,7.48804933 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_fuel.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#574469" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M17.846514,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 L17.846514,4.676 Z M8.63218069,7.77816667 L13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L8.63218069,7.77816667 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_hospital.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#983E44" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M21.1291111,17.1111111 L17.1106444,17.1111111 L17.1106444,21.1295778 C17.1106444,21.9138422 16.4689778,22.5555089 15.6847133,22.5555089 L12.3142911,22.5555089 C11.5300267,22.5555089 10.88836,21.9138422 10.88836,21.1295778 L10.88836,17.1111111 L6.86973778,17.1111111 C6.08547333,17.1111111 5.44383778,16.4694444 5.44383778,15.68518 L5.44383778,12.3147578 C5.44383778,11.5304933 6.08550444,10.8888267 6.86973778,10.8888267 L10.88836,10.8888267 L10.88836,6.87036 C10.88836,6.08609556 11.5300267,5.44442889 12.3142911,5.44442889 L15.6847133,5.44442889 C16.4689778,5.44442889 17.1106444,6.08609556 17.1106444,6.87036 L17.1106444,10.8888267 L21.1291111,10.8888267 C21.9133756,10.8888267 22.5550422,11.5304933 22.5550422,12.3147578 L22.5550422,15.68518 C22.5550422,16.4694444 21.9133756,17.1111111 21.1291111,17.1111111 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_hotel.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#614A43" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 Z M19.1970333,9.6516 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L19.1970333,9.6516 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_luggagehero.xml

@@ -1,28 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#851F03" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:alpha="0.5"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group
-                android:pivotX="12"
-                android:pivotY="12"
-                android:scaleX="0.5"
-                android:scaleY="0.5">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M8.5714,5.1429l6.8571,0l0,-1.7143l-6.8571,0ZM24,13.7143l0,6.4286c0,0.5893 -0.2098,1.0938 -0.6295,1.5134 -0.4196,0.4196 -0.9241,0.6295 -1.5134,0.6295l-19.7143,0c-0.5893,0 -1.0938,-0.2098 -1.5134,-0.6295 -0.4196,-0.4196 -0.6295,-0.9241 -0.6295,-1.5134l0,-6.4286l9,0l0,2.1429c0,0.2321 0.0848,0.433 0.2545,0.6027 0.1696,0.1696 0.3705,0.2545 0.6027,0.2545l4.2857,0c0.2321,0 0.433,-0.0848 0.6027,-0.2545 0.1696,-0.1696 0.2545,-0.3705 0.2545,-0.6027l0,-2.1429ZM13.7143,13.7143l0,1.7143l-3.4286,0l0,-1.7143ZM24,7.2857l0,5.1429l-24,0l0,-5.1429c0,-0.5893 0.2098,-1.0938 0.6295,-1.5134 0.4196,-0.4196 0.9241,-0.6295 1.5134,-0.6295l4.7143,0l0,-2.1429c0,-0.3571 0.125,-0.6607 0.375,-0.9107 0.25,-0.25 0.5536,-0.375 0.9107,-0.375l7.7143,0c0.3571,0 0.6607,0.125 0.9107,0.375 0.25,0.25 0.375,0.5536 0.375,0.9107l0,2.1429l4.7143,0c0.5893,0 1.0938,0.2098 1.5134,0.6295 0.4196,0.4196 0.6295,0.9241 0.6295,1.5134Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_nightlife.xml

@@ -1,26 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#8C491C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M21,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 L21,8.42778167 Z M10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L10.4455167,10.411115 Z" />
-            </group>
-        </vector>
-
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_parking.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#20607C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 Z M13.1840042,8.60425301 L14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_pharmacy.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#983E44" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M16.961,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 C7.28183167,18.3600667 7.71838667,19.382475 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 C9.877112,20.8116985 9.88986133,20.8240783 9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 L16.961,6.99999417 Z M16.961,8.39813333 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5632167,8.66905667 16.1849333,8.39813333 16.9611167,8.39813333 L16.961,8.39813333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_police.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 L14,5.833275 Z M15.85605,14.438025 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L15.85605,14.438025 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_post.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_recycling.xml

@@ -1,26 +0,0 @@
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-        android:width="40dp"
-        android:height="40dp" />
-      <solid android:color="#51585E" />
-    </shape>
-  </item>
-  <item>
-    <vector
-      android:width="24dp"
-      android:height="24dp"
-      android:viewportWidth="28"
-      android:viewportHeight="28">
-      <group
-        android:pivotX="12"
-        android:pivotY="12">
-        <path
-            android:fillColor="#000"
-            android:pathData="M9.26178239,9.86916295 L10.4193833,7.95061481 L11.2531868,6.56634591 C11.5688972,6.04016587 12.3298444,6.04016587 12.6455913,6.56634591 L13.843676,8.5577503 L12.8479738,10.2253086 L12.0384558,11.5367213 L9.26178239,9.86916295 Z M22.1731256,14.5805343 L20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L22.1731256,14.5805343 Z M17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427097,21.0810125 L17.5427461,21.0808911 Z M12.6856622,17.8427947 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 L12.6856622,17.8427947 Z M9.54470753,15.6975422 L10.9451262,16.5394327 L9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L9.54470753,15.6975422 Z M18.3684504,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L18.3684504,8.24191842 Z" />
-      </group>
-    </vector>
-  </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_rv.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M8.33758333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 L8.33772333,7.43983333 L8.33758333,7.43983333 Z M8.88445833,9.60225 L10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 Z M16.647925,10.684625 L16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.647925,10.684625 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_secondhand.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M13.9999526,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 L13.9999526,5 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z M13.4348426,10.5098167 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 L13.4348426,10.5098167 Z M15.1711926,10.7559133 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C17.2645181,18.3938777 17.2637586,18.3938777 17.2629991,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C16.179132,17.3046973 16.1798915,17.3046973 16.180651,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 L15.1711926,10.7559133 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_shopping.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6B425C" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M19.4443861,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L19.4443861,8.88885 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z M13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_toilet.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 L10.3454333,8.64113333 Z M19.2545667,17.43605 L19.2545667,21.83345 L16.7091333,21.83345 L16.7091333,17.43605 L14.1637,17.43605 L16.3909833,10.5257667 C16.3909833,10.5257667 16.7091683,9.26938333 17.98185,9.26938333 C19.2545317,9.26938333 19.5727167,10.5257667 19.5727167,10.5257667 L21.8,17.43605 L19.2545667,17.43605 L19.2545667,17.43605 Z M11.61815,15.5514167 L11.61815,21.83345 L9.07271667,21.83345 L9.07271667,15.5514167 L7.8,15.5514167 L7.8,11.0192667 C7.8,10.0528233 8.57319667,9.26938333 9.55198333,9.26938333 L11.1388833,9.26938333 C12.1064817,9.26938333 12.8908667,10.05231 12.8908667,11.0192667 L12.8908667,15.5514167 L11.61815,15.5514167 Z M19.7362833,7.07068333 C19.7362833,7.94232333 19.00161,8.64125 18.0853333,8.64125 C17.1690567,8.64125 16.4343833,7.94237 16.4343833,7.07068333 C16.4343833,6.19904333 17.1690567,5.50011667 18.0853333,5.50011667 C19.00161,5.50011667 19.7362833,6.19899667 19.7362833,7.07068333 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_tourism.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#6E4426" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M22.167,11.328l-5.717,-0.816l-2.45,-5.712l-2.45,5.712l-5.717,0.816l4.083,4.08l-0.817,5.726l4.9,-2.463l4.9,2.448l-0.817,-5.711z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_transport.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#2F6499" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M17.7652425,5.6 C19.3205789,5.6 20.6007172,6.82330936 20.6712621,8.37700229 L21.1340668,18.5587623 C21.2018095,20.0490603 20.1357825,21.3284073 18.6981339,21.5620297 L18.2940892,21.5992497 L9.77120086,21.6 C8.27928213,21.6 7.04973517,20.4769811 6.88169744,19.0301853 L6.86287684,18.6248613 L7.3279318,8.37707196 C7.39855249,6.8233354 8.67873133,5.6 10.2339515,5.6 L17.7652425,5.6 Z M9.92695997,17.2362972 C9.28430184,17.2362972 8.76333027,17.7572687 8.76333027,18.3999268 C8.76333027,19.042585 9.28430184,19.5635566 9.92695997,19.5635566 C10.5696181,19.5635566 11.0905897,19.042585 11.0905897,18.3999268 C11.0905897,17.7572687 10.5696181,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C17.4297098,17.2362972 16.9087383,17.7572687 16.9087383,18.3999268 C16.9087383,19.042585 17.4297098,19.5635566 18.0723679,19.5635566 C18.7150261,19.5635566 19.2359977,19.042585 19.2359977,18.3999268 C19.2359977,17.7572687 18.7150261,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 L10.736446,7.78180569 C9.95826161,7.78180569 9.31791619,8.39432582 9.28337093,9.17176139 L9.12032285,12.8726871 C9.12032285,13.675999 9.77154822,14.3272243 10.57486,14.3272243 L17.4890037,14.3257899 C18.2915299,14.2901216 18.9131848,13.6106375 18.8775195,12.8081258 L18.7159058,9.17178293 C18.6813533,8.39434738 18.0410005,7.78180569 17.2628087,7.78180569 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_water.xml

@@ -1,26 +0,0 @@
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="oval">
-      <size
-        android:width="40dp"
-        android:height="40dp" />
-      <solid android:color="#0A6074" />
-    </shape>
-  </item>
-  <item>
-    <vector
-      android:width="24dp"
-      android:height="24dp"
-      android:viewportWidth="28"
-      android:viewportHeight="28">
-      <group
-        android:pivotX="12"
-        android:pivotY="12">
-        <path
-          android:fillColor="#000"
-          android:pathData="M14,21.8749 C11.1749,21.8749 8.5482,19.4518 8.5482,16.4231 C8.5482,13.3606 12.6876,7.8747 14,6.1251 C15.3125,7.8751 19.4518,13.3606 19.4518,16.4231 C19.4518,19.4519 16.825,21.8749 14,21.8749 Z" />
-      </group>
-    </vector>
-  </item>
-</layer-list>

android/app/src/main/res/drawable-night/ic_category_wifi.xml

@@ -1,25 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="#51585E" />
-        </shape>
-    </item>
-    <item>
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="28"
-            android:viewportHeight="28">
-            <group
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:fillColor="#000"
-                    android:pathData="M14,16.98 C15.1045695,16.98 16.1045695,17.4277153 16.8284271,18.1515729 L14,20.98 L11.1715729,18.1515729 C11.8954305,17.4277153 12.8954305,16.98 14,16.98 Z M14,12.48 C16.3472102,12.48 18.4722102,13.4313949 20.0104076,14.9695924 L18.2426407,16.7373593 C17.1568542,15.6515729 15.6568542,14.98 14,14.98 C12.3431458,14.98 10.8431458,15.6515729 9.75735931,16.7373593 L7.98959236,14.9695924 C9.52778981,13.4313949 11.6527898,12.48 14,12.48 Z M14,7.98 C17.5898509,7.98 20.8398509,9.43507456 23.1923882,11.7876118 L21.4251209,13.5558785 C19.5249552,11.6554586 16.8997491,10.48 14,10.48 C11.1002509,10.48 8.47504482,11.6554586 6.57487909,13.5558785 L4.80761184,11.7876118 C7.16014913,9.43507456 10.4101491,7.98 14,7.98 Z" />
-            </group>
-        </vector>
-    </item>
-</layer-list>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M20,8 C20.82725,8 21.5,8.67275 21.5,9.5 L21.5,18.5 C21.5,19.32725 20.82725,20 20,20 L8,20 C7.17275,20 6.5,19.32725 6.5,18.5 L6.5,9.5 C6.5,8.67275 7.17275,8 8,8 L20,8 Z M20.00075,14 L8,14 L8,18.5 L20.0015,18.5 L20.00075,14 Z M14,15.5 L14,17 L9.5,17 L9.5,15.5 L14,15.5 Z M20,9.5 L8,9.5 L8,11 L20,11 L20,9.5 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M7,9.53073333 L14,6.3 L21,9.53073333 L21,10.60766 L19.9230733,10.60766 L19.9230733,18.68461 L21,18.68461 L21,20.2999767 L7,20.2999767 L7,18.68461 L8.07692667,18.68461 L8.07692667,10.60766 L7,10.60766 L7,9.53073333 Z M16.6923167,15.2756333 C16.6923167,14.0852833 15.4814333,13.1208 13.9976667,13.1208 C13.50468,13.1208 13.09784,12.7993017 13.09784,12.4012583 C13.09784,12.003215 13.4998967,11.6817167 13.9976667,11.6817167 C14.4954483,11.6817167 14.8974933,12.0070417 14.8974933,12.4012583 L16.69241,12.4012583 C16.69241,11.4673883 15.94096,10.6789083 14.8974933,10.3803583 L14.8974933,9.53068667 L13.1025767,9.53068667 L13.1025767,10.3803583 C12.0591567,10.6788967 11.30766,11.46733 11.30766,12.4012583 C11.30766,13.5916083 12.5185433,14.5560917 14.00231,14.5560917 C14.5000917,14.5560917 14.9021367,14.87759 14.9021367,15.2756333 C14.9021367,15.6736767 14.50008,15.995175 14.00231,15.995175 C13.5045283,15.995175 13.1024833,15.66985 13.1024833,15.2756333 L11.3075667,15.2756333 C11.3075667,16.2095033 12.0590167,16.9979833 13.1024833,17.2965333 L13.1024833,18.146205 L14.8974,18.146205 L14.8974,17.2965333 C15.94082,16.997995 16.6923167,16.2095617 16.6923167,15.2756333 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
       <size
           android:width="40dp"
           android:height="40dp" />
-      <solid android:color="#EB785D" />
+      <solid android:color="@color/entertainment" />
     </shape>
   </item>
   <item>
@@ -18,7 +18,7 @@
           android:pivotY="12">
   <path
       android:pathData="M10.7398398,14.5988166 C11.2766539,14.5988166 11.7741396,14.7668787 12.1823664,15.0532612 C11.7724801,15.4914625 11.5235582,16.0775925 11.5235582,16.7240712 L11.529303,16.8892426 L11.5491056,17.0705775 C11.6012609,17.429281 11.7280184,17.7632492 11.9167798,18.0556079 L11.9546499,18.1104694 L11.9142567,18.13405 C11.1417478,18.5947243 10.6376499,19.4380664 10.6376499,20.3887564 L10.637,21.073 L5.952,21.073 L5.95232411,17.1079171 C5.95232411,15.7221656 7.06098553,14.5988166 8.46443574,14.5988166 L10.7398398,14.5988166 Z M14.7363802,18.7647355 C15.6343829,18.7647355 16.3623501,19.4913492 16.3623501,20.3887564 L16.362,21.073 L11.637,21.073 L11.6376499,20.3887564 C11.6376499,19.4918257 12.3552335,18.7647355 13.2636198,18.7647355 L14.7363802,18.7647355 Z M19.4916069,12.4068343 C20.8792516,12.4068343 22.0041478,13.5296391 22.0041478,14.9163636 L22.004,21.073 L17.362,21.073 L17.3623501,20.3887564 L17.3567032,20.2194334 L17.3385166,20.043376 C17.2273964,19.2299207 16.7526866,18.5346787 16.0784713,18.1328785 L16.0416499,18.1124694 L16.0806774,18.0575117 C16.336328,17.665886 16.4764418,17.2070581 16.4764418,16.7240712 C16.4764418,15.6254025 15.757471,14.7010059 14.7609634,14.3838791 C15.0006762,13.2537372 15.9971232,12.4068343 17.215814,12.4068343 L19.4916069,12.4068343 Z M14,15.2664694 C14.8194057,15.2664694 15.4764418,15.9151249 15.4764418,16.7240712 C15.4764418,17.5330608 14.819449,18.1816731 14,18.1816731 C13.1805943,18.1816731 12.5235582,17.5330175 12.5235582,16.7240712 C12.5235582,15.9150816 13.1805943,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C10.8681135,9.19402109 11.8832295,10.1961892 11.8832295,11.4460053 C11.8832295,12.6958883 10.8681805,13.6979895 9.60213775,13.6979895 C8.33616197,13.6979895 7.32104605,12.6958214 7.32104605,11.4460053 C7.32104605,10.1961223 8.33616197,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C19.6199026,7.00111521 20.635192,8.00345456 20.635192,9.25348422 C20.635192,10.5035808 19.6199695,11.5058532 18.3537105,11.5058532 C17.0875184,11.5058532 16.072229,10.5035139 16.072229,9.25348422 C16.072229,8.00338763 17.0875184,7.00111521 18.3537105,7.00111521 Z"
-      android:fillColor="#FFF" />
+      android:fillColor="@color/foreground_color" />
       </group>
 </vector>
   </item>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#EC955E" />
+            <solid android:color="@color/food" />
         </shape>
     </item>
     <item>
@@ -18,7 +18,7 @@
                 android:pivotY="12">
                 <path
                     android:pathData="M12.5416667,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,11.1416783 Z M16.3333333,14.933345 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L16.3333333,14.933345 Z"
-                    android:fillColor="#FFF" />
+                    android:fillColor="@color/foreground_color" />
             </group>
         </vector>
     </item>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#EB785D" />
+            <solid android:color="@color/entertainment" />
         </shape>
     </item>
     <item>
@@ -18,7 +18,7 @@
                 android:pivotY="12">
                 <path
                     android:pathData="M14.8166667,12.2166667 L14.8166667,17.525 C14.8166667,20.0076667 12.8076667,22.0166667 10.325,22.0166667 C7.84233333,22.0166667 5.83333333,20.0076667 5.83333333,17.525 L5.83333333,12.2166667 L14.8166667,12.2166667 Z M12.3666667,17.9333333 L8.28333333,17.9333333 C8.28333333,18.6111667 9.198,19.1583333 10.325,19.1583333 C11.452,19.1583333 12.3666667,18.6111667 12.3666667,17.9333333 Z M22.1666667,6.5 L22.1666667,11.8083333 C22.1666667,14.291 20.1576667,16.3 17.675,16.3 C16.94,16.3 16.2458333,16.1121667 15.6333333,15.8018333 L15.6333333,11.4 L13.1833333,11.4 L13.1833333,6.5 L22.1666667,6.5 Z M12.3666667,14.6666667 C11.9175,14.6666667 11.55,15.0341667 11.55,15.4833333 C11.55,15.9325 11.9175,16.3 12.3666667,16.3 C12.8158333,16.3 13.1833333,15.9325 13.1833333,15.4833333 C13.1833333,15.0341667 12.8158333,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C7.83416667,14.6666667 7.46666667,15.0341667 7.46666667,15.4833333 C7.46666667,15.9325 7.83416667,16.3 8.28333333,16.3 C8.7325,16.3 9.1,15.9325 9.1,15.4833333 C9.1,15.0341667 8.7325,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C16.548,12.2166667 15.6333333,12.7638333 15.6333333,13.4416667 L19.7166667,13.4416667 C19.7166667,12.7638333 18.802,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C15.1841667,9.01533333 14.8166667,9.38283333 14.8166667,9.832 C14.8166667,10.2811667 15.1841667,10.6486667 15.6333333,10.6486667 C16.0825,10.6486667 16.45,10.2893333 16.45,9.832 C16.45,9.38283333 16.0825,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C19.2675,9.01533333 18.9,9.38283333 18.9,9.832 C18.9,10.2811667 19.2675,10.6486667 19.7166667,10.6486667 C20.1658333,10.6486667 20.5333333,10.2893333 20.5333333,9.832 C20.5333333,9.38283333 20.1658333,9.01533333 19.7166667,9.01533333 Z"
-                    android:fillColor="#FFF" />
+                    android:fillColor="@color/foreground_color" />
             </group>
         </vector>
     </item>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M6.8,7.48804933 C6.8,7.813281 7.06993167,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.55654167,14.5385077 8.9539,15.3205827 8.9539,16.286291 L8.9539,16.0215277 C8.9539,16.9867927 9.739055,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.1352133,17.769311 19.4000583,17.5195393 19.4000583,17.180436 L19.4000583,17.2812663 C19.4000583,16.9560347 19.129765,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.29328,16.6923913 10.030885,16.4426197 10.030885,16.1035163 L10.030885,16.2043467 C10.030885,15.879115 10.2980983,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 L7.37395333,7 C7.05702833,7 6.8,7.24977167 6.8,7.588875 L6.8,7.48804467 L6.8,7.48804933 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#AA96BC" />
+            <solid android:color="@color/cm_services" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M17.846514,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 L17.846514,4.676 Z M8.63218069,7.77816667 L13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L8.63218069,7.77816667 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#D85961" />
+            <solid android:color="@color/medical" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M21.1291111,17.1111111 L17.1106444,17.1111111 L17.1106444,21.1295778 C17.1106444,21.9138422 16.4689778,22.5555089 15.6847133,22.5555089 L12.3142911,22.5555089 C11.5300267,22.5555089 10.88836,21.9138422 10.88836,21.1295778 L10.88836,17.1111111 L6.86973778,17.1111111 C6.08547333,17.1111111 5.44383778,16.4694444 5.44383778,15.68518 L5.44383778,12.3147578 C5.44383778,11.5304933 6.08550444,10.8888267 6.86973778,10.8888267 L10.88836,10.8888267 L10.88836,6.87036 C10.88836,6.08609556 11.5300267,5.44442889 12.3142911,5.44442889 L15.6847133,5.44442889 C16.4689778,5.44442889 17.1106444,6.08609556 17.1106444,6.87036 L17.1106444,10.8888267 L21.1291111,10.8888267 C21.9133756,10.8888267 22.5550422,11.5304933 22.5550422,12.3147578 L22.5550422,15.68518 C22.5550422,16.4694444 21.9133756,17.1111111 21.1291111,17.1111111 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#664E42" />
+            <solid android:color="@color/hotel" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 Z M19.1970333,9.6516 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L19.1970333,9.6516 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#FB3207" />
+            <solid android:color="@color/luggagehero" />
         </shape>
     </item>
     <item>
@@ -20,7 +20,7 @@
                 android:scaleX="0.5"
                 android:scaleY="0.5">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M8.5714,5.1429l6.8571,0l0,-1.7143l-6.8571,0ZM24,13.7143l0,6.4286c0,0.5893 -0.2098,1.0938 -0.6295,1.5134 -0.4196,0.4196 -0.9241,0.6295 -1.5134,0.6295l-19.7143,0c-0.5893,0 -1.0938,-0.2098 -1.5134,-0.6295 -0.4196,-0.4196 -0.6295,-0.9241 -0.6295,-1.5134l0,-6.4286l9,0l0,2.1429c0,0.2321 0.0848,0.433 0.2545,0.6027 0.1696,0.1696 0.3705,0.2545 0.6027,0.2545l4.2857,0c0.2321,0 0.433,-0.0848 0.6027,-0.2545 0.1696,-0.1696 0.2545,-0.3705 0.2545,-0.6027l0,-2.1429ZM13.7143,13.7143l0,1.7143l-3.4286,0l0,-1.7143ZM24,7.2857l0,5.1429l-24,0l0,-5.1429c0,-0.5893 0.2098,-1.0938 0.6295,-1.5134 0.4196,-0.4196 0.9241,-0.6295 1.5134,-0.6295l4.7143,0l0,-2.1429c0,-0.3571 0.125,-0.6607 0.375,-0.9107 0.25,-0.25 0.5536,-0.375 0.9107,-0.375l7.7143,0c0.3571,0 0.6607,0.125 0.9107,0.375 0.25,0.25 0.375,0.5536 0.375,0.9107l0,2.1429l4.7143,0c0.5893,0 1.0938,0.2098 1.5134,0.6295 0.4196,0.4196 0.6295,0.9241 0.6295,1.5134Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#EC955E" />
+            <solid android:color="@color/food" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M21,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 L21,8.42778167 Z M10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L10.4455167,10.411115 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#427BB8" />
+            <solid android:color="@color/parking" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 Z M13.1840042,8.60425301 L14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#D85961" />
+            <solid android:color="@color/medical" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M16.961,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 C7.28183167,18.3600667 7.71838667,19.382475 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 C9.877112,20.8116985 9.88986133,20.8240783 9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 L16.961,6.99999417 Z M16.961,8.39813333 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5632167,8.66905667 16.1849333,8.39813333 16.9611167,8.39813333 L16.961,8.39813333 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 L14,5.833275 Z M15.85605,14.438025 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L15.85605,14.438025 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" />
             </group>
         </vector>

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

@@ -5,7 +5,7 @@
       <size
         android:width="40dp"
         android:height="40dp" />
-      <solid android:color="#747E86" />
+      <solid android:color="@color/amenity" />
     </shape>
   </item>
   <item>
@@ -18,7 +18,7 @@
         android:pivotX="12"
         android:pivotY="12">
         <path
-            android:fillColor="#FFF"
+            android:fillColor="@color/foreground_color"
             android:pathData="M9.26178239,9.86916295 L10.4193833,7.95061481 L11.2531868,6.56634591 C11.5688972,6.04016587 12.3298444,6.04016587 12.6455913,6.56634591 L13.843676,8.5577503 L12.8479738,10.2253086 L12.0384558,11.5367213 L9.26178239,9.86916295 Z M22.1731256,14.5805343 L20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L22.1731256,14.5805343 Z M17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427097,21.0810125 L17.5427461,21.0808911 Z M12.6856622,17.8427947 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 L12.6856622,17.8427947 Z M9.54470753,15.6975422 L10.9451262,16.5394327 L9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L9.54470753,15.6975422 Z M18.3684504,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L18.3684504,8.24191842 Z" />
       </group>
     </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M8.33758333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 L8.33772333,7.43983333 L8.33758333,7.43983333 Z M8.88445833,9.60225 L10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 Z M16.647925,10.684625 L16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.647925,10.684625 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M13.9999526,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 L13.9999526,5 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z M13.4348426,10.5098167 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 L13.4348426,10.5098167 Z M15.1711926,10.7559133 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C17.2645181,18.3938777 17.2637586,18.3938777 17.2629991,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C16.179132,17.3046973 16.1798915,17.3046973 16.180651,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 L15.1711926,10.7559133 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#BE75A3" />
+            <solid android:color="@color/shop" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M19.4443861,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L19.4443861,8.88885 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z M13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 L10.3454333,8.64113333 Z M19.2545667,17.43605 L19.2545667,21.83345 L16.7091333,21.83345 L16.7091333,17.43605 L14.1637,17.43605 L16.3909833,10.5257667 C16.3909833,10.5257667 16.7091683,9.26938333 17.98185,9.26938333 C19.2545317,9.26938333 19.5727167,10.5257667 19.5727167,10.5257667 L21.8,17.43605 L19.2545667,17.43605 L19.2545667,17.43605 Z M11.61815,15.5514167 L11.61815,21.83345 L9.07271667,21.83345 L9.07271667,15.5514167 L7.8,15.5514167 L7.8,11.0192667 C7.8,10.0528233 8.57319667,9.26938333 9.55198333,9.26938333 L11.1388833,9.26938333 C12.1064817,9.26938333 12.8908667,10.05231 12.8908667,11.0192667 L12.8908667,15.5514167 L11.61815,15.5514167 Z M19.7362833,7.07068333 C19.7362833,7.94232333 19.00161,8.64125 18.0853333,8.64125 C17.1690567,8.64125 16.4343833,7.94237 16.4343833,7.07068333 C16.4343833,6.19904333 17.1690567,5.50011667 18.0853333,5.50011667 C19.00161,5.50011667 19.7362833,6.19899667 19.7362833,7.07068333 Z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="@color/tourism" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M22.167,11.328l-5.717,-0.816l-2.45,-5.712l-2.45,5.712l-5.717,0.816l4.083,4.08l-0.817,5.726l4.9,-2.463l4.9,2.448l-0.817,-5.711z" />
             </group>
         </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#2F6499" />
+            <solid android:color="@color/transport" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M17.7652425,5.6 C19.3205789,5.6 20.6007172,6.82330936 20.6712621,8.37700229 L21.1340668,18.5587623 C21.2018095,20.0490603 20.1357825,21.3284073 18.6981339,21.5620297 L18.2940892,21.5992497 L9.77120086,21.6 C8.27928213,21.6 7.04973517,20.4769811 6.88169744,19.0301853 L6.86287684,18.6248613 L7.3279318,8.37707196 C7.39855249,6.8233354 8.67873133,5.6 10.2339515,5.6 L17.7652425,5.6 Z M9.92695997,17.2362972 C9.28430184,17.2362972 8.76333027,17.7572687 8.76333027,18.3999268 C8.76333027,19.042585 9.28430184,19.5635566 9.92695997,19.5635566 C10.5696181,19.5635566 11.0905897,19.042585 11.0905897,18.3999268 C11.0905897,17.7572687 10.5696181,17.2362972 9.92695997,17.2362972 Z M18.0723679,17.2362972 C17.4297098,17.2362972 16.9087383,17.7572687 16.9087383,18.3999268 C16.9087383,19.042585 17.4297098,19.5635566 18.0723679,19.5635566 C18.7150261,19.5635566 19.2359977,19.042585 19.2359977,18.3999268 C19.2359977,17.7572687 18.7150261,17.2362972 18.0723679,17.2362972 Z M17.2628087,7.78180569 L10.736446,7.78180569 C9.95826161,7.78180569 9.31791619,8.39432582 9.28337093,9.17176139 L9.12032285,12.8726871 C9.12032285,13.675999 9.77154822,14.3272243 10.57486,14.3272243 L17.4890037,14.3257899 C18.2915299,14.2901216 18.9131848,13.6106375 18.8775195,12.8081258 L18.7159058,9.17178293 C18.6813533,8.39434738 18.0410005,7.78180569 17.2628087,7.78180569 Z" />
             </group>
         </vector>

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

@@ -5,7 +5,7 @@
       <size
         android:width="40dp"
         android:height="40dp" />
-      <solid android:color="#54A3B6" />
+      <solid android:color="@color/water" />
     </shape>
   </item>
   <item>
@@ -18,7 +18,7 @@
         android:pivotX="12"
         android:pivotY="12">
         <path
-          android:fillColor="#FFF"
+          android:fillColor="@color/foreground_color"
           android:pathData="M14,21.8749 C11.1749,21.8749 8.5482,19.4518 8.5482,16.4231 C8.5482,13.3606 12.6876,7.8747 14,6.1251 C15.3125,7.8751 19.4518,13.3606 19.4518,16.4231 C19.4518,19.4519 16.825,21.8749 14,21.8749 Z" />
       </group>
     </vector>

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

@@ -4,7 +4,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="@color/amenity" />
         </shape>
     </item>
     <item>
@@ -17,7 +17,7 @@
                 android:pivotX="12"
                 android:pivotY="12">
                 <path
-                    android:fillColor="#FFF"
+                    android:fillColor="@color/foreground_color"
                     android:pathData="M14,16.98 C15.1045695,16.98 16.1045695,17.4277153 16.8284271,18.1515729 L14,20.98 L11.1715729,18.1515729 C11.8954305,17.4277153 12.8954305,16.98 14,16.98 Z M14,12.48 C16.3472102,12.48 18.4722102,13.4313949 20.0104076,14.9695924 L18.2426407,16.7373593 C17.1568542,15.6515729 15.6568542,14.98 14,14.98 C12.3431458,14.98 10.8431458,15.6515729 9.75735931,16.7373593 L7.98959236,14.9695924 C9.52778981,13.4313949 11.6527898,12.48 14,12.48 Z M14,7.98 C17.5898509,7.98 20.8398509,9.43507456 23.1923882,11.7876118 L21.4251209,13.5558785 C19.5249552,11.6554586 16.8997491,10.48 14,10.48 C11.1002509,10.48 8.47504482,11.6554586 6.57487909,13.5558785 L4.80761184,11.7876118 C7.16014913,9.43507456 10.4101491,7.98 14,7.98 Z" />
             </group>
         </vector>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <corners android:radius="12dp" />
-  <solid android:color="@color/active_track_recording" />
-</shape>

android/app/src/main/res/layout-land/layout_nav.xml

@@ -41,5 +41,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|start"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>

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

@@ -8,7 +8,6 @@
   android:paddingStart="@dimen/margin_base"
   android:paddingEnd="@dimen/margin_base"
   android:gravity="center_vertical"
-  android:background="?clickableBackground"
   android:orientation="horizontal">
 
   <com.google.android.material.imageview.ShapeableImageView

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

@@ -40,5 +40,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|center"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>

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

@@ -4,6 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:descendantFocusability="blocksDescendants"
+  android:background="?cardBackground"
   android:orientation="vertical">
   <include
     android:id="@+id/pp__preview"

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

@@ -1,3 +1,662 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Nazad</string>
+    <string name="cancel">Odustani</string>
+    <string name="delete">Obriši</string>
+    <string name="download_maps">Preuzmi mape</string>
+    <string name="download_has_failed">Preuzimanje nije uspelo. Tapni za ponovni pokušaj</string>
+    <string name="downloading">Preuzimanje…</string>
+    <string name="kilometres">Kilometri</string>
+    <string name="miles">Milje</string>
+    <string name="later">Kasnije</string>
+    <string name="search">Pretraga</string>
+    <string name="search_map">Traži na mapi</string>
+    <string name="location_is_disabled_long_text">Trenutno su svi lokacijski servisi na ovom uređaju ili aplikaciji isključeni. Potrebno je da ih uključite u Podešavanjima.</string>
+    <string name="limited_accuracy">Ograničena tačnost</string>
+    <string name="precise_location_is_disabled_long_text">Da bi se osigurala tačna navigacija omogućite preciznu lokaciju u podešavanjima</string>
+    <string name="zoom_to_country">Prikaži mapu</string>
+    <string name="country_status_download_failed">Preuzimanje nije uspelo</string>
+    <string name="try_again">Pokušaj ponovo</string>
+    <string name="about_menu_title">O aplikaciji</string>
+    <string name="about_headline">Otvoreni projekat koji pokreće zajednica</string>
+    <string name="about_proposition_1">• Laka i polirana</string>
+    <string name="about_proposition_2">• Orijentisana na privatnost i bez reklama</string>
+    <string name="about_proposition_3">• Oflajn, brza i kompaktna</string>
+    <string name="about_developed_by_enthusiasts">Potpuno otvorenog koda, neprofitna, transparentna u odlučivanju i finansijama.</string>
+    <string name="location_settings">Podešavanja lokacije</string>
+    <string name="close">Zatvori</string>
+    <string name="unsupported_phone">Ova aplikacija zahteva OpenGL. Na žalost, vaš uređaj nije podržan.</string>
+    <string name="download">Preuzmi</string>
+    <string name="disconnect_usb_cable">Molim vas otkačite USB kabl, ili ubacite memorijsku karticu da biste koristili CoMaps</string>
+    <string name="not_enough_free_space_on_sdcard">Molim vas, prvo oslobodite nešto prostora na SD kartici ili na USB memoriji da biste koristili aplikaciju</string>
+    <string name="download_resources">Pre nego što počnete da koristite aplikaciju, prvo preuzmite na vaš uređaj mapu sveta. \nZa to će biti potrebno %s memorije.</string>
+    <string name="download_resources_continue">Idi na mapu</string>
+    <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Možete \notići na mapu.</string>
+    <string name="download_country_ask">Preuzeti %1$s? (%2$s)</string>
+    <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
+    <string name="pause">Pauza</string>
+    <string name="continue_button">Nastavi</string>
+    <string name="download_country_failed">%s preuzimanje nije uspelo</string>
+    <string name="add_new_set">Napravi novu listu</string>
+    <string name="bookmark_set_name">Naziv liste</string>
+    <string name="bookmarks">Mesta</string>
+    <string name="bookmarks_and_tracks">Favoriti</string>
+    <string name="name">Naziv</string>
+    <string name="address">Adresa</string>
+    <string name="list">Lista</string>
+    <string name="settings">Podešavanja</string>
+    <string name="maps_storage">Mesto za čuvanje mapa</string>
+    <string name="maps_storage_summary">Izaberite folder u kom se čuvaju mape</string>
+    <string name="maps_storage_downloaded">Preuzete mape</string>
+    <string name="maps_storage_free_size">slobodno %1$s od %2$s</string>
+    <string name="move_maps">Premestiti mapu?</string>
+    <string name="move_maps_error">Greška prilikom premeštanja mapa</string>
+    <string name="wait_several_minutes">Ovo može da potraje nekoliko minuta. \nMolim vas, sačekajte…</string>
+    <string name="measurement_units">Jedinice mere</string>
+    <string name="measurement_units_summary">Izaberite između kilometara i milja</string>
+    <string name="category_eat">Gde jesti</string>
+    <string name="category_food">Namirnice</string>
+    <string name="category_transport">Transport</string>
+    <string name="category_fuel">Gorivo</string>
+    <string name="category_parking">Parking</string>
+    <string name="category_shopping">Kupovina</string>
+    <string name="category_secondhand">Polovna odeća</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_tourism">Turistička atrakcija</string>
+    <string name="category_entertainment">Zabava</string>
+    <string name="category_atm">Bankomat</string>
+    <string name="category_nightlife">Noćni život</string>
+    <string name="category_children">Sve za decu</string>
+    <string name="category_bank">Banka</string>
+    <string name="category_pharmacy">Apoteka</string>
+    <string name="category_hospital">Bolnica</string>
+    <string name="category_toilet">Toalet</string>
+    <string name="category_post">Pošta</string>
+    <string name="category_police">Policija</string>
+    <string name="category_recycling">Reciklaža</string>
+    <string name="category_water">Voda</string>
+    <string name="category_rv">Za kamper vozila</string>
+    <string name="description">Napomene</string>
+    <string name="share_bookmarks_email_subject">CoMaps favoriti</string>
+    <string name="share_bookmarks_email_body">Zdravo! \n \nU prilogu su moji favoriti; molim te da ih otvoriš u CoMaps-u. Ako ga nemaš već instaliranog, možeš da ga preuzmeš odavde: https://www.comaps.app/download/ \n \nUživaj u putovanju sa CoMaps-om!</string>
+    <string name="load_kmz_title">Učitavanje favorita</string>
+    <string name="load_kmz_successful">Favoriti su uspešno učitani! Možete ih pronači na mapi pomoću Menadžera favorita.</string>
+    <string name="load_kmz_failed">Neuspešno učitavanje favorita. Moguće da je fajl oštećen ili neispravan.</string>
+    <string name="unknown_file_type">Aplikacija ne prepoznaje ovu vrstu fajla: \n%1$s</string>
+    <string name="failed_to_open_file">Otvaranje fajla %1$s nije uspelo \n \n%2$s</string>
+    <string name="edit">Izmeni</string>
+    <string name="unknown_current_position">Vaša lokacija još nije određena</string>
+    <string name="cant_change_this_setting">Izvinite, podešavanje lokacije za čuvanje mapa je trenutno onemogućeno</string>
+    <string name="downloading_is_active">Preuzimanje mapa je u toku</string>
+    <string name="my_position_share_sms">Vidi moju trenutnu lokaciju u CoMaps-u! %1$s ili %2$s Još ne koristiš offline mape? Preuzmi ih ovde: https://www.comaps.app/download/</string>
+    <string name="bookmark_share_email_subject">Hej, vidi moj marker u CoMaps-u!</string>
+    <string name="my_position_share_email_subject">Hej, vidi moju trenutnu lokaciju na CoMaps mapi!</string>
+    <string name="my_position_share_email">Zdravo, \n \nJa sam ovde: %1$s. Klikni na ovaj %2$s ili ovaj link %3$s da bi video to mesto na mapi. \n \nHvala.</string>
+    <string name="share">Podeli</string>
+    <string name="email">Email</string>
+    <string name="copied_to_clipboard">Kopirano u klipbord: %s</string>
+    <string name="done">Gotovo</string>
+    <string name="data_version">OpenStreetMap podaci: %s</string>
+    <string name="tracks_title">Putanje</string>
+    <string name="length">Dužina</string>
+    <string name="share_my_location">Podeli moju lokaciju</string>
+    <string name="prefs_group_general">Opšta podešavanja</string>
+    <string name="prefs_group_information">Informacije</string>
+    <string name="prefs_group_route">Navigacija</string>
+    <string name="pref_zoom_title">Dugme za zumiranje</string>
+    <string name="pref_zoom_summary">Prikaži na mapi</string>
+    <string name="pref_map_style_title">Noćni režim</string>
+    <string name="off">Isključeno</string>
+    <string name="on">Uključeno</string>
+    <string name="auto">Automatski</string>
+    <string name="pref_map_3d_title">Prikaz perspektive</string>
+    <string name="pref_map_3d_buildings_title">3D zgrade</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D zgrade se ne prikazuju u režimu čuvanja baterije</string>
+    <string name="pref_tts_enable_title">Glasovne instrukcije</string>
+    <string name="pref_tts_street_names_title">Najavi ime ulice</string>
+    <string name="pref_tts_street_names_description">Kada je uključeno, ime ulice ili izlaz na koji treba skrenuti će biti izgovoren.</string>
+    <string name="pref_tts_language_title">Jezik glasa</string>
+    <string name="pref_tts_test_voice_title">Testiraj glasovne instrukcije</string>
+    <string name="pref_tts_playing_test_voice">Proverite glasnoću ili sistemska podešavanja Teksta-u-govor ako sada ne čujete glas</string>
+    <string name="pref_tts_unavailable">Nije dostupno</string>
+    <string name="pref_map_auto_zoom">Automatsko uvećavanje</string>
+    <string name="placepage_distance">Razdaljina</string>
+    <string name="search_show_on_map">Prikaži na mapi</string>
+    <string name="menu">Meni</string>
+    <string name="website">Veb-sajt</string>
+    <string name="news">Novosti</string>
+    <string name="panoramax">Panoramax Picture</string>
+    <string name="feedback">Povratne informacije</string>
+    <string name="rate_the_app">Ocena aplikacije</string>
+    <string name="help">Pomoć</string>
+    <string name="faq">Često postavljena pitanja</string>
+    <string name="donate">Donacija</string>
+    <string name="how_to_support_us">Volontirajte i poboljšajte CoMaps</string>
+    <string name="copyright">Copyright</string>
+    <string name="report_a_bug">Prijavite problem</string>
+    <string name="compass_calibration_recommended">Poboljšajte smer strelice tako što ćete pomerati telefon u putanji osmice kao biste kalibrisali kompas.</string>
+    <string name="compass_calibration_required">Pomerajte telefon u putanji osmice kako biste kalibrisali kompas i popravili smer strelice na mapi.</string>
+    <string name="long_tap_toast">Dodirnite dugo mapu da biste ponovo videli interfejs</string>
+    <string name="downloader_update_all_button">Ažuriraj sve</string>
+    <string name="downloader_cancel_all">Odustani od svih</string>
+    <string name="downloader_downloaded_subtitle">Preuzeto</string>
+    <string name="downloader_queued">Na čekanju</string>
+    <string name="downloader_near_me_subtitle">Blizu mene</string>
+    <string name="downloader_status_maps">Mape</string>
+    <string name="downloader_download_all_button">Preuzmi sve</string>
+    <string name="downloader_downloading">Preuzimanje:</string>
+    <string name="downloader_delete_map_while_routing_dialog">Da biste obrisali mapu, zaustavite navigaciju</string>
+    <string name="routing_failed_cross_mwm_building">Mogu se kreirati samo rute koje se kompletno nalaze u okviru mape jednog regiona.</string>
+    <string name="downloader_download_map">Preuzmi mapu</string>
+    <string name="downloader_retry">Pokušaj ponovo</string>
+    <string name="downloader_delete_map">Obriši mapu</string>
+    <string name="downloader_update_map">Ažuriraj mapu</string>
+    <string name="google_play_services">Google Fused lokacijski servis</string>
+    <string name="pref_use_google_play">Usluga lokacije koja kombinuje GPS, Wi-Fi, mobilnu mrežu i druge podatke kako bi se lokacija otkrila što je preciznije. Takođe se možete povezati sa Google serverima.</string>
+    <string name="routing_download_maps_along">Preuzmi sve mape koje se nalaze na ruti</string>
+    <string name="routing_requires_all_map">Da bi ruta mogla da se kreira, potrebno je da preuzimanje i ažuriranje svih mapa između vaše lokacije i vašeg odredišta.</string>
+    <string name="routing_not_enough_space">Nema dovoljno prostora</string>
+    <string name="enable_location_services">Molim vas uključite Lokacijske servise</string>
+    <string name="save">Sačuvaj</string>
+    <string name="create">Kreiraj</string>
+    <string name="red">Crvena</string>
+    <string name="yellow">Žuta</string>
+    <string name="blue">Plava</string>
+    <string name="green">Zelena</string>
+    <string name="purple">Ljubičasta</string>
+    <string name="orange">Narandžasta</string>
+    <string name="brown">Braon</string>
+    <string name="pink">Roze</string>
+    <string name="deep_purple">Tamno ljubičasta</string>
+    <string name="light_blue">Svetlo plava</string>
+    <string name="cyan">Cijan</string>
+    <string name="teal">Teal</string>
+    <string name="lime">Limeta</string>
+    <string name="deep_orange">Tamno narandžasta</string>
+    <string name="gray">Siva</string>
+    <string name="blue_gray">Plavo siva</string>
+    <string name="dialog_routing_disclaimer_title">Kada pratite rutu, obratite pažnju:</string>
+    <string name="dialog_routing_disclaimer_priority">— Uslovi na putu, saobraćajni propisi i znakovi imaju prioritet u odnosu na navigaciju;</string>
+    <string name="dialog_routing_disclaimer_precision">— Mapa može biti netačna i predložena ruta ne mora uvek biti najoptimalniji način da stignete na odredište;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Predloženu rutu treba da shvatite samo kao predlog;</string>
+    <string name="dialog_routing_disclaimer_borders">— Budite pažljivi sa rutama koje prolaze i blizini granica: rute koje kreira naša aplikacija mogu ponekad prelaziti granice dražava na nedozvoljenim mestima.</string>
+    <string name="dialog_routing_disclaimer_beware">Molimo Vas da budete oprezni i bezbedni na putu!</string>
+    <string name="dialog_routing_check_gps">Proveri GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Ne mogu da napravim rutu. Trenutne GPS koordinate ne mogu da se odrede.</string>
+    <string name="dialog_routing_location_turn_wifi">Molim Vas da proverite vaš GPS signal. Uključivanje Wi-Fi-a će popraviti preciznost vaše lokacije.</string>
+    <string name="dialog_routing_location_turn_on">Uključi Lokacijske servise</string>
+    <string name="dialog_routing_location_unknown_turn_on">Nije moguće odrediti trenutne GPS koordinate. Uključi lokacijske servise radi pronalaženja rute.</string>
+    <string name="dialog_routing_unable_locate_route">Ne mogu da pronađem rutu</string>
+    <string name="dialog_routing_cant_build_route">Ne mogu da napravim rutu</string>
+    <string name="dialog_routing_change_start_or_end">Molim Vas da podesite početnu ili odredišnu tačku.</string>
+    <string name="dialog_routing_change_start">Podesi početnu tačku</string>
+    <string name="dialog_routing_start_not_determined">Ruta nije kreirana. Ne mogu da odredim početnu tačku.</string>
+    <string name="dialog_routing_select_closer_start">Molim vas da izaberete početnu tačku bliže putu.</string>
+    <string name="dialog_routing_change_end">Podesi odredišnu tačku</string>
+    <string name="dialog_routing_end_not_determined">Ruta nije napravljena. Ne mogu da pronađem odredište.</string>
+    <string name="dialog_routing_select_closer_end">Molim Vas da izaberete odredišnu tačnu bliže putu</string>
+    <string name="dialog_routing_change_intermediate">Ne mogu da pronađem međuodredište</string>
+    <string name="dialog_routing_intermediate_not_determined">Molim Vas da podesite međuodredište</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Ne mogu da napravim rutu zbog greške u aplikaciji.</string>
+    <string name="dialog_routing_try_again">Molim Vas, pokušajte ponovo</string>
+    <string name="not_now">Ne sada</string>
+    <string name="dialog_routing_download_and_build_cross_route">Da li želite da preuzmete mapu i napravite optimalniju rutu koja se prostire na više od jedne mape?</string>
+    <string name="dialog_routing_download_cross_route">Preuzmi dodatne mape i napravi bolju rutu koja se prestire preko granica ove mape.</string>
+    <string name="search_without_internet_advertisement">Da biste počeli da pretražujete i pravite rute, molim Vas da preuzmete mapu. Nakon toga veza sa internetom Vam više neće biti potrebna.</string>
+    <string name="search_select_map">Izaberi mapu</string>
+    <string name="show">Prikaži</string>
+    <string name="hide">Sakrij</string>
+    <string name="categories">Kategorije</string>
+    <string name="history">Istorija</string>
+    <string name="search_not_found">Ups, nema rezultata</string>
+    <string name="search_not_found_query">Preuzmite region gde vršite pretragu, ili probajte da dodate ime obližnjeg naselja.</string>
+    <string name="search_history_title">Istorija pretrage</string>
+    <string name="search_history_text">Pogledajte vaše nedavne pretrage</string>
+    <string name="clear_search">Obriši istoriju pretrage</string>
+    <string name="read_in_wikipedia">Vikipedija</string>
+    <string name="wikimedia_commons">Vikimedijina ostava</string>
+    <string name="p2p_your_location">Vaša lokacija</string>
+    <string name="p2p_start">Kreni</string>
+    <string name="p2p_from_here">Start</string>
+    <string name="p2p_to_here">Odredište</string>
+    <string name="p2p_only_from_current">Navigacija je moguća samo od vaše trenutne lokacije</string>
+    <string name="p2p_reroute_from_current">Da li želite da napravite rutu od vaše trenutne lokacije?</string>
+    <string name="next_button">Dalje</string>
+    <string name="editor_time_from">Od</string>
+    <string name="editor_time_to">Do</string>
+    <string name="editor_time_add">Dodaj vreme</string>
+    <string name="editor_time_delete">Obriši vreme</string>
+    <string name="editor_time_allday">Non-stop (24 sata)</string>
+    <string name="editor_time_open">Otvoreno</string>
+    <string name="editor_time_close">Zatvoreno</string>
+    <string name="editor_time_add_closed">Dodaj neradno vreme</string>
+    <string name="editor_time_title">Radno vreme</string>
+    <string name="editor_time_advanced">Napredni režim</string>
+    <string name="editor_time_simple">Jednostavni režim</string>
+    <string name="editor_hours_closed">Neradno vreme</string>
+    <string name="editor_example_values">Primeri</string>
+    <string name="editor_correct_mistake">Ispravi grešku</string>
+    <string name="editor_add_select_location">Izaberite lokaciju</string>
+    <string name="editor_report_problem_desription_1">Molim Vas da detaljno opišete problem kako bi OpenStreetMap zajednica mogla da ga popravi.</string>
+    <string name="editor_report_problem_desription_2">Ili to učinite sami na https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_send_button">Pošalji</string>
+    <string name="editor_report_problem_title">Problem</string>
+    <string name="editor_report_problem_no_place_title">Ovo mesto ne postoji</string>
+    <string name="editor_report_problem_under_construction_title">Zatvoreno zbog održavanja</string>
+    <string name="editor_report_problem_duplicate_place_title">Duplirano mesto</string>
+    <string name="autodownload">Automatsko preuzimanje mapa</string>
+    <string name="daily">Svaki dan</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Danas ne radi</string>
+    <string name="day_off">Zatvoreno</string>
+    <string name="opens_in">Otvara se za %s</string>
+    <string name="closes_in">Zatvara se za %s</string>
+    <string name="closed">Zatvoreno</string>
+    <string name="opens_at">Otvara se u %s</string>
+    <string name="closes_at">Zatvara se u %s</string>
+    <string name="opens_day_at">Otvara se u %1$s u %2$s</string>
+    <string name="closes_day_at">Zatvara se u %1$s u %2$s</string>
+    <plurals name="minutes_short">
+        <item quantity="one">%d min</item>
+        <item quantity="few">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <string name="hours_confirmed_time_ago">Provereno %s</string>
+    <string name="existence_confirmed_time_ago">Provereno da postoji %s</string>
+    <string name="edit_opening_hours">Promeni radno vreme</string>
+    <string name="no_osm_account">Nemate OpenStreetMap nalog?</string>
+    <string name="register_at_openstreetmap">Registrujte se na OpenStreetMap-u</string>
+    <string name="login">Prijavite se</string>
+    <string name="not_signed_in">Niste prijavljeni</string>
+    <string name="login_osm">Prijava na OpenStreetMap</string>
+    <string name="logout">Odjavi se</string>
+    <string name="edit_place">Izmeni mesto</string>
+    <string name="add_language">Dodaj jezik</string>
+    <string name="street">Ulica</string>
+    <string name="house_number">Kućni broj</string>
+    <string name="details">Detalji</string>
+    <string name="social_media">Društveni mediji</string>
+    <string name="building">Zgrada</string>
+    <string name="add_street">Dodaj ulicu</string>
+    <string name="empty_street_name_error">Molim Vas, unesite naziv ulice</string>
+    <string name="choose_language">Izaberite jezik</string>
+    <string name="choose_street">Izaberite ulicu</string>
+    <string name="cuisine">Kuhinja</string>
+    <string name="select_cuisine">Izaberite kuhinju</string>
+    <string name="editor_add_phone">Dodaj broj telefona</string>
+    <string name="level">Sprat</string>
+    <string name="level_value_generic">Sprat: %s</string>
+    <string name="downloader_delete_map_dialog">Sve vaše promene na mapi će biti obrisane zajedno sa mapom</string>
+    <string name="downloader_update_maps">Ažuriraj mape</string>
+    <string name="downloader_mwm_migration_dialog">Da biste napravili rutu, potrebno je da ažurirate sve mape, a zatim da ponovo planirate rutu.</string>
+    <string name="downloader_search_field_hint">Pronađi mapu</string>
+    <string name="common_check_internet_connection_dialog">Molim Vas da proverite da li je Vaš uređaj povezan na internet</string>
+    <string name="downloader_no_space_title">Nema dovoljno prostora</string>
+    <string name="downloader_no_space_message">Molim Vas da obrišete nepotrebne podatke</string>
+    <string name="editor_login_error_dialog">Greška prilikom prijave</string>
+    <string name="editor_profile_changes">Verifikovane promene</string>
+    <string name="editor_focus_map_on_location">Prevucite mapu da postavite krst na lokaciju mesta ili posla.</string>
+    <string name="editor_edit_place_title">Izmena</string>
+    <string name="editor_add_place_title">Dodavanje</string>
+    <string name="editor_edit_place_name_hint">Naziv mesta</string>
+    <string name="editor_default_language_hint">Kao što je napisano na lokalnom jeziku</string>
+    <string name="editor_edit_place_category_title">Kategorija</string>
+    <string name="detailed_problem_description">Detaljan opis problema</string>
+    <string name="editor_report_problem_other_title">Drugi problem</string>
+    <string name="message_invalid_feature_position">Objekat ne može biti na ovom mestu</string>
+    <string name="osm_presentation">Podaci sa OpenStreetMap-a koje je kreirala zajednica do %s. Naučite više o tome kako da menjate i ažurirate mapu na OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je projekat zajednice koji ima za cilj pravljenje besplatne, slobodne i otvorene mape. OSM je glavni izvor podataka za mape u CoMaps-u i funkcioniše na sličan način kao Vikipedija. Možete dodati ili promeniti mesta i vaše promene postaju vidljive milionima korisnika širom sveta. \nPridružite se zajednici i pomozite da napravimo bolju mapu koja je dostupna svima!</string>
+    <string name="login_to_make_edits_visible">Prijavite se na openstreetmap.org da biste objavili vaše promene ostatku sveta</string>
+    <string name="downloader_of">%1$d od %2$d</string>
+    <string name="download_over_mobile_header">Preuzimanje preko mobilne mreže?</string>
+    <string name="download_over_mobile_message">Ovo može biti značajno skuplje u okviru određenih paketa ili u romingu</string>
+    <string name="error_enter_correct_house_number">Uneste ispravan kućni broj</string>
+    <string name="editor_building_levels">Spratovi (uklj. prizemlje, isključujući krov)</string>
+    <string name="error_enter_correct_storey_number">Broj spratova ne sme da prelazi %d</string>
+    <string name="editor_zip_code">Poštanski broj</string>
+    <string name="error_enter_correct_zip_code">Unesite ispravan poštanski broj</string>
+    <string name="editor_other_info">Napomena za OpenStreetMap volontere (nije obavezna)</string>
+    <string name="editor_note_hint">Opišite greške na mapi ili stvari koje se ne mogu promeniti pomoću CoMaps-a</string>
+    <string name="editor_about_osm">Vaše promene su poslate u javnu <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> bazu podataka. Molimo Vas da ne dodajete lične podatke ili podatke zaštićene autorskim pravima.</string>
+    <string name="editor_more_about_osm">Više o OpenStreetMap-u</string>
+    <string name="editor_osm_history">Vaša istorija uređivanja</string>
+    <string name="editor_osm_notes">Vaši podaci o mapi</string>
+    <string name="editor_operator">Operator</string>
+    <string name="operator">Operator: %s</string>
+    <string name="editor_category_unsuitable_title">Ne možete da pronađete odgovarajuću kategoriju?</string>
+    <string name="editor_category_unsuitable_text">CoMaps omogućava dodavanje jednostavnih kategorija za tačke na mapi, što isključuje gradove, puteve, jezera, tlocrte zgrada, itd. Molimo Vas da takve kategorije dodate direktno na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pročitajte naše <a href="https://www.comaps.app/support/advanced-map-editing/">uputstvo</a> za detaljne instrukcije, korak-po-korak.</string>
+    <string name="downloader_no_downloaded_maps_title">Niste preuzeli ni jednu mapu</string>
+    <string name="downloader_no_downloaded_maps_message">Preuzmite mape da biste pretraživali i koristili navigaciju bez interneta</string>
+    <string name="current_location_unknown_error_title">Trenutna lokacija nije poznata</string>
+    <string name="kilometers_per_hour">km/č</string>
+    <string name="miles_per_hour">mi/č</string>
+    <string name="hour">č</string>
+    <string name="minute">min</string>
+    <string name="day">d</string>
+    <string name="placepage_more_button">Više</string>
+    <string name="placepage_edit_bookmark_button">Izmeni snimljeno mesto</string>
+    <string name="placepage_personal_notes_hint">Lične beleške (tekst ili html)</string>
+    <string name="editor_reset_edits_message">Brisanje svih izmena koje nisu poslate?</string>
+    <string name="editor_reset_edits_button">Odbaci promene</string>
+    <string name="editor_remove_place_message">Brisanje dodatog mesta?</string>
+    <string name="editor_remove_place_button">Obriši</string>
+    <string name="editor_place_doesnt_exist">Mesto ne postoji</string>
+    <string name="editor_place_doesnt_exist_description">Opišite kako mesto sada izgleda ta biste poslali poruku o grešci OpenStreetMap zajednici</string>
+    <string name="delete_place_empty_comment_error">Molim Vas navedite razlog zbog čega brište ovo mesto</string>
+    <string name="editor_business_vacant_button">Poslovni prostor je prazan</string>
+    <string name="editor_mark_business_vacant_title">Označi poslovni prostor kao prazan</string>
+    <string name="editor_mark_business_vacant_description">Koristite da biste naznačili da se firma iselila i da je poslovni prostor prazan i spreman da primi novog zakupca.</string>
+    <string name="editor_submit">Pošalji</string>
+    <string name="error_enter_correct_phone">Unesite ispravan broj telefona</string>
+    <string name="error_enter_correct_web">Unesite ispravnu veb adresu</string>
+    <string name="error_enter_correct_email">Unesite ispravan email</string>
+    <string name="editor_level">Sprat (0 je prizemlje)</string>
+    <string name="error_enter_correct_level">Unesite važeći sprat</string>
+    <string name="error_enter_correct_facebook_page">Unesite ispravnu Facebook veb adresu, nalog, ili ime stranice</string>
+    <string name="error_enter_correct_instagram_page">Unesite ispravno Instagram korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_twitter_page">Unesite ispravno Twitter korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_vk_page">Unesite ispravno VK korisničko ime ili veb adresu</string>
+    <string name="error_enter_correct_line_page">Unesite ispravan LINE ID ili veb adresu</string>
+    <string name="error_enter_correct_fediverse_page">Unesite važeće korisničko ime Mastodona ili veb adresu</string>
+    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili veb adresu</string>
+    <string name="placepage_add_place_button">Dodaj mesto na OpenStreetMap</string>
+    <string name="place_page_map_too_old_title">Mape su zastarele</string>
+    <string name="place_page_map_too_old_description">Mape su stare, preuzmite nove.</string>
+    <string name="place_page_app_too_old_description">Mape su veoma stare, preuzmite novu veziju CoMaps aplikacije.</string>
+    <string name="place_page_update_too_old_map">Ažuriranje regionalnih mapa</string>
+    <string name="place_page_too_old_to_edit">Uređivanje OpenStreetMap-a je onemogućeno jer su podaci mape suviše stari.</string>
+    <string name="osm_note_hint">Ili ostavite napomenu OpenStreetMap zajednici da bi neko drugi mogao da doda ili papravi ovo mesto.</string>
+    <string name="osm_note_toast">Napomena će biti poslata na OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">Da li želite da podelite sa svim drugim korisnicima?</string>
+    <string name="editor_share_to_all_dialog_message_1">Proverite da niste uneli privatne ili lične podatke.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap maperi će proveriti promene i kontaktirati Vas ukoliko budu imali pitanja.</string>
+    <string name="navigation_stop_button">Stop</string>
+    <string name="track_recording">Snimanje putanje</string>
+    <string name="accept">Prihvati</string>
+    <string name="decline">Odbij</string>
+    <string name="mobile_data_dialog">Koristi mobilni internet radi prikaza detljnih informacija?</string>
+    <string name="mobile_data_option_always">Uvek koristi</string>
+    <string name="mobile_data_option_today">Samo danas</string>
+    <string name="mobile_data_option_not_today">Nemoj danas</string>
+    <string name="mobile_data">Mobilni internet</string>
+    <string name="mobile_data_description">Mobilni internet je potreban za obaveštenja o ažuriranju mape i za slanje izmena</string>
+    <string name="mobile_data_option_never">Nikad ne koristi</string>
+    <string name="mobile_data_option_ask">Uvek me pitaj</string>
+    <string name="traffic_update_maps_text">Da bi se prikazali podaci o saobraćaju, mapa mora da se ažurira</string>
+    <string name="big_font">Uvećana slova na mapi</string>
+    <string name="traffic_update_app">Molim Vas da ažurirate CoMaps</string>
+    <string name="traffic_data_unavailable">Podaci o saobraćaju nisu dostupni</string>
+    <string name="enable_logging">Snimanje log fajlova</string>
+    <string name="feedback_general">Vaše mišljenje</string>
+    <string name="prefs_languages_information">Koristimo sistemski servis tekst-u-govor za glasovne instrukcije. Mnogi Android uređaji koriste Google Prepoznavanje i sintezu govora, koji možete da preuzmete ili ažurirate putem Google Play prodavnice (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Za pojedine jezike, moraćete da instalirate sintetizator govora ili jezički paket putem prodavnice aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite Podešavanja vašeg uređaja → Jezik i unos → Govor → Izlaz Teksta u govor. \nOvde možete da upravljate podešavanjima za sintezu govora (na primer, da preuzmete jezički paket za upotrebu bez interneta) i da izaberete neku drugu mašinu za Tekst-u-govor.</string>
+    <string name="prefs_languages_information_off_link">Za više informacija pogledajte ovo uputstvo</string>
+    <string name="prefs_speed_cameras_information">Upozorenja o prekršajnim kamerama za brzinu su onemogućena u zemljama u kojima su upozorenja zabranjena zakonom.</string>
+    <string name="transliteration_title">Transliteracija u latinicu</string>
+    <string name="learn_more">Saznaj više</string>
+    <string name="routing_add_start_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali početnu tačku rute</string>
+    <string name="routing_add_finish_point">Koristite pretragu ili kratko dodirnite mapu da biste dodali odredišnu tačku</string>
+    <string name="planning_route_manage_route">Izmeni rutu</string>
+    <string name="button_plan">Plan</string>
+    <string name="placepage_remove_stop">Ukloni međuodredište</string>
+    <string name="placepage_add_stop">Međuodredište</string>
+    <string name="saved">Sačuvano</string>
+    <string name="dialog_error_storage_title">Problem sa pristupom memoriji</string>
+    <string name="dialog_error_storage_message">Eksterna memorija nije dostupna. SD kartica je možda uklonjena, oštećena, ili je fajl sistem samo za čitanje. Molim Vas, proverite Vašu SD karticu ili nas kontaktirajte na support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Simuliraj neispravnu memoriju</string>
+    <string name="error_enter_correct_name">Molim Vas da unesete ispravan naziv</string>
+    <string name="bookmark_lists">Liste favorita</string>
+    <string name="bookmark_lists_hide_all">Sakrij sve</string>
+    <string name="bookmark_lists_show_all">Prikaži sve</string>
+    <plurals name="bookmarks_places">
+        <item quantity="one">%d favorit</item>
+        <item quantity="few">%d favorita</item>
+        <item quantity="other">%d favorita</item>
+    </plurals>
+    <string name="bookmarks_create_new_group">Kreiraj novu listu</string>
+    <string name="bookmarks_import">Uvezi favorite</string>
+    <string name="bookmarks_error_message_share_general">Deljenje nije moguće zbog greške u aplikaciji</string>
+    <string name="bookmarks_error_title_share_empty">Greška prilikom deljenja</string>
+    <string name="bookmarks_error_message_share_empty">Ne može se podeliti prazna lista</string>
+    <string name="bookmarks_error_title_empty_list_name">Naziv ne sme biti prazan</string>
+    <string name="bookmarks_error_message_empty_list_name">Molim Vas unesite ime liste</string>
+    <string name="bookmarks_new_list_hint">Nova lista</string>
+    <string name="bookmarks_error_title_list_name_already_taken">Ovaj naziv već postoji</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Molim Vas izaberite drugi naziv</string>
+    <string name="please_wait">Molim Vas sačekajte…</string>
+    <string name="phone_number">Broj telefona</string>
+    <string name="profile">OpenStreetMap profil</string>
+    <plurals name="bookmarks_detect_message">
+        <item quantity="one">%d fajl je pronađen. Možete da ga pogledate nakon konverzije.</item>
+        <item quantity="few">%d fajla je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+        <item quantity="other">%d fajlova je pronađeno. Možete da ih pogledate nakon konverzije.</item>
+    </plurals>
+    <string name="restore">Rekonstruiši</string>
+    <plurals name="tracks">
+        <item quantity="one">%d putanja</item>
+        <item quantity="few">%d putanje</item>
+        <item quantity="other">%d putanja</item>
+    </plurals>
+    <string name="privacy">Privatnost</string>
+    <string name="privacy_policy">Politika privatnosti</string>
+    <string name="power_management">Upravljanje napajanjem</string>
+    <string name="terms_of_use">Uslovi korišćenja</string>
+    <string name="button_layer_traffic">Saobraćaj</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Stilovi mape i slojevi</string>
+    <string name="bookmarks_empty_list_title">Ova lista je prazna</string>
+    <string name="bookmarks_empty_list_message">Da biste dodali mesto, kratko dodirnite mesto na mapi, a onda dodirnite ikonicu sa zvezdom</string>
+    <string name="category_desc_more">…više</string>
+    <string name="export_file">Eksportuj KMZ</string>
+    <string name="export_file_gpx">Eksportuj GPX</string>
+    <string name="delete_list">Obriši listu</string>
+    <string name="speedcams_alert_title">Prekršajne kamere</string>
+    <string name="place_description_title">Opis mesta</string>
+    <string name="notification_channel_downloader">Preuzimanje mapa</string>
+    <string name="pref_tts_speedcams_auto">Upozoriti kod prekoračenja brzine</string>
+    <string name="pref_tts_speedcams_always">Uvek me upozori</string>
+    <string name="pref_tts_speedcams_never">Nemoj da me upozoravaš</string>
+    <string name="power_managment_title">Režim čuvanja baterije</string>
+    <string name="power_managment_description">Smanjuje potrošnju električne energije isključivanjem određenih funkcionalnosti</string>
+    <string name="power_managment_setting_never">Nikad</string>
+    <string name="power_managment_setting_auto">Kada je baterija pri kraju</string>
+    <string name="power_managment_setting_manual_max">Uvek</string>
+    <string name="enable_logging_warning_message">Privremeno uključite ovu opciju da biste sačuvali detaljne dijagnostičke logove ukoliko imate neki problem. Logove možete da nam pošaljete korišćenjem opcije \"Prijavite problem\" u prozoru Pomoć. Napomena: Logovi mogu da sadrže informacije o vašoj lokaciji.</string>
+    <string name="driving_options_title">Opcije rutiranja</string>
+    <string name="avoid_tolls">Izbegavaj putarine</string>
+    <string name="avoid_unpaved">Izbegavaj neasfaltirane puteve</string>
+    <string name="avoid_ferry">Izbegavaj trajekte</string>
+    <string name="avoid_motorways">Izbegavaj autoputeve</string>
+    <string name="avoid_steps">Izbegavaj stepenice</string>
+    <string name="avoid_paved">Izbegavaj asfaltirane puteve</string>
+    <string name="unable_to_calc_alert_title">Nije moguće izračunati rutu</string>
+    <string name="unable_to_calc_alert_subtitle">Ruta nije pronađena. Uzrok mogu biti opcije rutiranja ili nepotpuni OpenStreetMap podaci. Molim Vas da promenite vaše opcije rutiranja i pokušate ponovo.</string>
+    <string name="define_to_avoid_btn">Izaberi puteve za izbegavanje</string>
+    <string name="change_driving_options_btn">Opcije rutiranja su uključene</string>
+    <string name="toll_road">Putevi sa putarinama</string>
+    <string name="unpaved_road">Neasfaltirani putevi</string>
+    <string name="ferry_crossing">Linije trajekta</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne</string>
+    <string name="yes_available">Da</string>
+    <string name="no_available">Ne</string>
+    <string name="capacity">Broj mesta: %s</string>
+    <string name="network">Mreža: %s</string>
+    <string name="trip_finished">Stigli ste!</string>
+    <string name="ok">OK</string>
+    <string name="sort">Sortiranje…</string>
+    <string name="sort_bookmarks">Sortiranje favorita</string>
+    <string name="by_default">Podrazumevano</string>
+    <string name="by_type">Po tipu</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="by_date">Po datumu</string>
+    <string name="by_name">Po nazivu</string>
+    <string name="week_ago_sorttype">Pre nedelju dana</string>
+    <string name="month_ago_sorttype">Pre mesec dana</string>
+    <string name="moremonth_ago_sorttype">Pre više od mesec dana</string>
+    <string name="moreyear_ago_sorttype">Pre više od godinu dana</string>
+    <string name="near_me_sorttype">Blizu mene</string>
+    <string name="others_sorttype">Ostali</string>
+    <string name="food_places">Hrana</string>
+    <string name="tourist_places">Atrakcije</string>
+    <string name="museums">Muzeji</string>
+    <string name="parks">Parkovi</string>
+    <string name="swim_places">Plivanje</string>
+    <string name="mountains">Planine</string>
+    <string name="animals">Životinje</string>
+    <string name="hotels">Hoteli</string>
+    <string name="buildings">Zgrade</string>
+    <string name="money">Novac</string>
+    <string name="shops">Prodavnice</string>
+    <string name="parkings">Parking</string>
+    <string name="fuel_places">Benzinske stanice</string>
+    <string name="medicine">Medicina</string>
+    <string name="search_in_the_list">Pretraži listu</string>
+    <string name="religious_places">Verska mesta</string>
+    <string name="select_list">Izaberite listu</string>
+    <string name="transit_not_found">Navigacija u metrou u ovom regionu još nije dostupna</string>
+    <string name="dialog_pedestrian_route_is_long_header">Nije pronađena metro ruta</string>
+    <string name="dialog_pedestrian_route_is_long_message">Molim vas izaberite početnu i krajnju tačku bliže metro stanicama</string>
+    <string name="button_layer_isolines">Izolinije</string>
+    <string name="isolines_activation_error_dialog">Prikazivanje izolinija zahteva preuzmanje podataka sa mape za ovu oblast</string>
+    <string name="isolines_location_error_dialog">Izolinije nisu dostupne za ovu oblast</string>
+    <string name="elevation_profile_ascent">Uspon</string>
+    <string name="elevation_profile_descent">Spust</string>
+    <string name="elevation_profile_min_elevation">Minimalna visina</string>
+    <string name="elevation_profile_max_elevation">Maksimalna visina</string>
+    <string name="elevation_profile_difficulty">Težina</string>
+    <string name="elevation_profile_distance">Udalj.:</string>
+    <string name="elevation_profile_time">Vreme:</string>
+    <string name="isolines_toast_zooms_1_10">Uvećajte da biste videli izolinije</string>
+    <string name="downloader_loading_ios">Preuzimanje</string>
+    <string name="download_map_title">Preuzmi mapu sveta</string>
+    <string name="disk_error">Ne mogu da napravim folder i premenstim fajlove na internu memoriju uređaja ili na SD karticu</string>
+    <string name="disk_error_title">Greška sa memorijom</string>
+    <string name="connection_failure">Povezivanje nije uspelo</string>
+    <string name="disconnect_usb_cable_title">Otkačite USB kabl</string>
+    <string name="enable_keep_screen_on">Ekran uvek uključen</string>
+    <string name="enable_keep_screen_on_description">Kada je odabrano, ekran će uvek biti uključen dok se prikazuje mapa.</string>
+    <string name="enable_show_on_lock_screen">Prikaz mape na zaključanom ekranu</string>
+    <string name="enable_show_on_lock_screen_description">Kada je odabrano, aplikacija će raditi i na zaključanom ekranu, tj. kada je uređaj zaključan.</string>
+    <string name="change_map_locale">Jezik mape</string>
+    <string name="splash_subtitle">Podaci za mape su sa OpenStreetMap-a</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
+    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Hvala što koristite mape koje je napravila zajednica!</string>
+    <string name="app_tip_01">Sa vašim donacijama i podrškom, možemo da napravimo najbolje mape na svetu!</string>
+    <string name="app_tip_02">Da li vam se dopada naša aplikacija? Molim Vas da donirate da biste podržali dalji razvoj! Još vam se ne dopada? Molimo Vas da nam javite zašto, pa ćemo da je popravimo!</string>
+    <string name="app_tip_03">Ako znate nekog programera, možete da ga zamolite da implementira funkcionalnost koja vam je potrebna.</string>
+    <string name="app_tip_04">Dodirnite bilo gde na mapi da biste izabrali bilo šta. Dug dodir se koristi da se sakrije i prikaže interfejs.</string>
+    <string name="app_tip_05">Da li ste znali da možete da izaberete vašu trenutnu lokaciju na mapi?</string>
+    <string name="app_tip_06">Možete da pomognete da se aplikacija prevede na vaš jezik.</string>
+    <string name="app_tip_07">Naša aplikacija je razvijena od strane nekoliko entuzijasta i zajednice.</string>
+    <string name="app_tip_08">Lako možete da popravite ili unapredite podatke na mapi.</string>
+    <string name="app_tip_09">Naš glavni cilj je da napravimo brzu aplikaciju za mape, jednostavnu za korišćenje, orijentisanu na privatnost, koju ćete voleti.</string>
+    <string name="car_used_on_the_phone_screen">Vi sada koristite CoMaps na ekranu telefona</string>
+    <string name="car_used_on_the_car_screen">Vi sada koristite CoMaps na ekranu automobila</string>
+    <string name="aa_connected_title">Povezani ste na Android Auto</string>
+    <string name="car_continue_on_the_phone">Nastavi na telefonu</string>
+    <string name="car_continue_in_the_car">Prebaci na ekran automobila</string>
+    <string name="aa_location_permissions_request">CoMaps je potreban lokacijski pristup. Kada je sigurno, proverite obaveštenje na svom telefonu.</string>
+    <string name="aa_request_permission_notification">Ova aplikacija je potrebna vaša dozvola</string>
+    <string name="aa_request_permission_activity_text">CoMaps u Android Auto-u je potrebna dozvola za lokaciju da efikasno rade</string>
+    <string name="aa_grant_permissions">Odobri dozvole</string>
+    <string name="button_layer_outdoor">Na otvorenom</string>
+    <string name="browser_not_available">Veb čitač nije dostupan</string>
+    <string name="volume">Jačina zvuka</string>
+    <string name="bookmarks_export">Eksportuj sve mesta i putanje</string>
+    <string name="pref_tts_open_system_settings">Sistemska podešavanja sinteze govora</string>
+    <string name="pref_tts_no_system_tts">Sinteza govora nije pronađena, da li ste sigurni da je vaš uređaj podržava?</string>
+    <string name="drive_through">Prolaz za vozila</string>
+    <string name="clear_the_search">Obriši pretragu</string>
+    <string name="zoom_in">Uvećaj</string>
+    <string name="zoom_out">Umanji</string>
+    <string name="website_menu">Link menija</string>
+    <string name="view_menu">Prikaži meni</string>
+    <string name="open_in_app">Otvori u drugoj aplikaciji</string>
+    <string name="self_service">Samoposluživanje</string>
+    <string name="select_option">Izaberite opciju</string>
+    <string name="outdoor_seating">Bašta</string>
+    <string name="power_save_dialog_summary">Za precizniju navigaciju preporučujemo da se isključi režim čuvanja baterije u Podešavanjima vezanim za beteriju telefona.</string>
+    <string name="start_track_recording">Snimi putanju</string>
+    <string name="stop_track_recording">Zaustavi snimanje putanje</string>
+    <string name="stop_without_saving">Zaustavi bez snimanja</string>
+    <string name="continue_recording">Nastavi snimanje</string>
+    <string name="track_recording_alert_title">Sačuvati u favoritima?</string>
+    <string name="track_recording_toast_nothing_to_save">Putanja je prazna, nema šta da se sačuva</string>
+    <string name="error_no_file_manager_app">Dijalog za izbor foldera nije moguće prikazati pošto na uređaju nije instalirana odgovarajuća aplikacija. Molim Vas da instalirate aplikaciju za upravljanje fajlovima i pokušate ponovo.</string>
+    <string name="choose_color">Izaberite boju</string>
+    <string name="edit_track">Izmenite putanju</string>
+    <string name="uri_open_location_failed">Nema instaliranih aplikacija koje mogu da otvore lokaciju.</string>
+    <string name="nav_auto">Automatski u navigaciji</string>
+    <string name="pref_left_button_title">Podešavanje levog dugmeta</string>
+    <string name="pref_left_button_disable">Isključi</string>
+    <string name="pref_backup_title">Čuvanje favorita</string>
+    <string name="pref_backup_summary">Automatski napraviti rezervnu kopiju u folderu na uređaju</string>
+    <string name="pref_backup_now_title">Napravite rezervnu kopiju sada</string>
+    <string name="pref_backup_now_summary">Napravite rezervnu kopiju</string>
+    <string name="pref_backup_now_summary_progress">Pravim rezervnu kopiju…</string>
+    <string name="pref_backup_now_summary_ok">Rezervna kopija je uspešno završena</string>
+    <string name="pref_backup_now_summary_empty_lists">Nema mesta i putanja za izradu rezervne kopije</string>
+    <string name="pref_backup_now_summary_failed">Rezervna kopija nije uspela</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Folder za rezervnu kopiju nije dostupan</string>
+    <string name="pref_backup_status_summary_success">Poslednja uspešna rezervna kopija</string>
+    <string name="pref_backup_location_title">Lokacija rezervnih kopija</string>
+    <string name="pref_backup_location_summary_initial">Molim vas, prvo izaberite folder i dajte dozvolu</string>
+    <string name="pref_backup_history_title">Broj sačuvanih rezervnih kopija</string>
+    <string name="pref_backup_interval_title">Automatska rezervna kopija</string>
+    <string name="backup_interval_every_day">Svaki dan</string>
+    <string name="backup_interval_every_week">Sedmično</string>
+    <string name="backup_interval_manual_only">Isključeno (samo ručno)</string>
+    <string name="dialog_report_error_missing_folder">Izabrana lokacija rezervne kopije nije dostupna za snimanje. Molimo vas, odaberite drugo mesto.</string>
+    <string name="dialog_report_error_with_logs">Molimo vas, pošaljite nam poruku o grešci:\n- \"Omogući vođenje dnevnika\" u podešavanjima\n- reprodukujte problem\n- na ekranu \"O programu i pomoć\" kliknite na dugme \"Prijavi grešku\" i pošaljite na e-mail ili čat\n- onemogući vođenje dnevnika</string>
+    <string name="clear">Čisto</string>
+    <string name="route_type">Tip rute</string>
+    <string name="vehicle">Vozilo</string>
+    <string name="pedestrian">Pešak</string>
+    <string name="bicycle">Bicikla</string>
+    <string name="ruler">Lenjir</string>
+    <string name="bookmark_color">Boja favorita</string>
+    <string name="about_help">O programu i pomoć</string>
+    <string name="open_now">Sada je otvoreno</string>
+    <string name="closed_now">Zatvoreno sada</string>
+    <string name="at">na %s</string>
+    <string name="share_track">Podeli putanju</string>
+    <string name="delete_track_dialog_title">Obrisati %s?</string>
+    <string name="pref_tts_no_system_tts_short">Nije pronađen program za pretvaranje teksta u govor, proverite podešavanja aplikacije</string>
+    <string name="navigation_start_tts_message">"Pokretanje navigacije, jezik glasovnih instrukcija: "</string>
+    <string name="navigation_start_tts_disabled_message">Glasovne instrukcije onemogućene: TTS motor nije dostupan</string>
+    <string name="unknown_power_output">nepoznato</string>
+    <string name="charge_socket_type2">Tip 2 (bez kabla)</string>
+    <string name="charge_socket_type2_cable">Tip 2 (sa kablom)</string>
+    <string name="charge_socket_type2_combo">Tip 2 kombo</string>
+    <string name="charge_socket_type1">Tip 1</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Šuho</string>
+    <string name="unknown_socket_type">nepoznata utičnica</string>
+    <string name="edit_socket_info_tooltip">Kreirajte novu utičnicu ili promenite postojeće.</string>
+    <string name="charging_station_available_sockets">Raspoložive utičnice</string>
+    <string name="charge_socket_unknown_other">Druga ili nepoznata</string>
+    <string name="charge_socket_count">Broj</string>
+    <string name="charge_socket_power">Snaga (kW)</string>
+    <string name="editor_socket">Izmeni utičnicu</string>
+    <string name="unknown_count">nepoznato</string>
+    <string name="error_value_must_be_positive">Vrednost mora biti veća od nule</string>
+    <string name="error_invalid_number">Neispravan broj</string>
+    <string name="offline_explanation_title">Oflajn mape</string>
+    <string name="offline_explanation_text">Potrebno je preuzimanje mape da bi oblast mogla da se pregleda i da bi radilo navođenje.\nPreuzmite mape za oblasti gde želite da putujete.</string>
+    <string name="list_description_empty">Promenite listu da biste dodali opis</string>
+    <string name="advanced">Napredno</string>
+    <string name="download_resources_custom_url_title">Sopstveni server mapa</string>
+    <string name="download_resources_custom_url_message">Zameni podrazumevani server za preuzimanje mapa koji se koristi za preuzimanja mapa. Ostavite prazno da biste koristili CoMaps server.</string>
+    <string name="download_resources_custom_url_summary_none">Nije postavljeno</string>
+    <string name="download_resources_custom_url_error_scheme">Unesite punu URL adresu koja počinje sa https:// i koja se završava sa /</string>
+    <string name="pref_maplanguage_local">Lokalni jezik</string>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Přidat novou skupinu záložek</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Název záložky</string>
+    <string name="bookmark_set_name">Název seznamu</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Záložky</string>
+    <string name="bookmarks">Místa</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Záložky a stopy</string>
+    <string name="bookmarks_and_tracks">Oblíbené</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Název</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -144,13 +144,13 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Poznámky</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Sdílené záložky CoMaps</string>
+    <string name="share_bookmarks_email_subject">Má oblíbená místa z CoMaps</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Nahrávání záložek</string>
+    <string name="load_kmz_title">Načítání oblíbených</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Záložky byly úspěšně nahrány! Naleznete je na mapě nebo ve správci záložek.</string>
+    <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>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Nahrávání záložek se nezdařilo. Soubor může být poškozený nebo vadný.</string>
+    <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. -->
     <string name="unknown_file_type">Typ souboru není aplikací rozpoznán: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -490,7 +490,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Více</string>
-    <string name="placepage_edit_bookmark_button">Upravit záložku</string>
+    <string name="placepage_edit_bookmark_button">Upravit uložené místo</string>
     <string name="placepage_personal_notes_hint">Vlastní poznámka (text nebo HTML)</string>
     <string name="editor_reset_edits_message">Vymazat všechny místní změny?</string>
     <string name="editor_reset_edits_button">Zahodit změny</string>
@@ -547,18 +547,19 @@
     <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
     <string name="error_enter_correct_name">Zadejte prosím správný název</string>
-    <string name="bookmark_lists">Seznamy</string>
+    <string name="bookmark_lists">Seznamy oblíbených</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Skrýt vše</string>
     <string name="bookmark_lists_show_all">Zobrazit vše</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d záložka</item>
+        <item quantity="one">%d uložené místo</item>
-        <item quantity="few">%d záložky</item>
+        <item quantity="few">%d uložená místa</item>
-        <item quantity="other">%d záložek</item>
+        <item quantity="many">%d uložených míst</item>
+        <item quantity="other">%d uložených míst</item>
     </plurals>
     <string name="bookmarks_create_new_group">Vytvořit nový seznam</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Import záložek a stop</string>
+    <string name="bookmarks_import">Importovat oblíbené</string>
     <string name="bookmarks_error_message_share_general">Nelze sdílet kvůli chybě aplikace</string>
     <string name="bookmarks_error_title_share_empty">Chyba sdílení</string>
     <string name="bookmarks_error_message_share_empty">Nelze sdílet s prázdným seznamem</string>
@@ -589,7 +590,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Styly a vrstvy mapy</string>
     <string name="bookmarks_empty_list_title">Seznam je prázdný</string>
-    <string name="bookmarks_empty_list_message">Pro přidání nové značky klikněte na symbol hvězdičky na obrázku objektu</string>
+    <string name="bookmarks_empty_list_message">Pro uložení místa klepněte na místo na mapě a následně na ikonu hvězdy</string>
     <string name="category_desc_more">…ještě</string>
     <string name="export_file">Exportovat KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
@@ -642,7 +643,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Třídit…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Třídit záložky</string>
+    <string name="sort_bookmarks">Třídit oblíbené</string>
     <!-- Android -->
     <string name="by_default">Podle výchozího stavu</string>
     <!-- Android -->
@@ -752,7 +753,7 @@
     <string name="browser_not_available">Webový prohlížeč není k dispozici</string>
     <string name="volume">Hlasitost</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Export všech záložek a stop</string>
+    <string name="bookmarks_export">Exportovat všechna místa a stopy</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Systémové nastavení syntézy řeči</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -784,7 +785,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Pokračovat v nahrávání</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Uložit do záložek a stop?</string>
+    <string name="track_recording_alert_title">Uložit do oblíbených?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Trasa je prázdná - není co ukládat</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -803,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é záložky; 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/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>
@@ -833,16 +834,16 @@
     <string name="pedestrian">Pěší zóna</string>
     <string name="bicycle">Jízdní kolo</string>
     <string name="ruler">Pravítko</string>
-    <string name="bookmark_color">Barva záložky</string>
+    <string name="bookmark_color">Barva oblíbeného místa</string>
     <string name="clear">Vymazat</string>
     <string name="panoramax">Obrázek Panoramax</string>
     <string name="about_help">O aplikaci a nápověda</string>
     <string name="pref_backup_summary">Automaticky zálohovat do složky na vašem zařízení</string>
-    <string name="pref_backup_title">Záloha záložek a stop</string>
+    <string name="pref_backup_title">Zálohovat oblíbené</string>
     <string name="pref_backup_now_title">Zálohovat nyní</string>
     <string name="pref_backup_now_summary">Nyní vytvořit zálohu</string>
     <string name="pref_backup_now_summary_ok">Záloha úspěšně dokončena</string>
-    <string name="pref_backup_now_summary_empty_lists">Nemáte žádné záložky ani stopy k zálohování</string>
+    <string name="pref_backup_now_summary_empty_lists">Nemáte žádná místa ani stopy k zálohování</string>
     <string name="pref_backup_now_summary_progress">Zálohování…</string>
     <string name="pref_backup_now_summary_failed">Zálohování selhalo</string>
     <string name="pref_backup_now_summary_folder_unavailable">Složka pro zálohování není dostupná</string>
@@ -918,4 +919,5 @@
     <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na http:// nebo https://</string>
     <string name="advanced">Pokročilé</string>
     <string name="download_resources_custom_url_summary_none">Není nastaveno</string>
+    <string name="pref_maplanguage_local">Místní jazyk</string>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Neue Liste erstellen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Name der Lesezeichenliste</string>
+    <string name="bookmark_set_name">Name der Liste</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Lesezeichen</string>
+    <string name="bookmarks">Orte</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Lesezeichen und Tracks</string>
+    <string name="bookmarks_and_tracks">Favoriten</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Name</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,10 +148,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notizen</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps-Lesezeichen wurden mit dir geteilt</string>
+    <string name="share_bookmarks_email_subject">Meine CoMaps-Favoriten</string>
     <string name="share_bookmarks_email_body">Hallo! \n \nIm Anhang sind meine Lesezeichen aus der CoMaps-App. Du kannst sie in CoMaps öffnen. Wenn du die App nicht installiert hast, kannst du sie unter https://www.comaps.app/de/download/ herunterladen. \n \nViel Spaß beim Navigieren mit CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Lesezeichen werden geladen</string>
+    <string name="load_kmz_title">Favoriten laden</string>
     <!-- Kmz file successful loading -->
     <string name="load_kmz_successful">Lesezeichen erfolgreich geladen! Du kannst dieses nun auf deiner Karte oder im Lesezeichen-Manager anzeigen lassen.</string>
     <!-- Kml file loading failed -->
@@ -499,7 +499,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Mehr</string>
-    <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
+    <string name="placepage_edit_bookmark_button">Gespeicherten Ort bearbeiten</string>
     <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
     <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
     <string name="editor_reset_edits_button">Änderungen verwerfen</string>
@@ -564,17 +564,17 @@
     <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Bitte überprüfe das oder kontaktiere uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
     <string name="error_enter_correct_name">Bitte gebe deinen korrekten Namen ein</string>
-    <string name="bookmark_lists">Listen</string>
+    <string name="bookmark_lists">Favoritenlisten</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Alle ausblenden</string>
     <string name="bookmark_lists_show_all">Alle anzeigen</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d Lesezeichen</item>
+        <item quantity="one">%d gespeicherter Ort</item>
-        <item quantity="other">%d Lesezeichen</item>
+        <item quantity="other">%d gespeicherte Orte</item>
     </plurals>
     <string name="bookmarks_create_new_group">Neue Liste erstellen</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Lesezeichen und Tracks importieren</string>
+    <string name="bookmarks_import">Favoriten importieren</string>
     <string name="bookmarks_error_message_share_general">Teilen wegen eines Anwendungsfehlers nicht möglich</string>
     <string name="bookmarks_error_title_share_empty">Fehler beim Teilen</string>
     <string name="bookmarks_error_message_share_empty">Eine leere Liste kann nicht geteilt werden</string>
@@ -603,7 +603,7 @@
     <string name="subway">U-Bahn</string>
     <string name="layers_title">Kartenstile und Ebenen</string>
     <string name="bookmarks_empty_list_title">Die Liste ist leer</string>
-    <string name="bookmarks_empty_list_message">Zum Hinzufügen eines Lesezeichens tippe in der Karte auf den Ort und dann unten auf das Stern-Symbol</string>
+    <string name="bookmarks_empty_list_message">Um einen Ort zu speichern, tipp einfach auf einen Ort auf der Karte und dann auf das Sternsymbol</string>
     <string name="category_desc_more">…mehr</string>
     <string name="export_file">KMZ exportieren</string>
     <string name="export_file_gpx">GPX exportieren</string>
@@ -656,7 +656,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sortieren…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Lesezeichen sortieren</string>
+    <string name="sort_bookmarks">Favoriten sortieren</string>
     <!-- Android -->
     <string name="by_default">Nach Voreinstellung</string>
     <!-- Android -->
@@ -774,7 +774,7 @@
     <string name="browser_not_available">Webbrowser ist nicht verfügbar</string>
     <string name="volume">Lautstärke</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Alle Lesezeichen und Tracks exportieren</string>
+    <string name="bookmarks_export">Alle Orte und Tracks exportieren</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Einstellungen des Sprachsynthesesystems</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -806,7 +806,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Aufnahme fortsetzen</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">In Lesezeichen und Tracks speichern?</string>
+    <string name="track_recording_alert_title">Zu Favoriten hinzufügen?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Route ist leer - nichts zu speichern</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -838,13 +838,13 @@
     <string name="ruler">Lineal</string>
     <string name="route_type">Routentyp</string>
     <string name="pedestrian">Fußgänger</string>
-    <string name="bookmark_color">Lesezeichenfarbe</string>
+    <string name="bookmark_color">Farbe für Favoriten</string>
     <string name="about_help">Über &amp; Hilfe</string>
     <string name="panoramax">Panoramax-Bild</string>
     <string name="pref_backup_summary">Backup automatisch in einem Ordner auf deinem Gerät erstellen</string>
     <string name="pref_backup_now_summary">Backup sofort erstellen</string>
     <string name="pref_backup_now_summary_ok">Backup erfolgreich abgeschlossen</string>
-    <string name="pref_backup_now_summary_empty_lists">Keine Lesezeichen und Tracks für Backup vorhanden</string>
+    <string name="pref_backup_now_summary_empty_lists">Keine Orte und Tracks zum Sichern</string>
     <string name="pref_backup_now_summary_failed">Backup fehlgeschlagen</string>
     <string name="pref_backup_now_summary_folder_unavailable">Der Backup-Ordner ist nicht verfügbar</string>
     <string name="pref_backup_location_summary_initial">Bitte wähle zuerst einen Ordner und erteile die Berechtigung</string>
@@ -852,7 +852,7 @@
     <string name="pref_backup_interval_title">Automatisches Backup</string>
     <string name="backup_interval_every_day">Täglich</string>
     <string name="backup_interval_manual_only">Aus (nur manuell)</string>
-    <string name="pref_backup_title">Backup von Lesezeichen und Tracks</string>
+    <string name="pref_backup_title">Favoriten sichern</string>
     <string name="pref_backup_status_summary_success">Letztes erfolgreiches Backup</string>
     <string name="dialog_report_error_with_logs">Bitte sende uns einen Fehlerbericht:\n - in den Einstellungen \"Protokollierung aktivieren\"\n - das Problem reproduzieren\n - im Bildschirm \"Über &amp; Hilfe\" drücke den \"App-Fehler melden\"-Knopf und sende via E-Mail oder Chat\n - die Protokollierung deaktivieren</string>
     <string name="dialog_report_error_missing_folder">Der ausgewählte Backup-Ort ist nicht verfügbar oder beschreibbar. Bitte wähle einen anderen Ort.</string>
@@ -920,4 +920,5 @@
     <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
     <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
     <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// oder http:// anfängt</string>
+    <string name="pref_maplanguage_local">Lokale Sprache</string>
 </resources>

android/app/src/main/res/values-es/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">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Marcadores y trazas</string>
+    <string name="bookmarks_and_tracks">Favoritos</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nombre</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,7 +94,7 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">Error al mover los archivos de mapas</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Esto podría tardar varios minutos.\nAguarda…</string>
+    <string name="wait_several_minutes">Esto podría tardar varios minutos.\nPor favor, espera…</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">Unidades de medida</string>
     <!-- Detailed description of Measurement Units settings button -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadores de CoMaps compartidos con usted</string>
+    <string name="share_bookmarks_email_subject">Mis favoritos de CoMaps</string>
-    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores 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 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>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Cargando marcadores</string>
+    <string name="load_kmz_title">Cargando favoritos</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">¡Los marcadores se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Marcadores.</string>
+    <string name="load_kmz_successful">¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestor de Favoritos.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">No se pudieron cargar los marcadores. El archivo podría tener daños o defectos.</string>
+    <string name="load_kmz_failed">No se pudieron cargar los favoritos. El archivo podría tener daños o defectos.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">La aplicación no reconoce el tipo de archivo: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -169,7 +169,7 @@
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">La descarga del mapa está en curso</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">¡Mira mi ubicación actual en CoMaps! %1$s o %2$s ¿No tiene mapas offline? Descárgalos aquí: https://www.comaps.app/es/download/</string>
+    <string name="my_position_share_sms">¡Mira mi ubicación actual en CoMaps! %1$s o %2$s ¿No tienes mapas offline? Descárgalos aquí: https://www.comaps.app/es/download/</string>
     <!-- Subject for emailed bookmark -->
     <string name="bookmark_share_email_subject">¡Mira mi marcador en el mapa de CoMaps!</string>
     <!-- Subject for emailed position -->
@@ -355,12 +355,12 @@
     <string name="dialog_routing_intermediate_not_determined">Por favor, ajuste la parada intermedia</string>
     <string name="dialog_routing_system_error">Error del sistema</string>
     <string name="dialog_routing_application_error">No se pudo crear la ruta debido a un error en la aplicación</string>
-    <string name="dialog_routing_try_again">Intenta nuevamente</string>
+    <string name="dialog_routing_try_again">Inténtalo de nuevo</string>
     <string name="not_now">Ahora no</string>
     <string name="dialog_routing_download_and_build_cross_route">¿Deseas descargar el mapa y crear una ruta mejor que abarque más de un mapa?</string>
     <string name="dialog_routing_download_cross_route">Descarga mapas adicionales para crear una ruta mejor que cruce los límites de este mapa.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descarga el mapa. Después de eso, ya no necesitarás una conexión a Internet.</string>
+    <string name="search_without_internet_advertisement">Para empezar a buscar y crear rutas, descarga el mapa. Después de eso, ya no necesitarás conexión a Internet.</string>
     <string name="search_select_map">Seleccionar mapa</string>
     <!-- «Show» context menu -->
     <string name="show">Mostrar</string>
@@ -504,7 +504,7 @@
     <string name="placepage_more_button">Más</string>
     <string name="placepage_edit_bookmark_button">Editar marcador</string>
     <string name="placepage_personal_notes_hint">Notas personales (texto o html)</string>
-    <string name="editor_reset_edits_message">¿Restablecer todos los cambios locales?</string>
+    <string name="editor_reset_edits_message">¿Descartar todos los cambios locales?</string>
     <string name="editor_reset_edits_button">Descartar cambios</string>
     <string name="editor_remove_place_message">¿Eliminar el lugar añadido?</string>
     <string name="editor_remove_place_button">Eliminar</string>
@@ -524,7 +524,7 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">¿Quieres enviarlo a todos los usuarios?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Cerciórate de que no has introducido ningún dato privado o personal.</string>
+    <string name="editor_share_to_all_dialog_message_1">Asegúrate de que no has introducido ningún dato privado o personal</string>
     <string name="editor_share_to_all_dialog_message_2">Los editores de OpenStreetMap comprobarán los cambios y se pondrán en contacto contigo si tienen alguna pregunta.</string>
     <string name="navigation_stop_button">Detener</string>
     <!-- Shown as toast when starting the recent track recording -->
@@ -567,7 +567,7 @@
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
     <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
-    <string name="bookmark_lists">Listas</string>
+    <string name="bookmark_lists">Listas de favoritos</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
     <string name="bookmark_lists_show_all">Mostrar todo</string>
@@ -603,7 +603,7 @@
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Privacidad</string>
-    <string name="privacy_policy">Normativa de privacidad</string>
+    <string name="privacy_policy">Política de privacidad</string>
     <string name="terms_of_use">Condiciones de uso</string>
     <string name="button_layer_traffic">Tráfico</string>
     <string name="subway">Metro</string>
@@ -915,7 +915,7 @@
     <string name="editor_submit">Enviar</string>
     <string name="power_management">Gestión de energía</string>
     <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
-    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
+    <string name="place_page_map_too_old_description">Tu mapa está muy desactualizado, por favor actualízalo.</string>
     <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
     <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
     <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
@@ -924,7 +924,7 @@
     <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
     <string name="advanced">Avanzado</string>
     <string name="download_resources_custom_url_title">Servidor de mapas personalizado</string>
-    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
+    <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Déjalo en blanco para usar el servidor de CoMaps por defecto.</string>
     <string name="download_resources_custom_url_summary_none">No establecido</string>
     <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL empezando con http:// o https://</string>
 </resources>

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

@@ -62,11 +62,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Lisa uus loend</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Järjehoidjate loendi nimi</string>
+    <string name="bookmark_set_name">Loendi nimi</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Järjehoidjad</string>
+    <string name="bookmarks">Asukohad</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Järjehoidjad ja rajad</string>
+    <string name="bookmarks_and_tracks">Lemmikud</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nimi</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -142,14 +142,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Märkmed</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps järjehoidjaid jagati Sinuga</string>
+    <string name="share_bookmarks_email_subject">Minu lemmikud CoMapsis</string>
-    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest CoMaps. Palun ava need kui Sul on CoMaps paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https://www.comaps.app/download/ \n \nNaudi reisimist CoMapsiga!</string>
+    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest CoMaps. Palun ava need kui Sul CoMaps on nutiseadmesse paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https://www.comaps.app/download/ \n \nNaudi reisimist CoMapsiga!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Laadin järjehoidjaid</string>
+    <string name="load_kmz_title">Laadin lemmikuid</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Järjehoidjad edukalt laaditud! Leiad need kaardil või järjehoidjate halduri vaates.</string>
+    <string name="load_kmz_successful">Lemmikute laadimine õnnestus! Leiad need kaardilt või lemmikute halduri vaates.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Järjehoidjate laadimine ei õnnestunud. Fail võib olla vigane.</string>
+    <string name="load_kmz_failed">Lemmikute laadimine ei õnnestunud. Fail võib olla vigane.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Rakendus ei tunnista failitüüpi: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -494,7 +494,7 @@
     <string name="minute">min</string>
     <string name="day">p</string>
     <string name="placepage_more_button">Veel</string>
-    <string name="placepage_edit_bookmark_button">Muuda järjehoidjat</string>
+    <string name="placepage_edit_bookmark_button">Muuda salvestatud asukohta</string>
     <string name="placepage_personal_notes_hint">Isiklikud märkmed (tekst või html)</string>
     <string name="editor_reset_edits_message">Kas loobud kõigist kohalikest muudatustest?</string>
     <string name="editor_reset_edits_button">Loobu muudatustest</string>
@@ -559,17 +559,17 @@
     <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
     <string name="error_enter_correct_name">Palun sisesta korrektne nimi</string>
-    <string name="bookmark_lists">Loendid</string>
+    <string name="bookmark_lists">Lemmikute loendid</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Peida kõik</string>
     <string name="bookmark_lists_show_all">Näita kõiki</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d järjehoidja</item>
+        <item quantity="one">%d salvestatud asukoht</item>
-        <item quantity="other">%d järjehoidjat</item>
+        <item quantity="other">%d salvestatud asukohta</item>
     </plurals>
     <string name="bookmarks_create_new_group">Loo uus loend</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Impordi järjehoidjaid ja radasid</string>
+    <string name="bookmarks_import">Impordi lemmikuid</string>
     <string name="bookmarks_error_message_share_general">Jagamine polnud võimalik rakenduse vea tõttu</string>
     <string name="bookmarks_error_title_share_empty">Viga jagamisel</string>
     <string name="bookmarks_error_message_share_empty">Tühja loendit ei saa jagada</string>
@@ -598,7 +598,7 @@
     <string name="subway">Metroo</string>
     <string name="layers_title">Kaardi stiilid ja kihid</string>
     <string name="bookmarks_empty_list_title">See loend on tühi</string>
-    <string name="bookmarks_empty_list_message">Järjehoidja lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni</string>
+    <string name="bookmarks_empty_list_message">ASukoha lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni</string>
     <string name="category_desc_more">…veel</string>
     <string name="export_file">Ekspordi KMZ-failina</string>
     <string name="export_file_gpx">Ekspordi GPX-failina</string>
@@ -651,7 +651,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Järjesta…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Järjesta järjehoidjaid</string>
+    <string name="sort_bookmarks">Järjesta lemmikuid</string>
     <!-- Android -->
     <string name="by_default">Vaikimisi</string>
     <!-- Android -->
@@ -765,7 +765,7 @@
     <string name="browser_not_available">Veebibrauser ei ole saadaval</string>
     <string name="volume">Helivaljus</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Ekspordi kõik järjehoidjad ja rajad</string>
+    <string name="bookmarks_export">Ekspordi kõik asukohad ja rajad</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Süsteemsed kõnesünteesi seadistused</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -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 järjehoidjatesse ja radadesse?</string>
+    <string name="track_recording_alert_title">Kas salvestame lemmikute alla?</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 -->
@@ -834,16 +834,16 @@
     <string name="vehicle">Sõiduk</string>
     <string name="pedestrian">Jalakäija</string>
     <string name="ruler">Joonlaud</string>
-    <string name="bookmark_color">Järjehoidja värv</string>
+    <string name="bookmark_color">Lemmiku värv</string>
     <string name="panoramax">Panoramaxi pilt</string>
     <string name="about_help">Rakenduse teave ja abiteave</string>
-    <string name="pref_backup_title">Järjehoidjate ja radade varundus</string>
+    <string name="pref_backup_title">Lemmikute varundus</string>
     <string name="pref_backup_now_summary_ok">Varukoopia loomine õnnestus</string>
     <string name="pref_backup_summary">Varunda automaatselt sinu nutiseadmes asuvasse kausta</string>
     <string name="pref_backup_now_title">Varunda kohe</string>
     <string name="pref_backup_now_summary">Tee varukoopia kohe</string>
     <string name="pref_backup_now_summary_progress">Varundamine on töös…</string>
-    <string name="pref_backup_now_summary_empty_lists">Pole järjehoidjaid ega radu, mida varundada</string>
+    <string name="pref_backup_now_summary_empty_lists">Pole asukohti ega radu, mida varundada</string>
     <string name="pref_backup_now_summary_failed">Varundamine ei õnnestunud</string>
     <string name="backup_interval_manual_only">Pole kasutusel (vaid käsitsi varundus)</string>
     <string name="dialog_report_error_with_logs">Palun saada meile veateade, selleks:\n - Vali seadistustest „Lülita logimine sisse“\n - korda probleemi\n - Vaatest „Rakenduse teave ja abiteave“ klõpsi „Teata veast“ nuppu ja saada veateade e-kirjaga või vestluses\n - lülita logimine välja</string>
@@ -916,4 +916,5 @@
     <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
     <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
     <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on http:// või https://</string>
+    <string name="pref_maplanguage_local">Kohalik keel</string>
 </resources>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="back">Nazad</string>
+    <string name="back">Natrag</string>
-    <string name="download_has_failed">Preuzimanje neuspješno. Dotaknite za ponovni pokušaj.</string>
+    <string name="download_has_failed">Preuzimanje neuspješno. Dodirnite za ponovni pokušaj</string>
     <string name="cancel">Odustani</string>
     <string name="delete">Izbriši</string>
     <string name="kilometres">Kilometara</string>
     <string name="downloading">Preuzimanje…</string>
-    <string name="download_maps">Skini karte</string>
+    <string name="download_maps">Preuzmi karte</string>
     <string name="miles">Milje</string>
     <string name="later">Kasnije</string>
     <string name="search">Traži</string>
@@ -25,7 +25,7 @@
     <string name="report_a_bug">Prijavi pogrešku</string>
     <string name="save">Sačuvaj</string>
     <string name="share">Podijeli</string>
-    <string name="category_parking">Parkiranje</string>
+    <string name="category_parking">Parkiralište</string>
     <string name="website">Web stranica</string>
     <string name="downloader_status_maps">Karte</string>
     <string name="downloader_downloaded_subtitle">Preuzeto</string>
@@ -67,17 +67,17 @@
     <string name="name">Naziv</string>
     <string name="category_post">Pošta</string>
     <string name="email">E-mail</string>
-    <string name="done">Potvrdi</string>
+    <string name="done">Gotovo</string>
     <string name="rate_the_app">Ocijeni aplikaciju</string>
     <string name="downloader_downloading">Preuzima se:</string>
-    <string name="search_history_title">Povijest pretrage</string>
+    <string name="search_history_title">Povijest pretraživanja</string>
     <string name="not_now">Ne sada</string>
     <string name="pref_map_style_title">Noćni način</string>
     <string name="create">Napravi</string>
-    <string name="editor_time_close">Zatvara se</string>
+    <string name="editor_time_close">Zatvoreno</string>
     <string name="p2p_start">Početak</string>
     <string name="editor_time_to">Do</string>
-    <string name="editor_time_open">Otvara se</string>
+    <string name="editor_time_open">Otvoriti</string>
     <string name="day_off">Zatvoreno</string>
     <string name="clear_search">Obriši povijest pretrage</string>
     <string name="next_button">Dalje</string>
@@ -95,10 +95,10 @@
     <string name="minute">min</string>
     <string name="bookmark_lists_show_all">Prikaži sve</string>
     <string name="please_wait">Molim pričekajte…</string>
-    <string name="bookmark_lists">Liste</string>
+    <string name="bookmark_lists">Liste favorita</string>
     <string name="privacy">Privatnost</string>
     <string name="power_managment_setting_never">Nikada</string>
-    <string name="editor_reset_edits_button">Odbaci</string>
+    <string name="editor_reset_edits_button">Odbacite promjene</string>
     <string name="details">Detalji</string>
     <string name="privacy_policy">Politika privatnosti</string>
     <string name="editor_edit_place_category_title">Kategorija</string>
@@ -116,20 +116,20 @@
     <string name="money">Novac</string>
     <string name="app_site_url">https://comaps.app/hr/</string>
     <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
-    <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, omogućite Preciznu lokaciju u postavkama.</string>
+    <string name="precise_location_is_disabled_long_text">Za točnu navigaciju omogućite Preciznu lokaciju u postavkama</string>
     <string name="about_menu_title">O CoMaps aplikaciji</string>
     <string name="about_headline">Otvoreni projekt kojeg pokreće zajednica</string>
     <string name="about_proposition_1">• Jednostavan za korištenje i dotjeran</string>
-    <string name="about_proposition_3">• Offline, brz i kompaktan</string>
+    <string name="about_proposition_3">• Izvanmrežno, brz i kompaktan</string>
-    <string name="about_developed_by_enthusiasts">Potpuno otvoreni kod, neprofitan, sa transparentnim odlučivanjem i financijama.</string>
+    <string name="about_developed_by_enthusiasts">Potpuno otvorenog koda, neprofitan, s transparentnim donošenjem odluka i financijama.</string>
     <string name="location_settings">Postavke lokacije</string>
-    <string name="unsupported_phone">Aplikacija zahtijeva hardverski ubrzan OpenGL. Nažalost, vaš uređaj nije podržan.</string>
+    <string name="unsupported_phone">Aplikacija zahtijeva hardverski ubrzani OpenGL. Nažalost, vaš uređaj nije podržan.</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="downloader_loading_ios">Preuzima se</string>
     <string name="zoom_in">Uvećaj</string>
     <string name="zoom_out">Umanji</string>
     <string name="shops">Trgovine</string>
-    <string name="parkings">Parkiranje</string>
+    <string name="parkings">Parkiralište</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="translated_om_site_url">https://comaps.app/hr/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
@@ -145,9 +145,9 @@
     <string name="downloading_country_can_proceed">Preuzimanje %1$s (%2$s). Sada možete\nnastaviti na kartu.</string>
     <string name="update_country_ask">Ažurirati %1$s? (%2$s)</string>
     <string name="add_new_set">Dodaj novu Listu</string>
-    <string name="bookmark_set_name">Označi naziv Liste</string>
+    <string name="bookmark_set_name">Naziv liste</string>
-    <string name="bookmarks">Oznake</string>
+    <string name="bookmarks">Mjesta</string>
-    <string name="bookmarks_and_tracks">Oznake i Rute</string>
+    <string name="bookmarks_and_tracks">Favoriti</string>
     <string name="maps_storage">Spremi karte u</string>
     <string name="maps_storage_summary">Odaberite mapu u koju želite spremiti karte</string>
     <string name="maps_storage_downloaded">Preuzete karte</string>
@@ -173,11 +173,11 @@
     <string name="category_police">Policija</string>
     <string name="category_water">Voda</string>
     <string name="category_rv">Objekti za kampere</string>
-    <string name="share_bookmarks_email_subject">CoMaps Oznake su podijeljene s vama</string>
+    <string name="share_bookmarks_email_subject">Moji CoMaps favoriti</string>
-    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moje oznake; otvorite ih u CoMaps aplikaciji. Ukoliko ju nemate instaliranu, možete ju preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsima!</string>
+    <string name="share_bookmarks_email_body">Pozdrav!\n\nU privitku su moji favoriti; molim vas otvorite ih u CoMaps aplikaciji. Ako je nemate instaliranu, možete je preuzeti ovdje: https://www.comaps.app/download/\n\nUživajte u putovanju s CoMapsom!</string>
-    <string name="load_kmz_title">Učitavam Oznake</string>
+    <string name="load_kmz_title">Učitavanje favorita</string>
-    <string name="load_kmz_successful">Oznake su uspješno učitane! Možete ih pronaći na karti ili na zaslonu Upravitelja Oznaka.</string>
+    <string name="load_kmz_successful">Favoriti su uspješno učitani! Možete ih pronaći na karti ili na zaslonu Upravitelj favorita.</string>
-    <string name="load_kmz_failed">Učitavanje Oznaka nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
+    <string name="load_kmz_failed">Učitavanje favorita nije uspjelo. Datoteka je možda oštećena ili neispravna.</string>
     <string name="unknown_file_type">Aplikacija ne prepoznaje tip datoteke:\n%1$s</string>
     <string name="failed_to_open_file">Nije moguće otvoriti datoteku %1$s\n \n%2$s</string>
     <string name="unknown_current_position">Vaša lokacija još nije utvrđena</string>
@@ -190,10 +190,10 @@
     <string name="copied_to_clipboard">Kopirano u međuspremnik: %s</string>
     <string name="data_version">OpenStreetMap podaci: %s</string>
     <string name="tracks_title">Rute</string>
-    <string name="category_hotel">hotel</string>
+    <string name="category_hotel">Hotel</string>
     <string name="category_toilet">WC</string>
     <string name="track_recording">Snimanje Rute</string>
-    <string name="bookmarks_import">Uvoz Oznaka i Ruta</string>
+    <string name="bookmarks_import">Uvoz favorita</string>
     <plurals name="tracks">
         <item quantity="one">%d ruta</item>
         <item quantity="few">%d rute</item>
@@ -208,7 +208,7 @@
     <string name="pref_backup_title">Sigurnosna kopija Oznaka i Ruta</string>
     <string name="pref_backup_now_summary_empty_lists">Nema Oznaka i Ruta za izradu sigurnosne kopije</string>
     <string name="share_track">Podijeli Rutu</string>
-    <string name="placepage_edit_bookmark_button">Uredi Oznaku</string>
+    <string name="placepage_edit_bookmark_button">Uredi spremljeno mjesto</string>
     <string name="bookmark_lists_hide_all">Sakrij sve</string>
     <plurals name="bookmarks_places">
         <item quantity="one">%d Oznaka</item>
@@ -224,18 +224,18 @@
     <string name="bookmarks_error_title_list_name_already_taken">Taj naziv je već zauzet</string>
     <string name="bookmarks_error_message_list_name_already_taken">Molimo odaberite drugi naziv</string>
     <string name="bookmarks_empty_list_title">Ova Lista je prazna</string>
-    <string name="bookmarks_empty_list_message">Za dodavanje Oznake dotaknite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
+    <string name="bookmarks_empty_list_message">Za spremanje mjesta dodirnite mjesto na karti, a zatim dodirnite ikonu zvjezdice</string>
     <string name="sort_bookmarks">Sortiraj Oznake</string>
     <string name="bookmark_color">Boja Oznake</string>
     <string name="share_my_location">Podijeli moju lokaciju</string>
     <string name="pref_zoom_title">Gumbi za zumiranje</string>
     <string name="pref_map_3d_title">Pogled iz perspektive</string>
     <string name="pref_map_3d_buildings_title">3D zgrade</string>
-    <string name="pref_tts_enable_title">Glasovne najave</string>
+    <string name="pref_tts_enable_title">Glasovne upute</string>
     <string name="pref_tts_street_names_title">Najavi nazive ulica</string>
-    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza gdje koji treba skrenuti bit će izgovoren naglas.</string>
+    <string name="pref_tts_street_names_description">Kada je omogućeno, naziv ulice ili izlaza na koji treba skrenuti bit će izgovoren naglas.</string>
     <string name="pref_tts_language_title">Jezik glasovnih najava</string>
-    <string name="pref_tts_test_voice_title">Testiranje glasovnih najava</string>
+    <string name="pref_tts_test_voice_title">Testiranje glasovnih uputa</string>
     <string name="pref_tts_playing_test_voice">Provjerite glasnoću ili sistemske postavke za pretvaranje teksta u govor ako sada ne čujete glas</string>
     <string name="pref_tts_unavailable">Nije dostupno</string>
     <string name="pref_map_auto_zoom">Automatsko zumiranje</string>
@@ -270,4 +270,286 @@
     <string name="editor_time_add">Dodaj Raspored</string>
     <string name="editor_time_delete">Izbriši Raspored</string>
     <string name="editor_time_allday">Cijeli dan (24 sata)</string>
+    <string name="pref_zoom_summary">Prikaz na karti</string>
+    <string name="deep_orange">Tamno narančasta</string>
+    <string name="blue_gray">Plavo siva</string>
+    <string name="dialog_routing_disclaimer_title">Prilikom praćenja rute, imajte na umu:</string>
+    <string name="dialog_routing_disclaimer_priority">— Uvjeti na cestama, prometni propisi i prometni znakovi uvijek imaju prednost pred navigacijskim savjetima;</string>
+    <string name="dialog_routing_disclaimer_precision">— Karta može biti netočna, a predložena ruta možda nije uvijek najoptimalniji način za dolazak do odredišta;</string>
+    <string name="dialog_routing_disclaimer_recommendations">— Predložene rute treba shvatiti samo kao preporuke;</string>
+    <string name="dialog_routing_disclaimer_borders">— Budite oprezni s rutama u pograničnim zonama: rute koje je kreirala naša aplikacija ponekad mogu prelaziti državne granice na nedozvoljenim mjestima.</string>
+    <string name="dialog_routing_disclaimer_beware">Molimo vas da ostanete oprezni i sigurni na cestama!</string>
+    <string name="dialog_routing_check_gps">Provjerite GPS signal</string>
+    <string name="dialog_routing_error_location_not_found">Nije moguće izraditi rutu. Trenutne GPS koordinate nije moguće odrediti.</string>
+    <string name="dialog_routing_location_turn_wifi">Provjerite GPS signal. Uključivanje Wi‑Fi mreže poboljšat će točnost lokacije.</string>
+    <string name="dialog_routing_location_turn_on">Omogući usluge lokacije</string>
+    <string name="dialog_routing_location_unknown_turn_on">Nije moguće pronaći trenutne GPS koordinate. Omogućite usluge lokacije za izračun rute.</string>
+    <string name="dialog_routing_unable_locate_route">Nije moguće pronaći rutu</string>
+    <string name="dialog_routing_cant_build_route">Nije moguće stvoriti rutu</string>
+    <string name="dialog_routing_change_start_or_end">Molimo prilagodite početnu točku ili odredište.</string>
+    <string name="dialog_routing_change_start">Prilagodite početnu točku</string>
+    <string name="dialog_routing_start_not_determined">Ruta nije kreirana. Nije moguće pronaći početnu točku.</string>
+    <string name="dialog_routing_select_closer_start">Odaberite početnu točku bliže cesti.</string>
+    <string name="dialog_routing_change_end">Prilagodite odredište</string>
+    <string name="dialog_routing_end_not_determined">Ruta nije izrađena. Odredište nije moguće pronaći.</string>
+    <string name="dialog_routing_download_and_build_cross_route">Želite li preuzeti kartu i stvoriti optimalniju rutu koja obuhvaća više od jedne karte?</string>
+    <string name="dialog_routing_download_cross_route">Preuzmite dodatne karte kako biste stvorili bolju rutu koja prelazi granice ove karte.</string>
+    <string name="search_without_internet_advertisement">Da biste započeli s pretraživanjem i izradom ruta, preuzmite kartu. Nakon toga vam više neće biti potrebna internetska veza.</string>
+    <string name="search_select_map">Odaberite kartu</string>
+    <string name="search_not_found">Ups, nema pronađenih rezultata</string>
+    <string name="p2p_from_here">Ruta od</string>
+    <string name="p2p_to_here">Ruta do</string>
+    <string name="editor_time_add_closed">Dodajte izvan radno vrijeme</string>
+    <string name="editor_time_title">Radno vrijeme</string>
+    <string name="editor_time_advanced">Napredni način rada</string>
+    <string name="editor_time_simple">Jednostavni način rada</string>
+    <string name="editor_hours_closed">Izvan radnog vremena</string>
+    <string name="editor_example_values">Primjeri vrijednosti</string>
+    <string name="editor_correct_mistake">Ispravite grešku</string>
+    <string name="editor_add_select_location">Odaberite lokaciju</string>
+    <string name="editor_report_problem_desription_1">Molimo opišite problem detaljno kako bi ga OpenStreetMap zajednica mogla ispraviti.</string>
+    <string name="downloader_delete_map_dialog">Sve vaše izmjene na karti bit će izbrisane s kartom</string>
+    <string name="downloader_update_maps">Ažurirajte karte</string>
+    <string name="downloader_mwm_migration_dialog">Za izradu rute potrebno je ažurirati sve karte, a zatim ponovno isplanirati rutu.</string>
+    <string name="downloader_search_field_hint">Pronađite kartu</string>
+    <string name="common_check_internet_connection_dialog">Molimo provjerite je li vaš uređaj spojen na internet</string>
+    <string name="downloader_no_space_title">Nema dovoljno prostora</string>
+    <string name="downloader_no_space_message">Izbrišite sve nepotrebne podatke</string>
+    <string name="editor_login_error_dialog">Pogreška pri prijavi</string>
+    <string name="editor_profile_changes">Potvrđene promjene</string>
+    <string name="editor_focus_map_on_location">Povucite kartu kako biste postavili križić na željenu lokaciju.</string>
+    <string name="editor_add_place_title">Dodavanje</string>
+    <string name="editor_edit_place_name_hint">Naziv mjesta</string>
+    <string name="editor_default_language_hint">Kao što je napisano na lokalnom jeziku</string>
+    <string name="detailed_problem_description">Detaljan opis problema</string>
+    <string name="editor_report_problem_other_title">Drugačiji problem</string>
+    <string name="message_invalid_feature_position">Ovdje se ne može pronaći nijedan objekt</string>
+    <string name="osm_presentation">Podaci OpenStreetMapa koje je kreirala zajednica od %s. Saznajte više o tome kako urediti i ažurirati kartu na OpenStreetMap.org</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je zajednički projekt stvaranja besplatnih i otvorenih karata. To je glavni izvor kartografskih podataka u CoMaps aplikaciji i funkcionira slično kao Wikipedia. Možete dodavati ili uređivati mjesta, a vaši će unosi postati dostupni milijunima korisnika diljem svijeta.\nPridružite se zajednici i pomozite stvarati još bolju kartu za sve!</string>
+    <string name="login_to_make_edits_visible">Kreiraj OpenStreetMap račun ili se prijavite kako biste svijetu objavili svoje izmjene na karti</string>
+    <string name="downloader_of">%1$d od %2$d</string>
+    <string name="download_over_mobile_header">Preuzeti putem mobilne podatkovne veze?</string>
+    <string name="download_over_mobile_message">Ovo može biti znatno skuplje s nekim tarifama ili ako ste u roamingu</string>
+    <string name="error_enter_correct_house_number">Unesite važeći broj zgrade</string>
+    <string name="editor_building_levels">Broj katova (s prizemljem, bez krova)</string>
+    <string name="error_enter_correct_storey_number">Broj katova ne smije biti veći od %d</string>
+    <string name="editor_zip_code">Poštanski broj</string>
+    <string name="error_enter_correct_zip_code">Unesite važeći poštanski broj</string>
+    <string name="editor_other_info">Napomena za volontere OpenStreetMapa (nije obavezno)</string>
+    <string name="editor_note_hint">Opišite pogreške na karti ili stvari koje se ne mogu uređivati u CoMaps‑u</string>
+    <string name="editor_about_osm">Vaše se izmjene prenose u javnu bazu podataka <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Molimo vas da ne dodajete osobne podatke ili podatke zaštićene autorskim pravima.</string>
+    <string name="editor_more_about_osm">Više o OpenStreetMapu</string>
+    <string name="editor_osm_history">Vaša povijest uređivanja</string>
+    <string name="editor_osm_notes">Vaše bilješke o podacima na karti</string>
+    <string name="editor_operator">Operator</string>
+    <string name="operator">Operator: %s</string>
+    <string name="editor_category_unsuitable_title">Ne možete pronaći odgovarajuću kategoriju?</string>
+    <string name="editor_category_unsuitable_text">**CoMaps** omogućuje dodavanje samo jednostavnih kategorija točaka, što znači da nije moguće dodavati gradove, ceste, jezera, tlocrte zgrada itd. Takve kategorije dodajte izravno na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pogledajte naš <a href="https://www.comaps.app/support/advanced-map-editing/">vodič</a> za detaljne upute korak po korak.</string>
+    <string name="downloader_no_downloaded_maps_title">Niste preuzeli nijednu kartu</string>
+    <string name="downloader_no_downloaded_maps_message">Preuzmite karte za pretraživanje i navigaciju izvan mreže</string>
+    <string name="current_location_unknown_error_title">Trenutna lokacija je nepoznata</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="hour">h</string>
+    <string name="day">d</string>
+    <string name="placepage_more_button">Više</string>
+    <string name="placepage_personal_notes_hint">Osobne bilješke (tekst ili html)</string>
+    <string name="editor_reset_edits_message">Odbaciti sve lokalne promjene?</string>
+    <string name="editor_remove_place_message">Izbrisati dodano mjesto?</string>
+    <string name="editor_place_doesnt_exist">Mjesto ne postoji</string>
+    <string name="editor_place_doesnt_exist_description">Opišite kako mjesto sada izgleda kako biste poslali obavijest o pogrešci zajednici OpenStreetMapa</string>
+    <string name="delete_place_empty_comment_error">Molimo navedite razlog brisanja mjesta</string>
+    <string name="editor_business_vacant_button">Objekt više ne posluje</string>
+    <string name="editor_mark_business_vacant_title">Označi da nema aktivnog poslovanja</string>
+    <string name="editor_mark_business_vacant_description">Koristite ovo ako se tvrtka iselila, a prostor je prazan i spreman za novog najmoprimca.</string>
+    <string name="editor_submit">Pošalji</string>
+    <string name="error_enter_correct_phone">Unesite važeći telefonski broj</string>
+    <string name="error_enter_correct_web">Unesite valjanu web-adresu</string>
+    <string name="error_enter_correct_email">Unesite važeću e-adresu</string>
+    <string name="editor_level">Kat (0 je prizemlje)</string>
+    <string name="error_enter_correct_level">Unesite važeći broj kata</string>
+    <string name="error_enter_correct_facebook_page">Unesite važeću Facebook web adresu, račun ili naziv stranice</string>
+    <string name="error_enter_correct_instagram_page">Unesite važeće korisničko ime na Instagramu ili web-adresu</string>
+    <string name="error_enter_correct_twitter_page">Unesite važeće korisničko ime za X (Twitter) ili web-adresu</string>
+    <string name="error_enter_correct_vk_page">Unesite važeće VK korisničko ime ili web adresu</string>
+    <string name="error_enter_correct_line_page">Unesite važeći LINE ID ili web-adresu</string>
+    <string name="error_enter_correct_fediverse_page">Unesite važeće Mastodon korisničko ime ili web adresu</string>
+    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili web-adresu</string>
+    <string name="placepage_add_place_button">Dodaj mjesto na OpenStreetMap</string>
+    <string name="place_page_map_too_old_title">Podaci na karti su zastarjeli</string>
+    <string name="place_page_map_too_old_description">Podaci vaše trenutne karte su vrlo stari, ažurirajte kartu.</string>
+    <string name="place_page_app_too_old_description">Podaci vaše trenutne karte su vrlo stari, ažurirajte aplikaciju CoMaps.</string>
+    <string name="place_page_update_too_old_map">Ažurirajte regiju karte</string>
+    <string name="place_page_too_old_to_edit">Uređivanje OpenStreetMapa je onemogućeno jer su podaci karte prestari.</string>
+    <string name="osm_note_hint">Ili ostavite bilješku OSM zajednici da netko drugi doda ili ispravi mjesto.</string>
+    <string name="osm_note_toast">Bilješka će biti poslana OpenStreetMapu</string>
+    <string name="editor_share_to_all_dialog_title">Želite li to poslati svim korisnicima?</string>
+    <string name="editor_share_to_all_dialog_message_1">Provjerite da niste unijeli privatne ili osobne podatke.</string>
+    <string name="editor_share_to_all_dialog_message_2">Urednici OpenStreetMapa će provjeriti promjene i kontaktirati vas ako imaju bilo kakvih pitanja.</string>
+    <string name="navigation_stop_button">Stop</string>
+    <string name="decline">Odbaci</string>
+    <string name="mobile_data_dialog">Koristiti mobilni internet za prikaz detaljnih informacija?</string>
+    <string name="mobile_data_option_always">Uvijek koristi</string>
+    <string name="mobile_data_option_today">Samo danas</string>
+    <string name="mobile_data_option_not_today">Ne koristiti danas</string>
+    <string name="mobile_data">Mobilni internet</string>
+    <string name="mobile_data_description">Za obavijesti o ažuriranjima karata i prijenos izmjena potreban je mobilni internet</string>
+    <string name="mobile_data_option_never">Nikad ne koristite</string>
+    <string name="traffic_update_maps_text">Za prikaz podataka o prometu, karte moraju biti ažurirane</string>
+    <string name="big_font">Povećaj veličinu oznaka na karti</string>
+    <string name="traffic_update_app">Molimo ažurirajte CoMaps</string>
+    <string name="traffic_data_unavailable">Podaci o prometu nisu dostupni</string>
+    <string name="enable_logging">Omogući zapisivanje</string>
+    <string name="feedback_general">Opće povratne informacije</string>
+    <string name="prefs_languages_information">Za glasovne upute koristimo sistemski TTS. Mnogi Android uređaji koriste Google TTS, možete ga preuzeti ili ažurirati s Google Playa (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information_off">Za neke jezike morat ćete instalirati sintetizator govora ili dodatni jezični paket iz trgovine aplikacija (Google Play, Galaxy Store, App Gallery, FDroid). \nOtvorite postavke uređaja → Jezik i unos → Govor → Izlaz teksta u govor. Ovdje možete upravljati postavkama za sintezu govora (na primjer, preuzeti jezični paket za izvanmrežnu upotrebu) i odabrati drugi program za pretvaranje teksta u govor.</string>
+    <string name="prefs_languages_information_off_link">Za više informacija molimo provjerite ovaj vodič</string>
+    <string name="prefs_speed_cameras_information">Upozorenja na kamere za nadzor brzine onemogućena su u državama u kojima su takva upozorenja zabranjena lokalnim zakonima.</string>
+    <string name="transliteration_title">Prikaži u latinici</string>
+    <string name="learn_more">Saznajte više</string>
+    <string name="routing_add_start_point">Koristite pretraživanje ili dodirnite kartu za dodavanje početne točke rute</string>
+    <string name="routing_add_finish_point">Koristite pretraživanje ili dodirnite kartu za dodavanje odredišne točke</string>
+    <string name="planning_route_manage_route">Upravljanje rutom</string>
+    <string name="button_plan">Plan</string>
+    <string name="placepage_remove_stop">Ukloni zaustavljanje</string>
+    <string name="placepage_add_stop">Dodaj zaustavljanje</string>
+    <string name="dialog_error_storage_title">Problem s pristupom pohrani</string>
+    <string name="dialog_error_storage_message">Vanjska pohrana nije dostupna. SD kartica je možda uklonjena, oštećena ili je datotečni sustav samo za čitanje. Molimo provjerite svoju SD karticu ili nas kontaktirajte na support@comaps.app</string>
+    <string name="setting_emulate_bad_storage">Emuliraj lošu pohranu</string>
+    <string name="error_enter_correct_name">Molimo unesite točno ime</string>
+    <string name="bookmarks_error_title_share_empty">Pogreška dijeljenja</string>
+    <string name="profile">Profil na OpenStreetMapu</string>
+    <string name="restore">Vratiti</string>
+    <string name="power_management">Upravljanje napajanjem</string>
+    <string name="terms_of_use">Uvjeti korištenja</string>
+    <string name="button_layer_traffic">Promet</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Stilovi i slojevi karte</string>
+    <string name="export_file">Izvezi kao KMZ</string>
+    <string name="export_file_gpx">Izvezi kao GPX</string>
+    <string name="speedcams_alert_title">Kamera za nadzor brzine</string>
+    <string name="place_description_title">Opis mjesta</string>
+    <string name="notification_channel_downloader">Preuzimanje karata</string>
+    <string name="pref_tts_speedcams_auto">Upozori na prekoračenje brzine</string>
+    <string name="pref_tts_speedcams_always">Uvijek upozori</string>
+    <string name="pref_tts_speedcams_never">Nikad ne upozoravaj</string>
+    <string name="power_managment_title">Način rada za uštedu energije</string>
+    <string name="power_managment_description">Pokušajte smanjiti potrošnju energije na štetu nekih funkcionalnosti</string>
+    <string name="power_managment_setting_auto">Kad je baterija pri kraju</string>
+    <string name="enable_logging_warning_message">Privremeno omogućite ovu opciju kako biste snimili i ručno poslali detaljne dijagnostičke zapisnike o vašem problemu pomoću opcije \"Prijavi grešku\" u dijalogu Pomoć. Zapisnici mogu uključivati podatke o lokaciji.</string>
+    <string name="driving_options_title">Opcije rutiranja</string>
+    <string name="avoid_tolls">Izbjegni cestarine</string>
+    <string name="avoid_unpaved">Izbjegavaj neasfaltirane ceste</string>
+    <string name="avoid_ferry">Izbjegavaj trajekte</string>
+    <string name="avoid_motorways">Izbjegavaj autoceste</string>
+    <string name="avoid_steps">Izbjegavaj stepenice</string>
+    <string name="avoid_paved">Izbjegavaj asfaltirane ceste</string>
+    <string name="unable_to_calc_alert_title">Nije moguće izračunati rutu</string>
+    <string name="unable_to_calc_alert_subtitle">Ruta nije pronađena. Uzrok tome mogu biti vaše opcije rute ili nepotpuni podaci OpenStreetMapa. Molimo promijenite opcije rute i pokušajte ponovno.</string>
+    <string name="define_to_avoid_btn">Definirajte ceste koje treba izbjegavati</string>
+    <string name="change_driving_options_btn">Opcije rutiranja omogućene</string>
+    <string name="toll_road">Cesta s naplatom cestarine</string>
+    <string name="unpaved_road">Neasfaltirana cesta</string>
+    <string name="ferry_crossing">Trajektna linija</string>
+    <string name="capacity">Kapacitet: %s</string>
+    <string name="network">Mreža: %s</string>
+    <string name="ok">OK</string>
+    <string name="pref_map_3d_buildings_disabled_summary">3D zgrade su onemogućene u načinu rada za uštedu energije</string>
+    <string name="downloader_queued">U redu čekanja</string>
+    <string name="google_play_services">Googleov objedinjeni servis za određivanje lokacije</string>
+    <string name="pref_use_google_play">Vlasnički servis koji kombinira GPS, Wi‑Fi i mobilne mreže radi preciznijeg određivanja lokacije. Može se povezivati s Googleovim poslužiteljima.</string>
+    <string name="routing_download_maps_along">Preuzmite sve karte duž svoje rute</string>
+    <string name="routing_requires_all_map">Kako bismo izradili rutu, moramo preuzeti i ažurirati sve karte od vaše lokacije do odredišta.</string>
+    <string name="routing_not_enough_space">Nema dovoljno prostora</string>
+    <string name="enable_location_services">Omogućite Usluge lokacije</string>
+    <string name="deep_purple">Tamno ljubičasta</string>
+    <string name="light_blue">Svijetlo plava</string>
+    <string name="cyan">Cijan</string>
+    <string name="teal">Tirkizna</string>
+    <string name="lime">Limeta</string>
+    <string name="editor_report_problem_desription_2">Ili to učinite sami na https://www.openstreetmap.org/</string>
+    <string name="editor_report_problem_title">Problem</string>
+    <string name="editor_report_problem_no_place_title">Ovo mjesto ne postoji</string>
+    <string name="editor_report_problem_under_construction_title">Zatvoreno zbog održavanja</string>
+    <string name="editor_report_problem_duplicate_place_title">Duplikat mjesta</string>
+    <string name="autodownload">Automatsko preuzimanje karata</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Zatvoreno danas</string>
+    <string name="opens_in">Otvara se za %s</string>
+    <string name="closes_in">Zatvara se za %s</string>
+    <string name="opens_at">Otvara se u %s</string>
+    <string name="closes_at">Zatvara se u %s</string>
+    <string name="opens_day_at">Otvara se %1$s u %2$s</string>
+    <string name="closes_day_at">Zatvara se %1$s u %2$s</string>
+    <string name="by_default">Prema zadanim postavkama</string>
+    <string name="by_type">Po vrsti</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="by_date">Po datumu</string>
+    <string name="by_name">Po imenu</string>
+    <string name="week_ago_sorttype">Prije tjedan dana</string>
+    <string name="month_ago_sorttype">Prije mjesec dana</string>
+    <string name="moremonth_ago_sorttype">Prije više od mjesec dana</string>
+    <string name="moreyear_ago_sorttype">Prije više od godinu dana</string>
+    <string name="near_me_sorttype">U mojoj blizini</string>
+    <string name="others_sorttype">Ostali</string>
+    <string name="food_places">Hrana</string>
+    <string name="tourist_places">Znamenitosti</string>
+    <string name="museums">Muzeji</string>
+    <string name="parks">Parkovi</string>
+    <string name="swim_places">Plivanje</string>
+    <string name="mountains">Planine</string>
+    <string name="animals">Životinje</string>
+    <string name="hotels">Hoteli</string>
+    <string name="buildings">Zgrade</string>
+    <string name="fuel_places">Benzinske postaje</string>
+    <string name="elevation_profile_time">Vrijeme:</string>
+    <string name="medicine">Lijekovi</string>
+    <string name="search_in_the_list">Traži u popisu</string>
+    <string name="religious_places">Vjerska mjesta</string>
+    <string name="select_list">Odaberi popis</string>
+    <string name="transit_not_found">Navigacija podzemnom željeznicom u ovoj regiji još nije dostupna</string>
+    <string name="dialog_pedestrian_route_is_long_header">Nije pronađena ruta podzemne željeznice</string>
+    <string name="dialog_pedestrian_route_is_long_message">Molimo odaberite početnu ili završnu točku bliže stanici podzemne željeznice</string>
+    <string name="button_layer_isolines">Izohipse</string>
+    <string name="isolines_activation_error_dialog">Da biste aktivirali izohipse, preuzmite podatke karte za ovo područje</string>
+    <string name="isolines_location_error_dialog">Izohipse još nisu dostupne u ovom području</string>
+    <string name="elevation_profile_ascent">Uspon</string>
+    <string name="elevation_profile_descent">Silazak</string>
+    <string name="elevation_profile_min_elevation">Minimalna nadmorska visina</string>
+    <string name="elevation_profile_max_elevation">Maks. nadmorska visina</string>
+    <string name="elevation_profile_difficulty">Težina</string>
+    <string name="elevation_profile_distance">Udaljenost:</string>
+    <string name="isolines_toast_zooms_1_10">\"Povećajte prikaz za pregled izohipsi</string>
+    <string name="download_map_title">Preuzmite osnovnu kartu svijeta</string>
+    <string name="disk_error">Nije moguće stvoriti mapu i premjestiti datoteke na internu memoriju uređaja ili SD karticu</string>
+    <string name="disk_error_title">Pogreška diska</string>
+    <string name="connection_failure">Pogreška povezivanja</string>
+    <string name="disconnect_usb_cable_title">Isključite USB kabel</string>
+    <string name="enable_keep_screen_on">Drži zaslon uključenim</string>
+    <string name="enable_keep_screen_on_description">Kada je omogućeno, zaslon će uvijek biti uključen prilikom prikaza karte.</string>
+    <string name="enable_show_on_lock_screen">Prikaži na zaključanom zaslonu</string>
+    <string name="enable_show_on_lock_screen_description">Kada je omogućeno, aplikacija će raditi na zaključanom zaslonu čak i kada je uređaj zaključan.</string>
+    <string name="change_map_locale">Jezik karte</string>
+    <string name="pref_maplanguage_local">Lokalni jezik</string>
+    <string name="splash_subtitle">Podaci karte iz OpenStreetMapa</string>
+    <string name="app_tip_00">Hvala vam što koristite karte koje je izradila naša zajednica!</string>
+    <string name="app_tip_01">Uz vaše donacije i podršku, možemo stvoriti najbolje karte na svijetu!</string>
+    <string name="app_tip_02">Sviđa li vam se naša aplikacija? Donirajte kako biste podržali razvoj! Još vam se ne sviđa? Javite nam zašto i mi ćemo to popraviti!</string>
+    <string name="app_tip_03">Ako poznajete programera softvera, možete ga zamoliti da implementira značajku koja vam je potrebna.</string>
+    <string name="app_tip_04">Dodirnite bilo gdje na karti da biste nešto odabrali. Dugi dodir koristi se za skrivanje i prikaz sučelja.</string>
+    <string name="app_tip_05">Jeste li znali da se vaša trenutna lokacija na karti može odabrati?</string>
+    <string name="app_tip_06">Možete nam pomoći u prevođenju naše aplikacije na vaš jezik.</string>
+    <string name="app_tip_07">Našu aplikaciju razvili su nekoliko entuzijasta i zajednica.</string>
+    <string name="app_tip_08">Podatke karte možete jednostavno popraviti i poboljšati.</string>
+    <string name="app_tip_09">Naš glavni cilj je izrada brzih, na privatnost usmjerenih i jednostavnih karata koje ćete obožavati.</string>
+    <string name="car_used_on_the_phone_screen">Sada koristite CoMaps na zaslonu telefona</string>
+    <string name="car_used_on_the_car_screen">Sada koristite CoMaps na zaslonu automobila</string>
+    <string name="aa_connected_title">Povezani ste s Android Autom</string>
+    <string name="car_continue_on_the_phone">Nastavite na telefonu</string>
+    <string name="car_continue_in_the_car">Na ekran automobila</string>
+    <string name="aa_location_permissions_request">CoMaps treba pristup lokaciji. Kad bude sigurno, provjeri obavijest na svom telefonu.</string>
+    <string name="aa_request_permission_notification">Ova aplikacija treba vaše dopuštenje</string>
+    <string name="aa_request_permission_activity_text">CoMaps u Android Auto zahtijeva dopuštenja za lokaciju kako bi učinkovito funkcionirao</string>
+    <string name="aa_grant_permissions">Dodijeli dopuštenja</string>
+    <string name="button_layer_outdoor">Na otvorenom</string>
+    <string name="browser_not_available">Web preglednik nije dostupan</string>
 </resources>

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

@@ -160,7 +160,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Maaf, pengaturan Penyimpanan Peta saat ini sedang non-aktif.</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Pengunduhan negara sedang berjalan.</string>
+    <string name="downloading_is_active">Pengunduhan peta sedang berjalan</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Hei, lihat lokasiku saat ini di CoMaps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -212,7 +212,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Menguji petunjuk suara (TTS, Text-To-Speech)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Periksa pengaturan volume atau pengaturan teks-ke-ucapan sistem jika anda tidak mendengar suara sekarang.</string>
+    <string name="pref_tts_playing_test_voice">Periksa pengaturan volume atau teks-ke-ucapan sistem jika Anda tidak mendengar suara</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Tidak Tersedia</string>
     <string name="pref_map_auto_zoom">Perbesar otomatis</string>
@@ -231,7 +231,7 @@
     <!-- Button in the main Help dialog -->
     <string name="faq">Pertanyaan dan jawaban</string>
     <!-- Button in the main menu -->
-    <string name="donate">Menyumbangkan</string>
+    <string name="donate">Donasi</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Mendukung proyek</string>
     <!-- Button in the main Help dialog -->
@@ -258,7 +258,7 @@
     <string name="downloader_download_all_button">Unduh semua</string>
     <string name="downloader_downloading">Mengunduh:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Untuk menghapus peta, silakan hentikan navigasi.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Untuk menghapus peta, silakan hentikan navigasi terlebih dahulu</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Rute hanya dapat dibuat dengan yang seluruhnya ada di dalam peta tunggal.</string>
     <!-- Context menu item for downloader. -->
@@ -272,7 +272,7 @@
     <!-- Preference title -->
     <string name="google_play_services">Layanan Lokasi Google Play</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Dengan cepat menentukan perkiraan lokasi Anda melalui Bluetooth, WiFi, atau jaringan seluler</string>
+    <string name="pref_use_google_play">Layanan berpemilik (proprietary) yang memadukan GPS, Wi-Fi, jaringan seluler, dsb. untuk menentukan lokasi Anda dengan lebih akurat. Layanan ini mungkin terhubung ke server Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -330,18 +330,18 @@
     <string name="dialog_routing_location_turn_on">Aktifkan layanan lokasi</string>
     <string name="dialog_routing_location_unknown_turn_on">TIdak dapat menemukan koordinat GPS saat ini. Aktifkan layanan lokasi untuk mengalkulasi rute.</string>
     <string name="dialog_routing_unable_locate_route">Tidak dapat menemukan rute</string>
-    <string name="dialog_routing_cant_build_route">Tidak dapat membuat rute.</string>
+    <string name="dialog_routing_cant_build_route">Tidak dapat membuat rute</string>
     <string name="dialog_routing_change_start_or_end">Sesuaikan titik mula atau tujuan Anda.</string>
     <string name="dialog_routing_change_start">Sesuaikan titik mula</string>
     <string name="dialog_routing_start_not_determined">Rute tidak dibuat. Tidak dapat menemukan titik mula.</string>
     <string name="dialog_routing_select_closer_start">Pilih titik mula yang lebih dekat dengan jalan.</string>
     <string name="dialog_routing_change_end">Sesuaikan tujuan</string>
     <string name="dialog_routing_end_not_determined">Rute tidak dibuat. Tidak dapat menemukan tujuan.</string>
-    <string name="dialog_routing_select_closer_end">Pilih titik tujuan yang lebih dekat dengan jalan.</string>
+    <string name="dialog_routing_select_closer_end">Mohon pilih titik tujuan yang lebih dekat dengan jalan</string>
     <string name="dialog_routing_change_intermediate">Tidak dapat menemukan titik antara.</string>
     <string name="dialog_routing_intermediate_not_determined">Harap sesuaikan titik antara Anda.</string>
     <string name="dialog_routing_system_error">Kesalahan sistem</string>
-    <string name="dialog_routing_application_error">Tidak dapat membuat rute karena kesalahan aplikasi.</string>
+    <string name="dialog_routing_application_error">Tidak dapat membuat rute karena kesalahan aplikasi</string>
     <string name="dialog_routing_try_again">Mohon coba lagi</string>
     <string name="not_now">Jangan Sekarang</string>
     <string name="dialog_routing_download_and_build_cross_route">Apakah Anda ingin mengunduh peta dan membuat rute yang lebih optimal yang meliputi lebih dari satu peta?</string>
@@ -359,13 +359,13 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Unduh wilayah tempat Anda mencari atau coba tambahkan nama kota/desa terdekat.</string>
     <string name="search_history_title">Riwayat Pencarian</string>
-    <string name="search_history_text">Akses kueri pencarian terbaru dengan cepat.</string>
+    <string name="search_history_text">Lihat pencarian terakhir</string>
     <string name="clear_search">Bersihkan riwayat pencarian</string>
     <string name="p2p_your_location">Lokasi Anda</string>
     <string name="p2p_start">Mulai</string>
     <string name="p2p_from_here">Dari</string>
     <string name="p2p_to_here">Rute ke</string>
-    <string name="p2p_only_from_current">Navigasi tersedia hanya dari lokasi Anda saat ini.</string>
+    <string name="p2p_only_from_current">Navigasi hanya tersedia dari lokasi Anda saat ini</string>
     <string name="p2p_reroute_from_current">Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Berikut</string>
@@ -409,7 +409,7 @@
     <string name="not_signed_in">Belum masuk</string>
     <string name="login_osm">Masuk ke OpenStreetMap</string>
     <string name="logout">Keluar</string>
-    <string name="edit_place">Sunting tempat</string>
+    <string name="edit_place">Sunting Tempat</string>
     <string name="add_language">Tambahkan bahasa</string>
     <string name="street">Jalan</string>
     <!-- Editable House Number text field (in address block). -->
@@ -429,7 +429,7 @@
     <string name="downloader_update_maps">Perbarui peta</string>
     <string name="downloader_mwm_migration_dialog">Untuk membuat rute, Anda perlu memperbarui semua peta dan kemudian merencanakan rute tersebut lagi.</string>
     <string name="downloader_search_field_hint">Temukan peta</string>
-    <string name="common_check_internet_connection_dialog">Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.</string>
+    <string name="common_check_internet_connection_dialog">Pastikan perangkat Anda terhubung dengan internet</string>
     <string name="downloader_no_space_title">Tidak cukup ruang</string>
     <string name="downloader_no_space_message">Harap menghapus data yang tidak diperlukan</string>
     <string name="editor_login_error_dialog">Kesalahan masuk.</string>
@@ -493,7 +493,7 @@
     <string name="error_enter_correct_phone">Masukkan nomor telepon yang benar</string>
     <string name="error_enter_correct_web">Masukkan alamat web valid</string>
     <string name="error_enter_correct_email">Masukkan surel valid</string>
-    <string name="placepage_add_place_button">Menambahkan tempat ke OpenStreetMap</string>
+    <string name="placepage_add_place_button">Tambahkan tempat ke OpenStreetMap</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Apakah Anda ingin mengirimkannya ke semua pengguna?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
@@ -754,7 +754,7 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Untuk navigasi yang paling akurat, kami sarankan untuk menonaktifkan mode hemat daya dalam pengaturan baterai ponsel.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Merekam jalur</string>
+    <string name="start_track_recording">Rekam Jalur</string>
     <!-- Prompt for stopping a track recording. -->
     <string name="stop_track_recording">Hentikan perekaman jalur</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
@@ -779,4 +779,5 @@
     <string name="panoramax">Gambar Panoramax</string>
     <string name="app_site_url">https://comaps.app/id/</string>
     <string name="saved">Disimpan</string>
+    <string name="offline_explanation_text">Peta perlu diunduh untuk melihat dan menavigasi area ini.\nUnduh peta untuk wilayah yang ingin Anda jelajahi.</string>
 </resources>

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

@@ -23,8 +23,8 @@
     <string name="update_country_ask">Nowedhi %1$s? (%2$s)</string>
     <string name="pause">Powes</string>
     <string name="continue_button">Pesyewgh</string>
-    <string name="bookmarks">Lyververkys</string>
+    <string name="bookmarks">Leow</string>
-    <string name="bookmarks_and_tracks">Lyververkys ha Lerghow</string>
+    <string name="bookmarks_and_tracks">Drudhow</string>
     <string name="name">Hanow</string>
     <string name="address">Trigva</string>
     <string name="list">Rol</string>
@@ -61,7 +61,7 @@
     <string name="tracks_title">Lerghow</string>
     <string name="length">Hys</string>
     <string name="share_my_location">Kevrennewgh Ow Tyller</string>
-    <string name="prefs_group_general">Settyansow mayni</string>
+    <string name="prefs_group_general">Settyansow ollgemmyn</string>
     <string name="prefs_group_information">Kedhlow</string>
     <string name="prefs_group_route">Navygacyon</string>
     <string name="pref_zoom_summary">Displetya war an mappa</string>
@@ -118,7 +118,7 @@
     <string name="dialog_routing_location_turn_on">Gallosegi servisyow GPS</string>
     <string name="dialog_routing_change_end">Desedha destnans</string>
     <string name="dialog_routing_system_error">Error gans an kevreyth</string>
-    <string name="dialog_routing_try_again">Assayewgh arta mar pleg</string>
+    <string name="dialog_routing_try_again">Assaya arta mar pleg</string>
     <string name="not_now">Na Vynnav Lemmyn</string>
     <string name="search_select_map">Dewis Mappa</string>
     <string name="show">Showya</string>
@@ -186,7 +186,7 @@
     <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
     <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
     <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
-    <string name="editor_osm_history">Agas istori golegi</string>
+    <string name="editor_osm_history">Agas istori golegyans</string>
     <string name="editor_osm_notes">Agas notennow mappow</string>
     <string name="editor_operator">Oberador</string>
     <string name="operator">Oberador: %s</string>
@@ -195,14 +195,14 @@
     <string name="hour">o</string>
     <string name="minute">mynysen</string>
     <string name="placepage_more_button">Moy</string>
-    <string name="placepage_edit_bookmark_button">Golegi Lyververk</string>
+    <string name="placepage_edit_bookmark_button">Golegi Le Sawys</string>
     <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
     <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
     <string name="editor_reset_edits_button">Dilea chanjyow</string>
     <string name="editor_remove_place_message">Dilea le keworrys?</string>
     <string name="editor_remove_place_button">Dilea</string>
     <string name="editor_place_doesnt_exist">Le na eksistya</string>
-    <string name="delete_place_empty_comment_error">Provia an acheson rag dilea an le mar pleg</string>
+    <string name="delete_place_empty_comment_error">Provia an acheson rag ow dilea an le mar pleg</string>
     <string name="editor_business_vacant_button">Negys usi gwag</string>
     <string name="editor_mark_business_vacant_title">Sin negys dell gwag</string>
     <string name="editor_submit">Danvon</string>
@@ -223,7 +223,7 @@
     <string name="osm_note_toast">Noten a vydh danvon dhe OpenStreetMap</string>
     <string name="editor_share_to_all_dialog_title">A vynn\'ta mos danvon dhe oll usyoryon?</string>
     <string name="navigation_stop_button">Hedhi</string>
-    <string name="track_recording">Y\'n eur ma rekordya an lergh</string>
+    <string name="track_recording">Ow rekordya an lergh</string>
     <string name="accept">Amyttya</string>
     <string name="decline">Nagha</string>
     <string name="mobile_data_option_today">Unn Hedhyw</string>
@@ -234,11 +234,11 @@
     <string name="placepage_remove_stop">Dilea Powes</string>
     <string name="placepage_add_stop">Addya Powes</string>
     <string name="error_enter_correct_name">Ynworra unn hanow ewn mar pleg</string>
-    <string name="bookmark_lists">Rolyow</string>
+    <string name="bookmark_lists">Rolyow Drudhow</string>
     <string name="bookmark_lists_hide_all">Keles oll</string>
     <string name="bookmark_lists_show_all">Diskwedhes oll</string>
     <string name="bookmarks_create_new_group">Gul unn rol nowydh</string>
-    <string name="bookmarks_import">Ynperthi Lyververkys ha Lerghow</string>
+    <string name="bookmarks_import">Ynperthi Drudhow</string>
     <string name="bookmarks_error_message_empty_list_name">Ynworra an hanow rol mar pleg</string>
     <string name="bookmarks_new_list_hint">Rol nowydh</string>
     <string name="bookmarks_error_title_list_name_already_taken">An hanow ma usi seulabrys yn usyans</string>
@@ -261,7 +261,7 @@
     <string name="delete_list">Dilea rol</string>
     <string name="speedcams_alert_title">Kameras finweth tooth</string>
     <string name="place_description_title">Deskrifans Le</string>
-    <string name="pref_tts_speedcams_auto">Gwarnya a tothya</string>
+    <string name="pref_tts_speedcams_auto">Gwarnya a ow tothya</string>
     <string name="define_to_avoid_btn">Styrya fordhow rag avodya</string>
     <string name="toll_road">Tollfordh</string>
     <string name="unpaved_road">Fordh dor</string>
@@ -275,7 +275,7 @@
     <string name="trip_finished">Hwi re wrug!</string>
     <string name="ok">Da lowr</string>
     <string name="sort">Sortya…</string>
-    <string name="sort_bookmarks">Sortya lyververkys</string>
+    <string name="sort_bookmarks">Sortya drudhow</string>
     <string name="by_default">Dre defowt</string>
     <string name="by_type">Dre eghen</string>
     <string name="by_distance">Dre pellder</string>
@@ -318,7 +318,7 @@
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
+    <string name="app_tip_00">Meur ras rag ow devnydhya a\'gan mappys drehevys gans an kemeneth!</string>
     <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
     <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
     <string name="app_tip_06">Ty a yll gweres treylya a\'gan app yn dhayeth.</string>
@@ -327,7 +327,7 @@
     <string name="button_layer_outdoor">Yn-mes</string>
     <string name="browser_not_available">Peurell nakavadow</string>
     <string name="volume">Ughelder</string>
-    <string name="bookmarks_export">Esperthi oll Lyververkys ha Lerghow</string>
+    <string name="bookmarks_export">Esperthi oll Leow ha Lerghow</string>
     <string name="clear_the_search">Dilea an hwithrans</string>
     <string name="zoom_in">Moghhe</string>
     <string name="zoom_out">Lehe</string>
@@ -348,7 +348,7 @@
     <string name="pedestrian">Kerdher</string>
     <string name="bicycle">Diwros</string>
     <string name="ruler">Rewlell</string>
-    <string name="bookmark_color">Kolor lyververk</string>
+    <string name="bookmark_color">Kolor rag Drudh</string>
     <string name="about_help">A-dro ha Gweres</string>
     <string name="share_track">Kevren Lergh</string>
     <string name="delete_track_dialog_title">Dilea %s?</string>
@@ -376,7 +376,7 @@
     <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="download_has_failed">Y fyllis an iskarg, tava dhe dasassaya</string>
-    <string name="downloading">Iskargaow…</string>
+    <string name="downloading">Owth Iskargaow…</string>
     <string name="location_is_disabled_long_text">Hwi ungallosegi y\'n eur ma oll Gonisyow GPS rag an devis po app ma. Mar pleg, gallosegi y\'s yn Settyansow.</string>
     <string name="precise_location_is_disabled_long_text">Rag surhe navygacyon ewn, gallosegi GPS Kewar yn Settyansow</string>
     <string name="country_status_download_failed">Yn fyllis iskarg</string>
@@ -387,24 +387,24 @@
     <string name="unsupported_phone">An app rekwirya OpenGL gans uskisheans kalesweyth. Soweth, gas devis na skoodhys.</string>
     <string name="disconnect_usb_cable">Mar pleg, unjunya an korsen USB po ynworra kyf kov dhe devnydhya CoMaps</string>
     <string name="not_enough_free_space_on_sdcard">Mar pleg, gul neb dalghuster yn an karten SD/kyf kov kyns dhe devnydhya an app</string>
-    <string name="download_resources">Dherag hwi dalleth devnydhya an app, mar pleg iskarga an mappa ollvysel sempel dhe gas devis.\nY devnydhya %s a dalghuster.</string>
+    <string name="download_resources">Dherag hwi dalleth ow devnydhya an app, mar pleg iskarga an mappa ollvysel sempel dhe gas devis.\nY devnydhya %s a dalghuster.</string>
-    <string name="downloading_country_can_proceed">Iskargaow %1$s (%2$s). Hwi gallos\nprocedya dhe an mappa.</string>
+    <string name="downloading_country_can_proceed">Owth iskargaow %1$s (%2$s). Hwi gallos\nprocedya dhe an mappa.</string>
     <string name="download_country_failed">%s iskarg yw fyllis</string>
     <string name="add_new_set">Addya unn Rol Nowydh</string>
-    <string name="bookmark_set_name">Hanow Rol Lyververkys</string>
+    <string name="bookmark_set_name">Hanow Rol</string>
     <string name="maps_storage">Sawya mappys dhe</string>
     <string name="maps_storage_summary">Dewis an restrenva dhe iskarga mappys dhe</string>
     <string name="maps_storage_downloaded">Mappys iskargys</string>
     <string name="maps_storage_free_size">%1$s kavadow yn-mes a %2$s</string>
-    <string name="move_maps_error">Error dres gwaya restrennow mappa</string>
+    <string name="move_maps_error">Error dres ow gwaya restrennow mappa</string>
     <string name="wait_several_minutes">An argerdh ma re durya meur a mynysen.\nGortewgh mar pleg…</string>
     <string name="category_eat">Leow rag dybri</string>
     <string name="category_secondhand">Gwarennow Wortaswerth</string>
     <string name="category_nightlife">Delit dres Nos</string>
-    <string name="share_bookmarks_email_subject">Lyververkys CoMaps yw kevrennys gans ty</string>
+    <string name="share_bookmarks_email_subject">Ow Drudhow CoMaps</string>
-    <string name="share_bookmarks_email_body">Dydh da!\n\nOw lyververkys yw stag; mar pleg, ygeri y\'s yn CoMaps. A hwi kavos y na leys, hwi gallos iskarga y omma: https://www.comaps.app/download/ \n\nEnjoya travalya gans CoMaps!</string>
+    <string name="share_bookmarks_email_body">Dydh da!\n\nOw lyververkys yw stag; mar pleg, ygeri y\'s yn CoMaps. A hwi kavos y na leys, hwi gallos iskarga y omma: https://www.comaps.app/download/ \n\nEnjoya ow travalya gans CoMaps!</string>
-    <string name="load_kmz_successful">Lyververkys kargys yn sewen! Hwi gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Lyververkys.</string>
+    <string name="load_kmz_successful">Drudhow kargys yn sewen! Ty gallos kavos y\'s war an mappa po yn an skrin Dyghtyer Drudhow.</string>
-    <string name="load_kmz_failed">Y fyllis an karga lyververkys. An restren re bos anewn.</string>
+    <string name="load_kmz_failed">Y fyllis an karga drudhow. An restren re bos anewn.</string>
     <string name="unknown_file_type">An eghen restren yw anaswonys gans an app:\n%1$s</string>
     <string name="failed_to_open_file">Y fyllis ygeri restren %1$s \n\n%2$s</string>
     <string name="unknown_current_position">Dhe tyller yw determys na hwath</string>
@@ -422,12 +422,12 @@
     <string name="pref_map_auto_zoom">Brashe yn awtomatek</string>
     <string name="placepage_distance">Pellder</string>
     <string name="how_to_support_us">Bodhegi ha gwellhe CoMaps</string>
-    <string name="compass_calibration_recommended">Gwellhe tu seth gans gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh.</string>
+    <string name="compass_calibration_recommended">Gwellhe tu seth gans ow gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh.</string>
     <string name="compass_calibration_required">Gwaya an kellgowser yn unn gwayans niver eth dhe selya an mornaswydh ha ewna an tu seth war an mappa.</string>
     <string name="long_tap_toast">Tava hir war an mappa arta dhe gweles an ynterfas</string>
     <string name="downloader_downloaded_subtitle">Iskargys</string>
     <string name="downloader_queued">Lostys</string>
-    <string name="downloader_downloading">Iskargaow:</string>
+    <string name="downloader_downloading">Owth Iskarga:</string>
     <string name="downloader_delete_map_while_routing_dialog">Dhe dilea mappa, hedhi navygacyon, mar pleg</string>
     <string name="routing_failed_cross_mwm_building">Kerdhow gallos gul yw kontaynys yn leun a-berth yn unn mappa a unn pow hepken.</string>
     <string name="pref_use_google_play">Unn gonis perghenogel may kesunya GPS, Wi-fi, rosweythyow kellgowser h.e. rag determya dhe tyller yn kewar. Y re junya dhe servellow Google.</string>
@@ -435,14 +435,14 @@
     <string name="routing_requires_all_map">Rag gul unn kerdh, ni res iskarga ha nowedhi oll mappys a gas tyller dhe gas penn an fordh.</string>
     <string name="save">Sawya</string>
     <string name="cyan">Blou</string>
-    <string name="dialog_routing_disclaimer_title">Pan holya an hyns, kofhe mar pleg:</string>
+    <string name="dialog_routing_disclaimer_title">Pan ow holya an hyns, kofhe mar pleg:</string>
     <string name="dialog_routing_disclaimer_priority">— Studh fordh, laghys traffik, ha arwodhyow kavos ragwir pub eur a-ugh dhe hyntys navygacyon;</string>
     <string name="dialog_routing_disclaimer_precision">— An mappa re bos ankewar, ha an kussul hyns re na bos an method gwella dhe drehedhes an penn an fordh;</string>
     <string name="dialog_routing_disclaimer_recommendations">— Kussus kyns yw komendyansow hepken;</string>
     <string name="dialog_routing_disclaimer_borders">— Gul rach gans hyns ogas emlow: an kerdhow gulys gans agan app re tremena treweythyow emlow keswlasek yn tylleryow anreythhes.</string>
     <string name="dialog_routing_disclaimer_beware">Mar pleg, gortos hewol ha saw war an fordhow!</string>
     <string name="dialog_routing_error_location_not_found">Anabel dhe gul kerdh. Kesordenogyon GPS na gallos determys.</string>
-    <string name="dialog_routing_location_turn_wifi">Mar pleg, checkya gas sinell GPS. Gallosegi Wi-Fi re gwellhe gas kewerder GPS.</string>
+    <string name="dialog_routing_location_turn_wifi">Mar pleg, checkya gas sinell GPS. Ow gallosegi Wi-Fi re gwellhe gas kewerder GPS.</string>
     <string name="dialog_routing_location_unknown_turn_on">Anabel dhe desedha kesordenogyon GPS. Gallosegi gonisyow GPS dhe kalkya kerdh.</string>
     <string name="dialog_routing_unable_locate_route">Anabel dhe desedha kerdh</string>
     <string name="dialog_routing_cant_build_route">Anabel dhe gul kerdh</string>
@@ -457,9 +457,9 @@
     <string name="dialog_routing_application_error">Anabel dhe gul kerdh drefen unn error app</string>
     <string name="dialog_routing_download_and_build_cross_route">A vynnsowgh iskarga an mappa ha gul unn kerdh gwell a-dreus moy ages unn mappa?</string>
     <string name="dialog_routing_download_cross_route">Iskarga mappys keworransel dhe gul unn kerdh gwell a-dreus moy ages unn mappa.</string>
-    <string name="search_without_internet_advertisement">Rag dalleth hwilas ha gul kerdhow, iskarga an mappa, mar pleg. Wosa henna, hwi na fella res unn junyans kesrosweyth.</string>
+    <string name="search_without_internet_advertisement">Rag dalleth ow hwilas hag ow gul kerdhow, iskarga an mappa, mar pleg. Wosa henna, hwi na fella res unn junyans kesrosweyth.</string>
     <string name="search_not_found">Soweth, sewyansow kavos vyth</string>
-    <string name="search_not_found_query">Iskarga an pow py tyller hwi hwilas po assaya addya unn hanow tre/gwig yn ogas.</string>
+    <string name="search_not_found_query">Iskarga an pow py tyller hwi ow hwilas po assaya owth addya unn hanow tre/gwig yn ogas.</string>
     <string name="search_history_text">Gweles gas hwithransow a-dhiwedhes</string>
     <string name="p2p_from_here">Mos dhyworth</string>
     <string name="p2p_to_here">Mos war-tu</string>
@@ -499,8 +499,8 @@
     <string name="downloader_no_space_message">Mar pleg, dilea neb data heb res</string>
     <string name="editor_profile_changes">Chanjyow Gwirhys</string>
     <string name="editor_focus_map_on_location">Draylya an mappa rag settya an krows yn an tyller a an le po negys.</string>
-    <string name="editor_edit_place_title">Golegi</string>
+    <string name="editor_edit_place_title">Ow Golegi</string>
-    <string name="editor_add_place_title">Addya</string>
+    <string name="editor_add_place_title">Owth Addya</string>
     <string name="message_invalid_feature_position">Tra vyth gallos bos desedhys omma</string>
     <string name="osm_presentation">Data OpenStreetMap gulys gans an kemeneth dhyworth %s. Dyski moy a-dro fatel golegi ha nowedhi an mappa yn OpenStreetMap.org</string>
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) yw unn ragdres kemeneth dhe byldya unn mappa rydh ha apert. Y yw an devedhyans chif a data mappa yn CoMaps ha oberi haval dhe Wikipedya. Hwi gallos addya po golegi leow ha i bos kavadow dhe milvilyow usyoryon dres oll an bys.\nOmjunya an kemeneth ha gweres gul unn mappa gwell rag keniver!</string>
@@ -522,14 +522,14 @@
     <string name="place_page_map_too_old_description">Gas data mappa a\'n jydh yw pur koth, nowedhi an mappa mar pleg.</string>
     <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">Golegi OpenStreetMap yw ungallosegi dre reson an data mappa yw re koth.</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_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_option_always">Devnydhya Pub Prys</string>
     <string name="mobile_data_option_not_today">Na Devnydhya Hedhyw</string>
     <string name="mobile_data">Junyans Kellgowser</string>
-    <string name="mobile_data_description">Junyans kellgowser yw res rag messajys nowedhyans mappa ha ughkarga chanjyow</string>
+    <string name="mobile_data_description">Junyans kellgowser yw res rag messajys nowedhyans mappa hag owth ughkarga chanjyow</string>
     <string name="mobile_data_option_never">Devnydhya Bynner</string>
     <string name="mobile_data_option_ask">Govyn Pub Prys</string>
     <string name="traffic_update_maps_text">Rag diskwedhes data daromdak, mappys res bos nowedhys</string>
@@ -549,15 +549,15 @@
     <string name="dialog_error_storage_message">Dalghuster a-ves ankavadow. An karten SD re bos removys, shyndys, po an system restrennow yw redya-hepken. Mar pleg, checkya gas karten SD po kestava ni gans support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Hevelebya dalghuster drog</string>
     <plurals name="bookmarks_places">
-        <item quantity="zero">%d lyververkys</item>
+        <item quantity="zero">%d leow sawys</item>
-        <item quantity="one">%d lyververk</item>
+        <item quantity="one">%d le sawys</item>
-        <item quantity="two">%d lyververkys</item>
+        <item quantity="two">%d leow sawys</item>
-        <item quantity="few">%d lyververkys</item>
+        <item quantity="few">%d leow sawys</item>
-        <item quantity="many">%d lyververkys</item>
+        <item quantity="many">%d leow sawys</item>
-        <item quantity="other">%d lyververkys</item>
+        <item quantity="other">%d leow sawys</item>
     </plurals>
     <string name="bookmarks_error_message_share_general">Anabel dhe kevrenna awos unn error app</string>
-    <string name="bookmarks_error_title_share_empty">Error dres kevrenna</string>
+    <string name="bookmarks_error_title_share_empty">Error dres ow kevrenna</string>
     <string name="bookmarks_error_message_share_empty">Na gallos kevrenna unn rol gwag</string>
     <string name="bookmarks_error_title_empty_list_name">Hanow a res</string>
     <plurals name="bookmarks_detect_message">
@@ -576,7 +576,7 @@
         <item quantity="many">%d lerghow</item>
         <item quantity="other">%d lerghow</item>
     </plurals>
-    <string name="bookmarks_empty_list_message">Rag addya unn lyververk, tava unn le war an mappa ha tava an arwodik steren</string>
+    <string name="bookmarks_empty_list_message">Rag sawya unn le, tava unn le war an mappa ha tava an arwodik steren</string>
     <string name="notification_channel_downloader">Iskarger mappa</string>
     <string name="pref_tts_speedcams_always">Gwarnya pub prys</string>
     <string name="pref_tts_speedcams_never">Gwarnya bynner</string>
@@ -602,15 +602,15 @@
     <string name="moreyear_ago_sorttype">Moy ages nans yw unn bledhen</string>
     <string name="dialog_pedestrian_route_is_long_header">Kerdh metro kavosys vyth</string>
     <string name="dialog_pedestrian_route_is_long_message">Mar pleg, dewis unn tyller dalleth po penn an fordh yn-nes unn gorvas metro</string>
-    <string name="isolines_activation_error_dialog">Bywhe linen kettresow res iskargaow data mappa rag an arenebedh ma</string>
+    <string name="isolines_activation_error_dialog">Ow bywhe linen kettresow res owth iskarga data mappa rag an arenebedh ma</string>
     <string name="isolines_location_error_dialog">Linen kettresow yw kavadow yn an arenebedh ma na hwath</string>
     <string name="elevation_profile_ascent">Ascendyans</string>
     <string name="elevation_profile_descent">Diyskynnys</string>
-    <string name="downloader_loading_ios">Iskargaow</string>
+    <string name="downloader_loading_ios">Owth Iskarga</string>
     <string name="disk_error">Anabel dhe gul restrenva ha gwaya restrennow war devis kov po sdcard</string>
     <string name="disconnect_usb_cable_title">Unjunya korsen USB</string>
     <string name="enable_keep_screen_on">Gwitha an skrin byw</string>
-    <string name="enable_keep_screen_on_description">A gallosegys, an skrin yw bos byw pub prys dres diskwedhes an mappa.</string>
+    <string name="enable_keep_screen_on_description">A gallosegys, an skrin yw bos byw pub prys dres ow diskwedhes an mappa.</string>
     <string name="enable_show_on_lock_screen">Diskwedhes war an skrin floren</string>
     <string name="enable_show_on_lock_screen_description">A gallosegys, an app yw diskwedhes war an skrin floren pan an devis yw alhwedhys hwath.</string>
     <string name="app_tip_03">A hwi aswon unn gwrier medhelweyth, hwi gallos peji ga kowlwul unn nas may hwi res.</string>
@@ -619,8 +619,8 @@
     <string name="app_tip_07">Agan app yw gul gans nebes diwysygyon ha an kemeneth.</string>
     <string name="app_tip_08">Hwi gallos ewnhe ha gwellhe yn es an data map.</string>
     <string name="app_tip_09">Agan amkan chif yw byldya mappys uskis, privedh, ha es may hwi a wra kara.</string>
-    <string name="car_used_on_the_phone_screen">Hwi devnydhya lemmyn CoMaps war an skrin kellgowser</string>
+    <string name="car_used_on_the_phone_screen">Hwi ow devnydhya lemmyn CoMaps war an skrin kellgowser</string>
-    <string name="car_used_on_the_car_screen">Hwi devnydhya lemmyn CoMaps war an skrin karr</string>
+    <string name="car_used_on_the_car_screen">Hwi ow devnydhya lemmyn CoMaps war an skrin karr</string>
     <string name="car_continue_on_the_phone">Pesya war an kellgowser</string>
     <string name="car_continue_in_the_car">Dhe an skrin karr</string>
     <string name="aa_location_permissions_request">CoMaps res hedhas GPS. Pan y yw saw, checkya an messach war gas kellgowser.</string>
@@ -630,29 +630,29 @@
     <string name="pref_tts_no_system_tts">Settyansow tekst-dhe-areth na kavosys, Os ta sur gas devis skoodhya y?</string>
     <string name="drive_through">Drivya-dredh</string>
     <string name="self_service">Omgonis</string>
-    <string name="power_save_dialog_summary">Rag navygacyon moggha, ni komendya ungallosegi fordh batri yn settyansow kellgowser batri.</string>
+    <string name="power_save_dialog_summary">Rag navygacyon moggha, ni komendya owth ungallosegi fordh batri yn settyansow kellgowser batri.</string>
     <string name="stop_track_recording">Finsya Rekordyans Lergh</string>
     <string name="stop_without_saving">Hedhi Rekordyans Lergh</string>
     <string name="continue_recording">Pesya Rekordya</string>
-    <string name="track_recording_alert_title">Sawya yn Lyververkys ha Lerghow?</string>
+    <string name="track_recording_alert_title">Sawya yn Drudhow?</string>
     <string name="track_recording_toast_nothing_to_save">Lergh yw gwag - mann rag sawyans</string>
     <string name="error_no_file_manager_app">Anabel diskwedhes fenester dewis restrenva dre reson app fytti vyth yw leys war gas devis. Mar pleg, lea unn dyghtyer restrennow ha dasassaya.</string>
     <string name="uri_open_location_failed">App leys vyth may gallos ygeri an tyller</string>
     <string name="pref_left_button_disable">Ungallosegi</string>
-    <string name="pref_backup_title">Fardel ewnans gans lyververkys ha lerghow</string>
+    <string name="pref_backup_title">Backupya drudhow</string>
-    <string name="pref_backup_summary">Gul yn awtomatek unn fardel gans data rag ewnans yn unn restrenva war gas devis</string>
+    <string name="pref_backup_summary">Backupya yn awtomatek yn unn restrenva war gas devis</string>
     <string name="pref_backup_now_title">Gul y lemmyn</string>
-    <string name="pref_backup_now_summary">Gul a\'n par na fardel a-dhesempis</string>
+    <string name="pref_backup_now_summary">Gul unn backup a-dhesempis</string>
     <string name="pref_backup_now_summary_progress">Yn avonsyans…</string>
     <string name="pref_backup_now_summary_ok">Sewena</string>
-    <string name="pref_backup_now_summary_empty_lists">Lyververkys ha lerghow vyth rag gul unn fardel</string>
+    <string name="pref_backup_now_summary_empty_lists">Leow ha lerghow vyth rag backupya</string>
-    <string name="pref_backup_now_summary_failed">Y fyllis gul unn fardel</string>
+    <string name="pref_backup_now_summary_failed">Y fyllis gul unn backup</string>
     <string name="pref_backup_now_summary_folder_unavailable">An restrenva dewisys yw ankavadow</string>
     <string name="pref_backup_status_summary_success">Gwrians sewen a-dhiwedhes</string>
     <string name="pref_backup_location_title">Tyller</string>
     <string name="pref_backup_location_summary_initial">Mar pleg, dewis unn restrenva a-dherag ha grontya gront</string>
-    <string name="pref_backup_history_title">Niver a fardellow dhe gwitha</string>
+    <string name="pref_backup_history_title">Niver a backupys dhe gwitha</string>
-    <string name="pref_backup_interval_title">Gul fardellow yn awtomatek</string>
+    <string name="pref_backup_interval_title">Backupya yn awtomatek</string>
     <string name="backup_interval_manual_only">Marow (dre dhorn hepken)</string>
     <string name="dialog_report_error_missing_folder">An tyller dewisys yw ankavadow po redya-hepken. Dewis unn tyller aral, mar pleg.</string>
     <string name="dialog_report_error_with_logs">Mar pleg danvon unn derivas error dhe ni:\n - \"Gallosegi kovadhow\" yn an settyansow\n - Dasleverel yn diogel an kudyn\n - yn an skrin \"A-dro ha Gweres\", levna an boton \"Derivas unn kudyn\" ha danvon der ebost po keskows\n - ungallosegi kovadhow</string>
@@ -661,7 +661,7 @@
     <string name="closed_now">Degeys lemmyn</string>
     <string name="at">dhe %s</string>
     <string name="pref_tts_no_system_tts_short">Jynn tekst-dhe-areth kavosys vyth, checkya an settyansow app</string>
-    <string name="navigation_start_tts_message">"Dalleth navygacyon, yeth lev: "</string>
+    <string name="navigation_start_tts_message">"Ow dalleth navygacyon, yeth lev: "</string>
     <string name="navigation_start_tts_disabled_message">Lenna danvonadow marow: jynn tekst-dhe-areth ankavadow</string>
     <string name="offline_explanation_text">Unn mappa res iskargys rag gweles ha viajya an arenebedh.\nIskarga mappys rag arenebedhow may hwi mynnes viajya dhe.</string>
     <string name="list_description_empty">Golegi an rol rag addya unn deskrifans</string>
@@ -669,5 +669,6 @@
     <string name="download_resources_custom_url_title">Servell Mappa Personel</string>
     <string name="download_resources_custom_url_message">Aslea an servell defowt devnydhys rag iskargow mappa. Gwitha gwag rag devnydhya an servell CoMaps defowt.</string>
     <string name="download_resources_custom_url_summary_none">Anavleythys</string>
-    <string name="download_resources_custom_url_error_scheme">Mar pleg, ynworra unn URL may dalleth gans http:// po https://</string>
+    <string name="download_resources_custom_url_error_scheme">Mar pleg, ynworra unn URL may ow dalleth gans http:// po https://</string>
+    <string name="pref_maplanguage_local">Yeth Leel</string>
 </resources>

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

@@ -66,9 +66,9 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Naujo sąrašo pridėjimas</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Žymių sąrašo pavadinimas</string>
+    <string name="bookmark_set_name">Sąrašo pavadinimas</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Žymės</string>
+    <string name="bookmarks">Vietos</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Pavadinimas</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -488,7 +488,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Išsamiau</string>
-    <string name="placepage_edit_bookmark_button">Taisyti žymę</string>
+    <string name="placepage_edit_bookmark_button">Taisyti Įsimintą vietą</string>
     <string name="placepage_personal_notes_hint">Asmeninės pastabos (tekstas arba HTML)</string>
     <string name="editor_reset_edits_message">Anuliuoti visus vietinius pakeitimus?</string>
     <string name="editor_reset_edits_button">Atsisakyti pakeitimų</string>

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

@@ -66,11 +66,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Pievienot jaunu sarakstu</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Grāmatzīmju saraksta nosaukums</string>
+    <string name="bookmark_set_name">Saraksta nosaukums</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Grāmatzīmes</string>
+    <string name="bookmarks">Vietas</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Grāmatzīmes un ceļi</string>
+    <string name="bookmarks_and_tracks">Izlase</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nosaukums</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -146,16 +146,16 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Piezīmes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Ar jums kopīgoja „Oranic Maps“ grāmatzīmes</string>
+    <string name="share_bookmarks_email_subject">Mana “CoMaps” izlase</string>
-    <string name="share_bookmarks_email_body">Sveiki! \n \nPielikumā ir grāmatzīmes. Lūdzu, atveriet tās „CoMaps“ lietotnē. Ja Jums tā nav instalēta, instalējiet to te: https://www.comaps.app/download/ \n \nBaudiet ceļošanu ar „Oranic Maps“!</string>
+    <string name="share_bookmarks_email_body">Sveiciens! \n \nPielikumā ir mana izlase. Lūgums atvērt to lietotnē “CoMaps”. Ja tā nav uzstādīta, to var iegūt šeit: https://www.comaps.app/download/ \n \nIzbaudi ceļošanu ar “CoMaps”!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Ielādē grāmatzīmes</string>
+    <string name="load_kmz_title">Ielādē izlasi</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Grāmatzīmes ir ielādētas! Tās varat atrast kartē un grāmatzīmju pārvaldīšanas ekrānā.</string>
+    <string name="load_kmz_successful">Izlase sekmīgi ielādēta. To var atrast kartē vai izlases pārvaldīšanas skatā.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Grāmatzīmes ielādēt neizdevās. Iespējams, datne ir bojāta.</string>
+    <string name="load_kmz_failed">Neizdevās ielādēt izlasi. Datne var būt bojāta.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
-    <string name="unknown_file_type">Lietotne neatpazīst datnes tipu: \n%1$s</string>
+    <string name="unknown_file_type">Lietotne neatpazīst datnes veidu: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Neizdevās atvērt datni %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
@@ -496,9 +496,9 @@
     <string name="minute">min.</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Vairāk</string>
-    <string name="placepage_edit_bookmark_button">Rediģēt grāmatzīmi</string>
+    <string name="placepage_edit_bookmark_button">Labot saglabāto vietu</string>
-    <string name="placepage_personal_notes_hint">Personīgi pieraksti (teksts vai HTML)</string>
+    <string name="placepage_personal_notes_hint">Personīgas piezīmes (teksts vai HTML)</string>
-    <string name="editor_reset_edits_message">Vai izmest visas lokāli saglabātās izmaiņas?</string>
+    <string name="editor_reset_edits_message">Vai atmest visas vietējās izmaiņas?</string>
     <string name="editor_reset_edits_button">Atmest izmaiņas</string>
     <string name="editor_remove_place_message">Vai dzēst pievienoto vietu?</string>
     <string name="editor_remove_place_button">Dzēst</string>
@@ -561,19 +561,19 @@
     <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>
     <string name="error_enter_correct_name">Ierakstiet pareizu nosaukumu</string>
-    <string name="bookmark_lists">Saraksti</string>
+    <string name="bookmark_lists">Izlases saraksti</string>
     <!-- Do not display all bookmark lists on the map -->
-    <string name="bookmark_lists_hide_all">Slēpt visus</string>
+    <string name="bookmark_lists_hide_all">Paslēpt visus</string>
     <string name="bookmark_lists_show_all">Rādīt visus</string>
     <plurals name="bookmarks_places">
-        <item quantity="zero">%d grāmatzīmju</item>
+        <item quantity="zero">%d saglabātu vietu</item>
-        <item quantity="one">%d grāmatzīme</item>
+        <item quantity="one">%d saglabāta vieta</item>
-        <item quantity="other">%d grāmatzīmes</item>
+        <item quantity="other">%d saglabātas vietas</item>
     </plurals>
     <string name="bookmarks_create_new_group">Izveidot jaunu sarakstu</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importēt grāmatzīmes un ceļus</string>
+    <string name="bookmarks_import">Ievietot izlasi</string>
-    <string name="bookmarks_error_message_share_general">Programmas kļūdas dēļ kopīgošana neizdevās</string>
+    <string name="bookmarks_error_message_share_general">Nav iespējams kopīgot lietotnes kļūdas dēļ</string>
     <string name="bookmarks_error_title_share_empty">Kopīgošanas kļūda</string>
     <string name="bookmarks_error_message_share_empty">Nav iespējams kopīgot tukšu sarakstu</string>
     <string name="bookmarks_error_title_empty_list_name">Nosaukums nevar būt tukšs</string>
@@ -603,7 +603,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Kartes stili un slāņi</string>
     <string name="bookmarks_empty_list_title">Saraksts ir tukšs</string>
-    <string name="bookmarks_empty_list_message">Lai pievienotu grāmatzīmi, sākumā spiediet uz vietas kartē, bet tad uz zvaigznītes ikonas</string>
+    <string name="bookmarks_empty_list_message">Lai saglabātu vietu, jāpiesit vietai kartē un tad zvaigznes ikonai</string>
     <string name="category_desc_more">…vairāk</string>
     <string name="export_file">Izgūt KMZ formātā</string>
     <string name="export_file_gpx">Izgūt GPX formātā</string>
@@ -656,7 +656,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Kārtot…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Kārtot grāmatzīmes</string>
+    <string name="sort_bookmarks">Kārtot izlasi</string>
     <!-- Android -->
     <string name="by_default">Pēc noklusējuma</string>
     <!-- Android -->
@@ -723,7 +723,7 @@
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">Ja ieslēgts, lietotne darbosies pat tad, ja ierīce būs nobloķēta.</string>
     <!-- OpenStreetMap text on splash screen -->
-    <string name="splash_subtitle">Kartes datu avots ir „OpenStreetMap“</string>
+    <string name="splash_subtitle">Kartes dati ir no “OpenStreetMap”</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Paldies, ka izmantojat mūsu kopienas veidotās kartes!</string>
     <!-- App tip #01 -->
@@ -760,12 +760,12 @@
     <string name="browser_not_available">Tīmekļa pārlūkprogramma nav pieejama</string>
     <string name="volume">Skaļums</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Izgūt visus ceļus un grāmatzīmes</string>
+    <string name="bookmarks_export">Izgūt visas vietas un ceļus</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
-    <string name="pref_tts_open_system_settings">Runas sintēzes sistēmas iestatījumi</string>
+    <string name="pref_tts_open_system_settings">Runas atveidošanas sistēmas iestatījumi</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
-    <string name="pref_tts_no_system_tts">Lietotnes neatrada runas sintēzes iestatījumus. Vai ierīce tos atbalsta?</string>
+    <string name="pref_tts_no_system_tts">Runas atveidošanas iestatījumi netika atrasti. Vai ierīce tos atbalsta?</string>
-    <string name="drive_through">Caurbrauktuve caur</string>
+    <string name="drive_through">Caurbrauktuve</string>
     <string name="clear_the_search">Notīrīt meklēšanu</string>
     <string name="zoom_in">Tuvināt</string>
     <!-- Accessibility text for the zoom-out button on the map -->
@@ -783,7 +783,7 @@
     <string name="outdoor_seating">Ārtelpu sēdvietas</string>
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Lai navigācija būtu pēc iespējas precīzāka, iesakām tālruņa baterijas iesatatījumos izslēgt energotaupības režīmu.</string>
-    <string name="choose_color">Izvēlieties krāsu</string>
+    <string name="choose_color">Izvēlēties krāsu</string>
     <string name="edit_track">Labot ceļu</string>
     <string name="change_map_locale">Kartes valoda</string>
     <string name="wikimedia_commons">Vikikrātuve</string>
@@ -795,10 +795,10 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="continue_recording">Turpināt ierakstīt</string>
-    <string name="track_recording_alert_title">Saglabāt ceļu grāmatzīmju sadaļā?</string>
+    <string name="track_recording_alert_title">Pievienot izlasei?</string>
     <string name="editor_other_info">Piezīme OpenStreetMap brīvprātigajiem (nav obligāts)</string>
-    <string name="track_recording_toast_nothing_to_save">Ceļš ir tukšs – nav ko saglabāt</string>
+    <string name="track_recording_toast_nothing_to_save">Ceļš ir tukšs – nav nekā saglabājama</string>
-    <string name="error_no_file_manager_app">Nevar parādīt mapes atlases dialoglodziņu, jo jūsu ierīcē nav instalēta piemērota lietotne. Lūdzu, uzstādiet failu pārvaldnieka lietotni un mēģiniet vēlreiz.</string>
+    <string name="error_no_file_manager_app">Nevar attēlot mapes atlasīšanas logu, jo ierīcē nav uzstādīta piemērota lietotne. Lūgums uzstādīt datņu pārvaldnieka lietotni un mēģināt vēlreiz.</string>
     <string name="uri_open_location_failed">Nav uzstādīta neviena lietotne, kas varētu atvērt atrašanās vietu</string>
     <string name="aa_request_permission_notification">Šai lietotnei ir nepieciešama jūsu atļauja</string>
     <string name="editor_about_osm">Jūsu labojumi tiek augšupielādēti sabiedriskajā <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> datubāzē. Lūdzu, nepievienojiet personisku vai ar autortiesībām aizsargātu informāciju.</string>
@@ -861,4 +861,5 @@
         <item quantity="one">%d min.</item>
         <item quantity="other">%d min.</item>
     </plurals>
+    <string name="pref_maplanguage_local">Vietējā valoda</string>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Legg til en ny liste</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Bokmerkelistenavn</string>
+    <string name="bookmark_set_name">Listenavn</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bokmerker</string>
+    <string name="bookmarks">Steder</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bokmerker og spor</string>
+    <string name="bookmarks_and_tracks">Favoritter</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Navn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Merknader</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Delte CoMaps-bokmerker</string>
+    <string name="share_bookmarks_email_subject">Mine CoMaps-favoritter</string>
-    <string name="share_bookmarks_email_body">Hei! \n \nVedlagt er mine bokmerker; åpne dem i CoMaps. Har du ikke installert appen kan du laste ned her: https://www.comaps.app/download/ \n \nGod reise med CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hei! \n \nVedlagt er mine favoritter; åpne dem i CoMaps. Har du ikke installert appen kan du laste ned her: https://www.comaps.app/download/ \n \nGod reise med CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Laster inn bokmerker</string>
+    <string name="load_kmz_title">Laster inn favoritter</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bokmerkene ble lastet inn! Du finner dem på kartet eller på skjermen Bokmerkehåndtering.</string>
+    <string name="load_kmz_successful">Favoritter ble lastet inn! Du finner dem på kartet eller på skjermen Favoritthåndtering.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Mislyktes i å laste inn bokmerker. Filen kan være skadet eller defekt.</string>
+    <string name="load_kmz_failed">Mislyktes i å laste inn favoritter. Filen kan være skadet eller defekt.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen gjenkjennes ikke av appen: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -500,7 +500,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Mer</string>
-    <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
+    <string name="placepage_edit_bookmark_button">Rediger lagret sted</string>
     <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
     <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
     <string name="editor_reset_edits_button">Forkast endringer</string>
@@ -565,17 +565,17 @@
     <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
     <string name="error_enter_correct_name">Skriv inn korrekt navn</string>
-    <string name="bookmark_lists">Lister</string>
+    <string name="bookmark_lists">Favorittlister</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Skjul alle</string>
     <string name="bookmark_lists_show_all">Vis alle</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bokmerke</item>
+        <item quantity="one">%d lagret sted</item>
-        <item quantity="other">%d bokmerker</item>
+        <item quantity="other">%d lagrede steder</item>
     </plurals>
     <string name="bookmarks_create_new_group">Opprett ny liste</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importer bokmerker og spor</string>
+    <string name="bookmarks_import">Importer favoritter</string>
     <string name="bookmarks_error_message_share_general">Kan ikke dele på grunn av en programfeil</string>
     <string name="bookmarks_error_title_share_empty">Delingsfeil</string>
     <string name="bookmarks_error_message_share_empty">Kan ikke dele en tom liste</string>
@@ -604,7 +604,7 @@
     <string name="subway">T-bane</string>
     <string name="layers_title">Kartstiler og -lag</string>
     <string name="bookmarks_empty_list_title">Denne listen er tom</string>
-    <string name="bookmarks_empty_list_message">For å legge til et bokmerke, trykk et sted på kartet og trykk så stjerneikonet</string>
+    <string name="bookmarks_empty_list_message">For å lagre et sted, trykk et sted på kartet og trykk så stjerneikonet</string>
     <string name="category_desc_more">…mer</string>
     <string name="export_file">Eksporter KMZ</string>
     <string name="export_file_gpx">Eksporter GPX</string>
@@ -657,7 +657,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sorter…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorter bokmerker</string>
+    <string name="sort_bookmarks">Sorter favoritter</string>
     <!-- Android -->
     <string name="by_default">Som standard</string>
     <!-- Android -->
@@ -724,7 +724,7 @@
     <!-- Description in preferences -->
     <string name="enable_show_on_lock_screen_description">Når dette er aktivert, fungerer appen på låseskjermen selv når enheten er låst.</string>
     <!-- Current language of the map! -->
-    <string name="change_map_locale">Kart-språk</string>
+    <string name="change_map_locale">Kartspråk</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Kartdata fra OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -771,7 +771,7 @@
     <string name="browser_not_available">Nettleser er ikke tilgjengelig</string>
     <string name="volume">Volum</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Eksporter alle bokmerker og spor</string>
+    <string name="bookmarks_export">Eksporter alle steder og spor</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Systeminnstillinger for talesyntese</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -803,7 +803,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Fortsett opptak</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Lagre i bokmerker og spor?</string>
+    <string name="track_recording_alert_title">Lagre i favoritter?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Sporet er tomt - ingenting å lagre</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -832,7 +832,7 @@
     <string name="pref_backup_interval_title">Automatisk sikkerhetskopiering</string>
     <string name="backup_interval_manual_only">Av (kun manuelt)</string>
     <string name="delete_track_dialog_title">Slette %s?</string>
-    <string name="bookmark_color">Bokmerkefarge</string>
+    <string name="bookmark_color">Farge for favoritt</string>
     <string name="about_help">Om &amp; Hjelp</string>
     <string name="open_now">Åpen nå</string>
     <string name="read_in_wikipedia">Wikipedia</string>
@@ -851,11 +851,11 @@
     <string name="at">kl. %s</string>
     <string name="pref_tts_no_system_tts_short">Ingen tekst-til-tale-motor funnet, sjekk appinnstillingene</string>
     <string name="pref_left_button_title">Venstreknappoppsett</string>
-    <string name="pref_backup_title">Sikkerhetskopi av bokmerker og spor</string>
+    <string name="pref_backup_title">Sikkerhetskopier favoritter</string>
     <string name="pref_backup_summary">Automatisk sikkerhetskopiering til en mappe på enheten din</string>
     <string name="pref_backup_now_summary">Opprett en sikkerhetskopi med en gang</string>
     <string name="pref_backup_now_summary_ok">Sikkerhetskopiering fullført</string>
-    <string name="pref_backup_now_summary_empty_lists">Ingen bokmerker og spor å sikkerhetskopiere</string>
+    <string name="pref_backup_now_summary_empty_lists">Ingen steder og spor å sikkerhetskopiere</string>
     <string name="pref_backup_now_summary_folder_unavailable">Sikkerhetskopimappen er ikke tilgjengelig</string>
     <string name="pref_backup_status_summary_success">Siste vellykkede sikkerhetskopiering</string>
     <string name="pref_backup_location_summary_initial">Velg en mappe først og gi tillatelse</string>
@@ -911,4 +911,5 @@
     <string name="download_resources_custom_url_error_scheme">Angi en nettadresse som starter med http:// eller https://</string>
     <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
     <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
+    <string name="pref_maplanguage_local">Lokalt språk</string>
 </resources>

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

@@ -15,6 +15,7 @@
   <color name="bg_cards">#FF3C4044</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
+  <color name="bg_app">#10140F</color>
 
   <color name="bg_menu">#CC2D3237</color>
 
@@ -41,4 +42,20 @@
   <!-- Downloader -->
   <color name="dl_done">#54575b</color>
   <color name="dl_download">#ffe68c</color>
+
+  <!-- Categories -->
+  <color name="foreground_color">#000</color>
+
+  <color name="amenity">#51585E</color>
+  <color name="entertainment">#802D19</color>
+  <color name="food">#8C491C</color>
+  <color name="shop">#6B425C</color>
+  <color name="cm_services">#574469</color>
+  <color name="medical">#983E44</color>
+  <color name="hotel">#614A43</color>
+  <color name="luggagehero">#851F03</color>
+  <color name="parking">#20607C</color>
+  <color name="tourism">#6E4426</color>
+  <color name="transport">#2F6499</color>
+  <color name="water">#0A6074</color>
 </resources>

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

@@ -68,11 +68,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Nieuwe groep toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Naam van bladwijzergroep</string>
+    <string name="bookmark_set_name">Naam van lijst</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Bladwijzers</string>
+    <string name="bookmarks">Plaatsen</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
+    <string name="bookmarks_and_tracks">Favorieten</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Naam</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps bladwijzers zijn met u gedeeld</string>
+    <string name="share_bookmarks_email_subject">Mijn CoMaps Favorieten</string>
-    <string name="share_bookmarks_email_body">Hallo! \n \nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
+    <string name="share_bookmarks_email_body">Hallo! \n \nBijgevoegd zijn mijn favorieten; te openen in CoMaps. Als u dit niet geïnstalleerd heeft, dan kunt u het hier downloaden: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Bladwijzers laden</string>
+    <string name="load_kmz_title">Favorieten laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
+    <string name="load_kmz_successful">Favorieten met succes geladen! U vindt ze op de kaart of op het scherm Favorietenbeheer.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
+    <string name="load_kmz_failed">Favorieten laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -498,7 +498,7 @@
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Meer</string>
-    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
+    <string name="placepage_edit_bookmark_button">Opgeslagen plaats bewerken</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
     <string name="editor_reset_edits_button">Wijzigingen weggooien</string>
@@ -563,17 +563,17 @@
     <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
     <string name="error_enter_correct_name">Voer een geldige naam in</string>
-    <string name="bookmark_lists">Lijsten</string>
+    <string name="bookmark_lists">Favoriete lijsten</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Verberg alles</string>
     <string name="bookmark_lists_show_all">Toon alles</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d bladwijzer</item>
+        <item quantity="one">%d opgeslagen plaats</item>
-        <item quantity="other">%d bladwijzers</item>
+        <item quantity="other">%d opgeslagen plaatsen</item>
     </plurals>
     <string name="bookmarks_create_new_group">Maak een nieuwe lijst</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Bladwijzers en sporen importeren</string>
+    <string name="bookmarks_import">Favorieten importeren</string>
     <string name="bookmarks_error_message_share_general">Delen is onmogelijk wegens een toepassingsfout</string>
     <string name="bookmarks_error_title_share_empty">Deelfout</string>
     <string name="bookmarks_error_message_share_empty">Een lege lijst kan niet gedeeld worden</string>
@@ -602,7 +602,7 @@
     <string name="subway">Metro</string>
     <string name="layers_title">Kaartstijlen en -lagen</string>
     <string name="bookmarks_empty_list_title">Deze lijst is leeg</string>
-    <string name="bookmarks_empty_list_message">Om een bladwijzer toe te voegen, tikt u op een plaats op de kaart en vervolgens op het sterpictogram</string>
+    <string name="bookmarks_empty_list_message">Om een plaats op te slaan, tikt u op een plaats op de kaart en vervolgens op het sterpictogram</string>
     <string name="category_desc_more">…meer</string>
     <string name="export_file">Exporteer KMZ</string>
     <string name="export_file_gpx">Exporteer GPX</string>
@@ -655,7 +655,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Sorteer…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Sorteer bladwijzers</string>
+    <string name="sort_bookmarks">Favorieten sorteren</string>
     <!-- Android -->
     <string name="by_default">Standaard</string>
     <!-- Android -->
@@ -773,7 +773,7 @@
     <string name="browser_not_available">Webbrowser is niet beschikbaar</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Alle bladwijzers en sporen exporteren</string>
+    <string name="bookmarks_export">Alle plaatsen en sporen exporteren</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Instellingen spraaksynthesesysteem</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -805,7 +805,7 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Opname voortzetten</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Opslaan in bladwijzers en sporen?</string>
+    <string name="track_recording_alert_title">Opslaan in Favorieten?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">Spoor is leeg - niets op te slaan</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -838,16 +838,16 @@
     <string name="pedestrian">Voetganger</string>
     <string name="ruler">Lineaal</string>
     <string name="about_help">Over &amp; help</string>
-    <string name="bookmark_color">Bladwijzer kleur</string>
+    <string name="bookmark_color">Kleur voor favoriet</string>
     <string name="backup_interval_every_day">Dagelijks</string>
     <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up van bladwijzers en sporen</string>
+    <string name="pref_backup_title">Back-up van favorieten</string>
     <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
     <string name="pref_backup_now_title">Nu back-uppen</string>
     <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
     <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
     <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
-    <string name="pref_backup_now_summary_empty_lists">Geen bladwijzers en sporen voor een back-up</string>
+    <string name="pref_backup_now_summary_empty_lists">Geen plaatsen en sporen voor een back-up</string>
     <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
     <string name="pref_backup_interval_title">Automatische back-up</string>
     <string name="pref_backup_location_title">Back-up locatie</string>
@@ -920,4 +920,5 @@
     <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
     <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
     <string name="download_resources_custom_url_error_scheme">Voer een URL in beginnend met http:// of https://</string>
+    <string name="pref_maplanguage_local">Plaatselijke taal</string>
 </resources>

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

@@ -42,8 +42,8 @@
     <string name="continue_button">Nadaljuj</string>
     <string name="download_country_failed">Prenos za državo %s ni uspel</string>
     <string name="add_new_set">Dodaj nov seznam</string>
-    <string name="bookmark_set_name">Ime seznama zaznamkov</string>
+    <string name="bookmark_set_name">Ime seznama</string>
-    <string name="bookmarks">Zaznamki</string>
+    <string name="bookmarks">Kraji</string>
     <string name="name">Ime</string>
     <string name="address">Naslov</string>
     <string name="list">Seznam</string>
@@ -81,17 +81,17 @@
     <string name="category_rv">Prostori za avtodome</string>
     <string name="description">Pripis</string>
     <string name="share_bookmarks_email_subject">Nekdo je z vami delil zaznamke CoMaps</string>
-    <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v aplikaciji CoMaps. Če je še nimaš nameščene, jo lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
+    <string name="share_bookmarks_email_body">Živjo! \n \nV priponki so moji zaznamki. Prosim, odpri jih v orodju CoMaps. Če ga še nisi namestil, ga lahko preneseš tukaj: https://www.comaps.app/download/ \n \nUživaj v potovanju s CoMaps!</string>
     <string name="load_kmz_title">Nalagam zaznamke</string>
     <string name="load_kmz_successful">Zaznamki so uspešno naloženi! Najdete jih lahko na zemljevidu ali v upravitelju zaznamkov.</string>
-    <string name="load_kmz_failed">Zaznamkov ni bilo mogoče naložiti. Datoteka je morda okvarjena.</string>
+    <string name="load_kmz_failed">Zaznamkov ni bilo mogoče naložiti. Datoteka je morda poškodovana ali okvarjena.</string>
     <string name="unknown_file_type">Aplikacija ne prepozna te vrste datoteke: \n%1$s</string>
     <string name="failed_to_open_file">Ni bilo mogoče odpreti datoteke %1$s \n \n%2$s</string>
     <string name="edit">Uredi</string>
     <string name="unknown_current_position">Vaša lokacija še ni znana</string>
     <string name="cant_change_this_setting">Žal so nastavitve shranjevanja zemljevidov trenutno onemogočene</string>
     <string name="downloading_is_active">Poteka prenašanje zemljevida</string>
-    <string name="bookmarks_and_tracks">Zaznamki in poti</string>
+    <string name="bookmarks_and_tracks">Priljubljeni</string>
     <string name="my_position_share_sms">Oglej si mojo trenutno lokacijo na CoMaps! %1$s ali %2$s Si brez zemljevidov? Prenesi jih tukaj: https://www.comaps.app/download/</string>
     <string name="bookmark_share_email_subject">Živjo, oglej si tale kraj na CoMaps!</string>
     <string name="my_position_share_email_subject">Živjo, poglej si mojo trenutno lokacijo na zemljevidu CoMaps!</string>

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

@@ -62,11 +62,11 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">Направи нову листу</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Назив листе маркера</string>
+    <string name="bookmark_set_name">Назив листе</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">Маркери</string>
+    <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 -->
@@ -142,14 +142,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Напомене</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">CoMaps маркери су подељени са вама</string>
+    <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>
+    <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>
@@ -556,18 +556,18 @@
     <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>
     <string name="error_enter_correct_name">Молим Вас да унесете исправан назив</string>
-    <string name="bookmark_lists">Листе</string>
+    <string name="bookmark_lists">Листе фаворита</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Сакриј све</string>
     <string name="bookmark_lists_show_all">Прикажи све</string>
     <plurals name="bookmarks_places">
-        <item quantity="one">%d маркер</item>
+        <item quantity="one">%d фаворит</item>
-        <item quantity="few">%d маркера</item>
+        <item quantity="few">%d фаворита</item>
-        <item quantity="other">%d маркера</item>
+        <item quantity="other">%d фаворита</item>
     </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>
@@ -598,7 +598,7 @@
     <string name="subway">Метро</string>
     <string name="layers_title">Стилови мапе и слојеви</string>
     <string name="bookmarks_empty_list_title">Ова листа је празна</string>
-    <string name="bookmarks_empty_list_message">Да бисте додали маркер, кратко додирните место на мапи, а онда додирните иконицу са звездом</string>
+    <string name="bookmarks_empty_list_message">Да бисте додали место, кратко додирните место на мапи, а онда додирните иконицу са звездом</string>
     <string name="category_desc_more">…више</string>
     <string name="export_file">Експортуј KMZ</string>
     <string name="export_file_gpx">Експортуј GPX</string>
@@ -651,7 +651,7 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">Сортирање…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">Сортирање маркера</string>
+    <string name="sort_bookmarks">Сортирање фаворита</string>
     <!-- Android -->
     <string name="by_default">Подразумевано</string>
     <!-- Android -->
@@ -757,7 +757,7 @@
     <string name="browser_not_available">Веб читач није доступан</string>
     <string name="volume">Јачина звука</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Експортуј све маркере и путање</string>
+    <string name="bookmarks_export">Експортуј све места и путање</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Системска подешавања синтезе говора</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -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 -->
@@ -834,7 +834,7 @@
     <string name="route_type">Тип руте</string>
     <string name="pedestrian">Пешак</string>
     <string name="ruler">Лењир</string>
-    <string name="bookmark_color">Колор маркера</string>
+    <string name="bookmark_color">Боја фаворита</string>
     <string name="vehicle">Возило</string>
     <string name="about_help">О програму и помоћ</string>
     <string name="panoramax">Panoramax Picture</string>
@@ -855,8 +855,8 @@
     <string name="dialog_report_error_with_logs">Молимо вас, пошаљите нам поруку о грешци:\n- \"Омогући вођење дневника\" у подешавањима\n- репродукујте проблем\n- на екрану \"О програму и помоћ\" кликните на дугме \"Пријави грешку\" и пошаљите на е-маил или чат\n- онемогући вођење дневника</string>
     <string name="dialog_report_error_missing_folder">Изабрана локација резервне копије није доступна за снимање. Молимо вас, одаберите друго место.</string>
     <string name="pref_backup_interval_title">Аутоматска резервна копија</string>
-    <string name="pref_backup_now_summary_empty_lists">Нема маркера и путања за израду резервне копије</string>
+    <string name="pref_backup_now_summary_empty_lists">Нема места и путања за израду резервне копије</string>
-    <string name="pref_backup_title">Чување маркера и путања</string>
+    <string name="pref_backup_title">Чување фаворита</string>
     <string name="closed_now">Затворено сада</string>
     <string name="open_now">Сада је отворено</string>
     <string name="at">на %s</string>
@@ -919,4 +919,5 @@
     <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
     <string name="download_resources_custom_url_summary_none">Није постављено</string>
     <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
+    <string name="pref_maplanguage_local">Локални језик</string>
 </resources>

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

@@ -68,13 +68,13 @@
     <!-- "Add new bookmark list" dialog title -->
     <string name="add_new_set">添加新的书签列表</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">书签列表名称</string>
+    <string name="bookmark_set_name">列表名称</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
-    <string name="bookmarks">书签</string>
+    <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>
+    <string name="name">名称</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
     <string name="address">地址</string>
     <!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
@@ -148,14 +148,14 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">注记</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">已与您分享 CoMaps 书签</string>
+    <string name="share_bookmarks_email_subject">我的 CoMaps 收藏</string>
-    <string name="share_bookmarks_email_body">您好！ \n \n附件是我的书签，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载: https://www.comaps.app/download/ \n \n祝您使用 CoMaps 旅行愉快！</string>
+    <string name="share_bookmarks_email_body">您好！\n\n附件是我的收藏，请在 CoMaps 中打开。如果您没有安装 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. -->
@@ -508,7 +508,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="placepage_personal_notes_hint">个人注记（文字或 html）</string>
     <string name="editor_reset_edits_message">舍弃所有本地更改？</string>
     <string name="editor_reset_edits_button">舍弃更改</string>
@@ -573,20 +573,20 @@
     <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support@comaps.app 联系我们</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
     <string name="error_enter_correct_name">请输入正确的名称</string>
-    <string name="bookmark_lists">列表</string>
+    <string name="bookmark_lists">收藏列表</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">全部隐藏</string>
     <string name="bookmark_lists_show_all">全部显示</string>
     <plurals name="bookmarks_places">
-        <item quantity="other">%d 个书签</item>
+        <item quantity="other">%d 个已保存的地点</item>
     </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>
-    <string name="bookmarks_error_title_empty_list_name">名字不能为空</string>
+    <string name="bookmarks_error_title_empty_list_name">名称不能为空</string>
     <string name="bookmarks_error_message_empty_list_name">请输入列表名称</string>
     <string name="bookmarks_new_list_hint">新的列表</string>
     <string name="bookmarks_error_title_list_name_already_taken">这个名称已经被使用了</string>
@@ -609,7 +609,7 @@
     <string name="subway">地铁</string>
     <string name="layers_title">地图样式和图层</string>
     <string name="bookmarks_empty_list_title">该列表为空</string>
-    <string name="bookmarks_empty_list_message">要添加新书签，请点击对象卡片中的星形图标</string>
+    <string name="bookmarks_empty_list_message">要保存地点，请在地图上点击一个地点，然后点击星形图标</string>
     <string name="category_desc_more">…更多</string>
     <string name="export_file">导出为 KMZ</string>
     <string name="export_file_gpx">导出为 GPX</string>
@@ -662,15 +662,15 @@
     <!-- max. 10 symbols, both iOS and Android -->
     <string name="sort">排序…</string>
     <!-- Android, title, max 20-22 symbols -->
-    <string name="sort_bookmarks">分类排序</string>
+    <string name="sort_bookmarks">排序收藏</string>
     <!-- Android -->
-    <string name="by_default">使用默认值</string>
+    <string name="by_default">按默认</string>
     <!-- Android -->
     <string name="by_type">按类型</string>
     <!-- Android -->
     <string name="by_distance">按距离</string>
     <!-- Android -->
-    <string name="by_date">按时间</string>
+    <string name="by_date">按日期</string>
     <!-- Android -->
     <string name="by_name">按名称</string>
     <string name="week_ago_sorttype">一周前</string>
@@ -780,7 +780,7 @@
     <string name="browser_not_available">网络浏览器不可用</string>
     <string name="volume">音量</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">导出所有书签和轨迹</string>
+    <string name="bookmarks_export">导出所有地点和轨迹</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">文本转语音系统设置</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -812,7 +812,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 -->
@@ -840,7 +840,7 @@
     <string name="route_type">路线类型</string>
     <string name="bicycle">自行车</string>
     <string name="ruler">标尺</string>
-    <string name="bookmark_color">书签颜色</string>
+    <string name="bookmark_color">收藏颜色</string>
     <string name="pedestrian">行人</string>
     <string name="about_help">关于和帮助</string>
     <string name="panoramax">Panoramax 图片</string>
@@ -849,8 +849,8 @@
     <string name="pref_backup_now_summary">立即创建备份</string>
     <string name="pref_backup_now_summary_progress">正在备份…</string>
     <string name="pref_backup_now_summary_ok">备份已成功完成</string>
-    <string name="pref_backup_title">备份书签与轨迹</string>
+    <string name="pref_backup_title">备份收藏</string>
-    <string name="pref_backup_now_summary_empty_lists">没有要备份的书签和轨迹</string>
+    <string name="pref_backup_now_summary_empty_lists">没有要备份的地点和轨迹</string>
     <string name="pref_backup_now_summary_failed">备份失败</string>
     <string name="pref_backup_now_summary_folder_unavailable">备份文件夹不可用</string>
     <string name="pref_backup_status_summary_success">上次成功备份</string>
@@ -922,4 +922,5 @@
     <string name="advanced">高级</string>
     <string name="download_resources_custom_url_title">自定义地图服务器</string>
     <string name="download_resources_custom_url_message">覆盖用于地图下载的默认地图下载服务器。留空则使用 CoMaps 默认服务器。</string>
+    <string name="pref_maplanguage_local">本地语言</string>
 </resources>

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

@@ -124,7 +124,7 @@
   <color name="elevation_profile_dot_enabled">#FF9600</color>
   <color name="elevation_profile">@color/base_accent</color>
 
-  <color name="active_track_recording">#0057ff</color>
+  <color name="active_track_recording">#FFFF0000</color>
 
   <color name="material_calendar_surface_dark">#929292</color>
   <color name="notification_warning">#FFC22219</color>
@@ -133,5 +133,21 @@
   <color name="dl_done">#ebebeb</color>
   <color name="dl_download">#FF37653F</color>
   <color name="dl_update">#ffc30a</color>
+
+  <!-- Categories -->
+  <color name="foreground_color">#FFF</color>
+
+  <color name="amenity">#747E86</color>
+  <color name="entertainment">#EB785D</color>
+  <color name="food">#EC955E</color>
+  <color name="shop">#BE75A3</color>
+  <color name="cm_services">#AA96BC</color>
+  <color name="medical">#D85961</color>
+  <color name="hotel">#664E42</color>
+  <color name="luggagehero">#FB3207</color>
+  <color name="parking">#427BB8</color>
+  <color name="tourism">#9C6136</color>
+  <color name="transport">#2F6499</color>
+  <color name="water">#54A3B6</color>
 </resources>
 

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

@@ -287,13 +287,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?cardBackground</item>
+    <item name="backgroundTint">?colorSurfaceContainerLow</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?cardBackground</item>
+    <item name="android:background">?colorSurfaceContainerLow</item>
     <item name="behavior_hideable">false</item>
   </style>
 

android/app/src/main/res/xml/locales_config.xml

@@ -7,6 +7,7 @@
     <locale android:name="az" />
     <locale android:name="be" />
     <locale android:name="bg" />
+    <locale android:name="bn" />
     <locale android:name="ca" />
     <locale android:name="cs" />
     <locale android:name="da" />
@@ -21,11 +22,16 @@
     <locale android:name="fi" />
     <locale android:name="fr" />
     <locale android:name="fr-CA" />
-    <locale android:name="iw" />
+    <locale android:name="gl" />
+    <locale android:name="gsw" />
+    <locale android:name="he" />
     <locale android:name="hi" />
     <locale android:name="hu" />
+    <locale android:name="id" />
     <locale android:name="in" />
+    <locale android:name="is" />
     <locale android:name="it" />
+    <locale android:name="iw" />
     <locale android:name="ja" />
     <locale android:name="kw" />
     <locale android:name="ko" />
@@ -34,16 +40,20 @@
     <locale android:name="mr" />
     <locale android:name="mt" />
     <locale android:name="nb" />
+    <locale android:name="nb-NO" />
     <locale android:name="nl" />
     <locale android:name="pl" />
     <locale android:name="pt" />
     <locale android:name="pt-BR" />
     <locale android:name="ro" />
     <locale android:name="ru" />
+    <locale android:name="sl" />
     <locale android:name="sk" />
     <locale android:name="sr" />
+    <locale android:name="sr-Latn" />
     <locale android:name="sv" />
     <locale android:name="sw" />
+    <locale android:name="ta" />
     <locale android:name="th" />
     <locale android:name="tr" />
     <locale android:name="uk" />

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

@@ -1490,12 +1490,6 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv
   g_framework->Set3dMode(allow3d, allow3dBuildings);
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetCarScreenMode(JNIEnv * env, jclass, jboolean enabled)
-{
-  if (g_framework)
-    frm()->SetCarScreenMode(static_cast<bool>(enabled));
-}
-
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
 {
   bool enabled;

android/sdk/src/main/java/app/organicmaps/sdk/Framework.java

@@ -280,8 +280,6 @@ public class Framework
 
   public static native void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);
 
-  public static native void nativeSetCarScreenMode(boolean enabled);
-
   public static native boolean nativeGetAutoZoomEnabled();
 
   public static native void nativeSetAutoZoomEnabled(boolean enabled);

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -9,7 +9,6 @@ import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Handler;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresPermission;
@@ -17,9 +16,6 @@ import androidx.annotation.UiThread;
 import androidx.core.content.ContextCompat;
 import androidx.core.location.GnssStatusCompat;
 import androidx.core.location.LocationManagerCompat;
-
-import org.chromium.base.ObserverList;
-
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
@@ -29,8 +25,7 @@ import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
-
+import org.chromium.base.ObserverList;
-import java.util.HashMap;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -61,12 +56,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   private Handler mHandler;
   private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;
 
-  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
-  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
-  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
-  private double mTimeAtLastProviderChange = Double.NaN;
-  private String mCurrentProvider = null;
-
   @NonNull
   private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
     @Override
@@ -198,6 +187,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -211,80 +201,20 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    updateProviderDecision(location);
+    if (mSavedLocation != null)
-    if (mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider()))
     {
-      Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
-      return;
+      {
+        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
+        return;
+      }
     }
 
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
-
     mSavedLocation = location;
     mMyPosition = null;
     notifyLocationUpdated();
   }
 
-  private void updateProviderDecision(Location location)
-  {
-    if (Double.isNaN(mTimeAtLastProviderChange))
-      mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
-
-    String provider = location.getProvider();
-
-    Integer cnt = mProviderLocationCounts.getOrDefault(provider, 0);
-    Float avg = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
-
-    if (cnt == null || avg == null)
-    {
-      mProviderLocationCounts.clear();
-      mProviderAccuracyMeans.clear();
-      return;
-    }
-
-    int count = cnt;
-    float average = avg;
-
-    float accuracy = location.getAccuracy();
-    int newCount = count + 1;
-    float newAverage = (count * average + accuracy) / newCount;
-
-    mProviderLocationCounts.put(provider, newCount);
-    mProviderAccuracyMeans.put(provider, newAverage);
-
-    double currentTime = location.getElapsedRealtimeNanos();
-    double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
-
-    if (timeDiff > INTERVAL_PROVIDER_DECISION)
-    {
-      mCurrentProvider = getMinAccuracyProvider();
-      Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
-      mTimeAtLastProviderChange = currentTime;
-      mProviderLocationCounts.clear();
-      mProviderAccuracyMeans.clear();
-    }
-  }
-
-  private String getMinAccuracyProvider()
-  {
-    String minAccuracyProvider = null;
-    float minAccuracy = Float.MAX_VALUE;
-    for (String p : mProviderAccuracyMeans.keySet())
-    {
-      Float pAcc = mProviderAccuracyMeans.get(p);
-      if (pAcc == null)
-        continue;
-      float pAccuracy = pAcc;
-
-      if (pAccuracy < minAccuracy)
-      {
-        minAccuracy = pAccuracy;
-        minAccuracyProvider = p;
-      }
-    }
-    return minAccuracyProvider;
-  }
-
   // Used by GoogleFusedLocationProvider.
   @SuppressWarnings("unused")
   @Override

android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java

@@ -22,9 +22,6 @@ public final class Constants
     public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
     public static final String BLUESKY = "https://bsky.app/profile/comaps.app";
     public static final String PIXELFED = "https://pixelfed.social/comaps";
-    public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
-    public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
-
     public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";
 
     public static final String COPYRIGHT = "file:///android_asset/copyright.html";
@@ -36,13 +33,6 @@ public final class Constants
     private Url() {}
   }
 
-  public static class Package
-  {
-    public static final String FB_PACKAGE = "com.facebook.katana";
-
-    private Package() {}
-  }
-
   public static class Vendor
   {
     public static final String HUAWEI = "HUAWEI";

android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java

@@ -81,6 +81,20 @@ public class LocationUtils
     return location.getAccuracy() > 0.0f;
   }
 
+  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
+  {
+    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
+      return false;
+
+    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
+    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
+      return true;
+
+    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
+    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
+    return newLocation.getAccuracy() < lastAccuracy;
+  }
+
   public static boolean areLocationServicesTurnedOn(@NonNull Context context)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)

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

@@ -410,7 +410,6 @@
     <string name="type.highway.pedestrian.area">Voetgangergebied</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Voetgangerbrug</string>
-
     <string name="type.highway.pedestrian.square">Plein</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Voetgangertonnel</string>
@@ -770,8 +769,6 @@
     <string name="type.public_transport.platform">Platform</string>
     <string name="type.railway">Spoorweg</string>
     <string name="type.railway.abandoned">Verlate treinspoor</string>
-    <string name="type.railway.abandoned.bridge">Verlate treintonnel</string>
-    <string name="type.railway.abandoned.tunnel">Verlate treintonnel</string>
     <string name="type.railway.construction">Spoorweg in aanbou</string>
     <string name="type.railway.crossing">Spoorwegoorgang</string>
     <string name="type.railway.disused">Ongebruikte spoor</string>

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

@@ -421,7 +421,6 @@
     <string name="type.highway.pedestrian.area">Piyada ərazisi</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.pedestrian.bridge">Körpü</string>
-
     <string name="type.highway.pedestrian.square">Kvadrat</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.pedestrian.tunnel">Tunel</string>
@@ -787,8 +786,6 @@
     <string name="type.public_transport.platform">Platforma</string>
     <string name="type.railway">Dəmir yolu</string>
     <string name="type.railway.abandoned">Tərk edilmiş dəmir yolu</string>
-    <string name="type.railway.abandoned.bridge">Tərk edilmiş dəmir yolu</string>
-    <string name="type.railway.abandoned.tunnel">Tərk edilmiş dəmir yolu</string>
     <string name="type.railway.construction">Dəmir yolu tikintisi</string>
     <string name="type.railway.crossing">Dəmiryol kəsişməsi</string>
     <string name="type.railway.disused">Istifadəsiz dəmir yolu</string>

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

@@ -1,4 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="core_my_position">Moja pozicija</string>
+    <string name="core_my_places">Moja mesta</string>
+    <string name="maps_storage_internal">Interna privatna memorija</string>
+    <string name="maps_storage_shared">Interna deljena memorija</string>
+    <string name="maps_storage_removable">SD kartica</string>
+    <string name="maps_storage_external">Eksterna deljena memorija</string>
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Poštanski broj</string>
+    <string name="core_placepage_unknown_place">Tačka na mapi</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="mi">mi</string>
+    <string name="ft">stopa</string>
+    <string name="core_exit">Izlaz</string>
+    <string name="core_entrance">Ulaz</string>
+    <string name="subway_data_unavailable">Mapa metroa ne postoji</string>
+    <string name="public_access">Javni pristup</string>
+    <string name="limited_access">Ograničen pristup</string>
+    <string name="not_shared">Privatno</string>
+    <string name="access_rules_author_only">Online izmene</string>
+    <string name="today">Danas</string>
+    <string name="yesterday">Juče</string>
+    <string name="days_ago">pre %s dana</string>
+    <string name="week_ago">pre %s nedelja</string>
+    <string name="weeks_ago">pre %s nedelja</string>
+    <string name="month_ago">pre %s mesec</string>
+    <string name="months_ago">pre %s meseci</string>
+    <string name="year_ago">pre %s godine</string>
+    <string name="years_ago">pre %s godina</string>
 </resources>

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

@@ -977,8 +977,6 @@
     <string name="type.power.tower">Електрическа кула</string>
     <string name="type.power.pole">Електрически стълб</string>
     <string name="type.railway.abandoned">Изоставена железопътна линия</string>
-    <string name="type.railway.abandoned.bridge">Изоставен железопътен мост</string>
-    <string name="type.railway.abandoned.tunnel">Изоставен железопътен тунел</string>
     <string name="type.railway.construction">Строителство на железопътни линии</string>
     <string name="type.railway.crossing">Железопътен прелез</string>
     <string name="type.railway.disused">Неизползвана железопътна линия</string>

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

@@ -25,4 +25,5 @@
     <string name="months_ago">%s মাস আগে</string>
     <string name="years_ago">%s বছর আগে</string>
     <string name="m">মি</string>
+    <string name="ft">ফুট</string>
 </resources>

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

@@ -172,4 +172,6 @@
     <string name="type.waterway">জলপথ</string>
     <string name="type.waterway.canal">ক্যানাল</string>
     <string name="type.waterway.drain">ড্রেন</string>
+    <string name="type.amenity.bar">বার</string>
+    <string name="type.amenity.bicycle_parking">সাইকেল পার্কিং</string>
 </resources>

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

@@ -1039,7 +1039,6 @@
     <string name="type.man_made.telescope.radio">Telescopi (Ràdio)</string>
     <string name="type.man_made.telescope.gamma">Telescopi (Gamma)</string>
     <string name="type.man_made.observatory">Observatori</string>
-    <string name="type.amenity.charging_station.motorcar.small">Punt de Càrrega de Cotxes</string>
     <string name="type.amenity.sailing_school">Escola de Navegació</string>
     <string name="type.amenity.flight_school">Escola de Vol</string>
     <string name="type.amenity.prep_school">Escola Preparatòria</string>