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

OsmAnd/res/values-ca/phrases.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

OsmAnd/res/values-de/strings.xml

@@ -820,7 +820,7 @@
 	<string name="select_build_to_install">Auswählen eines OsmAnd-Builds für die Installation</string>
 	<string name="contribution_activity">Installations Version</string>
 	<string name="gps_status_app_not_found">Anwendung \'GPS Status\' ist nicht installiert. Soll diese installiert werden?</string>
-	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte in den Navigations-Einstellungen ein Sprachansage-Paket auswählen oder herunterladen.</string>
+	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte unter \'Einstellungen\' → \'Allgemein\' → \'Sprachansagen\' ein Sprachansage-Paket auswählen oder herunterladen.</string>
 	<string name="voice_is_not_available_title">Keine Sprachansage ausgewählt</string>
 	<string name="daynight_mode_day">Tag</string>
 	<string name="daynight_mode_night">Nacht</string>

OsmAnd/res/values-fr/strings.xml

@@ -49,8 +49,8 @@
   <string name="index_name_oceania">Océanie</string>
   <string name="index_name_other">Cartes mondiales et thématiques</string>
   <string name="index_name_wiki">Wikipédia Monde</string>
-  <string name="index_name_voice">Voix enregistrées (fonctions limitées)</string>
+  <string name="index_name_voice">Voix enregistrée (guidage limité)</string>
-  <string name="index_name_tts_voice">Voix de synthèse TTS (à préférer)</string>
+  <string name="index_name_tts_voice">Voix de synthèse (TTS, recommandée)</string>
   <string name="amenity_type_osmwiki">Wikipédia (hors-ligne)</string>
   <string name="amenity_type_user_defined">Défini par l\'utilisateur</string>
   <string name="fav_export_confirmation">Un fichier de favoris précédemment exporté existe déjà. Voulez vous le remplacer ?</string>
@@ -383,7 +383,7 @@
   <string name="select_build_to_install">Sélectionnez la version d\'OsmAnd à installer</string>
   <string name="contribution_activity">Fonction spéciale pour la version des contributeurs</string>
   <string name="gps_status_app_not_found">L\'application GPS sélectionnée n\'est pas installée. Souhaitez-vous l\'installer depuis la boutique ?</string>
-  <string name="voice_is_not_available_msg">Guidage vocal indisponible. Allez dans \"Paramètres\" puis téléchargez des voix.</string>
+  <string name="voice_is_not_available_msg">Aucun guidage vocal disponible. Allez dans \'Paramètres\' → \'Général\' → \'Guidage vocal\' puis sélectionnez ou téléchargez des voix.</string>
   <string name="voice_is_not_available_title">Aucune donnée vocale n\'est spécifiée</string>
   <string name="daynight_mode_day">Jour</string>
   <string name="daynight_mode_night">Nuit</string>
@@ -427,7 +427,7 @@
   <string name="transport_search_none">aucun</string>
   <string name="transport_search_again">Réinitialiser la recherche</string>
   <string name="map_index">Carte</string>
-  <string name="voice">Voix</string>
+  <string name="voice">Voix enregistrée</string>
   <string name="no_vector_map_loaded">Aucune carte vectorielle n\'a été chargée</string>
   <string name="map_route_by_gpx">Naviguer en utilisant l\'itinéraire GPX enregistré</string>
   <string name="gpx_files_not_found">Aucun fichier GPX n\'a été trouvé dans le dossier de traces</string>
@@ -1880,4 +1880,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="download_tab_local">Local</string>
 	<string name="map_locale">Langue pour la carte</string>
     <string name="rendering_attr_transportStops_name">Arrêts de transports en commun</string>
-    </resources>
+    <string name="voices">Guidage vocal</string>
+	</resources>

OsmAnd/res/values-it/strings.xml

@@ -2047,4 +2047,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="navigate_point_easting">In direzione Est</string>
     <string name="map_locale">Lingua della mappa</string>
     <string name="rendering_attr_transportStops_name">Fermate mezzi pubblici</string>
-    </resources>
+    <string name="voices">Suggerimenti vocali</string>
+	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -2103,4 +2103,5 @@
     <string name="download_tab_local">로컬</string>
 	<string name="map_locale">지도 언어</string>
     <string name="rendering_attr_transportStops_name">대중교통 정류소</string>
-    </resources>
+    <string name="voices">음성 안내</string>
+	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -444,7 +444,7 @@
   <string name="indexing_address">Adres wordt geïndexeerd…</string>
   <string name="indexing_map">Kaart wordt geïndexeerd…</string>
   <string name="indexing_poi">Interessepunten worden geïndexeerd…</string>
-  <string name="indexing_transport">Vervoer wordt geïndexeerd…</string>
+  <string name="indexing_transport">OV wordt geïndexeerd…</string>
   <string name="input_output_error">Datatransportfout opgetreden</string>
   <string name="km">km</string>
   <string name="km_h">km/u</string>
