From 0dd39caa71c54b46a88cf190a4434b5b75f393a1 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 22 Oct 2015 22:48:47 +0300 Subject: [PATCH 1/4] Fix OsmandRegions --- .../src/net/osmand/map/OsmandRegions.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java index cb5db953c6..8d6ee064d4 100644 --- a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java +++ b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java @@ -97,19 +97,35 @@ public class OsmandRegions { } private String getLang(BinaryMapDataObject o) { - return o.getNameByType(langType); + if (langType != null) { + return o.getNameByType(langType); + } else { + return null; + } } private String getMetric(BinaryMapDataObject o) { - return o.getNameByType(metricType); + if (metricType != null) { + return o.getNameByType(metricType); + } else { + return null; + } } private String getLeftHandDriving(BinaryMapDataObject o) { - return o.getNameByType(leftHandDrivingType); + if (leftHandDrivingType != null) { + return o.getNameByType(leftHandDrivingType); + } else { + return null; + } } private String getRoadSigns(BinaryMapDataObject o) { - return o.getNameByType(roadSignsType); + if (roadSignsType != null) { + return o.getNameByType(roadSignsType); + } else { + return null; + } } public String getDownloadName(BinaryMapDataObject o) { From 553bbb23af0b5d94cd9754deca7a81b669d1b694 Mon Sep 17 00:00:00 2001 From: Evgenii Martynenko Date: Thu, 22 Oct 2015 21:25:00 +0200 Subject: [PATCH 2/4] Translated using Weblate (Russian) Currently translated at 99.4% (1762 of 1772 strings) --- OsmAnd/res/values-ru/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index c6e645d019..b01ba845af 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2148,4 +2148,7 @@ Обновить все (%1$s Мб) Использовано бесплатных загрузок Вы можете посмотреть сколько бесплатных загрузок вы использовали - +Буфер обмена + QR-код + гео: + From aed9bc5791e57acc9ae6f8a29a847f3441057078 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Thu, 22 Oct 2015 21:48:52 +0200 Subject: [PATCH 3/4] Translated using Weblate (Swedish) Currently translated at 99.3% (1760 of 1772 strings) --- OsmAnd/res/values-sv/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 564860197b..4b6ea9d330 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -332,7 +332,7 @@ Europa Europa - Frankrike Europa - Tyskland -Europa/Asien - Ryssland +Ryssland Afrika Asien Oceanien @@ -2049,4 +2049,6 @@ Gratis nedladdningar hämtade Du kan ange hur många gratis nedladdningar som du har gjort Hämtar - %1$d fil(er) + Urklipp + geo: From 7139835194328d34b6017cd52f6b2d996eb5c91c Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 22 Oct 2015 20:00:07 +0200 Subject: [PATCH 4/4] Translated using Weblate (Danish) Currently translated at 100.0% (2057 of 2057 strings) --- OsmAnd/res/values-da/phrases.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 7d6358253c..b245166840 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -2183,7 +2183,7 @@ Socialfacilitet: bosted Socialfacilitet: plejehjem - Socialfacilitet: opsøgende + Socialfacilitet: privat humanitær organisation Socialfacilitet: madcentral Socialfacilitet: herberg Socialfacilitet: ambulant behandling @@ -2198,7 +2198,7 @@ Socialmålgruppe: unge Socialmålgruppe: hjemløse Socialmålgruppe: indvandrere - Socialmålgruppe: underprivilegerede + Socialmålgruppe: dårligt stillede Socialmålgruppe: stofmisbrugere Socialmålgruppe: arbejdsløse Socialmålgruppe: syge