From 00e68e965ed80e89ec4c81db27914894f8588f76 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Mon, 19 Dec 2016 18:10:55 +0300 Subject: [PATCH 01/83] Update strings --- OsmAnd/res/values-ru/strings.xml | 2 ++ OsmAnd/res/values/strings.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index c879ed049e..743f7ec4ec 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1,5 +1,7 @@ + Толщина горизонталей (изогипсы) + Толщина горизонталей Воду Старый поиск Показывать старый поиск diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index b0c98f937e..c2c663203d 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,8 @@ 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 --> + Contour lines width + Contour lines width Water Legacy search Show legacy search From 18417e0f9688071989c2e144c8ce4e64d329e851 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 19 Dec 2016 12:15:34 +0000 Subject: [PATCH 02/83] Translated using Weblate (Belarusian) Currently translated at 99.6% (2097 of 2104 strings) --- OsmAnd/res/values-be/strings.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 28204854ab..5824867cb1 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -201,7 +201,7 @@ Стандартныя мапы Мапа толькі дарог - Схаваць межы + Межы Не адлюстроўваць рэгіянальныя межы (адміністатыўныя ўзроўні 5–9) @@ -558,7 +558,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Трымайцеся левага боку Трымайцеся правага боку Адлюстроўваць толькі контуры, без заліваньня - Схаваць палігоны + Палігоны Рэжым візуалізацыі Аптымізаваць мапу для Мінімальны ўзровень маштабу з адлюстраваньнем ізаліній вышынь: @@ -2704,4 +2704,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві кітайская (Ганконг) Састарэлы пошук Паказваць састарэлы пошук + Ваду + Дазволіць састарэлы пошук у мэню From a6320b41f0169d678623d5b5b3bed65d1839e76a Mon Sep 17 00:00:00 2001 From: Osoitz Date: Mon, 19 Dec 2016 14:03:10 +0000 Subject: [PATCH 03/83] Translated using Weblate (Basque) Currently translated at 63.9% (1952 of 3054 strings) --- OsmAnd/res/values-eu/phrases.xml | 79 +++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml index b63a9a526a..aeb49e07c4 100644 --- a/OsmAnd/res/values-eu/phrases.xml +++ b/OsmAnd/res/values-eu/phrases.xml @@ -798,44 +798,44 @@ Ez dira telefono txartelak onartzen Kreditu txartelak onartzen dira Ez dira kreditu txartelak onartzen - Billeteak onartzen dira + Billeteak Ez dira billeteak onartzen - Eskudirua onartzen da + Eskudirua Ez da eskudirua onartzen - Zordunketa-txartelak onartzen dira + Zordunketa-txartelak Ez dira zordunketa-txartelak onartzen - Bitcoin onartzen da + Bitcoin Ez da bitcoin onartzen - Visa txartelak onartzen dira + Visa Ez dira Visa txartelak onartzen - MasterCard onartzen da + MasterCard Ez da MasterCard onartzen Doakoa - Kontu txartelak onartzen dira + Kontu txartelak Ez dira kontu txartelak onartzen - Maestro txartelak onartzen dira + Maestro txartelak Ez dira Maestro txartelak onartzen - American Express (AMEX) txartelak onartzen dira + American Express (AMEX) Ez dira American Express (AMEX) txartelak onartzen - Diners Club txartelak onartzen dira + Diners Club Ez dira Diners Club txartelak onartzen - DKV onartzen da + DKV Ez da DKV onartzen - UTA txartelak onartzen dira + UTA Ez dira UTA txartelak onartzen - - Visa Electron txartelak onartzen dira + Efectivo txartela + Visa Electron Ez dira Visa Electron txartelak onartzen - Litecoin onartzen da + Litecoin Ez da Litecoin onartzen - Txekeak onartzen dira + Txekeak Ez dira txekeak onartzen - PIKEPASS onartzen da + PIKEPASS Ez da PIKEPASS onartzen - Visa zordunketa txartelak onartzen dira + Visa zordunketa txartelak Ez dira Visa zordunketa txartelak onartzen Ez dira kripto-monetak onartzen - Bestelako ordainketa metodoak onartzen dira + Bestelakoak Ez dira bestelako ordainketa metodoak onartzen Tximinia Palmera @@ -1049,7 +1049,7 @@ Seinalea Audio-gida Bizikletarako mapa - Discover txartela onartzen da + Discover txartela Ez da Discover txartela onartzen Korrika egitea Karting @@ -1102,9 +1102,9 @@ Espiritualismoa Paganismoa Tenrikyo - V PAY txartelak onartzen dira + V PAY V PAY txartelak ez dira onartzen - Cibus txartelak onartzen dira + Cibus Cibus txartelak ez dira onartzen Transferentzia elektronikoak onartzen dira Transferentzia elektronikoak ez dira onartzen @@ -2126,4 +2126,39 @@ Larrialdietarako azpiegitura Telefonoa Webgunea + Moneta elektronikoak + Ez dira onartzen moneta elektronikoak + Ez da onartzen efectivo txartela + Girocard + Ez da onartzen Girocard txartela + PIKEPASS (izendatua) + Routex + Ez dira Routex erregai txartelak onartzen + Bancomat + Ez dira Bancomat txartelak onartzen + Aurrez ordaindutako tiketak + JCB + Ez dira JCB txartelak onartzen + Laser + Ez dira Laser txartelak onartzen + Quick + Ez dira Quick txartelak onartzen + Eurowag + Ez dira Eurowag txartelak onartzen + E‑ZPass + Ez dira E‑ZPass txartelak onartzen + Euroshell + Ez dira Euroshell erregai txartelak onartzen + KITCard + Ez dira KITCard txartelak onartzen + Westfalen + Ez dira Westfalen txartelak onartzen + Dogecoin + Ez dira Dogecoin txartelak onartzen + Animalien ostatua + Ostatu mota: txakurrak + Ostatu mota: katuak + Ostatu mota: txakurrak, katuak + Ostatu mota: zaldiak + From f7ac39c5139876dd04df50364f83b8612c9ca73c Mon Sep 17 00:00:00 2001 From: Kari Salovaara Date: Mon, 19 Dec 2016 13:11:17 +0000 Subject: [PATCH 04/83] Translated using Weblate (Finnish) Currently translated at 4.1% (127 of 3054 strings) --- OsmAnd/res/values-fi/phrases.xml | 81 ++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/OsmAnd/res/values-fi/phrases.xml b/OsmAnd/res/values-fi/phrases.xml index bca0c624b0..1dc1928631 100644 --- a/OsmAnd/res/values-fi/phrases.xml +++ b/OsmAnd/res/values-fi/phrases.xml @@ -50,4 +50,85 @@ Maksutapa Ääni Tapa + Palvelu + Itsepalvelu + Automatisoitu + Tyyppi + Metroasema + Rahti + Tyyppi + Lämmitys + Pumppu + Tyyppi + Tyyppi + Tyyppi + Pääkaupunki + Erikoisuus + Ominainen + Tyyppi + Tähtiluokitus + Uskonto + Tyyppi + Sisältö + Lisä- + Partioleiri + Syrjäseutu + Tyyppi + Rinteen vaikeus + Rinteen hoito + Lajityyppi + Istumapaikat ulkona + Pääsymaksu + Tupakointi + Jakelu + Drive-in + Läpiajo + Noutoravintola + Cocktaileja + Pienpanimo + Palvelu + Tyyppi + Hyväksytty jäte + Tyyppi + Tulisija + Kausittainen + Hierontatyyppi + Teltat + Pesukone + Matkailuvaunut + Virtalähde + Kotikäynti + Lautasantenni + Maksutapa (kuljetus) + Tyyppi + Kohderyhmä + Pölynimuri + Ominaispiirre + +Tie-este + Henkilökuljetus + Julkinen liikenne + Lentoliikenne + Vesiliikenne + Polkupyöräliikenne + Ilmakuljetus + Vaellusreitit + Vesipiste + Virtalähde + Kommunikointi + Maankäyttö + Hallinnollinen + Internet + Kerho + Ruoka + Kahvila ja ravintola + Palvelu + Käsityöt + Rahoitus + Luonto + Merenkulku + Sotilaallinen + Wikipedia + Käyttäjän määrittämä + From 5c711f93e04974095fd2b35d387c4e9548edda8c Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 19 Dec 2016 15:16:52 +0000 Subject: [PATCH 05/83] Translated using Weblate (Danish) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-da/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 0e6c3c8cf3..03d9df4e8a 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2737,4 +2737,6 @@ Hvis du ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p Serbisk (Latin) Kinesisk (Hong Kong) Vand + Højdekurver bredde + Højdekurver bredde From 7639fdcc0a42c4bcfb816b7098aae7f01cb66345 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 19 Dec 2016 15:24:33 +0000 Subject: [PATCH 06/83] Translated using Weblate (Catalan) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-ca/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index b72fe177c3..522a0cf6e8 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -63,7 +63,7 @@ Suprimeix un marcador d\'aparcament Identificable Rotonda: preneu la %1$d sortida i continueu - Sense polígons + Polígons Mode de renderització Mostra les línies de contorn Augmenta la quantitat de detalls mostrats al mapa @@ -858,7 +858,7 @@ Els mapes de tessel·les es poden obtenir directament de proveïdors en línia, Elimina l\'enregistrament Usa un enregistrador extern Altres mapes - Amaga els límits administratius + Límits administratius Mapa només de carreteres Mode segur El mode en segon pla encara s\'està executant. També el voleu aturar? @@ -2529,4 +2529,7 @@ Si aprecieu OsmAnd i OSM i voleu ajudar-los, és la via perfecta per fer-ho."Permet les autopistes Serbi (alfabet llatí) Xinès (Hong Kong) + Gruix de les corbes de nivell + Gruix de les corbes de nivell + Hidràulic From a3ab5726644e20f9a415d1fac9ca15cfbee157c3 Mon Sep 17 00:00:00 2001 From: Ajeje Brazorf Date: Mon, 19 Dec 2016 16:08:32 +0000 Subject: [PATCH 07/83] Translated using Weblate (Sardinian) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-sc/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index aaf31a05c1..2541f40816 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -346,7 +346,7 @@ Su grupu chi no est istadu iscantzelladu a pustis de carchi mese benit impostadu Mapas regulares Mapas cun petzi istradas - Cua sas làcanas + Làcanas Cua sas làcanas regionales (livellos amministrativos 5–9) @@ -907,7 +907,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).Àndala cumpartzida tràmite OsmAnd Mantène sa manca e sighi Mantène sa destra e sighi - Cua sos polìgonos + Polìgonos Modalidade de disinnu Ammustra curvas de livellu Datos àndala @@ -2654,4 +2654,7 @@ Si istimas OsmAnd e OSM e los boles suportare, custa est una manera perfeta pro Chirca betza Ammustra sa chirca betza Abìlita sa chirca betza dae sa lista + Ispessore curvas de livellu + Ispessore curvas de livellu + Abba From ef78c89351d7d4859034766ba5e4895743b3da1b Mon Sep 17 00:00:00 2001 From: jf-simon Date: Mon, 19 Dec 2016 20:25:10 +0000 Subject: [PATCH 08/83] Translated using Weblate (German) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-de/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1ff8b7f6a4..20c7dcaa6d 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2596,4 +2596,6 @@ und vieles mehr ... Serbisch (lateinisch) Chinesisch (Hong Kong) Wasser + Breite der Höhenlinien + Breite der Höhenlinien From 633d1d3eefd0d3f883ab510f0358cea3e070ad9f Mon Sep 17 00:00:00 2001 From: Softmap Date: Mon, 19 Dec 2016 20:29:27 +0000 Subject: [PATCH 09/83] Translated using Weblate (Arabic) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-ar/strings.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index ff89a06f39..99ebdcf5af 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -63,7 +63,7 @@ الطرق فقط الخطوط المحيطية (الكنتورية) الخرائط العادية - اخفِ الحدود + حدود حدّ السرعة @@ -494,7 +494,7 @@ في أسرع وقت ممكن دوّار: خذ المخرج %1$d ثم استمر اجعل جميع الميزات الأرض المساحية شفافة على خريطة - اخف المضلعات + مضلعات نمط التصيير تحسين الخريطة لـ بحث عن النقاط المهمة @@ -2653,4 +2653,13 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن      من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي الصربية (اللاتينية) الصينية (هونج كونج) + ماء + "تنصل: + إذا كنت تسير على ترجمة الجمل، يرجى التأكد من: + 1. لا توجد سلاسل مكررة بالاسم + ويسبق 2. كل الفاصلة (الاقتباس) من قبل مائل (انظر غيرها). + إذا كنت ترغب بجعل / تصحيح ترجمة الإنجليزية تأكد من: + 3. كل المعدلة / السلاسل التي تم إنشاؤها هي في الجزء العلوي من ملف (لجعل أسهل تجد ترجمتها \\ \'ق). + من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي" + عرض الخطوط الكنتورية From c64e4464d68610f9261a4a3e51f6cfdcd4176913 Mon Sep 17 00:00:00 2001 From: jf-simon Date: Sun, 18 Dec 2016 15:55:45 +0000 Subject: [PATCH 10/83] Translated using Weblate (German) Currently translated at 100.0% (3054 of 3054 strings) --- OsmAnd/res/values-de/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index f13d29a6bd..7c1b81f614 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3090,7 +3090,7 @@ Weihnachten: Internetseite Verkaufsart - Fahrrad Dienstleitung + Fahrrad-Kundendienst Dienstleistung Selbstbedienung Rezepte From 871f2258ec832e56d55b6ef25ce6d86593f3e0ff Mon Sep 17 00:00:00 2001 From: ace shadow Date: Mon, 19 Dec 2016 21:20:10 +0000 Subject: [PATCH 11/83] Translated using Weblate (Slovak) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-sk/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index ce2e31bd9b..3983e034f2 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -747,7 +747,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m Hľadanie hromadnej dopravy Hľadanie obľúbeného bodu Zobraziť plošné krajinné objekty na mape priehľadne - Skryť polygóny + Polygóny Vykresľovací režim Prispôsobenie mapy pre príslušný užívateľský profil Zobraziť vrstevnice @@ -885,7 +885,7 @@ Niektoré z hlavných funkcií: Obmedzenie rýchlosti GPX - Skryť hranice + Hranice oblastí Potlačiť zobrazenie hraníc regiónov (administratívne úrovne 5 až 9) časti Vrstevnice @@ -2509,4 +2509,7 @@ Ak potrebuje pomoc s aplikáciou OsmAnd, kontaktuje podporu: support@osmand.net. Povoliť použiť diaľnice Srbsky (Latinka) Čínsky (Hong Kong) + Hrúbka vrstevníc + Hrúbka vrstevníc + Voda From 73f86c8b1119820330d7b00f98c1084097bbb0de Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Tue, 20 Dec 2016 06:49:12 +0000 Subject: [PATCH 12/83] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 76bfa24cd1..d5a14f75c8 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2677,4 +2677,6 @@ Facebook：https://www.facebook.com/osmandapp 塞爾維亞語（拉丁語） 中文（香港） 水 + 等高線的線寬 + 等高線的線寬 From 2b099222762bd434252a6fa3f0b184ca5dd71ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=BCdinger?= Date: Mon, 19 Dec 2016 21:47:33 +0000 Subject: [PATCH 13/83] Translated using Weblate (German) Currently translated at 100.0% (3054 of 3054 strings) --- OsmAnd/res/values-de/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 7c1b81f614..63b4a8213d 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -1931,7 +1931,7 @@ Rollstuhlgerechte Toilette: Nein Toilettenzugang: Kunden Toilettenzugang: geduldet - Toilettenzugang: allgemein + Toilettenzugang: öffentlich Toilettenzugang: öffentlich Wickeltisch @@ -2062,7 +2062,7 @@ Kunstart: stalinistischer Neoklassizismus Architektur: vielseitig - Architektur: neue Sachlichkeit + Architektur: Neue Sachlichkeit Architektur: Zeitgenössisch Architektur: Konstruktivismus Architektur: Umgebinde @@ -3019,7 +3019,7 @@ Fahrrad laden: Ja Fahrrad laden: Nein -Kunst und Handwerk Zubehörgeschäft +Geschäft für Kunsthandwerksbedarf Typ Tankkarten @@ -3091,7 +3091,7 @@ Verkaufsart Fahrrad-Kundendienst - Dienstleistung + Kundendienst Selbstbedienung Rezepte Typ From 983813a10516549d63e06974c5e52100bbf15b55 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 10:28:58 +0100 Subject: [PATCH 14/83] Test voice activity: Improve debugging display --- .../net/osmand/plus/voice/TTSCommandPlayerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 407e6794d7..7b6fc95b3b 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -175,7 +175,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { speechAllowed = true; switch (mTts.isLanguageAvailable(new Locale(language))) { case TextToSpeech.LANG_MISSING_DATA: - ttsVoiceName = "setLanguage: LANG_MISSING_DATA"; + ttsVoiceName = language + ": LANG_MISSING_DATA"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_missing_language_data_title, @@ -189,11 +189,11 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { // Proceed anyway in this case, look like breaking here caused Issue #3344 //break; case TextToSpeech.LANG_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_COUNTRY_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? "setLanguage: LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; mTts.setLanguage(new Locale(language)); if (android.os.Build.VERSION.SDK_INT >= 21) { if (mTts.getVoice() != null) { @@ -208,7 +208,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { break; case TextToSpeech.LANG_NOT_SUPPORTED: //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition - ttsVoiceName = "setLanguage: LANG_NOT_SUPPORTED"; + ttsVoiceName = language + ": LANG_NOT_SUPPORTED"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_language_not_supported_title, From c06c0abbd0dc107434d0e9ee31be1a1277654c2e Mon Sep 17 00:00:00 2001 From: Kari Salovaara Date: Tue, 20 Dec 2016 09:02:32 +0000 Subject: [PATCH 15/83] Translated using Weblate (Finnish) Currently translated at 88.3% (1860 of 2106 strings) --- OsmAnd/res/values-fi/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 40ae26fad6..e6f99f96f2 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -2026,4 +2026,9 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t Jäsentämätön luettelo Tiekarttanäyttö Voit muuttaa toiselle reitille valitsemalla vältettäviä teitä + Korkeuskäyräviivojen leveys + Korkeuskäyriäviivojen leveys + Vesi + Periytyvä haku + Näytä periytyvä haku From cf22087d7ff934d9ebe634eca00c1fbaf9987b99 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Mon, 19 Dec 2016 15:21:19 +0000 Subject: [PATCH 16/83] Translated using Weblate (French) Currently translated at 99.5% (2097 of 2106 strings) --- OsmAnd/res/values-fr/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 169ffbd945..64d37e50ff 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2480,4 +2480,6 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\' Serbe (Latin) Chinois (Hong Kong) Eau + Épaisseur des traits pour les courbes de niveaux + Épaisseur des courbes de niveaux From 6a3b86f83bf1eebe77920dc7901d3f078293243a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Tue, 20 Dec 2016 08:16:52 +0000 Subject: [PATCH 17/83] Translated using Weblate (Icelandic) Currently translated at 83.5% (1759 of 2106 strings) --- OsmAnd/res/values-is/strings.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index 80dabd2d42..8b287ca0b4 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -192,7 +192,7 @@ … Í lagi Hætta við - Hafna + Hunsa Já Ekki nota Nei @@ -903,7 +903,7 @@ Ferill %2$s Slóð (URL) Byrja nýjan undirferil Deild staðsetning - Fela fláka + Flákar Besta kort fyrir Birta hæðarlínur Leit að heimilisfangi @@ -1596,7 +1596,7 @@ Len %2$s Nota OpenGL myndgerð Nota vélbúnaðarhröðun OpenGL myndgerðar (gæti virkað ekki á sumum tækjum) Uppfærslur tiltækar fyrir %1$s kort - strætisvagn,strætó,áætlanabifreið,sporvagn,rafknúinn strætisvagn,skutla + Strætisvagnaleiðir, sporvagnar og skutluleiðir %1$s þarf heimild fyrir þessu til að slökkva á skjánum til að spara orku. Kveikja á skjá (ef slökkt er á honum) þegar beygja nálgast Leiðir rafknúinna strætisvagna @@ -1792,4 +1792,7 @@ Punktar Senda allt inn Eyða breytingu Eyða núverandi ferli + Breidd hæðarlína + Breidd hæðarlína + Vatn From 0e03f102acfa7217d4a1c7b0f0b41df99359216f Mon Sep 17 00:00:00 2001 From: Athmane MOKRAOUI Date: Mon, 19 Dec 2016 22:20:07 +0000 Subject: [PATCH 18/83] Translated using Weblate (Arabic) Currently translated at 26.2% (802 of 3054 strings) --- OsmAnd/res/values-ar/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml index bf21aa6a1e..9d67a215ac 100644 --- a/OsmAnd/res/values-ar/phrases.xml +++ b/OsmAnd/res/values-ar/phrases.xml @@ -861,4 +861,8 @@ الإنجيلية الأرثودكسية الروسية عوامة مياه آمنة + عيد الميلاد + سوق عيد الميلاد + متجر عيد الميلاد + شجرة عيد الميلاد From b3c81d11338952a45344d4ed3f827320a4e537cd Mon Sep 17 00:00:00 2001 From: Kari Salovaara Date: Mon, 19 Dec 2016 19:58:26 +0000 Subject: [PATCH 19/83] Translated using Weblate (Finnish) Currently translated at 14.8% (454 of 3054 strings) --- OsmAnd/res/values-fi/phrases.xml | 352 +++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) diff --git a/OsmAnd/res/values-fi/phrases.xml b/OsmAnd/res/values-fi/phrases.xml index 1dc1928631..fc1499ef9c 100644 --- a/OsmAnd/res/values-fi/phrases.xml +++ b/OsmAnd/res/values-fi/phrases.xml @@ -131,4 +131,356 @@ Wikipedia Käyttäjän määrittämä + Leipomo + Alkoholikauppa + Juustokauppa + Suklaakauppa + Kahvikauppa + Posti + Virvoitusjuomakauppa + Lihakauppa + Herkkukauppa + Maatilamyymälä + Vihanneskauppa + Kalakauppa + Jäätelöbaari + Supermarket + Teekauppa + Pastakauppa + Leivoskauppa + Maitokauppa + Myyntiautomaatti + Viinikauppa + Kirjakauppa + Pyöräkauppa + Antiikkikauppa + Taidekauppa + Vauvan tarvikkeet + Laukkukauppa + Kylpyhuonetarvikkeet + Vuodevaatekauppa + Fashionputiikki + Kamerat ja tarvikkeet + Mattokauppa + Apteekki + Kenkäkauppa + Makeiskauppa + Tietokonekauppa + Kopiointipalvelu + Verhokauppa + Kangaskauppa +Sukellustarvikkeet + Ovet + Aikuisviihde + Muotikauppa + Kalastusvälineet + Kukkakauppa + Huonekalukauppa + Puutarhakauppa + Puutarhakalustekauppa + Nestekaasukauppa + Lahjakauppa + Rautakauppa + Jalokivikauppa + Kioski + Nahkakauppa + Matkapuhelinkauppa + Moottoripyöräkauppa + Musiikkikauppa + Urheilutarvikekauppa + Lippumyymälä + Lelukauppa + Rengaskauppa + Videokauppa + Kaihdinkauppa + Tavaratalo + Elektroniikkakauppa + Autokauppa + Autotarvikekauppa + Kosmetiikka + Kellokauppa + Pelikauppa + Videopelit + Ilotulitteet + Asekauppa + Parfyymikauppa + Maustekauppa + Hunajakauppa + Poliisi + Paloasema + Hätäpuhelin + Ambulanssiasema + SES asema + Kahluupaikka + Astinkivisilta + Vuoristosola + Portti + Kaupungin muuri + Tullikoju + Rajavalvonta + Pysähtymisvalo + + Autokorjaamo + Renkaat + Ajoneuvon katsastus + Autopesu + Huoltoasema + Diesel + Bio diesel + Oktaanit 80 + Oktaanit 91 + Oktaanit 92 + Oktaanit 95 + Oktaanit 98 + Oktaanit 100 + Etanooli + Metanooli + E10 + E20 + E85 + Biogas + Huoltoasema veneille + Latausasema + Paineilma + Pysäköinti + Moottoripyöräpysäköinti + Pysäköinnin sisäänajo + Tallit + + Julkisen liikenteen pysäkki + Bussipysäkki + Julkisen liikenteen pysäkin sijainti + Raitiovaunupysäkki + Julkisen liikenteen asema + Bussiasema + Rautatieasema + Rautatielaituri + Rautatiepysäkki + Metron sisäänkäynti + Metroasema + Taksiasema + + Lentoasema + Helikopterikenttä + Kiitorata + Lauttaterminaali + Majakka + + Polkupyörävuokraamo + Polkupyöräpysäköinti + + Tunneli + Silta + + Nopeuskamera + Moottoritieliittymä + Liittymä + Lepoalue + + Vesipiste + Veneveistämö + Vedenpuhdistamo + Vesitorni + Pato + Muuntaja + Postitoimisto + Postilaatikko + Puhelin + Havaintotorni + Kellotorni + Jäähdytystorni + Ukkosenjohdatin + Kierrätys + + Kierrätyskeskus + Kontti + Lasi + Paperi + Tekstiilit + Tölkit + Lasipullot + Muovi + Jätemetalli + Patterit + Muovipullot + Jäte (mustat muovisäkit) + Muovinen pakkausjäte + Sanomalehdet + Kartonki + Pahvi + Lehdet + Paperipakkaukset + Puu + Kirjat + Kengät + Alumiini + Orgaaninen jäte + Juomakartongit + Puutarhajäte + Metalli + Visa Electron + Visa Electron korttia ei hyväksytä + Shekit + Shekkejä ei hyväksytä + Visa Debit kortit + Visa Debit kortteja ei hyväksytä + Muut + Muita maksutapoja ei hyväksytä + Bancomat + Bancomat ei hyväksytä + Julkisen liikenteen liput + Juomat + Makeiset + Pakettien nouto ja postitus + Kondoomit + Postimerkit + Polkupyörän sisäkumit + Ruoka + Juomat ja ruoka + Polttoaineen myynti + Pakettien nouto + Pakettien postitus + Maito + Leipä + Purukumi + Pysäköintimaksut; julkisen liikenteen liput + Kahvi + Tullimaksut + Lippujen myynti + Veden myynti + Eläinten ruoka + Julkisen liikenteen aikataulut + Juomat ja makeiset + DVD + Kynttilät + Lelut + Jäätelö + SIM kortit + + Patsas + Kivi + Ajoneuvo + Historiallinen louhos + + Kostea niitty + Neva + Suo + Ruovikko + Räme + Suola-alue + Vuorovesi tasanne + Suolainen kosteikko + Mangrove + Aapasuo + Letto + Palsasuo + Muta + + Hiekka + Pienet kivet + Louhikko + + Savupiippu + Palmu + Sypressi + Lipputanko + + Kyllä + Ilman penkkiä + Korilla + Ilman koria + + Julkinen liikenne + Picnic + Säätila + Rakennus + Wi-Fi + Terminaali + Huomautus + Historiallinen lentokone + + Hissillä + Ilman hissiä + + Tekninen monumentti + + Leirintäalueen toimisto + Opastuskeskus + Konsultointitoimisto + Osuuskuntatoimisto + Metsänhoidon toimisto + Logistiikkatoimisto + Kirkkoherranvirasto + Julkaisun toimisto + + 91UL polttoaine + 100LL polttoaine + Jet A-1 polttoaine + AdBlue polttoaine + + Polttoaine: puu + Polttoaine: puuhiili + Polttoaine: hiili + + Katulamppu + + Tuotanto: riisi + Tuotanto: ruoho + Tuotanto: maissi + Tuotanto: viljakasvi + Tuotanto: sokeriruoko + Tuotanto: vehnä + Tuotanto: soija + Tuotanto: ohra + Tuotanto: vihannekset + Tuotanto: humala + Tuotanto: rapsi + Tuotanto: juurikas + Tuotanto: laventeli + Tuotanto: tee + Tuotanto: kahvi + Tuotanto: siipikarja + Tuotanto: auringonkukka + Tuotanto: vadelma + Tuotanto: tupakka + Tuotanto: mansikka + Tuotanto: vihannekset, kukat + Tuotanto: kassava + Tuotanto: karpalo + Tuotanto: parsa + Tuotanto: kukat + + Naiset + Alusasu + Miehet + Hääpuvut + Urheilut + Vauvat + Denim + Työasu + Hatut + Turkis + Nahka + Puvut + Perinteinen + Puvut + Äitiys + Klassinen + Ylisuuri + Koulu + Uima-asu + Sukat + Paidat + Tanssi + Sotilaallinen + + Historiallinen merkkipaalu + + Lapset + Naiset + Urheilut + Miehet + Ortopedinen + + Historiallinen kartano From fa3a29421d98c5901cca153070b2bb37ddd21a29 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 20 Dec 2016 08:46:50 +0000 Subject: [PATCH 20/83] Translated using Weblate (German) Currently translated at 100.0% (3054 of 3054 strings) --- OsmAnd/res/values-de/phrases.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 63b4a8213d..2f44a41a1f 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -1443,18 +1443,18 @@ Kapazität Ja - Keine reservierten Plätze für Behinderte - Reservierte Plätze für Behinderte - Reservierte Plätze für Frauen - Keine reservierten Plätze für Frauen - Reservierte Plätze für Frauen - reservierte Plätze für Schüler - reservierte Plätze für Lehrer - reservierte Plätze für Eltern - keine reservierten Plätze für Eltern - reservierte Plätze für Eltern + keine Behindertenplätze + Behindertenplätze + Frauenplätze + keine Frauenplätze + Frauenplätze + Schülerplätze + Lehrerplätze + Elternplätze + keine Elternplätze + Elternplätze - Kabin-, Gondel-, Sesselkapazität + Kabinen-, Gondel-, Sesselkapazität Kapazität pro Stunde durchschnittliche Fahrzeit, Minuten Blase From 2c79b6d3e20bcf8e58710869863fa4cdc974b67b Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 11:35:38 +0100 Subject: [PATCH 21/83] Test voice prompts: Display Locale system sets for language found in ttsconfig.p --- .../net/osmand/plus/voice/TTSCommandPlayerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 7b6fc95b3b..96d1469524 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -175,7 +175,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { speechAllowed = true; switch (mTts.isLanguageAvailable(new Locale(language))) { case TextToSpeech.LANG_MISSING_DATA: - ttsVoiceName = language + ": LANG_MISSING_DATA"; + ttsVoiceName = getDisplayName(new Locale(language)) + ": LANG_MISSING_DATA"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_missing_language_data_title, @@ -189,11 +189,11 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { // Proceed anyway in this case, look like breaking here caused Issue #3344 //break; case TextToSpeech.LANG_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? language + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; mTts.setLanguage(new Locale(language)); if (android.os.Build.VERSION.SDK_INT >= 21) { if (mTts.getVoice() != null) { @@ -208,7 +208,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { break; case TextToSpeech.LANG_NOT_SUPPORTED: //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition - ttsVoiceName = language + ": LANG_NOT_SUPPORTED"; + ttsVoiceName = getDisplayName(new Locale(language)) + ": LANG_NOT_SUPPORTED"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_language_not_supported_title, From 1785dc4ca52b62b3b149f24843a8918bc5cc3b50 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Tue, 20 Dec 2016 10:28:51 +0000 Subject: [PATCH 22/83] Translated using Weblate (Catalan) Currently translated at 70.6% (2157 of 3054 strings) --- OsmAnd/res/values-ca/phrases.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 2425dee0d3..c83126acbe 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -1713,7 +1713,7 @@ Només vegetarià Vegetarià Dieta vegetariana: no - Dieta vegetariana: algun plat + Vegetarià (algun plat) Només vegà Vegà Dieta vegana: no @@ -2358,4 +2358,13 @@ Superfície Nudisme Dieta + Especialitat mèdica + Tipus de massatge + Tendes de campanya + Rentadora + Caravanes + Subministrament elèctric + Tipus + Aire comprimit + Aspiradora From 9d831b09ca1a4b2b6189dce985821f56740f38ad Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 11:49:09 +0100 Subject: [PATCH 23/83] fix build --- .../net/osmand/plus/voice/TTSCommandPlayerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 96d1469524..e8cd70983f 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -175,7 +175,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { speechAllowed = true; switch (mTts.isLanguageAvailable(new Locale(language))) { case TextToSpeech.LANG_MISSING_DATA: - ttsVoiceName = getDisplayName(new Locale(language)) + ": LANG_MISSING_DATA"; + ttsVoiceName = (new Locale(language)).getDisplayName() + ": LANG_MISSING_DATA"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_missing_language_data_title, @@ -189,11 +189,11 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { // Proceed anyway in this case, look like breaking here caused Issue #3344 //break; case TextToSpeech.LANG_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? getDisplayName(new Locale(language)) + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; mTts.setLanguage(new Locale(language)); if (android.os.Build.VERSION.SDK_INT >= 21) { if (mTts.getVoice() != null) { @@ -208,7 +208,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { break; case TextToSpeech.LANG_NOT_SUPPORTED: //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition - ttsVoiceName = getDisplayName(new Locale(language)) + ": LANG_NOT_SUPPORTED"; + ttsVoiceName = (new Locale(language)).getDisplayName() + ": LANG_NOT_SUPPORTED"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_language_not_supported_title, From 782adbbc6adb16c2d1948fa8a35a77dbbd1c091e Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 12:42:51 +0100 Subject: [PATCH 24/83] #3344: Try Locale builder instead of constructor --- .../plus/voice/TTSCommandPlayerImpl.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index e8cd70983f..0bb6b6a598 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Locale.Builder public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { @@ -164,7 +165,14 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { mTtsContext = ctx; ttsVoiceName = ""; ttsRequests = 0; - final float speechRate = cSpeechRate; + final float speechRate = cSpeechRate; + + //#3344: Try Locale builder instead of constructor + final String[] languageFields = language.split("\\_"); + final languageFields[0]; + final languageFields[1]; + final Locale newLocale = new Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); + mTts = new TextToSpeech(ctx, new OnInitListener() { @Override public void onInit(int status) { @@ -173,9 +181,11 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { internalClear(); } else if (mTts != null) { speechAllowed = true; - switch (mTts.isLanguageAvailable(new Locale(language))) { + //#3344: Try Locale builder instead of constructor + //switch (mTts.isLanguageAvailable(new Locale(language))) { + switch (mTts.isLanguageAvailable(newLocale)) { case TextToSpeech.LANG_MISSING_DATA: - ttsVoiceName = (new Locale(language)).getDisplayName() + ": LANG_MISSING_DATA"; + ttsVoiceName = newLocale.getDisplayName() + ": LANG_MISSING_DATA"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_missing_language_data_title, @@ -186,15 +196,17 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { act); builder.show(); } - // Proceed anyway in this case, look like breaking here caused Issue #3344 + // Proceed anyway in this case //break; case TextToSpeech.LANG_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; + ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? (new Locale(language)).getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; - mTts.setLanguage(new Locale(language)); + ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; + //#3344: Try Locale builder instead of constructor + //mTts.setLanguage(new Locale(language)); + mTts.setLanguage(newLocale); if (android.os.Build.VERSION.SDK_INT >= 21) { if (mTts.getVoice() != null) { ttsVoiceName = ttsVoiceName + "\n\n" + mTts.getVoice().toString(); @@ -208,7 +220,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { break; case TextToSpeech.LANG_NOT_SUPPORTED: //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition - ttsVoiceName = (new Locale(language)).getDisplayName() + ": LANG_NOT_SUPPORTED"; + ttsVoiceName = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_language_not_supported_title, From 7000d87ec14a741bf01ea82bc5ac0cc5495c26f9 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 12:53:27 +0100 Subject: [PATCH 25/83] fix build --- .../src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 0bb6b6a598..6cf51a06f9 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Locale.Builder +import java.util.Locale.Builder; public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { @@ -168,9 +168,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { final float speechRate = cSpeechRate; //#3344: Try Locale builder instead of constructor + //final Locale newLocale = new Locale(language); final String[] languageFields = language.split("\\_"); - final languageFields[0]; - final languageFields[1]; final Locale newLocale = new Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); mTts = new TextToSpeech(ctx, new OnInitListener() { @@ -181,8 +180,6 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { internalClear(); } else if (mTts != null) { speechAllowed = true; - //#3344: Try Locale builder instead of constructor - //switch (mTts.isLanguageAvailable(new Locale(language))) { switch (mTts.isLanguageAvailable(newLocale)) { case TextToSpeech.LANG_MISSING_DATA: ttsVoiceName = newLocale.getDisplayName() + ": LANG_MISSING_DATA"; @@ -204,8 +201,6 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; - //#3344: Try Locale builder instead of constructor - //mTts.setLanguage(new Locale(language)); mTts.setLanguage(newLocale); if (android.os.Build.VERSION.SDK_INT >= 21) { if (mTts.getVoice() != null) { From fd7d2819b897b9516d41680a2cb873c82d934164 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 13:41:58 +0100 Subject: [PATCH 26/83] fix NoClassDefFoundError --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 6cf51a06f9..1d199ecdda 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Locale.Builder; public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { @@ -170,7 +169,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { //#3344: Try Locale builder instead of constructor //final Locale newLocale = new Locale(language); final String[] languageFields = language.split("\\_"); - final Locale newLocale = new Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); + final Locale newLocale = new Locale.Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); mTts = new TextToSpeech(ctx, new OnInitListener() { @Override From fa7639189f71029dbd5a9af1b75a6a21424cd053 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 14:14:11 +0100 Subject: [PATCH 27/83] check API --- .../net/osmand/plus/voice/TTSCommandPlayerImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 1d199ecdda..29a40fff80 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,10 +166,13 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - //#3344: Try Locale builder instead of constructor - //final Locale newLocale = new Locale(language); - final String[] languageFields = language.split("\\_"); - final Locale newLocale = new Locale.Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); + //#3344: Try Locale builder instead of constructor (only available from API 21) + if (android.os.Build.VERSION.SDK_INT >= 21) { + final String[] languageFields = language.split("\\_"); + final Locale newLocale = new Locale.Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); + } else { + final Locale newLocale = new Locale(language); + } mTts = new TextToSpeech(ctx, new OnInitListener() { @Override From 79b5bbfbebf54d60e554b85ee5b7552a291ca217 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 14:22:34 +0100 Subject: [PATCH 28/83] fix args --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 29a40fff80..b11f98da33 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -169,7 +169,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { //#3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { final String[] languageFields = language.split("\\_"); - final Locale newLocale = new Locale.Builder().setLanguage("languageFields[0]").setScript("").setRegion("languageFields[1]").build(); + final Locale newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); } else { final Locale newLocale = new Locale(language); } From 9ecf9c9b022def03a69bbf85db72f69c4c98e079 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 14:31:36 +0100 Subject: [PATCH 29/83] catch IllformedLocaleException --- .../src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index b11f98da33..03ebaff87f 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -168,8 +168,12 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { //#3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { - final String[] languageFields = language.split("\\_"); - final Locale newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); + try { + final String[] languageFields = language.split("\\_"); + final Locale newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); + } catch (IllformedLocaleException e) { + final Locale newLocale = new Locale(language); + } } else { final Locale newLocale = new Locale(language); } From 6243b075eed95058eda92725bb6889d1d5464fac Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 14:43:09 +0100 Subject: [PATCH 30/83] fix build --- .../src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 03ebaff87f..84d9ec52aa 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,16 +166,15 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - //#3344: Try Locale builder instead of constructor (only available from API 21) + Locale newLocale = new Locale(language); + // #3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { try { final String[] languageFields = language.split("\\_"); - final Locale newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); + newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); } catch (IllformedLocaleException e) { - final Locale newLocale = new Locale(language); + // Falls back to "new Locale(language)" } - } else { - final Locale newLocale = new Locale(language); } mTts = new TextToSpeech(ctx, new OnInitListener() { From ec6a5c38dc7b8c52f9b912b655a80da741109da0 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 14:58:21 +0100 Subject: [PATCH 31/83] fix build --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 84d9ec52aa..367047472c 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,13 +166,13 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - Locale newLocale = new Locale(language); + private Locale newLocale = new Locale(language); // #3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { try { final String[] languageFields = language.split("\\_"); newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); - } catch (IllformedLocaleException e) { + } catch (RuntimeException e) { // Falls back to "new Locale(language)" } } From a23684e24c0b125edc600b5d06f65c8327469587 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 15:28:44 +0100 Subject: [PATCH 32/83] remove typo --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 367047472c..0a0c9b5597 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,7 +166,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - private Locale newLocale = new Locale(language); + Locale newLocale = new Locale(language); // #3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { try { From cf1f2035985695434f614f08172fc78174c99842 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Tue, 20 Dec 2016 14:32:23 +0000 Subject: [PATCH 33/83] Translated using Weblate (Basque) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-eu/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index 553c983ede..338288990e 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -2672,4 +2672,6 @@ OsmAnd aplikazioarekin laguntza behar baduzu, jarri kontaktuan gure laguntza tal Serbiera (Latinoa) Txinera (Hong Kong) Ura + Sestra-kurben zabalera + Sestra-kurben zabalera From e4d1a6193d607fb04fc3d6dad635e128005e00d8 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 15:49:41 +0100 Subject: [PATCH 34/83] use final --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 0a0c9b5597..ba5a03b903 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,16 +166,17 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - Locale newLocale = new Locale(language); + Locale newLocale0 = new Locale(language); // #3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { try { final String[] languageFields = language.split("\\_"); - newLocale = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); + newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); } catch (RuntimeException e) { // Falls back to "new Locale(language)" } } + final Locale newLocale = newLocale0; mTts = new TextToSpeech(ctx, new OnInitListener() { @Override From 14770291684a9152d04aed3a600d7e5786d73fb7 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Tue, 20 Dec 2016 14:35:55 +0000 Subject: [PATCH 35/83] Translated using Weblate (Basque) Currently translated at 64.0% (1955 of 3054 strings) --- OsmAnd/res/values-eu/phrases.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml index aeb49e07c4..ae719b015f 100644 --- a/OsmAnd/res/values-eu/phrases.xml +++ b/OsmAnd/res/values-eu/phrases.xml @@ -1396,14 +1396,14 @@ Dutxa: kanpoan Dutxa: hotza Dutxa: barruan - Karabanak: bai + Bai Karabanak: ez Bat-batekoa: bai Bat-batekoa: ez Komuneko hondakinen estazioa: bai Komuneko hondakinen estazioa: ez Komuneko hondakinen estazioa: bezeroak besterik ez - Elektrizitate iturria: bai + Bai Elektrizitate iturria: ez Elektrizitate iturria (hargunea): CEE 17 urdina Elektrizitate iturria (hargunea): CEE 7/4 @@ -2161,4 +2161,5 @@ Ostatu mota: txakurrak, katuak Ostatu mota: zaldiak + Aterpea From 3e55e0aa632cdb76a834d3901234b9fc1e024197 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 17:12:54 +0100 Subject: [PATCH 36/83] add language used display also for LANG_NOT_SUPPORTED case --- .../plus/voice/TTSCommandPlayerImpl.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index ba5a03b903..ec45dca5e1 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -188,7 +188,6 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { speechAllowed = true; switch (mTts.isLanguageAvailable(newLocale)) { case TextToSpeech.LANG_MISSING_DATA: - ttsVoiceName = newLocale.getDisplayName() + ": LANG_MISSING_DATA"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_missing_language_data_title, @@ -199,29 +198,23 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { act); builder.show(); } - // Proceed anyway in this case - //break; + ttsVoiceName = newLocale.getDisplayName() + ": LANG_MISSING_DATA"; + ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed(); + break; case TextToSpeech.LANG_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_AVAILABLE" : ttsVoiceName; + ttsVoiceName = newLocale.getDisplayName() + ": LANG_AVAILABLE"; case TextToSpeech.LANG_COUNTRY_AVAILABLE: ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_AVAILABLE" : ttsVoiceName; case TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE: - ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; mTts.setLanguage(newLocale); - if (android.os.Build.VERSION.SDK_INT >= 21) { - if (mTts.getVoice() != null) { - ttsVoiceName = ttsVoiceName + "\n\n" + mTts.getVoice().toString(); - } - } else { - ttsVoiceName = ttsVoiceName + "\n\n" + mTts.getLanguage() + " (Voice details not reported in API<21)"; - } if(speechRate != 1) { mTts.setSpeechRate(speechRate); } + ttsVoiceName = "".equals(ttsVoiceName) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceName; + ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed(); break; case TextToSpeech.LANG_NOT_SUPPORTED: //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition - ttsVoiceName = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED"; if (isSettingsActivity(act)) { AlertDialog.Builder builder = createAlertDialog( R.string.tts_language_not_supported_title, @@ -233,6 +226,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { act); builder.show(); } + ttsVoiceName = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED"; + ttsVoiceName = ttsVoiceName + "\n\n" + getVoiceUsed(); break; } } @@ -241,6 +236,17 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { private boolean isSettingsActivity(final Context ctx) { return ctx instanceof SettingsActivity; } + + private String getVoiceUsed() { + if (android.os.Build.VERSION.SDK_INT >= 21) { + if (mTts.getVoice() != null) { + return mTts.getVoice().toString(); + } + } else { + return mTts.getLanguage() + " (Voice details not reported in API<21)"; + } + + } }); mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() { // The call back is on a binder thread. From 33c6961897e4158a5a440eadbac8d9493b6655cf Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Tue, 20 Dec 2016 15:13:07 +0000 Subject: [PATCH 37/83] Translated using Weblate (Belarusian) Currently translated at 99.6% (2098 of 2106 strings) --- OsmAnd/res/values-be/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 5824867cb1..cc57d75a78 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2706,4 +2706,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Паказваць састарэлы пошук Ваду Дазволіць састарэлы пошук у мэню + Таўшчыня гарызанталяў From b58f2397460ab34447c29dbf4a24b3dc4aaa2530 Mon Sep 17 00:00:00 2001 From: Kari Salovaara Date: Tue, 20 Dec 2016 15:36:30 +0000 Subject: [PATCH 38/83] Translated using Weblate (Finnish) Currently translated at 88.5% (1864 of 2106 strings) --- OsmAnd/res/values-fi/strings.xml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index e6f99f96f2..946056bc6f 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -834,7 +834,12 @@ Pit %2$s "Tällä lisäosalla voit päästä monenlaisiin online (ns. laatta tai rasteri) karttoihin, esimääritellyistä Openstreetmap laatoista (kuten Mapnik) satelliitti kuviin ja erityistarkoitus tasoihin kuten sääkarttoihin, ilmasto karttoihin, geologisiin karttoihin, mäkisävy tasoihin, jne.\n\nMitä tahansa näistä kartoista voidaan käyttää pää (pohja) karttana näytettäessä OsmAnd karttaruudulla, tai päällys- tai aluskerroksena toiselle pohjakartalle (kuten OsmAndin perus offline kartat). Saadaksesi mikä tahansa aluskerros näkyvämmäksi, tiettyjä osia OsmAnd vektorikartoista voi helposti piilottaa \'Kartta asetukset\' valikosta tarvittaessa.\n\nLaattakarttoja voi saada suoraan online lähteistä, tai voidaan valmistaa offline käyttöön (tai manuaalisesti kopioida OsmAndin kansioon) sqlite tietokantana jonka voi teihdä eri kolmannen osapuolen karttavalmistelu työkaluilla. " "Tämä lisäosa ottaa käyttöön toiminnallisuudet nauhoittaa ja tallentaa jälkiä manuaalisesti koskettamalla GPX nauhoitus toimintoja karttaruudulla, tai myös automaattisesti tallentaa kaikki navigointireitit GPX tiedostoon.\n\nNauhoitetut jäljet voidaan jakaa ystävillesi tai käyttää OSM osallistumisissa. Urheilijat voivat nauhoittaa jälkiä harjoittelun seuraamiseen. Jotain perus jälkianalyysejä voidaan tehdä suoraan OsmAndissa, kuten kierrosaikoja, keskimääräistä nopeutta jne., ja jälkiä voi tietysty myös myöhemmin analysoida erityisissä kolmannen osapuolen analysointi työkaluissa. " OsMo seuranta - "Tämä lisäosa tarjoaa toiminnot OsMo kehittyneeseen live seurantaan, katso http://osmo.mobi.\n\nVoit seurata muita laitteita ja olla seurattuna. Voit spontaanisti luoda anonyymejä ryhmiä, jakaa toistenne sijainnin, ja viestitellä. Mukana tulee eri vaihtoehtoja harjoituksen seuraamiseen tai jatkuvaan seuraamiseen.\n\nAnonyymejä ryhmiä luodaan määritellyiksi päivämääriksi ja rajoitettuna määrättyihin toimintohin, esimerkiksi ei ole etäohjausta eikä ryhmän pääkäyttäjää. Täysin toimivia ryhmiä, toisaalta, voi luoda verkkosivuilla ja vain rekisteröityneillä käyttäjillä on pääsy niihin. " + "Tämä lisäosa tarjoaa toiminnot OsMo kehittyneeseen live seurantaan, katso http://osmo.mobi. + +Voit seurata muita laitteita ja olla seurattuna. Voit spontaanisti luoda anonyymejä ryhmiä, jakaa toistenne sijainnin, ja viestitellä. Mukana tulee eri vaihtoehtoja harjoituksen seuraamiseen tai jatkuvaan seuraamiseen. + +Anonyymejä ryhmiä luodaan määritellyiksi päivämääriksi ja rajoitettuna määrättyihin toimintohin, toisin sanoeni ei etäohjausta eikä ryhmän pääkäyttäjää. Täysin toimivia ryhmiä, toisaalta, voi luoda verkkosivuilla ja vain rekisteröityneillä käyttäjillä on pääsy niihin. + " Korkeuskäyrät lisäosa OsmAnd lisäosa offline korkeuskäyrille "Tämä lisäosa tarjoaa sekä korkeuskäyrä päällyskerros ja (helpotus) mäkisävy tason näytettäväksi OsmAnd offline karttojen päällä. Tätä toiminnallisuutta arvostavat paljon urheilijat, retkeilijät, vuoristo seikkailijat, ja ketkä tahansa maisemien ihailusta kiinnostuneet.\n\nMaailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläistä) perustuu mittauksiin jotka on tehnyt SRTM (Shuttle Radar Topography Mission) ja ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), ja kuvausvälineet mukana kulkeva Terra, NASAn maapallontarkkailujärjestelmän lippulaiva satelliitti. ASTER on yhteistyö NASAn, Japanin talous-, kauppa ja teollisuusministeriön (METI), ja Japanin avaruusjärjestelmien (J-spacesystems) välillä. " @@ -2031,4 +2036,27 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t Vesi Periytyvä haku Näytä periytyvä haku + " + • Uusi tehokas vapaan tekstin haku + + + • Autoradiojärjestelmä / kovaääninen puhelin yhdistäminen Bluetooth avulla + + + • Parannettu reittiopasatus, ääniviestitys ja käännöskaistojen osoitus + + + • Parannettu liikennetaso reitin hahmottamisella + + + • Lisätty kohteita sekä tuki paikallisille kohteille + + + • Paljo muita parannuksia ja virheiden korjauksia + + + ja lisää… + " + Audion bittinopeus + Valitse audion bittinopeus From c8b2f026fc537f7747377d7c71064aec52101fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Tue, 20 Dec 2016 15:19:35 +0000 Subject: [PATCH 39/83] Translated using Weblate (Icelandic) Currently translated at 86.1% (1814 of 2106 strings) --- OsmAnd/res/values-is/strings.xml | 59 ++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index 8b287ca0b4..175c447db3 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -192,7 +192,7 @@ … Í lagi Hætta við - Hunsa + Hafna Já Ekki nota Nei @@ -1596,7 +1596,7 @@ Len %2$s Nota OpenGL myndgerð Nota vélbúnaðarhröðun OpenGL myndgerðar (gæti virkað ekki á sumum tækjum) Uppfærslur tiltækar fyrir %1$s kort - Strætisvagnaleiðir, sporvagnar og skutluleiðir + strætisvagn,strætó,áætlanabifreið,sporvagn,rafknúinn strætisvagn,skutla %1$s þarf heimild fyrir þessu til að slökkva á skjánum til að spara orku. Kveikja á skjá (ef slökkt er á honum) þegar beygja nálgast Leiðir rafknúinna strætisvagna @@ -1795,4 +1795,59 @@ Punktar Breidd hæðarlína Breidd hæðarlína Vatn + Þú ert að fara að eyða %1$d minnispunktum. Ertu viss? + Hljóð/myndskeiðs-minnispunktar + Tilgreindu talhraða fyrir TTS + Ertu viss um að þú viljir stöðva leiðsögnina? + Virkja þetta til að reikna nákvæmar leiðir án hnökra. Er ennþá takmarkað út frá vegalengdum og fremur hægvirkt. + Nákvæmt leiðaval (alfa-tilraunaútgáfa) + Dropbox-viðbótin gerir þér kleift að samstilla ferla og minnispunkta við hljóð/myndskeið með því að nota Dropbox-aðganginn þinn. + Velja eftir beiðni + Taka upp myndskeið + Taka upp hljóð + Veldu sjálfgefna aðgerð viðmótshluta + Sjálfgefin aðgerð viðmótshluta + Veldu úttakssnið myndmerkis + Frálagssnið myndmerkis + Nota myndavélarforritið + Upptaka á lagi + {0} merkisstaðir/minnispunktar voru sendir inn + Merkisstaðir/minnispunktar sem vistaðir eru á tæki + Birta og sýsla með merkisstaði/minnispunkta sem skráðir eru í staðværum gagnagrunni + Raddskipanir (TTS-raddgerfill, forgangur) + Raddskipanir (TTS) + TTS-rödd + Stilla stærð leturs fyrir nöfn á kortinu + Aflúsunarupplýsingar myndgerðar + Birta afköst myndgerðar + Snúa við stefnu GPX + Frálag raddleiðsagnar + Hljóð margmiðlun/tónlist + Lágmarks aðdráttarstig við notkun vektorkorta + Lágm. aðdráttur vektora + Nettengd OSM kortaflokkun með myndum + Nettengd NafnaLeit + Vísirinn \'\'{0}\'\' passaði ekki í minni + Fyrri útgáfa OsmAnd er uppsett. Öll ónettengd gögn verða studd af nýju útgáfunni. Hinsvegar ætti að flytja út eftirlætispunkta í eldri útgáfunni og flytja aftur inn í nýju útgáfunni. + Engin raddleiðsögn er tiltæk, farðu í \'Stillingar\' → \'Almennt\' → \'Raddleiðsögn\' og veldu eða náðu í pakka með raddskipunum. + Það tókst að hlaða myndgerðarforritinu inn + Frávik kom upp: ekki tókst að hlaða myndgerðarforritinu inn + GPX-skrá með eftirlætum fannst ekki í {0} + Engin ónettengd gögn um héruð fundust á SD-korti. Náðu í héruðin af internetinu. + Settu inn leitarskilyrði til að finna merkisstað + OSM-minnispunktar (nettengt) + Hámarksbiðtími eftir hverri bakgrunnsleiðréttingu á staðsetningu + Hámarksbið eftir leiðréttingu + Veldu millibil þess sem bakgrunnsþjónustu er vakin upp + Veldu staðsetningarþjónustu til að nota með bakgrunnsþjónustu + Staðsetningarþjónusta + Leiðsagnarþjónusta í bakgrunni krefst þess að staðsetningarþjónusta sé í gangi. + Snið opnunartíma er ekki stutt við breytingar + Sendi inn hnút… + Stigvaxandi leit götu + Stigvaxandi leit byggingar + Upplýsingum um hnút var ekki hlaðið inn + Snjöll endurreiknun leiðar + Einungis endurreikna upphafshluta leiðar fyrir langar ferðir + Ertu viss um að þú viljir sækja kort eingöngu með vegum, jafnvel þó þú sért þegar með staðlaða (fulla útgáfu) korts? From af4a8d3fdc5fb250f713b227d8a3c073ea5b908a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Tue, 20 Dec 2016 15:40:09 +0000 Subject: [PATCH 40/83] Translated using Weblate (Icelandic) Currently translated at 40.6% (1242 of 3054 strings) --- OsmAnd/res/values-is/phrases.xml | 194 ++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml index 576442a002..5534db039d 100644 --- a/OsmAnd/res/values-is/phrases.xml +++ b/OsmAnd/res/values-is/phrases.xml @@ -126,11 +126,11 @@ Vatn Almenningssamgöngur Bygging - Flugstöð + Tölva Strætisvagn Lest Smálest - Skóli + Skólaföt Skýli Óvirkt Borg @@ -698,7 +698,7 @@ Breidd - Arkítektar + Arkítekt Tegund: olíuiðnaður Tegund: verksmiðja @@ -1148,4 +1148,192 @@ Salt: nei Alþjóðlegt Svæðisbundið + Internetaðgangur: tölva + Miðstöð + Aðeins þegar umferð gangandi er leyfð + + Reiðhjól: ekki leyfð + Leyfð á sumrin + Veður + Sólskýli + Þráðlaust Wi-Fi net + Um kapal + Ekki internetaðgangur + Með internetaðgangi + + Hámarksbreidd + IATA-kóði + ICAO-kóði + FAA-kóði + + Byggingastíll: módernískur + Byggingastíll: stalínísk nýklassík + Byggingastíll: samtímalegur + Byggingastíll: umgebinde + Byggingastíll: art nouveau + Byggingastíll: nýklassík + Byggingastíll: viktoríanskur + Byggingastíll: brútalismi + Byggingastíll: klassískur + Byggingastíll: gotneskur + Byggingastíll: barokk + Byggingastíll: vilhelmínskur + Byggingastíll: endurreisn + Byggingastíll: rómantískur + + Lestagöng + Göngubrú + Hjólreiðabrú + Járnbrautabrú + Yfirborð: óbundið + Yfirborð: steinlagt + Yfirborð: asfalt + Yfirborð: steinsteypa + Yfirborð: steinvölur + Yfirborð: steinn + Yfirborð: málmur + Yfirborð: timbur + Yfirborð: möl + Yfirborð: fín möl + Yfirborð: þjappað + Yfirborð: sandur + Yfirborð: gras + Yfirborð: leðja + Yfirborð: ísing + Yfirborð: salt + Yfirborð: snjór + + Rafknúinn strætisvagn + Sporvagn + Einteinungur + Dráttarlest + Ferja + + Leið járnbrautar + + Sögulegur hlutur + Eftirlit: já + Með verslun + + Smásala + Hjólasala: nei + Viðgerðir + Hjólaviðgerðir: nei + Leiga + Hjólaleiga: nei + Loftdæla + Loftdæla fyrir hjól: nei + Hreinsun + Hleðsla reiðhjóla: já + Hleðsla reiðhjóla: nei + Staður til skoðunar villtra dýra + + Þjálfun: tungumál + Þjálfun: tónlist + Þjálfun: dans + Þjálfun: íþróttir + Þjálfun: listir + Þjálfun: matreiðsla + Þjálfun: tölvur + Þjálfun: jóga + Þjálfun: bardagaíþróttir + Þjálfun: flug + Þjálfun: hárgreiðsla + + Tegund: bílarif + Söguleg flugvél + + Með lyftu + Án lyftu + + Skrifstofa tjaldstæðis + Skrifstofa skógarvarða + Sóknarskrifstofa + Eldsneyti 91UL + Eldsneyti 100LL + Eldsneyti Jet A-1 + Eldsneyti AdBlue + + Eldsneyti: viður + Eldsneyti: viðarkol + Eldsneyti:; kol + + Ljósastaur + + Útafakstursakrein + + Afurð: hrísgrjón + Afurð: gras + Afurð: maís + Afurð: korn + Afurð: sykurreyr + Afurð: hveiti + Afurð: soja + Afurð: bygg + Afurð: grænmeti + Afurð: humlar + Afurð: repja + Afurð: rófur + Afurð: lavander + Afurð: te + Afurð: kaffi + Afurð: alifuglar + Afurð: sólblóm + Afurð: hindber + Afurð: tóbak + Afurð: jarðarber + Afurð: grænmeti, blóm + Afurð: kassava + Afurð: trönuber + Afurð: aspas + Afurð: blóm + + Eftirlit: innandyra + Eftirlit: utandyra + Eftirlit: opinbert + + Konur + Undirföt + Karlar + Brúðkaupsfatnaður + Íþróttir + Ungabörn + Gallafatnaður + Vinnuföt + Hattar + Loðfeldir + Leður + Búningar + Hefðbundið + Jakkaföt + Óléttuklæðnaður + Gamaldags + Yfirstærðir + Sundföt + Sokkar + Skyrtur + Dans + Hernaðar + + Börn + Konur + Íþróttir + Karlar + Tælenskt + Kynlífs + Kínverskt + Heilsumeðferð + + Nuddþjónustur + Leyft + Tjöld ekki leyfð + Hundar leyfðir + Hundar ekki leyfðir + + Hestar leyfðir + Hestar ekki leyfðir + Dýr leyfð + Dýr ekki leyfð + + Sögulegir gálgar From 94b4fe124f261a3536c6d1e754db1a67d48a045d Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 17:16:20 +0100 Subject: [PATCH 41/83] remove blank line --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index ec45dca5e1..3c0e877c61 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -245,7 +245,6 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { } else { return mTts.getLanguage() + " (Voice details not reported in API<21)"; } - } }); mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() { From 8632d85a36df9f3882024014eee998ae1874effe Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 17:55:04 +0100 Subject: [PATCH 42/83] add return --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 3c0e877c61..dad212f4cb 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -245,6 +245,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { } else { return mTts.getLanguage() + " (Voice details not reported in API<21)"; } + return ""; } }); mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() { From 248bb3caeba503eae84041c2b03024e307e6ceb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=BCdinger?= Date: Tue, 20 Dec 2016 16:23:17 +0000 Subject: [PATCH 43/83] Translated using Weblate (German) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-de/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 20c7dcaa6d..9c47ff867d 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2347,9 +2347,9 @@ Lon %2$s Es wird empfohlen, das Rendern von Polygonen zu deaktivieren. Widgets - "Nicht genug Speicher! -Es werden vorübergehend {3} MB und {1} MB dauerhaft benötigt. -Aktuell sind nur {2} MB verfügbar." + Nicht genug Speicher! +Es werden vorübergehend {3} MB und dauerhaft {1} MB Speicherplatz benötigt. +Aktuell sind nur {2} MB verfügbar. {0} Datei(en) herunterladen? Dies benötigt vorübergehend {3} MB und dauerhaft {1} MB. (Aktuell sind {2} MB verfügbar.) From c1f957436f4e9fc8f6dd0add1a401ca834c9807a Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 20 Dec 2016 18:25:35 +0100 Subject: [PATCH 44/83] match also dash for backward compatibility --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index dad212f4cb..0a4b508a99 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -170,7 +170,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { // #3344: Try Locale builder instead of constructor (only available from API 21) if (android.os.Build.VERSION.SDK_INT >= 21) { try { - final String[] languageFields = language.split("\\_"); + final String[] languageFields = language.split("[\\_\\-]"); newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); } catch (RuntimeException e) { // Falls back to "new Locale(language)" From 322b8c909ebbac385c1cd5c2ba360b99aa2cb786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=BCdinger?= Date: Tue, 20 Dec 2016 17:22:27 +0000 Subject: [PATCH 45/83] Translated using Weblate (German) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 9c47ff867d..4b2e67edb0 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2529,7 +2529,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt Filter speichern Filter löschen Neuer Filter - Bitte geben sie einen Namen für den neuen Filter ein. Dieser wird zur Liste der Kategorien hinzugefügt. + Bitte geben Sie einen Namen für den neuen Filter ein. Dieser wird zur Liste der Kategorien hinzugefügt. Ausgewählte Kategorien Benutzerdefinierten Filter erstellen Benutzerdefinierte Suche From 6cb4b0315c2aa5c7f0bda66d31c8e8cbedd92506 Mon Sep 17 00:00:00 2001 From: njohnston Date: Tue, 20 Dec 2016 20:53:34 +0000 Subject: [PATCH 46/83] Fix incorrect minimum precision logic for track recording OsmAnd 2.5 introduced an optional minimum precision for location when recording tracks. When this is used, track points are only recorded if the location accuracy at the time of sampling is within the minimum precision. Logic in the code was inverted: points with accuracy below (i.e. within) the minimum precision were rejected, and points with accuracy above the minimum precision were accepted. For example, if the minimum precision was set to 20 metres, all points with an accuracy of 20 metres or under were incorrectly rejected. --- OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java index 9b6987b700..df7f1d4b64 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java @@ -375,7 +375,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { record = false; } float precision = settings.SAVE_TRACK_PRECISION.get(); - if(precision > 0 && (!location.hasAccuracy() || location.getAccuracy() < precision)) { + if(precision > 0 && (!location.hasAccuracy() || location.getAccuracy() > precision)) { record = false; } float minSpeed = settings.SAVE_TRACK_MIN_SPEED.get(); From 1167f6ab70dad7935ae824cdd143fe3e42a4ce4b Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Tue, 20 Dec 2016 17:51:11 +0000 Subject: [PATCH 47/83] Translated using Weblate (Belarusian) Currently translated at 99.6% (2099 of 2106 strings) --- OsmAnd/res/values-be/strings.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index cc57d75a78..da22ead574 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2707,4 +2707,25 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Ваду Дазволіць састарэлы пошук у мэню Таўшчыня гарызанталяў + " + • Іконкі на мапе, якія можа націскаць, + + +• Пошук любых POI: Пошук рэстаранаў паводле кухні або кемпінгаў з пэўнымі выгодамі, + + +• Новы стыль мапы \"OsmAnd Topo\" для веласіпедыстаў і пешых турыстаў. + + +• Паляпшэньне запісу сьледу, + + +• Паляпшэньне апавяшчэньняў пры навігацыі (Android Wear) + + +• Мноства іншых паляпшэньняў і выпраўленьняў, + + +і многае іншае ... + " From 006ae932d04db42e5548391380eed0af62423838 Mon Sep 17 00:00:00 2001 From: Kari Salovaara Date: Tue, 20 Dec 2016 19:44:40 +0000 Subject: [PATCH 48/83] Translated using Weblate (Finnish) Currently translated at 92.5% (1949 of 2106 strings) --- OsmAnd/res/values-fi/strings.xml | 98 +++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 946056bc6f..6fc9ef28bf 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -959,7 +959,7 @@ Anonyymejä ryhmiä luodaan määritellyiksi päivämääriksi ja rajoitettuna m Hae sijaintini Älä näytä päivityksiä Haluatko päivittää kaikki kartat nyt? - Puhdista kaikki kuvakkeet + Poista kaikki tiilet Polttoainetaudellisella tavalla Käytä polttoainetaloudellista tapaa (tavallisesti lyhyempi) Muuta @@ -1594,7 +1594,7 @@ Jälki %2$s Audio/Video data Dropbox lisäosa Ainoastaan tiet kartta - Piilota rajat + Rajat Valitse koska näyttää \"ainoastaan tiet\" kartta: Ainoastaan tiet kartta Vikasietotila @@ -1613,7 +1613,7 @@ Jälki %2$s Muistia varattu %1$s MB (Android raja %2$s MB, Dalvik %3$s MB). Jaa reitti GPX tiedostona Reitti jaettu käyttäen OsmAnd - Piilota monikulmiot + Monikulmiot Hahmotustila Optimoi kartta Näytä alkaen zoomaustasosta (tarvitsee korkeuskäyrätietoja): @@ -2059,4 +2059,96 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t " Audion bittinopeus Valitse audion bittinopeus + GPX tiedostoa ei valittu. Valitaksesi paina ja pidä käytettävissä olevalla jäljellä. + Luodaksesi ryhmiä tulee Sinun olla OsMo\'on rekisteröitynyt käyttäjä. + OsMo käyttäjätietosi eivät ole oikein. + Generoi uudelleen käyttäjä id:si + Peruuta kohteen liikuttelu + Aseta liikkuvaksi kohteeksi + Serbia (latinalaisin) + Kiina (Hong Kong) + Määrittele puheen nopeus TTS:lle + Puheen nopeus + elliptinen merkator + Poista välikohteet + Säilytä välikohteet + Olet jo asettanut välikohteita. + Vähentää kohinaa kompassilukemissa mutta lisää hitautta + Käytä magneetista sensoria määrittäesä kompassin arvoja suuntasensorin sijaan + Käytä magneetista sensoria + Harkitse ostavasi Korkeuskäyrä laajennuksen Kaupasta tukeaksesi jatkokehitystä. + Audio halutusta nauhoituksesta soitetaan. +%1$s + Tee audio muistiinpano + Alppivaelluksen mittakaava (SAC) + Hahmota polut SAC mittakaavan mukaisesti + Hahmota polut OSMC jälkien pohjalta + + Toista suunnistusohjeet + Keskitä käytettävä kartta automaattisesti. + Paikallista dataa POI estsimiseksi ei ole käytettävissä. + Muokkaa peitteen läpinäkyvyyttä + Peitteen läpinäkyvyys + Muokkaa peruskartan läpinäkyvyyttä + Peruskartan läpinäkyvyys + Kartta on jo asennettu, asetukset päivitetään + Valitse (tiili) kartat asennettavaksi tai päivitettäväksi + Internet yhteys tarvitaan tähän toimintoon mutta se ei ole käytettävissä + Asenna lisää… + Minimi zoomaustaso käytettäväksi vektorikartoilla + Min vektorien zoomaustaso + Online OSM karttaluokittelu kuvin + Tapahtui virhe offline haussa + Järjestelmä + Valitse näytettävä kieli (ole hyvä ja käynnnistä OsmAnd uudestaan muutoksen jälkeen) + Näytettävä kieli + epätäydellinen + Jaa sijainti käyttäen + Sijainti: %1$s +%2$s + GPX Väyläpiste \'\'{0}\'\' lisättiin onnistuneesti + Lisää väyläpiste tallennettuun GPX jälkeen + Lisää GPX väyläpiste + Hallinnollinen + Indeksoidaan osoitteita.… + Indeksoidaan karttaa… + Indeksoidaan POI… + Poistettua karttadatan formaattia \'\'{0}\'\' ei tueta + Indeksi \'\'{0}\'\' ei mahtunut muistiin + Indeksin \'\'{0}\'\' versiota ei tueta + Valitse päivä/yö tilan vaihtamisen sääntö + Tätä karttaa ei voitu ladata + Näytä POIn verkkosivut + Näytä POIn puhelinnumero + Korkean resoluution näyttö + Vektorikarttoja ei ladattu + Suunnista käyttäen GPX + GPX tiedostoja ei löytynyt jälkien hakemistosta + Virhe luettaessa GPX dataa + Offline vektorikartat + Muokkaa POI + Ei suosikkipisteitä tallennettavaksi + Reitti + OSM Muistiinpanot (online) + POI… + Karttatasot + POIn muutos + Virheellinen formaatti: %s + Älykäs reitin uudelleen laskenta + Laske uudelleen ainoastaan reitin alkuosa pidemmille matkoille + Arvostele tämä sovellutus + Kerro meille miksi. + Ole hyvä ja kerro meille mitä haluaisit muuttaa tässä sovelluksessa. + Vieminen epäonnistui + Viety onnistuneesti {0}/{1} + Offline Kartat +& Suunnistus + + + + Käytetyt ilmaiset lataukset + Näyttää käytetyt ilmaiset lataukset + + Valitse inne haluat tallentaa kartat ja muut datatiedostot. + From e5ff2f7885f08b0a05f38d96c1f54c3aecd1da48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=BCdinger?= Date: Tue, 20 Dec 2016 18:00:53 +0000 Subject: [PATCH 49/83] Translated using Weblate (German) Currently translated at 100.0% (2106 of 2106 strings) --- OsmAnd/res/values-de/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 4b2e67edb0..a794117883 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2489,14 +2489,14 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt %1$s Haltestellen vor Oberirdische Objekte - Kraftstoff sparende Route + Kraftstoffsparende Route Kraftstoffsparende Route verwenden (in der Regel kürzer) - Wollen sie Favorit \'%1$s\' wirklich ersetzen? + Wollen Sie den Favorit \'%1$s\' wirklich ersetzen? Ändern Erste Schritte Wollen sie jetzt alle Karten aktualisieren? Alle Kartenkacheln löschen - Sie haben keine Offline Karten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen. + Es sind keine Offline-Karten installiert. Sie können jetzt eine Karte auswählen oder später Karten über “Menü - %1$s“ herunterladen. Eine andere Region auswählen Karte wird gesucht… Lassen Sie OsmAnd Ihren Standort bestimmen und Karten für diese Region zum Herunterladen vorschlagen. From fefdb0ba611e9f18a81161804583f7a6a7ff7a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Tue, 20 Dec 2016 20:00:04 +0000 Subject: [PATCH 50/83] Translated using Weblate (Icelandic) Currently translated at 45.7% (1396 of 3054 strings) --- OsmAnd/res/values-is/phrases.xml | 178 ++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml index 5534db039d..2ddcd5885c 100644 --- a/OsmAnd/res/values-is/phrases.xml +++ b/OsmAnd/res/values-is/phrases.xml @@ -136,7 +136,7 @@ Borg Lækur Opinbert - Herþjónusta + Hernaðar Einka Wikipedia @@ -1336,4 +1336,180 @@ Dýr ekki leyfð Sögulegir gálgar + Leyft að vera með opinn eld + Ekki leyft að vera með opinn eld + Skátatjaldsvæði: já + Skátatjaldsvæði: nei + Einungis hópar: já + Einungis hópar: nei + Þvottavél: nei + Steypibað: nei + Steypibað: hitað + Steypibað: utandyra + Steypibað: kalt + Steypibað: innandyra + Hjólhýsi: nei + Án pöntunar: já + Án pöntunar: nei + Stöð fyrir hreinlætisúrgang: já + Stöð fyrir hreinlætisúrgang: nei + Rafmagnsinnstungur: nei + Rafmagnsinnstungur: CEE 17 blátt + Rafmagnsinnstungur: CEE 7/4 + Rafmagnsinnstungur: CEE 7/5 + Rafmagnsinnstungur: NEMA 5-15 + + Hámarksfjöldi tjalda + Hámarksfjöldi hjólhýsa + Dagvistun + + Brennsluofn + Afurð: múrsteinar + Afurð: brennt kalk + Afurð: leður + Afurð: kalk + Afurð: bjór + Afurð: viðarkol + Afurð: kjöt + + Lýsing fyrir notendur hjólastóla + Lýsing fyrir sjónskerta + Lýsing fyrir heyrnarskerta + + Handrið: já + Rampur: já + Rampur: nei + Hjólastólarampur: já + Hjólastólarampur: nei + Rampur (barnakerrur): já + Rampur (barnakerrur): nei + Reiðhjólarampur: já + Reiðhjólarampur: nei + Farangursrampur: já + Farangursrampur: nei + Fjöldi þrepa + Ástand þrepa: jöfn + Ástand þrepa: ójöfn + Ástand þrepa: hrjúf + + Menning: forn-rómversk (753 f.kr – 284 e.kr.) + Menning: etrúsk (12.– 6. öld e.kr.) + Menning: forsöguleg + Menning: forn-grísk + Menning: rómversk + Menning: forn-egypsk (til 332 f.kr) + Menning: keltnesk + Menning: vestur-rómversk (285 e.kr. – 476 e.kr.) + Efni: viður + Efni: málmur + Efni: járnbent steinsteypa + Efni: steinsteypa + Efni: stál + Efni: steinn + Efni: steinhleðsla + Efni: múrsteinn + Efni: plast + Efni: sandsteinn + Efni: granítsteinn + Efni: málmur: viður + Efni: gler + Efni: brons + Efni: mold + Efni: samsett + Efni: kalksteinn + Efni: marmari + Efni: ál + + Landnám + Sögulegt býli + Söguleg járnbrautarstöð + + Söguleg járnbraut + + Tegund byggingar: bænhús + Tegund byggingar: sýnagóga + Fyrrverandi fangabúðir + Hitastig + Farþegar + Farartæki + Reiðhjól + Gámar + Líkamsræktarstöð + + Flugeldaverslun + + Fæðingardeild + Líkamsræktarmiðstöð + Líkamsrækt + + Billjarð + + Örbylgjuofn: já + Örbylgjuofn: nei + Vatnshitari: já + Vatnshitari: nei + + Tegund: yfirborð + Hlaup + Frisbígolf + Innanhúsfótbolti + Skvass + Hnefaleikar + + Áletrun:N + Áletrun:NV + Áletrun:V + Áletrun:SV + Áletrun:S + Áletrun:SA + Áletrun:A + Áletrun:NA + + Í byggingu + Verndarsvæði + Græðlingaræktun + + Vatnshani + Fligtak + Lending + Þjálfun + Opinbert: já + Opinbert: nei + Neyðartilfelli: já + Neyðartilfelli: nei + Aðal + Tjörn + Tankur + Tegund skáps: rafmagn + Tegund skáps: samskipti + Tegund skáps: kapalsjónvarp + Tegund skáps: gas + Tegund skáps: póstþjónusta + Tegund skáps: úrgangur + Tegund skáps: vatnsmiðlun + Tegund skáps: götulýsing + + Geymsluskápar + Dýpt + + Salt + Sumarbúðir + Hernaðar/almennings + Loftræstigöng + + Sjónauki + Loftvog + Loftvog: nei + Hitamælir + Hitamælir: nei + Rakamælir + Rakamælir: nei + Lágmarksaldur + + Umferðarspegill + + Vatnstankur + + Jól + Jólatré From 574a71845a9c4690572dc39e71bd5f7d800bba7c Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 06:23:56 +0100 Subject: [PATCH 51/83] improve TTS Locale specifiction also for API<21 --- .../net/osmand/plus/voice/TTSCommandPlayerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 0a4b508a99..0d74e253f8 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,14 +166,14 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - Locale newLocale0 = new Locale(language); - // #3344: Try Locale builder instead of constructor (only available from API 21) + final String[] languageFields = language.split("[\\_\\-]"); + Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); + // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { try { - final String[] languageFields = language.split("[\\_\\-]"); - newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build(); + newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("languageFields[3]").setRegion(languageFields[1]).setVariant(languageFields[2]).build(); } catch (RuntimeException e) { - // Falls back to "new Locale(language)" + // Falls back to constructor } } final Locale newLocale = newLocale0; From 3fae089fe74494b378d371c1edcd99b15fcfd2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Tue, 20 Dec 2016 22:34:20 +0000 Subject: [PATCH 52/83] Translated using Weblate (Icelandic) Currently translated at 45.8% (1400 of 3054 strings) --- OsmAnd/res/values-is/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml index 2ddcd5885c..5fd53b81a2 100644 --- a/OsmAnd/res/values-is/phrases.xml +++ b/OsmAnd/res/values-is/phrases.xml @@ -1512,4 +1512,8 @@ Jól Jólatré + Aukalegt + Reiðhjólaþjónusta + Vatnsuppspretta + Sjálfvirk From 7b2342123c4e2fcc26056327f79635ff8f94e5a0 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 06:45:59 +0100 Subject: [PATCH 53/83] better order --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 0d74e253f8..219facd595 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,12 +166,12 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - final String[] languageFields = language.split("[\\_\\-]"); + final String[] languageFields = language.split("[\\-\\_]"); Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { try { - newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("languageFields[3]").setRegion(languageFields[1]).setVariant(languageFields[2]).build(); + newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setRegion(languageFields[1]).setVariant(languageFields[2]).setScript(languageFields[3]).build(); } catch (RuntimeException e) { // Falls back to constructor } From 6a04d041e44c7f09133663bda75d6470cb35b80c Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 07:12:16 +0100 Subject: [PATCH 54/83] fix array --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 219facd595..26f5e57e3b 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,7 +166,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - final String[] languageFields = language.split("[\\-\\_]"); + final String[] languageFields = (language + "___".split("[\\_\\-]"); Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { From da2766e7560613c384aaf7130b4b0bbe3bdf6f80 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 07:20:49 +0100 Subject: [PATCH 55/83] fix parentheses --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 26f5e57e3b..06af92f3b1 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,7 +166,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - final String[] languageFields = (language + "___".split("[\\_\\-]"); + final String[] languageFields = (language + "___").split("[\\_\\-]"); Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { From bf37c00db7dedd39418356715f84bdff5c4a1125 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 07:35:45 +0100 Subject: [PATCH 56/83] try fix minimum array length --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 06af92f3b1..9a755e4d92 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,7 +166,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - final String[] languageFields = (language + "___").split("[\\_\\-]"); + final String[] languageFields = (language + "___x").split("[\\_\\-]"); Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { From b77a6e7dc354607e41dc035855f42702cd4ca561 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 21 Dec 2016 08:05:46 +0100 Subject: [PATCH 57/83] make sure array has 4 fields minimum --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 9a755e4d92..3768aedccc 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -166,7 +166,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { ttsRequests = 0; final float speechRate = cSpeechRate; - final String[] languageFields = (language + "___x").split("[\\_\\-]"); + final String[] languageFields = (language + "____.").split("[\\_\\-]"); Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]); // #3344: Try Locale builder instead of constructor (only available from API 21), also supports script if (android.os.Build.VERSION.SDK_INT >= 21) { From d59145427e9564db46eeeaf552cdd597d8e302f5 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 21 Dec 2016 18:42:00 +0300 Subject: [PATCH 58/83] Add phrase --- OsmAnd/res/values-ru/phrases.xml | 2 ++ OsmAnd/res/values/phrases.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 6804054a1a..db503b281d 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -3369,4 +3369,6 @@ Конструкция: радом Конструкция: замаскированная + Грузовая станция + \ No newline at end of file diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 3bc50bb283..d254ca8636 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -3335,4 +3335,6 @@ Construction: dome Construction: concealed + Freight station + From b158a3e3a8858d652b26d83a66a54a8d849985c5 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Wed, 21 Dec 2016 11:12:41 +0000 Subject: [PATCH 59/83] Translated using Weblate (Belarusian) Currently translated at 99.7% (2100 of 2106 strings) --- OsmAnd/res/values-be/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index da22ead574..490868678d 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -2728,4 +2728,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві і многае іншае ... " + Таўшчыня гарызанталяў (ізагіпсы) From dfe12835aa19a2fe1f076aa6f16d249741e9ff94 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 21 Dec 2016 12:08:17 +0000 Subject: [PATCH 60/83] Translated using Weblate (Swedish) Currently translated at 98.6% (2077 of 2106 strings) --- OsmAnd/res/values-sv/strings.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index ad4cca01c3..08557b5ffe 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -203,7 +203,7 @@ Du hittar din parkeringsplats och -tid på instrumentbrädan och i widgeten på Snarast Rondell: ta %1$d avfarten och kör Gör alla ytor på kartan transparenta - Dölj polygoner + Polygoner Renderingsläge Visning från zoomnivå (kräver höjdkurvsdata): Visa höjdkurvor @@ -798,7 +798,7 @@ Nyttjat utrymme är {1} MB. Färgschema för vägar Ingen rutt - Dölj gränser + Gränser Undertryck visning av regionala gränser (adminnivåer 5-9) @@ -2403,4 +2403,10 @@ Om du tycker om OsmAnd och OSM och vill stödja dem så är detta ett utmärkt s och mer … " Med tanke på den kommande julen och nyåret så kan du välja att visa POI som har med julen att göra: julgranar, julmarknader med mera. + Bredd på konturlinjer + Vatten + Avgift för prenumerationen dras varje månad. Du kan avbryta din prenumeration på Google Play när som helst. + Delar av din gåva skickas till OSM-användare som skickat in ändringar till OpenStreeMap. Prenumerationskostnaden förblir densamma. + En prenumeration aktiverar uppdateringar varje timme, dag eller vecka och obegränsade nedladdningar av alla kartor globalt. + Erhåll obegränsade nedladdningar av kartor samt kartuppdateringar oftare än en gång i månaden: varje vecka, varje dag eller varje timme. From 47ad23c83005bbf0f87d8f482a1f3569555b2d27 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 21 Dec 2016 12:28:42 +0000 Subject: [PATCH 61/83] Translated using Weblate (Catalan) Currently translated at 71.3% (2180 of 3054 strings) --- OsmAnd/res/values-ca/phrases.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index c83126acbe..8a4e9a20d3 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -2367,4 +2367,31 @@ Tipus Aire comprimit Aspiradora + Visites a domicili + Tipus de medicina + Plat + Característica + +Infraestructura d\'emergència + Botiga d\'espècies + Venda de mel + Material religiós + + Benzinera per avions + Benzinera per embarcacions + Hoquei sobre gel + Accés a Internet - de pagament + Accés a Internet - de franc + + Lògia maçònica + Club nàutic + Club d\'escoltes + + Wiki en afrikaans + Wiki en bengalí + Wiki en bishnupriya + Wiki en gal·lès + Wiki en persa + Wiki en malaiàlam + Wiki en marathi From 4c3d00c8485dfd470a8e2c9369ff0e9beffd9f95 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 18 Dec 2016 17:34:38 +0000 Subject: [PATCH 62/83] Translated using Weblate (Danish) Currently translated at 100.0% (3055 of 3055 strings) --- OsmAnd/res/values-da/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 8febbec2bc..884b19aaf3 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -3427,4 +3427,6 @@ Konstruktion: kuppel Konstruktion: skjult +Godsterminal + From b9214888a05abc8792ea2c2f35c2f0bfe2185fd8 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 21 Dec 2016 18:42:00 +0300 Subject: [PATCH 63/83] Add phrases --- OsmAnd/res/values-ru/strings.xml | 7 ++++++- OsmAnd/res/values/strings.xml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 743f7ec4ec..f3a0a5e2a7 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1,6 +1,11 @@ - Толщина горизонталей (изогипсы) + Частота горизонталей + Частота горизонталей + Высокая + Средняя + Низкая + Толщина горизонталей Толщина горизонталей Воду Старый поиск diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index c2c663203d..8076245882 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,11 @@ 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 --> + Contour lines density + Contour lines density + High + Medium + Low Contour lines width Contour lines width Water From 9fde072d82fc54918eebae96cfd21584eae50661 Mon Sep 17 00:00:00 2001 From: Kheireddine Mkh Date: Wed, 21 Dec 2016 18:35:04 +0000 Subject: [PATCH 64/83] Translated using Weblate (Arabic) Currently translated at 26.4% (808 of 3055 strings) --- OsmAnd/res/values-ar/phrases.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml index 9d67a215ac..fdcbd6b473 100644 --- a/OsmAnd/res/values-ar/phrases.xml +++ b/OsmAnd/res/values-ar/phrases.xml @@ -865,4 +865,11 @@ سوق عيد الميلاد متجر عيد الميلاد شجرة عيد الميلاد + بناية استعجالات + متجر الأدوات المنزلية + احتياطي مياه الحرائق + ممهل + محطة المطار + بوابة الصعود + From d212fde5e73ccc5128db1b3adfd0cce1855d5353 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Wed, 21 Dec 2016 18:14:49 +0000 Subject: [PATCH 65/83] Translated using Weblate (Belarusian) Currently translated at 99.6% (3045 of 3055 strings) --- OsmAnd/res/values-be/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index d83cc60665..52a3c8c643 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -3372,4 +3372,6 @@ Канструкцыя: радом Канструкцыя: замаскаваная +Грузавая станцыя + From b6a388e96f5e3bdd0f33f5d6e76771e2aaf205b1 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 21 Dec 2016 19:05:44 +0000 Subject: [PATCH 66/83] Translated using Weblate (Danish) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-da/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 03d9df4e8a..2ca6d81336 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2739,4 +2739,9 @@ Hvis du ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p Vand Højdekurver bredde Højdekurver bredde + Højdekurver tæthed + Højdekurver tæthed + Høj + Mellem + Lav From 3422a0b5174e98b0c2c9602bd11aef37383397dd Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 21 Dec 2016 19:42:01 +0000 Subject: [PATCH 67/83] Translated using Weblate (Catalan) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-ca/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 522a0cf6e8..6e54805cbc 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2532,4 +2532,9 @@ Si aprecieu OsmAnd i OSM i voleu ajudar-los, és la via perfecta per fer-ho."Gruix de les corbes de nivell Gruix de les corbes de nivell Hidràulic + Densitat de les corbes de nivell + Densitat de les corbes de nivell + Gros + Mitjà + Baix From 00f2ae37f1256b63b02cd94dd340e617f60b33d6 Mon Sep 17 00:00:00 2001 From: Athmane MOKRAOUI Date: Wed, 21 Dec 2016 19:53:38 +0000 Subject: [PATCH 68/83] Translated using Weblate (Arabic) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-ar/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 99ebdcf5af..3c386dfbc3 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -1223,7 +1223,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن بحث عرض الوصف رسالة - حمل الخرائط + تنزيل الخرائط لعرض إشارات وقواعد المرور بشكل صحيح، من فضلك اختر منطقة القيادة: إضافة إلى المواقع المفضلة مواقعي @@ -2662,4 +2662,9 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن 3. كل المعدلة / السلاسل التي تم إنشاؤها هي في الجزء العلوي من ملف (لجعل أسهل تجد ترجمتها \\ \'ق). من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي" عرض الخطوط الكنتورية + كثافة الخطوط الكنتورية + كثافة الخطوط الكنتورية + عالية + متوسطة + منخفض From 25fa90a45c7bb09086dc1eb1e807b804d9026e0c Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Wed, 21 Dec 2016 19:14:57 +0000 Subject: [PATCH 69/83] Translated using Weblate (French) Currently translated at 99.5% (2101 of 2111 strings) --- OsmAnd/res/values-fr/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 64d37e50ff..063892a4ee 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2482,4 +2482,8 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\' Eau Épaisseur des traits pour les courbes de niveaux Épaisseur des courbes de niveaux + Densité des courbes de niveaux + Élevé + Moyen + Faible From 1c03955ba5e5fe7f48637af777294c067fc09c36 Mon Sep 17 00:00:00 2001 From: Athmane MOKRAOUI Date: Wed, 21 Dec 2016 20:37:02 +0000 Subject: [PATCH 70/83] Translated using Weblate (French) Currently translated at 99.7% (2106 of 2111 strings) --- OsmAnd/res/values-fr/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 063892a4ee..743fbc5063 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1835,7 +1835,7 @@ Pour revenir à l’un des styles de carte classique de OsmAnd, désactivez simp Se déconnecter Désactivé Couleur de l\'itinéraire basée sur les symboles de randonnée OSMC - Couleur selon l\'étendue de l\'itinéraire + Couleur selon l\'affiliation du réseau Supprimer la modification OSM Afficher les détails Lire l\'article complet (en ligne) @@ -2486,4 +2486,8 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\' Élevé Moyen Faible + Densité de lignes de contour + Recherche héritée + Afficher la recherche héritée + Activer la recherche héritée dans la liste déroulante From 6d4064c25e859cf2c3e2d880f375261448d91045 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 20 Dec 2016 08:46:50 +0000 Subject: [PATCH 71/83] Translated using Weblate (German) Currently translated at 100.0% (3055 of 3055 strings) --- OsmAnd/res/values-de/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 2f44a41a1f..c51786bf82 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3343,4 +3343,6 @@ Konstruktion: Schüssel Konstruktion: verdeckt +Güterbahnhof + From c0ba4f7aed5b5c78a7c98a8b380e50f9d522cd53 Mon Sep 17 00:00:00 2001 From: Franco Date: Wed, 21 Dec 2016 22:46:06 +0000 Subject: [PATCH 72/83] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index f39a077763..58eb97e051 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -2503,4 +2503,11 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop Serbio (latín) Chino (Hong Kong) Agua + Densidad de las curvas de nivel + Densidad de curvas de nivel + Alto + Mediano + Bajo + Anchura de las curvas de nivel + Anchura de curvas de nivel From 6ff597b01044a1c4488dc57e58d23ebbe4f3a786 Mon Sep 17 00:00:00 2001 From: Franco Date: Mon, 19 Dec 2016 02:19:54 +0000 Subject: [PATCH 73/83] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (3055 of 3055 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index 37b9e2efd9..a9c7b89bff 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -3393,4 +3393,6 @@ Construcción: Domo Construcción: Oculta +Estación ferroviaria de carga + From 9c025e291343b88846629508a12dc9b160754fe2 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 22 Dec 2016 01:34:22 +0100 Subject: [PATCH 74/83] Update srtm data --- .../net/osmand/binary/BinaryInspector.java | 9 +- .../src/net/osmand/router/GeneralRouter.java | 3 +- .../osmand/router/RouteResultPreparation.java | 3 +- .../net/osmand/router/RouteSegmentResult.java | 82 +++++++++++++++++++ .../src/net/osmand/util/Algorithms.java | 11 +++ 5 files changed, 102 insertions(+), 6 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index ef9ccd4a7d..754f1be034 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -74,14 +74,15 @@ public class BinaryInspector { in.inspector(new String[] { // "-vpoi", // "-vmap", "-vmapobjects", // "-vmapcoordinates", -// "-vrouting", - "-vtransport", + "-vrouting", +// "-vtransport", // "-vaddress", "-vcities","-vstreetgroups", // "-vstreets", "-vbuildings", "-vintersections", // "-lang=ru", -// "-bbox=4.8486,52.3084,4.8747,52.2970", -// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm", +// "-bbox=30.4981,50.4424,30.5195,50.4351", +// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm", System.getProperty("maps.dir")+"/Map.obf" +// System.getProperty("maps.dir")+"/Ukraine_kiev-city_europe.obf" }); } else { in.inspector(args); diff --git a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java index 2203b89d62..a497b57c9d 100644 --- a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java +++ b/OsmAnd-java/src/net/osmand/router/GeneralRouter.java @@ -62,7 +62,8 @@ public class GeneralRouter implements VehicleRouter { OBSTACLES("obstacle_time"), ROUTING_OBSTACLES("obstacle"), ONEWAY("oneway"), - PENALTY_TRANSITION("penalty_transition"); + PENALTY_TRANSITION("penalty_transition"), + OBSTACLE_SRTM_ALT_SPEED("obstacle_srtm_alt_speed"); public final String nm; RouteDataObjectAttribute(String name) { nm = name; diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java index 57d34b167b..82a6110dee 100644 --- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java +++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java @@ -360,6 +360,7 @@ public class RouteResultPreparation { } additional.append("start_bearing = \"").append(res.getBearingBegin()).append("\" "); additional.append("end_bearing = \"").append(res.getBearingEnd()).append("\" "); + additional.append("height = \"").append(Arrays.toString(res.getHeightValues())).append("\" "); additional.append("description = \"").append(res.getDescription()).append("\" "); println(MessageFormat.format("\t", (res.getObject().getId() >> (BinaryInspector.SHIFT_ID )) + "", res.getObject().getId() + "", @@ -378,7 +379,7 @@ public class RouteResultPreparation { int[] pointNameTypes = res.getObject().getPointNameTypes(k); if (tp != null || pointNameTypes != null) { StringBuilder bld = new StringBuilder(); - bld.append(" 0) { + double dd = MapUtils.getDistance(plat, plon, lat, lon); + int height = HEIGHT_UNDEFINED; + if(k == object.getPointsLength() - 1) { + height = endHeight; + } else { + int[] tps = object.getPointTypes(k); + if (tps != null) { + for (int id : tps) { + RouteTypeRule rt = object.region.quickGetEncodingRule(id); + if (rt.getTag().equals("osmand_ele_asc")) { + height = (int) (prevHeight + Float.parseFloat(rt.getValue())); + break; + } else if (rt.getTag().equals("osmand_ele_desc")) { + height = (int) (prevHeight - Float.parseFloat(rt.getValue())); + break; + } + } + } + } + pf[2*k] = (float) dd; + pf[2*k+1] = height; + if(height != HEIGHT_UNDEFINED) { + // interpolate undefined + double totalDistance = dd; + int startUndefined = k; + while(startUndefined - 1 >= 0 && pf[2*(startUndefined - 1)+1] == HEIGHT_UNDEFINED) { + startUndefined --; + totalDistance += pf[2*(startUndefined)]; + } + if(totalDistance > 0) { + double angle = (height - prevHeight) / totalDistance; + for(int j = startUndefined; j < k; j++) { + pf[2*j+1] = (float) ((pf[2*j] * angle) + pf[2*j-1]); + } + } + prevHeight = height; + } + + } else { + pf[0] = 0; + pf[1] = startHeight; + } + plat = lat; + plon = lon; + } + boolean reverse = startPointIndex > endPointIndex; + int st = Math.min(startPointIndex, endPointIndex); + int end = Math.max(startPointIndex, endPointIndex); + + float[] res = new float[(end - st + 1) * 2]; + for (int k = 0; k < res.length / 2; k++) { + if (k == 0) { + res[2 * k] = 0; + } else { + res[2 * k] = pf[reverse ? (2 * (end - k)) : (2 * (k + st))]; + } + res[2 * k + 1] = pf[reverse ? (2 * (end - k) + 1) : (2 * (k + st) + 1)]; + } + return res; + } + @SuppressWarnings("unchecked") private void updateCapacity() { diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/net/osmand/util/Algorithms.java index 1ae2a1d07f..97dd1bdd16 100644 --- a/OsmAnd-java/src/net/osmand/util/Algorithms.java +++ b/OsmAnd-java/src/net/osmand/util/Algorithms.java @@ -70,6 +70,17 @@ public class Algorithms { } return def; } + + public static int parseIntSilently(String input, int def) { + if (input != null && input.length() > 0) { + try { + return Integer.parseInt(input); + } catch (NumberFormatException e) { + return def; + } + } + return def; + } public static String getFileNameWithoutExtension(File f) { From 2a40acd4a1c9c7f535aaa3c5dac67501590acd18 Mon Sep 17 00:00:00 2001 From: Athmane MOKRAOUI Date: Wed, 21 Dec 2016 20:07:21 +0000 Subject: [PATCH 75/83] Translated using Weblate (Arabic) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-ar/strings.xml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 3c386dfbc3..7cceffad4b 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -1448,7 +1448,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن السواحلية العبرية إلى الأمام - لوحةالتحكم + لوحة التحكم إرسال التتبع لخدمة ويب محددة إذا تم تمكين تسجيل GPX. تعقب على الإنترنت (GPX مطلوب) بدء التتبع على الإنترنت @@ -1933,7 +1933,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن الاصداء اتصل بنا تعديل تغيير OSM - لوحة التحكم + لوحة التحكم أو شريط المراقبة التحديث التنزيل عبر الواي فاي فقط تحديث آني @@ -2644,23 +2644,11 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن تفعيل البحث القديم في قائمة الدرج الطريق السريع مسموح الطريق السريع مسموح - تنصل: -          إذا كنت تسير على ترجمة الجمل، يرجى التأكد من: -          1. لا توجد سلاسل مكررة بالاسم -          ويسبق 2. كل الفاصلة (الاقتباس) من قبل مائل (انظر غيرها). -          إذا كنت ترغب بجعل / تصحيح ترجمة الإنجليزية تأكد من: -          3. كل المعدلة / السلاسل التي تم إنشاؤها هي في الجزء العلوي من ملف (لجعل أسهل تجد ترجمتها \\ \'ق). -     من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي + بحث موروث الصربية (اللاتينية) الصينية (هونج كونج) ماء - "تنصل: - إذا كنت تسير على ترجمة الجمل، يرجى التأكد من: - 1. لا توجد سلاسل مكررة بالاسم - ويسبق 2. كل الفاصلة (الاقتباس) من قبل مائل (انظر غيرها). - إذا كنت ترغب بجعل / تصحيح ترجمة الإنجليزية تأكد من: - 3. كل المعدلة / السلاسل التي تم إنشاؤها هي في الجزء العلوي من ملف (لجعل أسهل تجد ترجمتها \\ \'ق). - من فضلك: إلقاء نظرة على http://code.google.com/p/osmand/wiki/UIConsistency، قد حقا تحسين بك وعملنا :-) تشك - هاردي" + عرض الخطوط الكنتورية عرض الخطوط الكنتورية كثافة الخطوط الكنتورية كثافة الخطوط الكنتورية From 1988e2d6b8c814966204d386f18ee99f879a0230 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Wed, 21 Dec 2016 20:42:51 +0000 Subject: [PATCH 76/83] Translated using Weblate (French) Currently translated at 99.7% (2106 of 2111 strings) --- OsmAnd/res/values-fr/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 743fbc5063..6600eaad41 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1835,7 +1835,7 @@ Pour revenir à l’un des styles de carte classique de OsmAnd, désactivez simp Se déconnecter Désactivé Couleur de l\'itinéraire basée sur les symboles de randonnée OSMC - Couleur selon l\'affiliation du réseau + Couleur selon l\'affiliation de l\'itinéraire Supprimer la modification OSM Afficher les détails Lire l\'article complet (en ligne) @@ -2486,7 +2486,7 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\' Élevé Moyen Faible - Densité de lignes de contour + Densité des courbes de niveaux Recherche héritée Afficher la recherche héritée Activer la recherche héritée dans la liste déroulante From b602dfcb7c0e0c6e99ed25d6f20534d494c4e13c Mon Sep 17 00:00:00 2001 From: jf-simon Date: Wed, 21 Dec 2016 20:44:29 +0000 Subject: [PATCH 77/83] Translated using Weblate (German) Currently translated at 99.9% (2110 of 2111 strings) --- OsmAnd/res/values-de/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index a794117883..c53a87bf12 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2598,4 +2598,8 @@ und vieles mehr ... Wasser Breite der Höhenlinien Breite der Höhenlinien + Dichte der Höhenlinien + Dichte der Höhenlinien + Höhe + Mittel From e207055498473980fa3e4592bbc2f870ddfef949 Mon Sep 17 00:00:00 2001 From: Athmane MOKRAOUI Date: Wed, 21 Dec 2016 19:47:15 +0000 Subject: [PATCH 78/83] Translated using Weblate (Arabic) Currently translated at 26.7% (818 of 3055 strings) --- OsmAnd/res/values-ar/phrases.xml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml index fdcbd6b473..b21f702ce1 100644 --- a/OsmAnd/res/values-ar/phrases.xml +++ b/OsmAnd/res/values-ar/phrases.xml @@ -412,7 +412,7 @@ الوصول إلى المراحيض بالكراسي المتحركة: نعم الوصول إلى المراحيض بالكراسي المتحركة: لا - الوصول إلى المراحيض: العملاء + الوصول إلى المراحيض : العملاء طاولة تغيير الحفاض لا توجد طاولة تغيير الحفاض غرفة تغيير الحفاضات @@ -706,7 +706,7 @@ نصب تذكاري حديقة الحيوانات زيارة منزلية - أدوات مساعذة للسمع + أدوات مساعدة للسمع لوازم السفن والقوارب متجر ستائر متجر الدرجات الرباعية @@ -749,7 +749,7 @@ صانع ساعات بناء إطار النوافذ - ادارة الجنائز + إدارة الجنائز تركيب الحواسيب صالون تجميل تجميل الاظافر @@ -796,7 +796,7 @@ نادي التصوير الفوتوغرافي نادي الرماية نادي السياحة - نادي جمعية خيرية + جمعية خيرية محفل ماسوني نادي الإبحار نادي الكشافة @@ -865,11 +865,21 @@ سوق عيد الميلاد متجر عيد الميلاد شجرة عيد الميلاد - بناية استعجالات + هياكل الإستعجالات متجر الأدوات المنزلية احتياطي مياه الحرائق ممهل محطة المطار بوابة الصعود + نادي الفنون + نادي علم الفلك + نادي الإعلام الآلي + نادي الدراجات النارية + نادي للرياضة + نادي للألعاب + نادي السيارات + نادي الشطرنج + نادي قدامى المحاربين + نادي الصيد From 13b2acd8f4628a156ccc1661b596dd31d29614de Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Thu, 22 Dec 2016 00:46:47 +0000 Subject: [PATCH 79/83] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index d5a14f75c8..55c94bc19a 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2679,4 +2679,9 @@ Facebook：https://www.facebook.com/osmandapp 水 等高線的線寬 等高線的線寬 + 等高線的密度 + 等高線的密度 + 高 + 中 + 低 From 55353c4bed5259d10d51988921cd411f51394c66 Mon Sep 17 00:00:00 2001 From: Franco Date: Thu, 22 Dec 2016 00:52:21 +0000 Subject: [PATCH 80/83] Translated using Weblate (Spanish (American)) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-es-rUS/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml index be95e77463..72ae5c5ed3 100644 --- a/OsmAnd/res/values-es-rUS/strings.xml +++ b/OsmAnd/res/values-es-rUS/strings.xml @@ -2502,4 +2502,11 @@ Si amas a OsmAnd, OSM y quieres apoyarlos, esta es una perfecta manera de hacerl Serbio (latín) Chino (Hong Kong) Agua + Densidad de las curvas de nivel + Densidad de curvas de nivel + Alto + Mediano + Bajo + Anchura de las curvas de nivel + Anchura de curvas de nivel From 6495807a02844d417d859420f82349acb61a8df5 Mon Sep 17 00:00:00 2001 From: Franco Date: Mon, 19 Dec 2016 03:06:10 +0000 Subject: [PATCH 81/83] Translated using Weblate (Spanish (American)) Currently translated at 100.0% (3055 of 3055 strings) --- OsmAnd/res/values-es-rUS/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml index a6d1a5910d..b5fda68dc8 100644 --- a/OsmAnd/res/values-es-rUS/phrases.xml +++ b/OsmAnd/res/values-es-rUS/phrases.xml @@ -3155,4 +3155,6 @@ Construcción: Domo Construcción: Oculta +Estación ferroviaria de carga + From bf6d0e84a6733b82fbabd307fbfe24752f169f86 Mon Sep 17 00:00:00 2001 From: jf-simon Date: Wed, 21 Dec 2016 20:44:29 +0000 Subject: [PATCH 82/83] Translated using Weblate (German) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index c53a87bf12..c42f4e2c3b 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2602,4 +2602,5 @@ und vieles mehr ... Dichte der Höhenlinien Höhe Mittel + Niedrig From 0cbc5e9142fce585836273e292c570ac8e67b8ac Mon Sep 17 00:00:00 2001 From: Ajeje Brazorf Date: Thu, 22 Dec 2016 11:05:33 +0000 Subject: [PATCH 83/83] Translated using Weblate (Sardinian) Currently translated at 100.0% (2111 of 2111 strings) --- OsmAnd/res/values-sc/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 2541f40816..5cf99da719 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -2657,4 +2657,9 @@ Si istimas OsmAnd e OSM e los boles suportare, custa est una manera perfeta pro Ispessore curvas de livellu Ispessore curvas de livellu Abba + Densidade de curvas de livellu + Densidade de curvas de livellu + Arta + Mesana + Bassa