@@ -513,7 +513,7 @@
   <string name="unknown_location">Positie nog niet bekend</string>
   <string name="download_files">Download</string>
   <string name="context_menu_item_search_transport">Zoek openbaar vervoer</string>
-  <string name="transport_searching_transport">Vervoer resultaten (geen bestemming):</string>
+  <string name="transport_searching_transport">Openbaar vervoer-resultaten (geen bestemming):</string>
   <string name="transport_searching_route">Vervoer resultaten ({0} naar bestemming):</string>
   <string name="transport_search_none">geen</string>
   <string name="transport_search_again">Opnieuw OV zoeken</string>
@@ -1973,7 +1973,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="print_route">Route afdrukken</string>
     <string name="speed_limit_exceed">Te hoge snelheid melden bij...</string>
 	<string name="speed_limit_exceed_message">Hoeveel de maximumsnelheid mag worden overschreden voordat een melding volgt.</string>
-	<string name="rendering_category_transport">Vervoer</string>
+	<string name="rendering_category_transport">Openbaar vervoer</string>
     <string name="rendering_category_others">Overige kaart attributen</string>
     <string name="map_widget_appearance_rem">Resterende onderdelen</string>
     <string name="map_widget_top">Statusbalk</string>

OsmAnd/res/values-sc/strings.xml

@@ -1068,8 +1068,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t- Mapas agiornadas
 \n\t- Àteras caraterìsticas minores "</string>    
 	<string name="free_version_message">Custa versione gratùita de OsmAnd est limitada a %1$s iscarrigamentos e non suportada sos artìculos sena lìnia de Wikipedia.</string>
-	<string name="index_name_voice">Pachetos boghe (registrados, funtzionalidades limitadas)</string>
+	<string name="index_name_voice">Indicatziones vocales (registradas, funtzionalidades limitadas)</string>
-	<string name="index_name_tts_voice">Pachetos boghe (TTS-sintetizados, preferìbiles)</string>
+	<string name="index_name_tts_voice">Indicatziones vocales (TTS-sintetizadas, preferìbiles)</string>
 	<string name="amenity_type_user_defined">Definidu dae s\'impitadore</string>
 	<string name="fav_export_confirmation">Esistint documentos cun prefèrridos esportados giai. Los boles remplasare?</string>
 	<string name="index_settings">Gesti sos documentos de sas mapas</string>
@@ -1330,7 +1330,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="context_menu_item_search_transport">Chirca trasportos pùblicos</string>
 	<string name="transport_search_none">perunu</string>
 	<string name="map_index">Mapa</string>
-	<string name="voice">Boghe</string>
+	<string name="voice">Boghe registrada</string>
 	<string name="no_vector_map_loaded">Sas mapas vetoriales non sunt istadas carrigadas</string>
 	<string name="map_route_by_gpx">Àndala tramite GPX</string>
 	<string name="gpx_files_not_found">Perunu documentu GPX agatadu in sa cartella /tracks</string>
@@ -1391,7 +1391,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="osmand_routing_experimental">"Su nàvigu sena lìnia de OsmAnd est isperimentale e non funtzionada pro distàntzias prus mannas de  20 km.\n\nSu servìtziu de nàvigu benit furnidu intertantu tramite CloudMade in lìnia."</string>
 	<string name="osmand_net_previously_installed">B\'est installada una versione pretzedente de OsmAnd. Totu sos datos ant a èssere suportados dae s\'aplicu nou. Sos prefèrridos depent èssere esportados dae s\'aplicu bètzu e importados a manuda in su nou.</string>
 	<string name="gps_status_app_not_found">Aplicu istadu GPS no installada. La boles chircare in su Market?</string>
-	<string name="voice_is_not_available_msg">Boghe gia non disponìbile. Bae in sas impostaduras, issèbera su pachete prefèrridu e iscàrrigalu.</string>
+	<string name="voice_is_not_available_msg">Boghe de ghia non disponìbile. Intra in \'Impostaduras\' → \'Impostaduras generales\' → \'Ghia vocale\', issèbera su pachete prefèrridu e/o iscàrrigalu.</string>
 	<string name="daynight_descr">Issèbera sas règulas pro sa muda de sa modalidade die/note</string>
 	<string name="download_files_question">Iscarrigare {0} documentu/os ({1} MB)?</string>
 	<string name="reload">Torra a carrigare</string>
@@ -1801,4 +1801,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="navigate_point_easting">In diretzione Est</string>
     <string name="rendering_attr_transportStops_name">Firmadas traspòrtu pùblicu</string>
     <string name="map_locale">Limba de sa mapa</string>
-    </resources>
+    <string name="voices">Indicatziones vocales</string>
+	</resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -324,8 +324,8 @@
 	<string name="index_name_oceania">大洋洲</string>
 	<string name="index_name_other">世界各地和專題地圖</string>
 	<string name="index_name_wiki">全球維基百科 POI</string>
