Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2014-10-08 16:12:43 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:29:51 +0300
commit773a8c937c3debcd2670b5cd440878682aa25c2c (patch)
treed9c4ca96e24438c7416dfce6c0c4aab4307af644
parent13b399395321ff642679d5d9b4900817c1b59ece (diff)
generated routing fail messages
-rw-r--r--android/res/values-ar/strings.xml29
-rw-r--r--android/res/values-cs/strings.xml18
-rw-r--r--android/res/values-da/strings.xml29
-rw-r--r--android/res/values-de/strings.xml29
-rw-r--r--android/res/values-es/strings.xml29
-rw-r--r--android/res/values-fr/strings.xml31
-rw-r--r--android/res/values-hu/strings.xml29
-rw-r--r--android/res/values-it/strings.xml29
-rw-r--r--android/res/values-ja/strings.xml25
-rw-r--r--android/res/values-ko/strings.xml29
-rw-r--r--android/res/values-nl/strings.xml29
-rw-r--r--android/res/values-pl/strings.xml29
-rw-r--r--android/res/values-pt/strings.xml29
-rw-r--r--android/res/values-ru/strings.xml29
-rw-r--r--android/res/values-sk/strings.xml29
-rw-r--r--android/res/values-sv/strings.xml22
-rw-r--r--android/res/values-th/strings.xml22
-rw-r--r--android/res/values-tr/strings.xml22
-rw-r--r--android/res/values-uk/strings.xml22
-rw-r--r--android/res/values-zh-rTW/strings.xml16
-rw-r--r--android/res/values-zh/strings.xml16
-rw-r--r--android/res/values/strings.xml22
-rw-r--r--iphone/Maps/ar.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/cs.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/da.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/de.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/en.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/es.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/fr.lproj/Localizable.strings33
-rw-r--r--iphone/Maps/hu.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/it.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/ja.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/ko.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/nl.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/pl.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/pt.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/ru.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/sk.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/sv.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/th.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/tr.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/uk.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/zh-Hans.lproj/Localizable.strings31
-rw-r--r--iphone/Maps/zh-Hant.lproj/Localizable.strings31
-rw-r--r--tizen/MapsWithMe/res/deu-DE.xml4
-rw-r--r--tizen/MapsWithMe/res/eng-GB.xml4
-rw-r--r--tizen/MapsWithMe/res/fra-FR.xml4
-rw-r--r--tizen/MapsWithMe/res/ita-IT.xml4
-rw-r--r--tizen/MapsWithMe/res/pol-PL.xml4
-rw-r--r--tizen/MapsWithMe/res/por-PT.xml4
-rw-r--r--tizen/MapsWithMe/res/rus-RU.xml4
-rw-r--r--tizen/MapsWithMe/res/spa-ES.xml4
-rw-r--r--tizen/MapsWithMe/res/ukr-UA.xml4
53 files changed, 903 insertions, 381 deletions
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 1e649d2d78..f35922d7e2 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -417,10 +417,6 @@
<string name="routing_map_outdated">يرجى تحديث الخريطة لإنشاء مسار.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">إصدار MAPS.ME الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">لقد حدث خطأ أثناء إنشاء المسار. من فضلك، حاول وجهة أخرى.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">خلق المسار ممكن في خريطة واحدة فقط.</string>
<!-- Update all button text -->
<string name="downloader_update_all">تحديث الكل</string>
<!-- Downloaded maps category -->
@@ -437,14 +433,19 @@
<string name="downloader_outdated_maps">انتهت صلاحيته</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">محدّث</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">تنزيل الخريطة + تحديد المسار</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">تنزيل تحديد المسار</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">إزالة تحديد المسار</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">تحميل الخريطة</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">انطلق!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">تحديد المسار متاح فقط من خلال الإصدار الكامل لتطبيق MAPS.ME. احصل عليه الآن!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">الموقع الحالي غير مُعَرّف. يرجى تحديد موقع لإنشاء مسار.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">هناك حاجة إلى بيانات إضافية لإنشاء مسار. بدء التحميل؟</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">لا يمكن حساب المسار. لا توجد طرق قرب نقطة البداية لديك.</string>
+ <string name="routing_failed_dst_point_not_found">لا يمكن حساب المسار. لا توجد طرق بالقرب من وجهتك المقصودة.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">يمكن فقط إنشاء المسارات التي توجد بشكل كامل ضمن خريطة واحدة.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">لم يتم العثور على مسار بين المنشأ والوُجْهَة المحددة. الرجاء تحديد نقطة بداية أو نهاية مختلفة.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">حدث خطأ داخلي. يرجى محاولة حذف الخريطة وإعادة تنزيلها مرة أخرى. إذا استمرت المشكلة يرجى الاتصال بنا على support@maps.me.</string>
</resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 6d717a4fea..ab8675e38a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -416,6 +416,7 @@
<string name="pref_calibration_title">Kalibrace kompasu</string>
<!-- Search Suggestion -->
<string name="wifi">WiFi/Internet</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">Stáhnout Mapu + Směrování</string>
<!-- Context menu item for downloader. -->
@@ -426,4 +427,21 @@
<string name="downloader_download_map">Stáhněte si mapu</string>
<!-- Button for routing PP. -->
<string name="routing_go">Jet!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Směrování je k dispozici pouze v plné verzi MAPS.ME. Získejte ji hned teď!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Aktuální umístění je nedefinované. Chcete-li vytvořit trasu, zadejte prosím umístění.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">K vytvoření trasy jsou zapotřebí další data. Začít stahování?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Nelze vypočítat trasu. Poblíž Vašeho výchozího bodu nejsou žádné cesty.</string>
+ <string name="routing_failed_dst_point_not_found">Nelze vypočítat trasu. Poblíž Vašeho cílového bodu nejsou žádné cesty.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Lze vytvářet jen takové trasy, které jsou zcela leží na území jediné mapy.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Mezi vybraným počátkem a cílem nebyla nalezena žádná trasa. Vyberte prosím jiný počáteční nebo koncový bod.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Došlo k vnitřní chybě. Zkuste prosím mapu vymazat a stáhnout znovu. Jestliže problém přetrvává, kontaktujte nás prosím na support@maps.me.</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 81fa29e746..408c85f8fa 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -415,10 +415,6 @@
<string name="routing_map_outdated">Venligst opdatér kortet for at oprette en rute.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Den nye version af MAPS.ME gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">En fejl opstod ved oprettelsen af en rute. Venligst prøv at vælge en anden destination.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Oprettelse af ruter er kun muligt inden for ét kort.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Opdater alle</string>
<!-- Downloaded maps category -->
@@ -433,14 +429,19 @@
<string name="downloader_outdated_maps">Uddateret</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Up-to-date</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Hent kort + ruteangivelse</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Hent ruteangivelse</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Slet ruteangivelse</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Download kort</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Kør!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Oprettelse af ruter er kun tilgængelig i den fulde version af MAPS.ME. Få den nu!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Den nuværende placering er ikke defineret. Venligst angiv placering for at oprette en rute.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Yderligere data er nødvendig, for at oprette en rute. Begynde download?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Kan ikke beregne ruten. Ingen veje nær dit startpunkt.</string>
+ <string name="routing_failed_dst_point_not_found">Kan ikke beregne ruten. Ingen veje nær din destination.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Ruter kan kun oprettes, hvis de er fuldt indeholdt i ét enkelt kort</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Der blev ikke fundet en rute mellem det valgte begyndelsespunkt og destinationen. Venligst vælg et andet start- eller slutpunkt.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Intern fejl opstod. Venligt prøv at slette og downloade kortet igen. Hvis problemet vare ved, venligst kontakt os på support@maps.me.</string>
</resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 684b2910cd..b72b44ee58 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -408,10 +408,6 @@
<string name="routing_map_outdated">Bitte aktualisieren Sie die Karte, um eine Route zu erzeugen.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Maps, um diese Funktion nutzen zu können.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Beim Erstellen der Route ist ein Fehler aufgetreten. Bitte wählen Sie ein anderes Ziel.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Das Erstellen von Routen ist nur innerhalb einer Karte möglich.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Alles aktualisieren</string>
<!-- Downloaded maps category -->
@@ -428,14 +424,19 @@
<string name="downloader_outdated_maps">Veraltet</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Aktuell</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Karte + Streckenführung herunterladen</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Streckenführung herunterladen</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Streckenführung löschen</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Karte herunterladen</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Los!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Routing ist nur in der Vollversion von MAPS.ME verfügbar. Jetzt holen!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Der aktuelle Standort ist nicht definiert. Bitte geben Sie den Standort ein, um eine Route zu erstellen.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Zusätzliche Daten werden zum Erstellen einer Route benötigt. Mit dem Download beginnen?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Die Route kann nicht berechnet werden. Es gibt keine Straßen in der Nähe von Ihrem Ausgangspunkt.</string>
+ <string name="routing_failed_dst_point_not_found">Die Route kann nicht berechnet werden. Es gibt keine Straßen in der Nähe von Ihrem Ziel.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Es können nur Routen erstellt werden, die vollständig in einer einzigen Karte enthalten sind.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Es wurde keine Route zwischen dem ausgewählten Ausgangspunkt und Ziel gefunden. Bitte wählen Sie einen anderen Start- oder Endpunkt.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Es ist ein interner Fehler aufgetreten. Bitte versuchen Sie, die Karte zu löschen und erneut herunterzuladen.</string>
</resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 2f00432dbe..4f6d6070df 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -394,10 +394,6 @@
<string name="routing_map_outdated">Por favor, actualiza el mapa para crear una ruta.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Se ha producido un error mientras se creaba una ruta. Por favor, intenta elegir otro destino.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Solo es posible crear rutas dentro de un mapa.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Actualizar todos</string>
<!-- Downloaded maps category -->
@@ -414,14 +410,19 @@
<string name="downloader_outdated_maps">Anticuado</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Actualizado</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Descargar mapa + itinerario</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Descargar itinerario</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Eliminar itinerario</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Descargar mapa</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">¡Listo!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">La planificación de la ruta solo está disponible en la versión completa de MAPS.ME. ¡Consígala ya!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">La ubicación actual no está definida. Por favor, especifique la ubicación para crear la ruta.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Son necesarios datos adicionales para crear la ruta. ¿Empezar la descarga?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">No se puede calcular la ruta. No hay carreteras cerca de su punto de partida.</string>
+ <string name="routing_failed_dst_point_not_found">No se puede calcular la ruta. No hay carreteras cerca de su destino.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Solo se pueden crear rutas que estén totalmente incluidas en un mapa único.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">No se ha encontrado ninguna ruta entre el origen seleccionado y el destino. Por favor, seleccione un punto de partida o destino diferente.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Se ha producido un error interno. Por favor, intente eliminar y descargar el mapa otra vez. Si el problema persiste, por favor contáctenos en support@maps.me.</string>
</resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 68a18528c5..9ae003f7be 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -101,6 +101,8 @@
<!-- Message to display at the center of the screen when the country is downloading -->
<string name="country_status_downloading">Téléchargement de \n^\n^%</string>
<string name="country_status_download_routing">Télécharger Carte + Itinéraire\n^ ^</string>
+ <!-- Button text for the button at the center of the screen when the country is not downloaded -->
+ <string name="country_status_download">Téléchargez la carte\n^ ^</string>
<!-- Message to display at the center of the screen when the country download has failed -->
<string name="country_status_download_failed">^\n - Échec lors du téléchargement</string>
<!-- Button text for the button under the country_status_download_failed message -->
@@ -422,10 +424,6 @@
<string name="routing_map_outdated">Veuillez mettre à jour la carte pour créer un itinéraire.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Une erreur s\&#39;est produite lors de la création d\&#39;un itinéraire. Veuillez essayer de choisir une autre destination.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">La création d\&#39;itinéraires n\&#39;est possible que sur une seule carte.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Tout mettre à jour</string>
<!-- Downloaded maps category -->
@@ -442,14 +440,19 @@
<string name="downloader_outdated_maps">Dépassé</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">À jour</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Télécharger Carte + Itinéraire</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Télécharger Itinéraire</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Supprimer Itinéraire</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Téléchargez la carte</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Allez-y !</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">L\&#39;itinéraire est uniquement disponible dans la version complète de MAPS.ME. Téléchargez-la dès maintenant !</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">L\&#39;emplacement actuel n\&#39;est pas défini. Veuillez préciser l\&#39;emplacement pour créer l\&#39;itinéraire.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Des données supplémentaires sont nécessaires pour créer un itinéraire. Vous désirez lancer le téléchargement ?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Impossible de calculer l\&#39;itinéraire. Aucune route à proximité de votre point de départ.</string>
+ <string name="routing_failed_dst_point_not_found">Impossible de calculer l\&#39;itinéraire. Aucune route à proximité de votre destination.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Les itinéraires entièrement contenus sur une seule carte peuvent être créés.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Il n\&#39;existe aucun itinéraire entre l\&#39;origine et la destination choisies . Veuillez sélectionner un point de départ ou d\&#39;arrivée différent.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Une erreur interne s\&#39;est produite. Veuillez essayer de supprimer la carte et téléchargez la à nouveau. Si le problème persiste, veuillez contacter support@maps.me.</string>
</resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index a7c268d37f..b1b738bf03 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -412,10 +412,6 @@
<string name="routing_map_outdated">Kérjük, útvonal létrehozásához frissítsd a térképet.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">A MAPS.ME új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Hiba történt útvonal létrehozása közben. Kérjük, próbálj másik úticélt kiválasztani.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Útvonalak létrehozása csak egy térképen belül lehetséges.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Mind frissítése</string>
<!-- Downloaded maps category -->
@@ -432,14 +428,19 @@
<string name="downloader_outdated_maps">Elavult</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Friss</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Térkép + útvonal letöltése</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Útvonal letöltése</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Útvonal törlése</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Térkép letöltése</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Indulás!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Az útvonaltervezés csak a MAPS.ME teljes verziójában elérhető. Szerezd meg most!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Nem meghatározott a jelenlegi helyszín. Kérjük, határozza meg a helyszínt, hogy útvonal készülhessen.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Útvonaltervezéshez további adatok is szükségesek. Elkezded a letöltést?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Az útvonal nem tervezhető meg. Nincsenek utak a kiindulópontja közelében.</string>
+ <string name="routing_failed_dst_point_not_found">Az útvonal nem tervezhető meg. Nincsenek utak az úti céljának közelében.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Útvonalakat csak akkor lehet készíteni, ha teljesen rajta vannak egy térképen.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Nem találtunk útvonalat a kiválasztott kiindulópont és az úti cél között. Kérjük, válasszon másik kiinduló- vagy végpontot.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Belső hiba történt. Kérjük, próbálja meg kitörölni és újra letölteni a térképet. Ha a probléma továbbra is fennáll, kérjük, vegye fel velünk a kapcsolatot a support@maps.me e-mail címen.</string>
</resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 5e0c2e3c79..df98e1d61f 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -400,10 +400,6 @@
<string name="routing_map_outdated">Aggiorna la mappa per creare un itinerario.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Si è verificato un errore nella creazione del percorso. Prova a scegliere un\&#39;altra destinazione.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Gli itinerari si possono creare solo nell\&#39;ambito di una mappa.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Aggiorna tutto</string>
<!-- Downloaded maps category -->
@@ -420,14 +416,19 @@
<string name="downloader_outdated_maps">Obsoleto</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Aggiornato</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Scarica mappa e percorso</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Scarica percorso</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Elimina il percorso</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Scarica Map</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Andare!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Il percorso è disponibile solo nella versione completa di MAPS.ME. Prendila ora!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">La posizione attuale non è definita. Specifica la posizione per creare il percorso.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Ulteriori dati sono necessari per creare un percorso. Inizio a scaricarli?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Impossibile calcolare il percorso. Nessuna strada vicina al tuo punto di partenza.</string>
+ <string name="routing_failed_dst_point_not_found">Impossibile calcolare il percorso. Nessuna strada vicina al tuo punto di arrivo.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">I percorsi possono essere creati solo se interamente presenti in una singola mappa.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Non è stata trovata alcuna strada fra il punto di partenza e d\&#39;arrivo selezionati. Seleziona un punto di partenza e d\&#39;arrivo diversi.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Si è verificato un errore interno. Prova ad eliminare la mappa e a scaricarla nuovamente. Se il problema dovesse persistere, contattaci all\&#39;indirizzo support@maps.me.</string>
</resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 4a62283e1d..8ef8a3f568 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -406,14 +406,19 @@
<string name="downloader_my_maps">マイマップ</string>
<!-- Country queued for download -->
<string name="downloader_queued">待ち行列型の</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">地図とルートをダウンロード</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">ルートをダウンロード</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">るーどを削除</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">地図をダウンロード</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">開始!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">ルート決定機能はMAPS.MEの完全版でのみ利用可能です。今すぐ入手しましょう!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">現在地が設定されていません。ルートを作成するには現在地を設定してください。</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">ルートを作成するには追加のデータが必要です。ダウンロードを開始しますか?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">ルートを計算できません。出発地点の近くに道路がありません。</string>
+ <string name="routing_failed_dst_point_not_found">ルートを計算できません。目的地の近くに道路がありません。</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">一つの地図に完全に収まるルートのみ作成可能です。</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">選択した出発地と目的地との間にルートが見つかりません。別の出発地点と到着地点を選択してください。</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">内部エラーが発生しました。もう一度地図をダウンロードしてください。問題が解決しない場合は、support@maps.meまでご連絡ください。</string>
</resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index e675d031d7..1cfb39f404 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -391,10 +391,6 @@
<string name="routing_map_outdated">경로를 생성하도록 지도를 업데이트하십시오.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">MAPS.ME의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">경로를 만드는 동안 오류가 발생했습니다. 다른 목적지를 선택하도록 시도하십시오.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">경로를 생성하는 것은 하나의 지도 내에서만 가능합니다.</string>
<!-- Update all button text -->
<string name="downloader_update_all">모두 업데이트</string>
<!-- Downloaded maps category -->
@@ -411,14 +407,19 @@
<string name="downloader_outdated_maps">만료됨</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">최신</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">지도 + 라우팅 다운로드</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">라우팅 다운로드</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">라우팅 삭제</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">지도 다운로드</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">이동!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">라우팅은 MAPS.ME의 정식 버전에서만 사용할 수 있습니다 지금 당장 얻으세요!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">현재 위치는 정의되지 않습니다. 경로를 생성할 위치를 지정하십시오.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">추가 데이터는 경로를 생성하기 위해 필요합니다. 다운로드를 시작하시겠습니까?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">경로를 계산할 수 없습니다. 시작 지점 근처에 도로가 없습니다.</string>
+ <string name="routing_failed_dst_point_not_found">경로를 계산할 수 없습니다. 목적지 근처에 도로가 없습니다.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">경로는 하나의 지도에 완전히 포함되도록만 생성할 수 있습니다.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">선택한 출발지와 목적지 사이에서 발견있는 경로가 없습니다. 다른 출발지 또는 도착지를 선택하십시오.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">내부 오류가 발생했습니다. 다시지도를 삭제하고 다운로드하도록 시도하십시오. 문제가 지속되면 support@maps.me로 문의하시기 바랍니다.</string>
</resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 2feb25a798..de0ea0f4d1 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -395,10 +395,6 @@
<string name="routing_map_outdated">Werk de kaart bij om een route te maken.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Met de nieuwe versie van MAPS.ME kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Er deed zich een fout voor bij het maken van een route. Probeer een andere bestemming te kiezen.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Routes kunnen alleen binnen één kaart worden gemaakt.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Alles bijwerken</string>
<!-- Downloaded maps category -->
@@ -415,14 +411,19 @@
<string name="downloader_outdated_maps">Verouderd</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Up-to-date</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Download kaart + routering</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Download routering</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Verwijder routering</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Kaart downloaden</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Starten!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Route aanmaken is alleen beschikbaar in de volledige versie van MAPS.ME. Neem nu meteen!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Huidige locatie is niet gedefinieerd. Gelieve de locatie te specificeren om de route te creëren.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Er zijn extra gegevens nodig om een ​​route te creëren. Beginnen met downloaden?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Kan de route niet berekenen. Geen wegen in de buurt van uw beginpunt.</string>
+ <string name="routing_failed_dst_point_not_found">Kan de route niet berekenen. Geen wegen in de buurt van uw bestemming.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Slechts de routes die volledig opgenomen zijn in één kaart kunnen gecreëerd worden.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Er is geen route gevonden tussen het geselecteerde beginpunt en de bestemming. Gelieve een andere beginpunt of een eindbestemming te kiezen.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Er is een interne fout opgetreden. Probeer het kaart te verwijderen en opnieuw te downloaden. Indien het probleem blijft optreden, neem dan contact met ons op support@maps.me.</string>
</resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 1dc0282dbb..303c177263 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -414,10 +414,6 @@
<string name="routing_map_outdated">Proszę zaktualizować mapę, by utworzyć trasę.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Podczas tworzenia trasy wystąpił błąd. Proszę spróbować wybrać inny punkt docelowy.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Tworzenie tras możliwe jest wyłącznie w obrębie jednej mapy.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Uaktualnij wszystko</string>
<!-- Downloaded maps category -->
@@ -434,14 +430,19 @@
<string name="downloader_outdated_maps">Nieaktualne</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Najnowsze</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Pobierz mapę + wyznaczanie tras</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Pobierz wyznaczanie tras</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Skasuj wyznaczanie tras</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Pobierz mapę</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Przejdź!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Tworzenie trasy dostępne jest tylko w pełnej wersji aplikacji MAPS.ME. Pobierz pełną wersję, teraz!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Bieżąca lokalizacja nie została zdefiniowana. Aby utworzyć trasę, określ lokalizację.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Aby stworzyć trasę, potrzebne są dodatkowe dane. Rozpocząć pobieranie?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Nie można obliczyć trasy. Brak dróg w pobliżu punktu rozpoczęcia podróży.</string>
+ <string name="routing_failed_dst_point_not_found">Nie można obliczyć trasy. Brak dróg w pobliżu celu podróży.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Trasy można tworzyć tylko pod warunkiem, że zawarte będą w ramach pojedynczej mapy.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Nie znaleziono trasy pomiędzy wybranym punktem rozpoczęcia podróży a jej celem. Wybierz inny punkt początkowy lub końcowy.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Wystąpił wewnętrzny błąd. Spróbuj usunąć mapę i pobrać ją ponownie. Jeśli problem będzie się nadal powtarzał, skontaktuj się z nami pod adresem support@maps.me.</string>
</resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index b5228fbb42..fbd277c744 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -410,10 +410,6 @@
<string name="routing_map_outdated">Por favor, atualize o mapa para criar uma rota.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual para um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Ocorreu um erro enquanto criava uma rota. Por favor, tente escolher outro destino.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">É possível criar rotas apenas dentro de um mapa.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Atualizar tudo</string>
<!-- Downloaded maps category -->
@@ -430,14 +426,19 @@
<string name="downloader_outdated_maps">Desatualizado</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Atualizado</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Descarregar Mapa + Roteamento</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Descarregar Roteamento</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Apagar Roteamento</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Descarregar Mapa</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Avançar!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">A criação de rota só está disponível na versão completa de MAPS.ME. Obtenha-a já!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">A localização atual não foi definida. Por favor especifique a localização para criar o trajeto.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">São necessários dados adicionais para criar uma rota. Iniciar o download?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Impossível calcular o trajeto. Não há estradas próximas do seu ponto de partida.</string>
+ <string name="routing_failed_dst_point_not_found">Impossível calcular o trajeto. Não há estradas próximas do seu destino.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Só podem ser criados trajetos que estejam completamente contidos num único mapa.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Não foi encontrado um trajeto entre a origem selecionada e o destino. Por favor selecione um ponto de partida ou de chegada diferente.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Ocorreu um erro interno. Por favor experimente apagar o mapa e depois descarregue-o novamente. Se o problema persistir, contacte-nos através de support@maps.me.</string>
</resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 68b23c6420..fc821b9250 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -414,10 +414,6 @@
<string name="routing_map_outdated">Пожалуйста, обновите карту для того, чтобы проложить маршрут.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Возникла ошибка при создании этого маршрута. Пожалуйста, выберите другой пункт назначения.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Создание маршрута возможно в пределах одной карты.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Обновить все</string>
<!-- Downloaded maps category -->
@@ -434,14 +430,19 @@
<string name="downloader_outdated_maps">Неактуальные</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Обновленные</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Скачать карту + маршруты</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Скачать маршруты</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Удалить маршруты</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Скачать карту</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Поехали!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Создание маршрутов возможно только в платной версии MAPS.ME. Скачай сейчас!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Невозможно проложить маршрут. Не определено текущее местоположение.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Для построения маршрута необходимы дополнительные данные. Перейти к загрузке?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Невозможно проложить маршрут. Нет дорог рядом с пунктом отправления.</string>
+ <string name="routing_failed_dst_point_not_found">Невозможно проложить маршрут. Нет дорог рядом с пунктом назначения.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Маршрут может быть проложен внутри карты только одного региона.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Невозможно проложить маршрут между выбранными точками. Пожалуйста, измените начало или конец маршрута.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Внутренняя ошибка. Пожалуйста, удалите карту и скачайте ее еще раз. Если это не помогло, напишите нам на support@maps.me</string>
</resources>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index af91aa183e..4d6e57bbf9 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -417,10 +417,6 @@
<string name="routing_map_outdated">Pre vytvorenie trasy si, prosím, aktualizujte mapu.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Nová verzia aplikácie MAPS.ME umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Pri vytváraní trasy sa vyskytla chyba. Skúste si, prosím, zvoliť iný cieľ trasy.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Trasy je možné vytvárať iba v rámci jednej mapy.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Aktualizovať všetky</string>
<!-- Downloaded maps category -->
@@ -437,14 +433,19 @@
<string name="downloader_outdated_maps">Zastarané</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Aktualizované</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map_and_routing">Na stiahnutie Mapa + Trasa</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_routing">Trasa na stiahnutie</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_delete_routing">Zmazať Trasu</string>
- <!-- Context menu item for downloader. -->
- <string name="downloader_download_map">Stiahnite si Mapu</string>
- <!-- Button for routing PP. -->
- <string name="routing_go">Štart!</string>
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Vytváranie trás je k dispozícii iba v plnej verzii MAPS.ME. Získajte ho hneď teraz!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Aktuálna lokácia nie je definovaná. Prosím, špecifikujte lokáciu pre vytvorenie trasy.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Na vytvorenie trasy sú potrebné ďalšie dáta. Začať sťahovanie?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Nedá sa vypočítať trasa. Žiadne cesty v blízkosti východiskového bodu.</string>
+ <string name="routing_failed_dst_point_not_found">Nedá sa vypočítať trasa. Žiadne cesty v blízkosti cieľa.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Cesty môžu byť vytvorené len tak, že sú plne obsiahnuté v jednej mape.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Nebol nájdená trasa medzi vybraným východiskom a cieľom. Prosím vyberte iný počiatočný a koncový bod.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Došlo k vnútornej chybe. Prosím, skúste zmazať a znovu stiahnuť mapu. Ak problém pretrvá, prosím, kontaktujte nás na support@maps.me.</string>
</resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index bac407ccb9..3dda6c076b 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -413,10 +413,6 @@
<string name="routing_map_outdated">Uppdatera kartan för att skapa en rutt.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">Den nya versionen av MAPS.ME låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Ett fel uppstod när rutten skulle skapas. Testa att välja en annan destination.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Det går bara att skapa rutter på en karta.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Uppdatera alla</string>
<!-- Downloaded maps category -->
@@ -433,6 +429,7 @@
<string name="downloader_outdated_maps">Gammal</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Aktuell</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">Ladda ner karta + anvisningar</string>
<!-- Context menu item for downloader. -->
@@ -443,4 +440,21 @@
<string name="downloader_download_map">Ladda ner karta</string>
<!-- Button for routing PP. -->
<string name="routing_go">Kör!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Anvisningar är endast tillgängliga i den fullständiga versionen av MAPS.ME. Skaffa den nu!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Nuvarande plats är inte definierad. Ange din plats för att skapa rutt.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Ytterligare data behövs för att skapa en rutt. Påbörja nedladdning?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Rutten kan inte beräknas. Det finns inga vägar vid startpunkten.</string>
+ <string name="routing_failed_dst_point_not_found">Rutten kan inte beräknas. Det finns inga vägar vid målet.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Rutter kan endast skapas om de finns inom en enda karta.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Ingen rutt hittades mellan vald startpunkt och målet. Välj en annan start- eller slutpunkt.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Ett internt fel inträffade. Försök att radera och ladda ner kartan igen. Kontakta oss på support@maps.me om problemet kvarstår.</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index f38718c3ae..5a0c05a6b9 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -415,10 +415,6 @@
<string name="routing_map_outdated">โปรดอัปเดตแผนที่เพื่อสร้างเส้นทาง</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">เวอร์ชันใหม่ของ MAPS.ME อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">เกิดความผิดพลาดขณะที่สร้างเส้นทาง โปรดลองเลือกปลายทางอื่น</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">การสร้างเส้นทางสามารถทำได้ภายในหนึ่งแผนที่เท่านั้น</string>
<!-- Update all button text -->
<string name="downloader_update_all">อัปเดตทั้งหมด</string>
<!-- Downloaded maps category -->
@@ -435,6 +431,7 @@
<string name="downloader_outdated_maps">ล้าสมัย</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">ทันสมัย</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">ดาวน์โหลดแผนที่ + การเลือกเส้นทาง</string>
<!-- Context menu item for downloader. -->
@@ -445,4 +442,21 @@
<string name="downloader_download_map">ดาวน์โหลดแผนที่</string>
<!-- Button for routing PP. -->
<string name="routing_go">ไป!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">เส้นทางจะใช้ได้เฉพาะในเวอร์ชันเต็มของ MAPS.ME. รับได้ในขณะนี้!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">ไม่มีการกำหนดสถานที่ปัจจุบัน โปรดระบุสถานที่ตั้งเพื่อสร้างเส้นทาง</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">ข้อมูลเพิ่มเติมเป็นต้องมีเพื่อสร้างเส้นทาง เริ่มต้นการดาวน์โหลด?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">ไม่สามารถคำนวณเส้นทางได้ ไม่มีถนนที่อยู่ใกล้เคียงกับจุดเริ่มต้นของคุณ</string>
+ <string name="routing_failed_dst_point_not_found">ไม่สามารถคำนวณเส้นทางได้ ไม่มีถนนที่อยู่ใกล้กับปลายทางของคุณ</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">สามารถสร้างเส้นทางแบบสมบูรณ์ได้เฉพาะที่มีอยู่ในแผนที่เดียวเท่านั้น</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">ไม่พบเส้นทางที่อยู่ระหว่างต้นทางและปลายทางที่เลือก โปรดเลือกจุดเริ่มต้นและจุดสิ้นสุดอื่น</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">เกิดข้อผิดพลาดขึ้นภายใน โปรดลองลบและดาวน์โหลดแผนที่อีกครั้ง โปรดติดต่อเราได้ที่ support@maps.me.</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 27333f2ffe..7e4aef6406 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -417,10 +417,6 @@
<string name="routing_map_outdated">Yeni bir rota oluşturmak için lütfen haritayı güncelleyin.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">MAPS.ME\&#39;nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Rotayı oluştururken bir hata meydana geldi. Lütfen başka bir varış noktası seçmeyi deneyin.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Rota oluşturma sadece bir harita içerisinde mümkündür.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Tümünü güncelle</string>
<!-- Downloaded maps category -->
@@ -437,6 +433,7 @@
<string name="downloader_outdated_maps">Güncel değil</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Güncel</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">Harita + Rota İndir</string>
<!-- Context menu item for downloader. -->
@@ -447,4 +444,21 @@
<string name="downloader_download_map">Haritayı İndir</string>
<!-- Button for routing PP. -->
<string name="routing_go">Git!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Rotalama sadece MAPS.ME tam sürümünde kullanılabilir. Hemen al!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Geçerli konum tanımlı değil. Rota oluşturmak için lütfen konum belirtin.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Bir rota oluşturmak için ek bilgiler gereklidir. İndirme işlemini başlat?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Rota hesaplanamıyor. Başlangıç noktanızın yakınında hiçbir yol yok.</string>
+ <string name="routing_failed_dst_point_not_found">Rota hesaplanamıyor. Varış yerinizin yakınında hiçbir yol yok.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Rotalar sadece tamamen tek bir harita dâhilinde oluşturulabilir.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Seçilen kalkış yeriyle varış yeri arasında hiçbir rota bulunamadı. Lütfen farklı bir başlangıç veya bitiş noktası seçin.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Sistem içi hata oluştu. Lütfen haritayı silin ve tekrar yüklemeyi deneyin. Sorun devam ettiği takdirde lütfen support@maps.me adresinden bize ulaşın.</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 00f0f73bda..ae8b3ab5f6 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -408,10 +408,6 @@
<string name="routing_map_outdated">Будь ласка, оновіть карту, щоб прокласти маршрут.</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">Сталася помилка при прокладанні цього маршруту. Будь ласка, виберіть інши йпункт призначення.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Створення маршруту можливе в межах однієї карти.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Оновити все</string>
<!-- Downloaded maps category -->
@@ -428,6 +424,7 @@
<string name="downloader_outdated_maps">Неактуальні</string>
<!-- Up to date maps category -->
<string name="downloader_uptodate_maps">Оновлені</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">Завантажити карту + маршрути</string>
<!-- Context menu item for downloader. -->
@@ -438,4 +435,21 @@
<string name="downloader_download_map">Завантажити мапу</string>
<!-- Button for routing PP. -->
<string name="routing_go">Поїхали!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Створення маршрутів можливе лише у платній версії MAPS.ME. Завантаж зараз!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Неможливо прокласти маршрут. Не визначено поточне місцезнаходження.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Для прокладання маршруту необхідна додаткова інформація. Перейти до завантаження?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Неможливо прокласти маршрут. Немає доріг поруч з відправною точкою.</string>
+ <string name="routing_failed_dst_point_not_found">Неможливо прокласти маршрут. Немає доріг поруч з пунктом призначення.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Маршрут бути прокладений всередині мапи тільки одного регіону.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">Неможливо прокласти маршрут між вибраними точками. Будь ласка, змініть початок і кінець маршруту.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Внутрішня помилка. Будь ласка, видаліть мапу і завантажте її ще раз. Якщо це не допомогло, напишіть нам на support@maps.me</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 8d91435bab..6dc314382b 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -390,6 +390,7 @@
<string name="pref_calibration_title">指南針校準</string>
<!-- Search Suggestion -->
<string name="wifi">無線網絡/互聯網</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">下載地圖 + 佈置路線</string>
<!-- Context menu item for downloader. -->
@@ -400,4 +401,19 @@
<string name="downloader_download_map">下載地圖</string>
<!-- Button for routing PP. -->
<string name="routing_go">開始!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">佈置路線只在MAPS.ME的完整版本中才有。现在就得到它吧!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">當前地點未定。請明確地點以創建路線。</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">無法計算路線。沒有在您起點附近的路。</string>
+ <string name="routing_failed_dst_point_not_found">無法計算路線。沒有在您終點附近的路。</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">路程只能完全處在同一地圖裏時才能被創建。</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">找不到所選起點和終點間的路程。請選擇不同的起點或終點。</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">出現內部錯誤。請嘗試刪除并再次下載地圖。如果還有問題請聯系我們:support@maps.me。</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index ad79ff1636..9c8a26b35f 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -425,6 +425,7 @@
<string name="downloader_my_maps">我的地图</string>
<!-- Country queued for download -->
<string name="downloader_queued">已排队</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">下载地图 + 路线</string>
<!-- Context menu item for downloader. -->
@@ -435,4 +436,19 @@
<string name="downloader_download_map">下载地图</string>
<!-- Button for routing PP. -->
<string name="routing_go">出发!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">布置路线只在MAPS.ME的完整版本中才有。现在就得到它吧!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">当前地点未定。请明确地点以创建路线。</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">无法计算路线。没有在您起点附近的路。</string>
+ <string name="routing_failed_dst_point_not_found">无法计算路线。没有在您终点附近的路。</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">路程只能完全处在同一地图里时才能被创建。</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">找不到所选起点和终点间的路程。请选择不同的起点或终点。</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">出现内部错误。请尝试删除并再次下载地图。如果还有问题请联系我们:support@maps.me。</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 5b414bb622..bb998ee474 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -428,10 +428,6 @@
<string name="routing_map_outdated">Please update the map to create a route</string>
<!-- Update maps suggestion -->
<string name="routing_update_maps">The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.</string>
- <!-- Route building error message -->
- <string name="routing_error_select_new_dst">An error occurred while creating a route. Please choose another destination.</string>
- <!-- Routing between different MWMs error message -->
- <string name="routing_one_map_only">Creating routes is possible within one map only.</string>
<!-- Update all button text -->
<string name="downloader_update_all">Update all</string>
<!-- Downloaded maps category -->
@@ -452,6 +448,7 @@
<string name="downloader_status_outdated">Update</string>
<!-- Status of failed country in the list -->
<string name="downloader_status_failed">Failed</string>
+<<<<<<< HEAD
<!-- Context menu item for downloader. -->
<string name="downloader_download_map_and_routing">Download Map + Routing</string>
<!-- Context menu item for downloader. -->
@@ -462,4 +459,21 @@
<string name="downloader_download_map">Download Map</string>
<!-- Button for routing PP. -->
<string name="routing_go">Go!</string>
+=======
+ <!-- Show in Lite version when user try to download routing files or try to build route -->
+ <string name="routing_failed_buy_pro">Routing is only available in the full version of MAPS.ME. Get it right now!</string>
+ <!-- Show when user try build route, but we don't know where he -->
+ <string name="routing_failed_unknown_my_position">Current location is undefined. Please specify location to create route.</string>
+ <!-- Show if use has not routing file, or InconsistentMWMandRoute -->
+ <string name="routing_failed_has_no_routing_file">Additional data is required to create the route. Download data now?</string>
+ <!-- StartPointNotFound or EndPointNotFound -->
+ <string name="routing_failed_start_point_not_found">Cannot calculate the route. No roads near your starting point.</string>
+ <string name="routing_failed_dst_point_not_found">Cannot calculate the route. No roads near your destination.</string>
+ <!-- PointsInDifferentMWM -->
+ <string name="routing_failed_cross_mwm_building">Routes can only be created that are fully contained within a single map.</string>
+ <!-- RouteNotFound -->
+ <string name="routing_failed_route_not_found">There is no route found between the selected origin and destination.Please select a different start or end point.</string>
+ <!-- InternalError -->
+ <string name="routing_failed_internal_error">Internal error occurred. Please try to delete and download the map again. If problem persist please contact us at support@maps.me.</string>
+>>>>>>> generated routing fail messages
</resources>
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index d8fad64a99..bb680db81f 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "إصدار MAPS.ME الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.";
-/* Route building error message */
-"routing_error_select_new_dst" = "لقد حدث خطأ أثناء إنشاء المسار. من فضلك، حاول وجهة أخرى.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "خلق المسار ممكن في خريطة واحدة فقط.";
-
/* Update all button text */
"downloader_update_all" = "تحديث الكل";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "تنزيل الخريطة + تحديد المسار";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "انطلق!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "تحديد المسار متاح فقط من خلال الإصدار الكامل لتطبيق MAPS.ME. احصل عليه الآن!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "الموقع الحالي غير مُعَرّف. يرجى تحديد موقع لإنشاء مسار.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "هناك حاجة إلى بيانات إضافية لإنشاء مسار. بدء التحميل؟";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "لا يمكن حساب المسار. لا توجد طرق قرب نقطة البداية لديك.";
+
+"routing_failed_dst_point_not_found" = "لا يمكن حساب المسار. لا توجد طرق بالقرب من وجهتك المقصودة.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "يمكن فقط إنشاء المسارات التي توجد بشكل كامل ضمن خريطة واحدة.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "لم يتم العثور على مسار بين المنشأ والوُجْهَة المحددة. الرجاء تحديد نقطة بداية أو نهاية مختلفة.";
+
+/* InternalError */
+"routing_failed_internal_error" = "حدث خطأ داخلي. يرجى محاولة حذف الخريطة وإعادة تنزيلها مرة أخرى. إذا استمرت المشكلة يرجى الاتصال بنا على support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 3ccdd46a86..ca00b00d9c 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
-/* Route building error message */
-"routing_error_select_new_dst" = "An error occurred while creating a route. Please choose another destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Creating routes is possible within one map only.";
-
/* Update all button text */
"downloader_update_all" = "Update all";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Stáhnout Mapu + Směrování";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Jet!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Směrování je k dispozici pouze v plné verzi MAPS.ME. Získejte ji hned teď!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Aktuální umístění je nedefinované. Chcete-li vytvořit trasu, zadejte prosím umístění.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "K vytvoření trasy jsou zapotřebí další data. Začít stahování?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Nelze vypočítat trasu. Poblíž Vašeho výchozího bodu nejsou žádné cesty.";
+
+"routing_failed_dst_point_not_found" = "Nelze vypočítat trasu. Poblíž Vašeho cílového bodu nejsou žádné cesty.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Lze vytvářet jen takové trasy, které jsou zcela leží na území jediné mapy.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Mezi vybraným počátkem a cílem nebyla nalezena žádná trasa. Vyberte prosím jiný počáteční nebo koncový bod.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Došlo k vnitřní chybě. Zkuste prosím mapu vymazat a stáhnout znovu. Jestliže problém přetrvává, kontaktujte nás prosím na support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index b36d5c5c96..8f261fa5b9 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Den nye version af MAPS.ME gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.";
-/* Route building error message */
-"routing_error_select_new_dst" = "En fejl opstod ved oprettelsen af en rute. Venligst prøv at vælge en anden destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Oprettelse af ruter er kun muligt inden for ét kort.";
-
/* Update all button text */
"downloader_update_all" = "Opdater alle";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Hent kort + ruteangivelse";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Kør!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Oprettelse af ruter er kun tilgængelig i den fulde version af MAPS.ME. Få den nu!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Den nuværende placering er ikke defineret. Venligst angiv placering for at oprette en rute.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Yderligere data er nødvendig, for at oprette en rute. Begynde download?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Kan ikke beregne ruten. Ingen veje nær dit startpunkt.";
+
+"routing_failed_dst_point_not_found" = "Kan ikke beregne ruten. Ingen veje nær din destination.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Ruter kan kun oprettes, hvis de er fuldt indeholdt i ét enkelt kort";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Der blev ikke fundet en rute mellem det valgte begyndelsespunkt og destinationen. Venligst vælg et andet start- eller slutpunkt.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Intern fejl opstod. Venligt prøv at slette og downloade kortet igen. Hvis problemet vare ved, venligst kontakt os på support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 7581f41043..e782237e02 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Maps, um diese Funktion nutzen zu können.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Beim Erstellen der Route ist ein Fehler aufgetreten. Bitte wählen Sie ein anderes Ziel.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Das Erstellen von Routen ist nur innerhalb einer Karte möglich.";
-
/* Update all button text */
"downloader_update_all" = "Alles aktualisieren";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Karte + Streckenführung herunterladen";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Los!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Routing ist nur in der Vollversion von MAPS.ME verfügbar. Jetzt holen!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Der aktuelle Standort ist nicht definiert. Bitte geben Sie den Standort ein, um eine Route zu erstellen.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Zusätzliche Daten werden zum Erstellen einer Route benötigt. Mit dem Download beginnen?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Die Route kann nicht berechnet werden. Es gibt keine Straßen in der Nähe von Ihrem Ausgangspunkt.";
+
+"routing_failed_dst_point_not_found" = "Die Route kann nicht berechnet werden. Es gibt keine Straßen in der Nähe von Ihrem Ziel.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Es können nur Routen erstellt werden, die vollständig in einer einzigen Karte enthalten sind.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Es wurde keine Route zwischen dem ausgewählten Ausgangspunkt und Ziel gefunden. Bitte wählen Sie einen anderen Start- oder Endpunkt.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Es ist ein interner Fehler aufgetreten. Bitte versuchen Sie, die Karte zu löschen und erneut herunterzuladen.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index fb2cd02c9c..00e76dce82 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
-/* Route building error message */
-"routing_error_select_new_dst" = "An error occurred while creating a route. Please choose another destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Creating routes is possible within one map only.";
-
/* Update all button text */
"downloader_update_all" = "Update all";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Download Map + Routing";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Go!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Routing is only available in the full version of MAPS.ME. Get it right now!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Current location is undefined. Please specify location to create route.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Additional data is required to create the route. Download data now?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Cannot calculate the route. No roads near your starting point.";
+
+"routing_failed_dst_point_not_found" = "Cannot calculate the route. No roads near your destination.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Routes can only be created that are fully contained within a single map.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "There is no route found between the selected origin and destination.Please select a different start or end point.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Internal error occurred. Please try to delete and download the map again. If problem persist please contact us at support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index fe2d02ffbd..8cb0dbcf7c 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Se ha producido un error mientras se creaba una ruta. Por favor, intenta elegir otro destino.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Solo es posible crear rutas dentro de un mapa.";
-
/* Update all button text */
"downloader_update_all" = "Actualizar todos";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Descargar mapa + itinerario";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "¡Listo!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "La planificación de la ruta solo está disponible en la versión completa de MAPS.ME. ¡Consígala ya!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "La ubicación actual no está definida. Por favor, especifique la ubicación para crear la ruta.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Son necesarios datos adicionales para crear la ruta. ¿Empezar la descarga?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "No se puede calcular la ruta. No hay carreteras cerca de su punto de partida.";
+
+"routing_failed_dst_point_not_found" = "No se puede calcular la ruta. No hay carreteras cerca de su destino.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Solo se pueden crear rutas que estén totalmente incluidas en un mapa único.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "No se ha encontrado ninguna ruta entre el origen seleccionado y el destino. Por favor, seleccione un punto de partida o destino diferente.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Se ha producido un error interno. Por favor, intente eliminar y descargar el mapa otra vez. Si el problema persiste, por favor contáctenos en support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index f712c227f3..391580a797 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -159,7 +159,7 @@
"country_status_download_routing" = "Télécharger Carte + Itinéraire\n^ ^";
/* Button text for the button at the center of the screen when the country is not downloaded */
-"country_status_download" = "Download Map\n^ ^";
+"country_status_download" = "Téléchargez la carte\n^ ^";
/* Message to display at the center of the screen when the country download has failed */
"country_status_download_failed" = "^\n - Échec lors du téléchargement";
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Une erreur s'est produite lors de la création d'un itinéraire. Veuillez essayer de choisir une autre destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "La création d'itinéraires n'est possible que sur une seule carte.";
-
/* Update all button text */
"downloader_update_all" = "Tout mettre à jour";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Télécharger Carte + Itinéraire";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Allez-y !";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "L'itinéraire est uniquement disponible dans la version complète de MAPS.ME. Téléchargez-la dès maintenant !";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "L'emplacement actuel n'est pas défini. Veuillez préciser l'emplacement pour créer l'itinéraire.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Des données supplémentaires sont nécessaires pour créer un itinéraire. Vous désirez lancer le téléchargement ?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Impossible de calculer l'itinéraire. Aucune route à proximité de votre point de départ.";
+
+"routing_failed_dst_point_not_found" = "Impossible de calculer l'itinéraire. Aucune route à proximité de votre destination.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Les itinéraires entièrement contenus sur une seule carte peuvent être créés.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Il n'existe aucun itinéraire entre l'origine et la destination choisies . Veuillez sélectionner un point de départ ou d'arrivée différent.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Une erreur interne s'est produite. Veuillez essayer de supprimer la carte et téléchargez la à nouveau. Si le problème persiste, veuillez contacter support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 5a0fe581ed..78419e1f24 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "A MAPS.ME új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Hiba történt útvonal létrehozása közben. Kérjük, próbálj másik úticélt kiválasztani.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Útvonalak létrehozása csak egy térképen belül lehetséges.";
-
/* Update all button text */
"downloader_update_all" = "Mind frissítése";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Térkép + útvonal letöltése";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Indulás!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Az útvonaltervezés csak a MAPS.ME teljes verziójában elérhető. Szerezd meg most!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Nem meghatározott a jelenlegi helyszín. Kérjük, határozza meg a helyszínt, hogy útvonal készülhessen.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Útvonaltervezéshez további adatok is szükségesek. Elkezded a letöltést?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Az útvonal nem tervezhető meg. Nincsenek utak a kiindulópontja közelében.";
+
+"routing_failed_dst_point_not_found" = "Az útvonal nem tervezhető meg. Nincsenek utak az úti céljának közelében.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Útvonalakat csak akkor lehet készíteni, ha teljesen rajta vannak egy térképen.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Nem találtunk útvonalat a kiválasztott kiindulópont és az úti cél között. Kérjük, válasszon másik kiinduló- vagy végpontot.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Belső hiba történt. Kérjük, próbálja meg kitörölni és újra letölteni a térképet. Ha a probléma továbbra is fennáll, kérjük, vegye fel velünk a kapcsolatot a support@maps.me e-mail címen.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 5810c5aecc..b98911d8a2 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Si è verificato un errore nella creazione del percorso. Prova a scegliere un'altra destinazione.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Gli itinerari si possono creare solo nell'ambito di una mappa.";
-
/* Update all button text */
"downloader_update_all" = "Aggiorna tutto";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Scarica mappa e percorso";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Andare!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Il percorso è disponibile solo nella versione completa di MAPS.ME. Prendila ora!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "La posizione attuale non è definita. Specifica la posizione per creare il percorso.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Ulteriori dati sono necessari per creare un percorso. Inizio a scaricarli?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Impossibile calcolare il percorso. Nessuna strada vicina al tuo punto di partenza.";
+
+"routing_failed_dst_point_not_found" = "Impossibile calcolare il percorso. Nessuna strada vicina al tuo punto di arrivo.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "I percorsi possono essere creati solo se interamente presenti in una singola mappa.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Non è stata trovata alcuna strada fra il punto di partenza e d'arrivo selezionati. Seleziona un punto di partenza e d'arrivo diversi.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Si è verificato un errore interno. Prova ad eliminare la mappa e a scaricarla nuovamente. Se il problema dovesse persistere, contattaci all'indirizzo support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 63bb14bc58..a0fa4e948b 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
-/* Route building error message */
-"routing_error_select_new_dst" = "An error occurred while creating a route. Please choose another destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Creating routes is possible within one map only.";
-
/* Update all button text */
"downloader_update_all" = "全てをアップデート";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "地図とルートをダウンロード";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "開始!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "ルート決定機能はMAPS.MEの完全版でのみ利用可能です。今すぐ入手しましょう!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "現在地が設定されていません。ルートを作成するには現在地を設定してください。";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "ルートを作成するには追加のデータが必要です。ダウンロードを開始しますか?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "ルートを計算できません。出発地点の近くに道路がありません。";
+
+"routing_failed_dst_point_not_found" = "ルートを計算できません。目的地の近くに道路がありません。";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "一つの地図に完全に収まるルートのみ作成可能です。";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "選択した出発地と目的地との間にルートが見つかりません。別の出発地点と到着地点を選択してください。";
+
+/* InternalError */
+"routing_failed_internal_error" = "内部エラーが発生しました。もう一度地図をダウンロードしてください。問題が解決しない場合は、support@maps.meまでご連絡ください。";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 8ec959a01c..fab39e6857 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "MAPS.ME의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.";
-/* Route building error message */
-"routing_error_select_new_dst" = "경로를 만드는 동안 오류가 발생했습니다. 다른 목적지를 선택하도록 시도하십시오.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "경로를 생성하는 것은 하나의 지도 내에서만 가능합니다.";
-
/* Update all button text */
"downloader_update_all" = "모두 업데이트";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "지도 + 라우팅 다운로드";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "이동!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "라우팅은 MAPS.ME의 정식 버전에서만 사용할 수 있습니다 지금 당장 얻으세요!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "현재 위치는 정의되지 않습니다. 경로를 생성할 위치를 지정하십시오.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "추가 데이터는 경로를 생성하기 위해 필요합니다. 다운로드를 시작하시겠습니까?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "경로를 계산할 수 없습니다. 시작 지점 근처에 도로가 없습니다.";
+
+"routing_failed_dst_point_not_found" = "경로를 계산할 수 없습니다. 목적지 근처에 도로가 없습니다.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "경로는 하나의 지도에 완전히 포함되도록만 생성할 수 있습니다.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "선택한 출발지와 목적지 사이에서 발견있는 경로가 없습니다. 다른 출발지 또는 도착지를 선택하십시오.";
+
+/* InternalError */
+"routing_failed_internal_error" = "내부 오류가 발생했습니다. 다시지도를 삭제하고 다운로드하도록 시도하십시오. 문제가 지속되면 support@maps.me로 문의하시기 바랍니다.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index c28d9e82ea..0135c0da11 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Met de nieuwe versie van MAPS.ME kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Er deed zich een fout voor bij het maken van een route. Probeer een andere bestemming te kiezen.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Routes kunnen alleen binnen één kaart worden gemaakt.";
-
/* Update all button text */
"downloader_update_all" = "Alles bijwerken";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Download kaart + routering";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Starten!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Route aanmaken is alleen beschikbaar in de volledige versie van MAPS.ME. Neem nu meteen!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Huidige locatie is niet gedefinieerd. Gelieve de locatie te specificeren om de route te creëren.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Er zijn extra gegevens nodig om een ​​route te creëren. Beginnen met downloaden?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Kan de route niet berekenen. Geen wegen in de buurt van uw beginpunt.";
+
+"routing_failed_dst_point_not_found" = "Kan de route niet berekenen. Geen wegen in de buurt van uw bestemming.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Slechts de routes die volledig opgenomen zijn in één kaart kunnen gecreëerd worden.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Er is geen route gevonden tussen het geselecteerde beginpunt en de bestemming. Gelieve een andere beginpunt of een eindbestemming te kiezen.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Er is een interne fout opgetreden. Probeer het kaart te verwijderen en opnieuw te downloaden. Indien het probleem blijft optreden, neem dan contact met ons op support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 9d234e2ef4..97ed581cd2 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Podczas tworzenia trasy wystąpił błąd. Proszę spróbować wybrać inny punkt docelowy.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Tworzenie tras możliwe jest wyłącznie w obrębie jednej mapy.";
-
/* Update all button text */
"downloader_update_all" = "Uaktualnij wszystko";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Pobierz mapę + wyznaczanie tras";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Przejdź!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Tworzenie trasy dostępne jest tylko w pełnej wersji aplikacji MAPS.ME. Pobierz pełną wersję, teraz!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Bieżąca lokalizacja nie została zdefiniowana. Aby utworzyć trasę, określ lokalizację.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Aby stworzyć trasę, potrzebne są dodatkowe dane. Rozpocząć pobieranie?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Nie można obliczyć trasy. Brak dróg w pobliżu punktu rozpoczęcia podróży.";
+
+"routing_failed_dst_point_not_found" = "Nie można obliczyć trasy. Brak dróg w pobliżu celu podróży.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Trasy można tworzyć tylko pod warunkiem, że zawarte będą w ramach pojedynczej mapy.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Nie znaleziono trasy pomiędzy wybranym punktem rozpoczęcia podróży a jej celem. Wybierz inny punkt początkowy lub końcowy.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Wystąpił wewnętrzny błąd. Spróbuj usunąć mapę i pobrać ją ponownie. Jeśli problem będzie się nadal powtarzał, skontaktuj się z nami pod adresem support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index f68238554e..b23edfcf32 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual para um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Ocorreu um erro enquanto criava uma rota. Por favor, tente escolher outro destino.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "É possível criar rotas apenas dentro de um mapa.";
-
/* Update all button text */
"downloader_update_all" = "Atualizar tudo";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Descarregar Mapa + Roteamento";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Avançar!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "A criação de rota só está disponível na versão completa de MAPS.ME. Obtenha-a já!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "A localização atual não foi definida. Por favor especifique a localização para criar o trajeto.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "São necessários dados adicionais para criar uma rota. Iniciar o download?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Impossível calcular o trajeto. Não há estradas próximas do seu ponto de partida.";
+
+"routing_failed_dst_point_not_found" = "Impossível calcular o trajeto. Não há estradas próximas do seu destino.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Só podem ser criados trajetos que estejam completamente contidos num único mapa.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Não foi encontrado um trajeto entre a origem selecionada e o destino. Por favor selecione um ponto de partida ou de chegada diferente.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Ocorreu um erro interno. Por favor experimente apagar o mapa e depois descarregue-o novamente. Se o problema persistir, contacte-nos através de support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index bda045f4cc..ec4906d89a 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Возникла ошибка при создании этого маршрута. Пожалуйста, выберите другой пункт назначения.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Создание маршрута возможно в пределах одной карты.";
-
/* Update all button text */
"downloader_update_all" = "Обновить все";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Скачать карту + маршруты";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Поехали!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Создание маршрутов возможно только в платной версии MAPS.ME. Скачай сейчас!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Невозможно проложить маршрут. Не определено текущее местоположение.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Для построения маршрута необходимы дополнительные данные. Перейти к загрузке?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Невозможно проложить маршрут. Нет дорог рядом с пунктом отправления.";
+
+"routing_failed_dst_point_not_found" = "Невозможно проложить маршрут. Нет дорог рядом с пунктом назначения.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Маршрут может быть проложен внутри карты только одного региона.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Невозможно проложить маршрут между выбранными точками. Пожалуйста, измените начало или конец маршрута.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Внутренняя ошибка. Пожалуйста, удалите карту и скачайте ее еще раз. Если это не помогло, напишите нам на support@maps.me";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index 516c997801..5802d1454b 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Nová verzia aplikácie MAPS.ME umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Pri vytváraní trasy sa vyskytla chyba. Skúste si, prosím, zvoliť iný cieľ trasy.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Trasy je možné vytvárať iba v rámci jednej mapy.";
-
/* Update all button text */
"downloader_update_all" = "Aktualizovať všetky";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Na stiahnutie Mapa + Trasa";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Štart!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Vytváranie trás je k dispozícii iba v plnej verzii MAPS.ME. Získajte ho hneď teraz!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Aktuálna lokácia nie je definovaná. Prosím, špecifikujte lokáciu pre vytvorenie trasy.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Na vytvorenie trasy sú potrebné ďalšie dáta. Začať sťahovanie?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Nedá sa vypočítať trasa. Žiadne cesty v blízkosti východiskového bodu.";
+
+"routing_failed_dst_point_not_found" = "Nedá sa vypočítať trasa. Žiadne cesty v blízkosti cieľa.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Cesty môžu byť vytvorené len tak, že sú plne obsiahnuté v jednej mape.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Nebol nájdená trasa medzi vybraným východiskom a cieľom. Prosím vyberte iný počiatočný a koncový bod.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Došlo k vnútornej chybe. Prosím, skúste zmazať a znovu stiahnuť mapu. Ak problém pretrvá, prosím, kontaktujte nás na support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index 0366c223d3..b830465834 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "Den nya versionen av MAPS.ME låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Ett fel uppstod när rutten skulle skapas. Testa att välja en annan destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Det går bara att skapa rutter på en karta.";
-
/* Update all button text */
"downloader_update_all" = "Uppdatera alla";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Ladda ner karta + anvisningar";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Kör!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Anvisningar är endast tillgängliga i den fullständiga versionen av MAPS.ME. Skaffa den nu!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Nuvarande plats är inte definierad. Ange din plats för att skapa rutt.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Ytterligare data behövs för att skapa en rutt. Påbörja nedladdning?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Rutten kan inte beräknas. Det finns inga vägar vid startpunkten.";
+
+"routing_failed_dst_point_not_found" = "Rutten kan inte beräknas. Det finns inga vägar vid målet.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Rutter kan endast skapas om de finns inom en enda karta.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Ingen rutt hittades mellan vald startpunkt och målet. Välj en annan start- eller slutpunkt.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Ett internt fel inträffade. Försök att radera och ladda ner kartan igen. Kontakta oss på support@maps.me om problemet kvarstår.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index 068fd89e50..89c0f6e051 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "เวอร์ชันใหม่ของ MAPS.ME อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้";
-/* Route building error message */
-"routing_error_select_new_dst" = "เกิดความผิดพลาดขณะที่สร้างเส้นทาง โปรดลองเลือกปลายทางอื่น";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "การสร้างเส้นทางสามารถทำได้ภายในหนึ่งแผนที่เท่านั้น";
-
/* Update all button text */
"downloader_update_all" = "อัปเดตทั้งหมด";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "ดาวน์โหลดแผนที่ + การเลือกเส้นทาง";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "ไป!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "เส้นทางจะใช้ได้เฉพาะในเวอร์ชันเต็มของ MAPS.ME. รับได้ในขณะนี้!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "ไม่มีการกำหนดสถานที่ปัจจุบัน โปรดระบุสถานที่ตั้งเพื่อสร้างเส้นทาง";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "ข้อมูลเพิ่มเติมเป็นต้องมีเพื่อสร้างเส้นทาง เริ่มต้นการดาวน์โหลด?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "ไม่สามารถคำนวณเส้นทางได้ ไม่มีถนนที่อยู่ใกล้เคียงกับจุดเริ่มต้นของคุณ";
+
+"routing_failed_dst_point_not_found" = "ไม่สามารถคำนวณเส้นทางได้ ไม่มีถนนที่อยู่ใกล้กับปลายทางของคุณ";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "สามารถสร้างเส้นทางแบบสมบูรณ์ได้เฉพาะที่มีอยู่ในแผนที่เดียวเท่านั้น";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "ไม่พบเส้นทางที่อยู่ระหว่างต้นทางและปลายทางที่เลือก โปรดเลือกจุดเริ่มต้นและจุดสิ้นสุดอื่น";
+
+/* InternalError */
+"routing_failed_internal_error" = "เกิดข้อผิดพลาดขึ้นภายใน โปรดลองลบและดาวน์โหลดแผนที่อีกครั้ง โปรดติดต่อเราได้ที่ support@maps.me.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 106de15142..eed67b4514 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "MAPS.ME'nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Rotayı oluştururken bir hata meydana geldi. Lütfen başka bir varış noktası seçmeyi deneyin.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Rota oluşturma sadece bir harita içerisinde mümkündür.";
-
/* Update all button text */
"downloader_update_all" = "Tümünü güncelle";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Harita + Rota İndir";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Git!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Rotalama sadece MAPS.ME tam sürümünde kullanılabilir. Hemen al!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Geçerli konum tanımlı değil. Rota oluşturmak için lütfen konum belirtin.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Bir rota oluşturmak için ek bilgiler gereklidir. İndirme işlemini başlat?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Rota hesaplanamıyor. Başlangıç noktanızın yakınında hiçbir yol yok.";
+
+"routing_failed_dst_point_not_found" = "Rota hesaplanamıyor. Varış yerinizin yakınında hiçbir yol yok.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Rotalar sadece tamamen tek bir harita dâhilinde oluşturulabilir.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Seçilen kalkış yeriyle varış yeri arasında hiçbir rota bulunamadı. Lütfen farklı bir başlangıç veya bitiş noktası seçin.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Sistem içi hata oluştu. Lütfen haritayı silin ve tekrar yüklemeyi deneyin. Sorun devam ettiği takdirde lütfen support@maps.me adresinden bize ulaşın.";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 505dae0ce2..31dc079e31 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.";
-/* Route building error message */
-"routing_error_select_new_dst" = "Сталася помилка при прокладанні цього маршруту. Будь ласка, виберіть інши йпункт призначення.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Створення маршруту можливе в межах однієї карти.";
-
/* Update all button text */
"downloader_update_all" = "Оновити все";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "Завантажити карту + маршрути";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "Поїхали!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "Створення маршрутів можливе лише у платній версії MAPS.ME. Завантаж зараз!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "Неможливо прокласти маршрут. Не визначено поточне місцезнаходження.";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Для прокладання маршруту необхідна додаткова інформація. Перейти до завантаження?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "Неможливо прокласти маршрут. Немає доріг поруч з відправною точкою.";
+
+"routing_failed_dst_point_not_found" = "Неможливо прокласти маршрут. Немає доріг поруч з пунктом призначення.";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "Маршрут бути прокладений всередині мапи тільки одного регіону.";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "Неможливо прокласти маршрут між вибраними точками. Будь ласка, змініть початок і кінець маршруту.";
+
+/* InternalError */
+"routing_failed_internal_error" = "Внутрішня помилка. Будь ласка, видаліть мапу і завантажте її ще раз. Якщо це не допомогло, напишіть нам на support@maps.me";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 10d9a29ec9..f60733d07b 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
-/* Route building error message */
-"routing_error_select_new_dst" = "An error occurred while creating a route. Please choose another destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Creating routes is possible within one map only.";
-
/* Update all button text */
"downloader_update_all" = "更新全部";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "下载地图 + 路线";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "出发!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "布置路线只在MAPS.ME的完整版本中才有。现在就得到它吧!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "当前地点未定。请明确地点以创建路线。";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Additional data is required to create the route. Download data now?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "无法计算路线。没有在您起点附近的路。";
+
+"routing_failed_dst_point_not_found" = "无法计算路线。没有在您终点附近的路。";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "路程只能完全处在同一地图里时才能被创建。";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "找不到所选起点和终点间的路程。请选择不同的起点或终点。";
+
+/* InternalError */
+"routing_failed_internal_error" = "出现内部错误。请尝试删除并再次下载地图。如果还有问题请联系我们:support@maps.me。";
+>>>>>>> generated routing fail messages
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index fa245756c6..522c58688a 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -661,12 +661,6 @@
/* Update maps suggestion */
"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
-/* Route building error message */
-"routing_error_select_new_dst" = "An error occurred while creating a route. Please choose another destination.";
-
-/* Routing between different MWMs error message */
-"routing_one_map_only" = "Creating routes is possible within one map only.";
-
/* Update all button text */
"downloader_update_all" = "Update all";
@@ -697,6 +691,7 @@
/* Status of failed country in the list */
"downloader_status_failed" = "Failed";
+<<<<<<< HEAD
/* Context menu item for downloader. */
"downloader_download_map_and_routing" = "下載地圖 + 佈置路線";
@@ -711,3 +706,27 @@
/* Button for routing PP. */
"routing_go" = "開始!";
+=======
+/* Show in Lite version when user try to download routing files or try to build route */
+"routing_failed_buy_pro" = "佈置路線只在MAPS.ME的完整版本中才有。现在就得到它吧!";
+
+/* Show when user try build route, but we don't know where he */
+"routing_failed_unknown_my_position" = "當前地點未定。請明確地點以創建路線。";
+
+/* Show if use has not routing file, or InconsistentMWMandRoute */
+"routing_failed_has_no_routing_file" = "Additional data is required to create the route. Download data now?";
+
+/* StartPointNotFound or EndPointNotFound */
+"routing_failed_start_point_not_found" = "無法計算路線。沒有在您起點附近的路。";
+
+"routing_failed_dst_point_not_found" = "無法計算路線。沒有在您終點附近的路。";
+
+/* PointsInDifferentMWM */
+"routing_failed_cross_mwm_building" = "路程只能完全處在同一地圖裏時才能被創建。";
+
+/* RouteNotFound */
+"routing_failed_route_not_found" = "找不到所選起點和終點間的路程。請選擇不同的起點或終點。";
+
+/* InternalError */
+"routing_failed_internal_error" = "出現內部錯誤。請嘗試刪除并再次下載地圖。如果還有問題請聯系我們:support@maps.me。";
+>>>>>>> generated routing fail messages
diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml
index d6359df305..a1a0ca9550 100644
--- a/tizen/MapsWithMe/res/deu-DE.xml
+++ b/tizen/MapsWithMe/res/deu-DE.xml
@@ -109,10 +109,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Bitte aktualisieren Sie die Karte, um eine Route zu erzeugen.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Maps, um diese Funktion nutzen zu können.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Beim Erstellen der Route ist ein Fehler aufgetreten. Bitte wählen Sie ein anderes Ziel.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Das Erstellen von Routen ist nur innerhalb einer Karte möglich.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Alles aktualisieren</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml
index 07a3dfe513..76801fac83 100644
--- a/tizen/MapsWithMe/res/eng-GB.xml
+++ b/tizen/MapsWithMe/res/eng-GB.xml
@@ -119,10 +119,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Please update the map to create a route</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">An error occurred while creating a route. Please choose another destination.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Creating routes is possible within one map only.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Update all</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml
index ec11ee00b2..67f8cec4fe 100644
--- a/tizen/MapsWithMe/res/fra-FR.xml
+++ b/tizen/MapsWithMe/res/fra-FR.xml
@@ -119,10 +119,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Veuillez mettre à jour la carte pour créer un itinéraire.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Une erreur s\&#39;est produite lors de la création d\&#39;un itinéraire. Veuillez essayer de choisir une autre destination.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">La création d\&#39;itinéraires n\&#39;est possible que sur une seule carte.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Tout mettre à jour</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml
index 40089474ed..8f8f015f38 100644
--- a/tizen/MapsWithMe/res/ita-IT.xml
+++ b/tizen/MapsWithMe/res/ita-IT.xml
@@ -111,10 +111,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Aggiorna la mappa per creare un itinerario.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Si è verificato un errore nella creazione del percorso. Prova a scegliere un\&#39;altra destinazione.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Gli itinerari si possono creare solo nell\&#39;ambito di una mappa.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Aggiorna tutto</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml
index 20d4751baa..e9c2a68b7d 100644
--- a/tizen/MapsWithMe/res/pol-PL.xml
+++ b/tizen/MapsWithMe/res/pol-PL.xml
@@ -111,10 +111,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Proszę zaktualizować mapę, by utworzyć trasę.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Podczas tworzenia trasy wystąpił błąd. Proszę spróbować wybrać inny punkt docelowy.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Tworzenie tras możliwe jest wyłącznie w obrębie jednej mapy.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Uaktualnij wszystko</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml
index 2f30897c41..bb5098bcfc 100644
--- a/tizen/MapsWithMe/res/por-PT.xml
+++ b/tizen/MapsWithMe/res/por-PT.xml
@@ -111,10 +111,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Por favor, atualize o mapa para criar uma rota.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual para um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Ocorreu um erro enquanto criava uma rota. Por favor, tente escolher outro destino.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">É possível criar rotas apenas dentro de um mapa.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Atualizar tudo</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml
index cad0a8ebf1..f1e4f089b8 100644
--- a/tizen/MapsWithMe/res/rus-RU.xml
+++ b/tizen/MapsWithMe/res/rus-RU.xml
@@ -119,10 +119,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Пожалуйста, обновите карту для того, чтобы проложить маршрут.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Возникла ошибка при создании этого маршрута. Пожалуйста, выберите другой пункт назначения.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Создание маршрута возможно в пределах одной карты.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Обновить все</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml
index d76358b489..6b42327883 100644
--- a/tizen/MapsWithMe/res/spa-ES.xml
+++ b/tizen/MapsWithMe/res/spa-ES.xml
@@ -107,10 +107,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Por favor, actualiza el mapa para crear una ruta.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Se ha producido un error mientras se creaba una ruta. Por favor, intenta elegir otro destino.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Solo es posible crear rutas dentro de un mapa.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Actualizar todos</text>
<!-- Downloaded maps category -->
diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml
index 84d3d4e4af..f05a823d71 100644
--- a/tizen/MapsWithMe/res/ukr-UA.xml
+++ b/tizen/MapsWithMe/res/ukr-UA.xml
@@ -113,10 +113,6 @@
<text id="IDS_ROUTING_MAP_OUTDATED">Будь ласка, оновіть карту, щоб прокласти маршрут.</text>
<!-- Update maps suggestion -->
<text id="IDS_ROUTING_UPDATE_MAPS">В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.</text>
- <!-- Route building error message -->
- <text id="IDS_ROUTING_ERROR_SELECT_NEW_DST">Сталася помилка при прокладанні цього маршруту. Будь ласка, виберіть інши йпункт призначення.</text>
- <!-- Routing between different MWMs error message -->
- <text id="IDS_ROUTING_ONE_MAP_ONLY">Створення маршруту можливе в межах однієї карти.</text>
<!-- Update all button text -->
<text id="IDS_DOWNLOADER_UPDATE_ALL">Оновити все</text>
<!-- Downloaded maps category -->