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

OsmAnd/res/values-ca/strings.xml

@@ -1865,4 +1865,13 @@
 	<string name="avoid_roads_msg">Podeu condicionar la ruta seleccionant vies a evitar</string>
     <string name="save_track_to_gpx_globally_headline">Registre de traces a petició</string>
 	<string name="recents">RECENTS</string>
+	<string name="proxy_pref_title">Proxy</string>
+    <string name="proxy_pref_descr">Configuració d\'un proxy per accedir internet</string>
+    <string name="settings_privacy">Privacitat</string>
+    <string name="enable_proxy_title">Activa Proxy HTTP</string>
+	<string name="enable_proxy_descr">Configureu Proxy HTTP per totes les peticions de xarxa</string>
+	<string name="proxy_host_title">Host proxy</string>
+	<string name="proxy_host_descr">Configureu el nom de host del vostre proxy\' (p.e. 127.0.0.1)</string>
+	<string name="proxy_port_title">Port proxy</string>
+	<string name="proxy_port_descr">Configureu el número de port del vostre proxy (per exemple 8118)</string>
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -1881,4 +1881,13 @@
 	<string name="navigation_over_track">Start navigation over spor?</string>
 	<string name="avoid_roads_msg">Du kan ændre ruten ved at vælge veje der skal undgås</string>
     <string name="recents">SENESTE</string>
+	<string name="proxy_pref_title">Proxy</string>
+    <string name="proxy_pref_descr">Opsæt en proxy internetkommunikation</string>
+    <string name="settings_privacy">Beskyttelse af personlige oplysninger</string>
+    <string name="enable_proxy_title">Aktiver HTTP Proxy</string>
+	<string name="enable_proxy_descr">Konfigurere HTTP-proxyserveren for alle netværksanmodninger</string>
+	<string name="proxy_host_title">Proxy vært</string>
+	<string name="proxy_host_descr">Konfigurere dit proxy værtsnavn (f.eks. 127.0.0.1)</string>
+	<string name="proxy_port_title">Proxy port</string>
+	<string name="proxy_port_descr">Konfigurere dit proxy portnummer (f.eks. 8118)</string>
 	</resources>

OsmAnd/res/values-es/strings.xml

@@ -1890,10 +1890,13 @@
 	<string name="navigation_over_track">¿Empezar navegación sobre traza?</string>
 	<string name="avoid_roads_msg">Puedes cambiar la ruta seleccionando los caminos a evitar</string>
     <string name="proxy_pref_title">Proxy</string>
-    <string name="proxy_pref_descr">Configura un proxy de acceso a internet</string>
+    <string name="proxy_pref_descr">Configurar un proxy de acceso a Internet</string>
     <string name="settings_privacy">Privacidad</string>
     <string name="recents">RECIENTES</string>
 	<string name="enable_proxy_title">Activar Proxy HTTP</string>
 	<string name="enable_proxy_descr">Configurar Proxy HTTP para todas las peticiones de red</string>
 	<string name="proxy_host_title">Host proxy</string>
+	<string name="proxy_port_title">Puerto del proxy</string>
+	<string name="proxy_port_descr">Configurar el número de puerto de tu proxy (p.e. 8118)</string>
+	<string name="proxy_host_descr">Configura el hostname de tu proxy (p.e. 127.0.0.1)</string>
 	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1853,4 +1853,14 @@
 	<string name="navigation_over_track">Начать навигацию по треку?</string>
 	<string name="avoid_roads_msg">Вы можете изменить маршрут, выбрав дороги, которые стоит избегать</string>
     <string name="save_track_to_gpx_globally_headline">Запись трека по требованию</string>
+	<string name="proxy_pref_title">Прокси-сервер</string>
+    <string name="proxy_pref_descr">Настройка интернет соединения через прокси-сервер</string>
+    <string name="settings_privacy">Приватность</string>
+    <string name="enable_proxy_title">Включить HTTP прокси-сервер</string>
+	<string name="enable_proxy_descr">Настройка HTTP прокси-сервера для всех сетевых запросов</string>
+	<string name="proxy_host_title">Адрес прокси-сервера</string>
+	<string name="proxy_host_descr">Настройте имя хоста вашего прокси-сервера (например, 127.0.0.1)</string>
+	<string name="proxy_port_title">Порт прокси-сервера</string>
+	<string name="proxy_port_descr">Настройте номер порта вашего прокси-сервера (например, 8118)</string>
+	<string name="recents">НЕДАВНИЕ</string>
 	</resources>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="rendering_attr_streetLighting_name">Street lighting</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="proxy_pref_descr">Setup a proxy internet communication</string>
     <string name="settings_privacy">Privacy</string>