-	<string name="index_name_voice">語音包 (真人發音，功能有限)</string>
+	<string name="index_name_voice">提示語音 (真人發音，功能有限)</string>
-	<string name="index_name_tts_voice">語音包 (TTS-合成音，優先)</string>
+	<string name="index_name_tts_voice">提示語音 (TTS-合成語音，優先)</string>
 	<string name="amenity_type_osmwiki">維基百科 (離線)</string>
 	<string name="amenity_type_user_defined">使用者定義</string>
 	<string name="fav_export_confirmation">我的最愛已有上次匯出的檔，要取代它嗎？</string>
@@ -622,7 +622,7 @@
 	<string name="select_build_to_install">選擇 OsmAnd 編譯安裝</string>
 	<string name="contribution_activity">安裝的版本</string>
 	<string name="gps_status_app_not_found">GPS 狀態工具未安裝，到 Play 商場找嗎？</string>
-	<string name="voice_is_not_available_msg">語音導航無法使用。請到設定功能，選取喜歡的語音資料然後下載。</string>
+	<string name="voice_is_not_available_msg">語音導航無法使用時。請到\'設定\'→ \'一般設定\' → \'語音導航\'，選取或下載提示語音包。</string>
 	<string name="voice_is_not_available_title">未選定語音導航</string>
 	<string name="daynight_mode_day">日間</string>
 	<string name="daynight_mode_night">夜間</string>
@@ -664,7 +664,7 @@
 	<string name="transport_search_none">無</string>
 	<string name="transport_search_again">重置交通運輸查尋</string>
 	<string name="map_index">地圖</string>
-	<string name="voice">語音</string>
+	<string name="voice">真人語音</string>
 	<string name="no_vector_map_loaded">向量地圖未載入</string>
 	<string name="map_route_by_gpx">以 GPX 導航</string>
 	<string name="gpx_files_not_found">在 /tracks 資料夾找不到 GPX 檔案</string>
@@ -802,7 +802,7 @@
 	<string name="route_general_information">總距離 %1$s、行駛時間 %2$d 小時 %3$d 分。</string>
 	<string name="router_service_descr">選擇線上或離線的導航服務</string>
 	<string name="router_service">導航服務</string>
-	<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取</string>
+	<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取！</string>
 	<string name="download_question">下載 {0} - {1}？</string>
 	<string name="download_question_exist">離線資料 {0}已存在 ({1})。您要更新 ({2})嗎 ?</string>
 	<string name="address">地址</string>
@@ -1683,7 +1683,7 @@
     <string name="none_selected_gpx">沒有選定 GPX 檔案。選取現有的軌跡再按住。</string>
     <string name="local_index_unselect_gpx_file">取消選擇</string>
     <string name="local_index_select_gpx_file">選取要顯示的</string>
-    <string name="route_descr_destination">\t</string>
+    <string name="route_descr_destination">目的地</string>
     <string name="no_index_file_to_download">無法下載，請檢查網路連線。</string>
     <string name="osmo_gpx_points_downloaded">OsMo 標點 %1$s 已下載。</string>
     <string name="osmo_auto_connect_descr">自動連線至服務，隨後啟動應用程式</string>
@@ -1844,7 +1844,7 @@
     <string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作）</string>
     <string name="dismiss">排除</string>
     <string name="no_internet_connection">不能下載。請連接到 Wifi 網路進行。</string>
-    <string name="download_tab_downloads">下載</string>
+    <string name="download_tab_downloads">全部下載</string>
     <string name="download_tab_updates">更新</string>
     <string name="download_tab_local">本機</string>
 	<string name="navigate_point_northing">北距</string>
@@ -1852,4 +1852,5 @@
     <string name="navigate_point_zone">地區</string>
     <string name="map_locale">地圖上的語言</string>
     <string name="rendering_attr_transportStops_name">候車亭</string>
-    </resources>
+    <string name="voices">提示語音</string>
+	</resources>

OsmAnd/res/values/strings.xml

@@ -1670,7 +1670,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="loading_builds">Loading OsmAnd builds&#8230;</string>
 	<string name="select_build_to_install">Select an OsmAnd build to install</string>
 	<string name="gps_status_app_not_found">GPS Status application not installed. Search in Market?</string>
-	<string name="voice_is_not_available_msg">No voice guidance available, please go to the Navigation Settings and select or download a voice prompt package.</string>
+	<string name="voice_is_not_available_msg">No voice guidance available, please go to \'Settings\' → \'General\' → \'Voice guidance\' and select or download a voice prompt package.</string>
 	<string name="voice_is_not_available_title">No voice guidance selected</string>
 	<string name="daynight_mode_day">Day</string>
 	<string name="daynight_mode_night">Night</string>