From 945ef131843aa969ac217779d1642b11c169ce1d Mon Sep 17 00:00:00 2001 From: Laurentiu Dobrota Date: Fri, 17 Jul 2015 08:47:52 +0200 Subject: [PATCH 01/13] Translated using Weblate (Romanian) Currently translated at 78.1% (1346 of 1723 strings) --- OsmAnd/res/values-ro/strings.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index f73b768693..d8a8486c5d 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1,4 +1,5 @@ -Serviciul sleep încă rulează în background. Doriți să-l opriți? + +Serviciul sleep încă rulează în background. Doriți să-l opriți? Modificări în versiunea 1.0.0 : \n\t* Rutare îmbunătățită, mai rapidă și mai exactă (până la 250 km) \n\t* Posibilitate afișare hartă exclusiv pentru drumuri @@ -1673,4 +1674,7 @@ Europa - Marea Britanie Se calculează segment de traseu OsmAnd fără Internet Utilizaţi drumul cel mai scurt - \ No newline at end of file + Implicit(13) + Implicit(cyan transparent) + Culoare GPX + From e94399d56dd4b5d9adc989ab2d8171d2f451a38b Mon Sep 17 00:00:00 2001 From: Onkar Shinde Date: Fri, 17 Jul 2015 08:00:13 +0200 Subject: [PATCH 02/13] Translated using Weblate (Marathi) Currently translated at 4.1% (36 of 873 strings) --- OsmAnd/res/values-mr/phrases.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-mr/phrases.xml b/OsmAnd/res/values-mr/phrases.xml index f042d42766..dd5a44db84 100644 --- a/OsmAnd/res/values-mr/phrases.xml +++ b/OsmAnd/res/values-mr/phrases.xml @@ -17,4 +17,23 @@ वायु परिवहन जल परिवहन उर्जा - + क्रिडा + कला + नैसर्गिक + बेकरी + मद्य + चॉकलेट दुकान + कॉफी दुकान + मॉल + मांस + चहाचे दुकान + वाइन दुकान + + सायकल दुकान + कपड्याचे दुकान + मुलांचे कपडे + कॉम्प्युटर दुकान + पडद्याचे दुकान + फुलांचे दुकान + फर्निचर + From 2cca1a6bc537aea4faffc97db8e97ffac349f0f6 Mon Sep 17 00:00:00 2001 From: Nicolas Palix Date: Fri, 17 Jul 2015 18:30:54 +0200 Subject: [PATCH 03/13] Translated using Weblate (French) Currently translated at 100.0% (873 of 873 strings) --- OsmAnd/res/values-fr/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml index 67507e3668..be3460d2d1 100644 --- a/OsmAnd/res/values-fr/phrases.xml +++ b/OsmAnd/res/values-fr/phrases.xml @@ -915,4 +915,6 @@ Passe à bus Réseau régional de randonnée pédestre Pays + Tarif + From 1905fbbf16ff1697b63dc561ff4394c874566572 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Fri, 17 Jul 2015 15:27:01 +0200 Subject: [PATCH 04/13] Translated using Weblate (Belarusian) Currently translated at 98.8% (863 of 873 strings) --- OsmAnd/res/values-be/phrases.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index d401884db2..f4555a5756 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -907,4 +907,20 @@ Кран Краіна Прасека + Кантроль:аплата + +Патрабаванне:максімальная хуткасць + Патрабаванне:максімальная вышыня + Патрабаванне:мінімальная адлегласць + Патрабаванне:кантроль + Патрабаванне:доступ + Патрабаванне:святлафоры + Аплата + + Невыкарыстоўваемы + + Закінуты + Максімальная вага + Максімальная вышыня + Гадзіны абслугоўвання From dc2529acf0b7faefb0f52bc62f9d47b7dbed6b4f Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Fri, 17 Jul 2015 18:01:01 +0200 Subject: [PATCH 05/13] Translated using Weblate (Sardinian) Currently translated at 88.8% (776 of 873 strings) --- OsmAnd/res/values-sc/phrases.xml | 63 +++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml index 7783ded57e..f157efc045 100644 --- a/OsmAnd/res/values-sc/phrases.xml +++ b/OsmAnd/res/values-sc/phrases.xml @@ -767,4 +767,65 @@ Butega de mùsica Giogos Videogiogos - + Butega de casu + Tziculateria + Butega de pasta + Pastisseria + Càmeras e lentes + Butega de candelas + Butega de moda + Artìculos pro Freefly (paracadutismu) + Butega de calorìferos + Butega de artìculos pro su giardinu + Butega de còrgiu + Butega de pneumàticos + Butega de relògios + Artìculos pro piscinas + Modellos a iscala + Trofeos, prèmios + Pirotècnica + Armeria + + Turre de osservatzione + Àrea amparada + + Grue + Istadu + Cabina + Àrea religiosa + Àrea birde comune de sa bidda + Imprestadinare + Àrbore + Barriera pro bitzicletas + Barriera pro mototzicletas + Isoladu (bighinadu) + Trampa pro postales + Barriera genèrica + Limitadore de artària + Tornellu + Intrada + Intrada printzipale + Intrada + Essida + + Oràrios de abertura + Descritzione + Telèfonu + Giassu/situ web + Oràrios de servìtziu + Artària màssima + Pesu màssimu + Abbandonadu + Foras de usu (disusadu) + + Operadore + Marca + Controllu: semàforos + Controllu: lestresa màssima + Controllu: artària màssima + Controllu: distàntzia mìnima + Controllu: ispetziones + Controllu: atzessu + Controllu: pedàgiu + + From c8f20c06058a8c26a4a2e86c351fd96da432ed8f Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 18 Jul 2015 17:05:07 +0200 Subject: [PATCH 06/13] fix rounding of average speed in GPX analysis --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index f44bfd6f55..abefa6b3ef 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -1,3 +1,4 @@ + package net.osmand.plus; import java.io.BufferedInputStream; @@ -305,9 +306,9 @@ public class GPXUtilities { // 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods. if(speedCount > 0) { if(timeMoving > 0){ - avgSpeed = (float) (totalDistanceMoving / timeMoving * 1000); + avgSpeed = (float)totalDistanceMoving / (float)timeMoving * 1000; } else { - avgSpeed = (float) (totalSpeedSum / speedCount); + avgSpeed = (float)totalSpeedSum / (float)speedCount; } } else { avgSpeed = -1; From 7788a75eb8933c8cb99f3ad7e17061e250faca7e Mon Sep 17 00:00:00 2001 From: Hisham Omar Date: Sat, 18 Jul 2015 11:03:17 +0200 Subject: [PATCH 07/13] Translated using Weblate (Arabic) Currently translated at 81.7% (1408 of 1723 strings) --- OsmAnd/res/values-ar/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index bddf90df14..2a091db2f6 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -1322,7 +1322,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن تاريخي استخدام الاراضي وقت الفراغ - من صنع الانسان + من صنع الإنسان عسكري طبيعي مكتب From dc8478e5615c3a3d2734075de66d0f24025ddd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Pa=C4=8Di=C4=87?= Date: Sat, 18 Jul 2015 15:29:19 +0200 Subject: [PATCH 08/13] Translated using Weblate (Croatian) Currently translated at 76.3% (1315 of 1723 strings) --- OsmAnd/res/values-hr/strings.xml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml index 3956c8a0ba..ca713dcc5b 100644 --- a/OsmAnd/res/values-hr/strings.xml +++ b/OsmAnd/res/values-hr/strings.xml @@ -48,7 +48,7 @@ Mjerenje udaljenosti Zvučni zapisi - Zabilježi zvučne/video zapise tijekom putovanja + Audio/Video dodatak pruža mogućnost da zabilježite fotografiju ili video tokom puta, koristeći gumb na zaslonu karte, ili izravno u kontekstnom izborniku za bilo koje mjesto na karti. Ostale karte Samo ceste Regularne karte @@ -595,7 +595,7 @@ \n\t* EGM96 geoid offset correction for GPS altitude readings " OsmAnd dodatak za offline slojnice - Dodatak za Slojnice + Slojnice "Promjene u 1.0.0: \n\t* Poboljšana navigacija: brža i preciznija, do 250 km @@ -708,7 +708,7 @@ Učitavanje OsmAnd nadogradnji-… Odaberite jednu od OsmAnd nadogradnji za instalaciju Instalirajte verziju - Mapa za pohranu + Mapa za pohranu podataka Instalirana je prethodna inačica OsmAnd aplikacije. Svi offline podaci će biti podržani od strane nove inačice aplikacije. Ali Favorite treba izvesti iz stare aplikacije i kasnije uvesti u novu. Ne mogu pronaći određenu mapu. @@ -1332,8 +1332,8 @@ Koristiti HTTPS %1$s treba dozvolu za isključivanje zaslona za značajku uštede energije. - Trenutna boja GPX traga - Trenutna širina GPX traga + Boja GPX traga + Širina GPX traga Crvena Prozirna crvena Prozirna narančasta @@ -1349,7 +1349,7 @@ Prozirna plava Ljubičasta Prozirna ljubičasta - Kako bi se primijenile promjene, potrebno je ponovno pokretanje aplikacije. + Kako bi se u potpunosti primijenile promjene, potrebno je ponovno pokrenuti aplikaciju. Svijetla Tamna Bengalski @@ -1549,4 +1549,11 @@ Odredište Wikipedia Zatvori promjene + + Unutarnja memorija + U mnogim zemljama (Njemačka, Francuska, Italija, i druge) Korištenje upozorenja za nadolazeće uređaje za mjerenje brzine nije dopušteno zakonom. OsmAnd ne preuzima nikakvu odgovornost ako kršite zakon. Molimo kliknite da samo ako ste sigurni da želite koristiti ovu značajku. + zakasnio + OsMo (OSM Monitoring) + Prikaži + Lokalno From 1a3aea4b7998526d481b75a92f5cc8e4a001f81f Mon Sep 17 00:00:00 2001 From: S k Date: Sat, 18 Jul 2015 14:55:59 +0200 Subject: [PATCH 09/13] Translated using Weblate (Malayalam) Currently translated at 0.9% (8 of 873 strings) --- OsmAnd/res/values-ml/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-ml/phrases.xml b/OsmAnd/res/values-ml/phrases.xml index 935939a6bf..ee629cc6b2 100644 --- a/OsmAnd/res/values-ml/phrases.xml +++ b/OsmAnd/res/values-ml/phrases.xml @@ -4,4 +4,7 @@ നാച്ചുറല്‍ നോട്ടിക്കല്‍ വിക്കിപീഡിയ + കിയോസ്ക് + മെഡിക്കല്‍ സ്ടോര്‍ + സെല്‍ഫോണ്‍ കട From 2ff7517b33d7921aef77ff4bce02cb944ce89a0d Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 18 Jul 2015 17:39:55 +0200 Subject: [PATCH 10/13] introduce rounding in format, too --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 2 +- OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index abefa6b3ef..6277b66929 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -306,7 +306,7 @@ public class GPXUtilities { // 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods. if(speedCount > 0) { if(timeMoving > 0){ - avgSpeed = (float)totalDistanceMoving / (float)timeMoving * 1000; + avgSpeed = (float)totalDistanceMoving / (float)timeMoving * 1000f; } else { avgSpeed = (float)totalSpeedSum / (float)speedCount; } diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index dc603a9832..5b57871d42 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -127,15 +127,15 @@ public class OsmAndFormatter { // case of car return ((int) Math.round(kmh)) + " " + ctx.getString(R.string.km_h); } - int kmh10 = (int) (kmh * 10f); - // calculate 2.0 km/h instead of 2 km/h in order to not stress UI text lengh + int kmh10 = (int) Math.round(kmh * 10f); + // for smaller values display 1 decimal digit (x.0 km/h instead of x km/h) return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h); } else { float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE; if (mph >= 10) { return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour); } else { - int mph10 = (int) (mph * 10f); + int mph10 = (int) Math.round(mph * 10f); return (mph10 / 10f) + " " + ctx.getString(R.string.mile_per_hour); } } From 970ce86ca58e597c8b139a15c51f98ed86e7378c Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 18 Jul 2015 17:47:18 +0200 Subject: [PATCH 11/13] fix old omission, it seems --- OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index 5b57871d42..8eab7654f5 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -132,7 +132,7 @@ public class OsmAndFormatter { return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h); } else { float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE; - if (mph >= 10) { + if (mph >= 10 || am.hasFastSpeed()) { return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour); } else { int mph10 = (int) Math.round(mph * 10f); From 635b751be68f90f04fc3fd6e43a78afb8f9462d8 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 18 Jul 2015 17:43:32 +0200 Subject: [PATCH 12/13] Translated using Weblate (Slovak) Currently translated at 97.8% (854 of 873 strings) --- OsmAnd/res/values-sk/phrases.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml index 94fba1559c..725ffdc67d 100644 --- a/OsmAnd/res/values-sk/phrases.xml +++ b/OsmAnd/res/values-sk/phrases.xml @@ -910,4 +910,10 @@ Vynútenie:prístup Vynútenie:mýto - +Krajina + Vynútenie:minimálna vzdialenosť + Vynútenie:maximálna rýchlosť + Poplatok + + Otváracie hodiny + From 5f7b295614016c81d9110cec33702b009a3a33db Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 18 Jul 2015 18:25:38 +0200 Subject: [PATCH 13/13] shift precision cutover of avgSpeed display form 10%/1% to more realistic 5%/0.5% --- OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index 8eab7654f5..67b22af97f 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -123,16 +123,16 @@ public class OsmAndFormatter { ApplicationMode am = settings.getApplicationMode(); float kmh = metersperseconds * 3.6f; if (mc == MetricsConstants.KILOMETERS_AND_METERS) { - if (kmh >= 10 || am.hasFastSpeed()) { - // case of car + // e.g. car case and for high-speeds: Display rounded to 1 km/h (5% precision at 20 km/h) + if (kmh >= 20 || am.hasFastSpeed()) { return ((int) Math.round(kmh)) + " " + ctx.getString(R.string.km_h); } + // for smaller values display 1 decimal digit x.y km/h, (0.5% precision at 20 km/h) int kmh10 = (int) Math.round(kmh * 10f); - // for smaller values display 1 decimal digit (x.0 km/h instead of x km/h) return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h); } else { float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE; - if (mph >= 10 || am.hasFastSpeed()) { + if (mph >= 20 || am.hasFastSpeed()) { return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour); } else { int mph10 = (int) Math.round(mph * 10f);