diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2014-10-09 14:41:35 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:29:53 +0300 |
| commit | 7e580d925aed34695a28d0418291e2376a420aca (patch) | |
| tree | 07fe68ee1b830ab3b01093d8768b0447b3f6f77e /android/res/values-sv | |
| parent | 3ab7c394435d41ee77f1617f0bbc32bbd354f3f9 (diff) | |
rebase fix
Diffstat (limited to 'android/res/values-sv')
| -rw-r--r-- | android/res/values-sv/strings.xml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 3dda6c076b..5dede68009 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -429,26 +429,15 @@ <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. --> - <string name="downloader_download_routing">Ladda ner anvisningar</string> - <!-- Context menu item for downloader. --> - <string name="downloader_delete_routing">Radera anvisningar</string> - <!-- Context menu item for downloader. --> - <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 --> + <!-- StartPointNotFound --> <string name="routing_failed_start_point_not_found">Rutten kan inte beräknas. Det finns inga vägar vid startpunkten.</string> + <!-- EndPointNotFound --> <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> @@ -456,5 +445,14 @@ <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 + <!-- Context menu item for downloader. --> + <string name="downloader_download_map_and_routing">Ladda ner karta + anvisningar</string> + <!-- Context menu item for downloader. --> + <string name="downloader_download_routing">Ladda ner anvisningar</string> + <!-- Context menu item for downloader. --> + <string name="downloader_delete_routing">Radera anvisningar</string> + <!-- Context menu item for downloader. --> + <string name="downloader_download_map">Ladda ner karta</string> + <!-- Button for routing PP. --> + <string name="routing_go">Kör!</string> </resources> |