Merge branch 'origin/master' into Weblate.

This commit is contained in:
Hosted Weblate 2019-12-11 21:13:47 +01:00
commit 56cc3c7e93
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
5 changed files with 104 additions and 93 deletions

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--
Our app defaults to American English with default strings in res/values
This file is manually maintained in res/values-en-rGB and should ONLY contain strings where a different spelling should be used for English as used in the United Kingdom
-->
<string name="rendering_attr_currentTrackColor_name">GPX colour</string>
<string name="rendering_attr_currentTrackColor_description">GPX colour</string>
<string name="shared_string_color">Colour</string>
@ -66,7 +66,6 @@
<string name="favourites_remove_dialog_msg">Delete favourite point \'%s\'?</string>
<string name="favourites_remove_dialog_success">Favourite point {0} was successfully deleted.</string>
<string name="replace_favorite_confirmation">Are you sure you want to replace favourite %1$s?</string>
<string name="always_center_position_on_map">Display position always in centre</string>
<string name="choose_auto_follow_route">Auto-centre map view</string>
<string name="auto_follow_route_navigation">Auto-centre nav only</string>
@ -91,5 +90,6 @@
<string name="quick_action_favorites_hide">Hide Favourites</string>
<string name="quick_action_category_descr">Select the category to save the favourite in.</string>
<string name="analyze_on_map">Analyse on map</string>
<string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
</resources>
<string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
<string name="show_transparency_seekbar">Show transparency slider</string>
</resources>

View file

@ -3690,4 +3690,6 @@
<string name="poi_bath_type_lake">Lac</string>
<string name="poi_horse_forestry">Accès à cheval : forestiers seuls</string>
<string name="poi_foot_destination">Accès piétonnier : riverains</string>
<string name="poi_trailer_no">Accès aux remorques : non</string>
<string name="poi_psv_yes">Accès aux transports publics ou taxis : oui</string>
</resources>

View file

@ -1882,7 +1882,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
<string name="osm_live_thanks">Merci pour votre soutien à OsmAnd !
\nPour activer toutes les nouvelles fonctionnalités, merci de redémarrer OsmAnd.</string>
<string name="osm_live_subscription_settings">Paramétrage de l\'abonnement</string>
<string name="show_transparency_seekbar">Afficher la barre de recherche transparente</string>
<string name="show_transparency_seekbar">Afficher curseur de réglage de la transparence</string>
<string name="recalculate_route">Recalculer l\'itinéraire</string>
<string name="storage_directory_shared">Mémoire partagée</string>
<string name="shared_string_topbar">Barre supérieure</string>
@ -3370,4 +3370,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
<string name="save_heading">Inclure l\'entête</string>
<string name="save_heading_descr">Enregistrer l\'entête avec chaque point lors de l\'enregistrement d\'une trace.</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">Montre des itinéraires cyclables de réseau de nœud</string>
<string name="rendering_value_walkingRoutesOSMCNodes_name">Réseaux de nœud</string>
<string name="personal_category_name">Personnel</string>
</resources>

View file

@ -3388,4 +3388,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="add_new_profile_q">Pridať nový profil \'%1$s\'\?</string>
<string name="save_heading">Pridať nadpis</string>
<string name="save_heading_descr">Pridať nadpis ku každému bodu trasy pri zázname.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Osobné</string>
</resources>

View file

@ -3350,4 +3350,7 @@
<string name="add_new_profile_q">\'%1$s\' yeni profil ekle\?</string>
<string name="save_heading">Başlığı dahil et</string>
<string name="save_heading_descr">Kayıt sırasında her bir izleme noktasının başlığını kaydet.</string>
<string name="distance_and_address">%1$s • %2$s</string>
<string name="street_city">%1$s, %2$s</string>
<string name="personal_category_name">Kişisel</string>
</resources>