Merge branch 'master' of ssh://github.com/osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2015-01-21 00:52:34 +01:00
commit b0815c2b64
2 changed files with 12 additions and 2 deletions

View file

@ -1997,4 +1997,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="proxy_host_descr">Задайце хостнэйм вашага проксі (напрыклад 127.0.0.1)</string>
<string name="proxy_port_title">Порт проксі</string>
<string name="proxy_port_descr">Задайце нумар парта вашага проксі (напрыклад 8118)</string>
</resources>
<string name="proxy_pref_descr">Наладзіць Інтэрнэт сувязь праз проксі</string>
<string name="settings_privacy">Прыватнасьць</string>
</resources>

View file

@ -1899,4 +1899,12 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="navigation_over_track">Démarrer la navigation sur les pistes ?</string>
<string name="save_track_to_gpx_globally_headline">Enregistrement de traces à la demande</string>
<string name="recents">Récents</string>
</resources>
<string name="proxy_pref_title">Proxy</string>
<string name="enable_proxy_descr">Configurer le proxy http pour toutes les requêtes réseau</string>
<string name="proxy_host_title">Hôte proxy</string>
<string name="proxy_host_descr">Configurez le nom d\'hôte de votre proxy (par exemple 127.0.0.1)</string>
<string name="proxy_port_title">Port proxy</string>
<string name="proxy_port_descr">Configurez le numéro de port de votre proxy (par exemple 8118)</string>
<string name="proxy_pref_descr">Définir un proxy pour les communications Internet</string>
<string name="settings_privacy">Confidentialité</string>
</resources>