From 3f21b5e4af10ce2f84272b25d678d35ae41ef6db Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Fri, 21 Aug 2015 18:16:37 +0300 Subject: [PATCH 01/14] Merge fix --- .../osmand/plus/osmedit/OsmEditingPlugin.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index dbbdd5820f..7c9aabcb43 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -69,7 +69,7 @@ public class OsmEditingPlugin extends OsmandPlugin { private OsmBugsLayer osmBugsLayer; private OsmEditsLayer osmEditsLayer; - private EditingPOIDialogProvider poiActions; +// private EditingPOIDialogProvider poiActions; @Override public void updateLayers(OsmandMapTileView mapView, MapActivity activity) { @@ -120,8 +120,8 @@ public class OsmEditingPlugin extends OsmandPlugin { @Override public void mapActivityCreate(MapActivity activity) { // Always create new actions ! - poiActions = new EditingPOIDialogProvider(activity, this); - activity.addDialogProvider(getPoiActions(activity)); +// poiActions = new EditingPOIDialogProvider(activity, this); +// activity.addDialogProvider(getPoiActions(activity)); activity.addDialogProvider(getBugsLayer(activity)); } @@ -131,12 +131,12 @@ public class OsmEditingPlugin extends OsmandPlugin { return SettingsOsmEditingActivity.class; } - public EditingPOIDialogProvider getPoiActions(MapActivity activity) { - if (poiActions == null) { - poiActions = new EditingPOIDialogProvider(activity, this); - } - return poiActions; - } +// public EditingPOIDialogProvider getPoiActions(MapActivity activity) { +// if (poiActions == null) { +// poiActions = new EditingPOIDialogProvider(activity, this); +// } +// return poiActions; +// } @Override public void registerMapContextMenuActions(final MapActivity mapActivity, @@ -149,8 +149,11 @@ public class OsmEditingPlugin extends OsmandPlugin { public boolean onContextMenuClick(ArrayAdapter adapter, int resId, int pos, boolean isChecked) { if (resId == R.string.context_menu_item_create_poi) { //getPoiActions(mapActivity).showCreateDialog(latitude, longitude); + EditPoiFragment editPoiFragment = + EditPoiFragment.createAddPoiInstance(latitude, longitude, + mapActivity.getMyApplication()); mapActivity.getSupportFragmentManager().beginTransaction() - .add(R.id.fragmentContainer, new EditPoiFragment(), EditPoiFragment.TAG) + .add(R.id.fragmentContainer, editPoiFragment, EditPoiFragment.TAG) .addToBackStack(null) .commit(); } else if (resId == R.string.context_menu_item_open_bug) { @@ -158,11 +161,13 @@ public class OsmEditingPlugin extends OsmandPlugin { registerLayers(mapActivity); } osmBugsLayer.openBug(latitude, longitude); - } else if (resId == R.string.poi_context_menu_delete) { - getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj); - } else if (resId == R.string.poi_context_menu_modify) { - getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj); - } + } //else if (resId == R.string.poi_context_menu_delete) { + // TODO implement delete +// getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj); +// } else if (resId == R.string.poi_context_menu_modify) { + // TODO implement edit +// getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj); +// } return true; } }; From 65840c619fe04e20924a108e04eb4166a1a4dfe2 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Fri, 21 Aug 2015 21:05:04 +0200 Subject: [PATCH 02/14] Translated using Weblate (Slovak) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-sk/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 560aef6b96..3237aa3e8e 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2258,4 +2258,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Preskočiť OsmAnd Offline mapy\n& Navigácia +Odoslať POI From 131269a865c0e50a2ca5d3e333cf830b1e8c8920 Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Sat, 22 Aug 2015 03:27:46 +0200 Subject: [PATCH 03/14] Translated using Weblate (German) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-de/strings.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index be430b0473..9419a0e635 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2239,17 +2239,23 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Bewerten Sie diese App Bitte bewerten Sie OsmAnd auf Google Play Sagen Sie uns warum. - Bitte teilen Sie uns mit welche Änderungen Sie sich für diese App wünschen. + Bitte teilen Sie uns mit, was Sie an dieser App ändern würden. Wir kümmern uns wirklich - Keine Updates verfügbar - Live-Updates + Keine Aktualisierungen verfügbar + Live-Aktualisierungen Ihre Meinung ist uns sehr viel wert, Rückmeldungen sind uns wichtig. Hochladen ist fehlgeschlagen Erfolgreich hochgeladen {0}/{1} Erneut versuchen Fehler: {0} - Dashboard-Optionen - Rückgängig + Übersichtsseitenoptionen + Rückgängig machen Überspringen OsmAnd - + Gefährdung + Hervorhebender Umriss + Änderung löschen + Karte war verdeckt + Offline-Karten\n& Navigation + POI übermitteln + From c73b8d8949f1a281cc0c895c45ec632652e16a9c Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 22 Aug 2015 04:21:55 +0200 Subject: [PATCH 04/14] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index ffaca91829..2b58d88886 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2081,4 +2081,5 @@ 跳過 OsmAnd 離線地圖\n和導航 +提交興趣點 From 26a6393cd31bb97c3ca20e8726143561ce9dea6b Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Sat, 22 Aug 2015 11:02:22 +0300 Subject: [PATCH 05/14] Poi fix --- .../osmand/plus/osmedit/OsmEditingPlugin.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index dbbdd5820f..7c9aabcb43 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java @@ -69,7 +69,7 @@ public class OsmEditingPlugin extends OsmandPlugin { private OsmBugsLayer osmBugsLayer; private OsmEditsLayer osmEditsLayer; - private EditingPOIDialogProvider poiActions; +// private EditingPOIDialogProvider poiActions; @Override public void updateLayers(OsmandMapTileView mapView, MapActivity activity) { @@ -120,8 +120,8 @@ public class OsmEditingPlugin extends OsmandPlugin { @Override public void mapActivityCreate(MapActivity activity) { // Always create new actions ! - poiActions = new EditingPOIDialogProvider(activity, this); - activity.addDialogProvider(getPoiActions(activity)); +// poiActions = new EditingPOIDialogProvider(activity, this); +// activity.addDialogProvider(getPoiActions(activity)); activity.addDialogProvider(getBugsLayer(activity)); } @@ -131,12 +131,12 @@ public class OsmEditingPlugin extends OsmandPlugin { return SettingsOsmEditingActivity.class; } - public EditingPOIDialogProvider getPoiActions(MapActivity activity) { - if (poiActions == null) { - poiActions = new EditingPOIDialogProvider(activity, this); - } - return poiActions; - } +// public EditingPOIDialogProvider getPoiActions(MapActivity activity) { +// if (poiActions == null) { +// poiActions = new EditingPOIDialogProvider(activity, this); +// } +// return poiActions; +// } @Override public void registerMapContextMenuActions(final MapActivity mapActivity, @@ -149,8 +149,11 @@ public class OsmEditingPlugin extends OsmandPlugin { public boolean onContextMenuClick(ArrayAdapter adapter, int resId, int pos, boolean isChecked) { if (resId == R.string.context_menu_item_create_poi) { //getPoiActions(mapActivity).showCreateDialog(latitude, longitude); + EditPoiFragment editPoiFragment = + EditPoiFragment.createAddPoiInstance(latitude, longitude, + mapActivity.getMyApplication()); mapActivity.getSupportFragmentManager().beginTransaction() - .add(R.id.fragmentContainer, new EditPoiFragment(), EditPoiFragment.TAG) + .add(R.id.fragmentContainer, editPoiFragment, EditPoiFragment.TAG) .addToBackStack(null) .commit(); } else if (resId == R.string.context_menu_item_open_bug) { @@ -158,11 +161,13 @@ public class OsmEditingPlugin extends OsmandPlugin { registerLayers(mapActivity); } osmBugsLayer.openBug(latitude, longitude); - } else if (resId == R.string.poi_context_menu_delete) { - getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj); - } else if (resId == R.string.poi_context_menu_modify) { - getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj); - } + } //else if (resId == R.string.poi_context_menu_delete) { + // TODO implement delete +// getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj); +// } else if (resId == R.string.poi_context_menu_modify) { + // TODO implement edit +// getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj); +// } return true; } }; From 4b384fb41bca1a8f69b12bf62650e737d95a9e9d Mon Sep 17 00:00:00 2001 From: Denis Jukni Date: Sat, 22 Aug 2015 01:46:12 +0200 Subject: [PATCH 06/14] Translated using Weblate (Albanian) Currently translated at 3.4% (60 of 1745 strings) --- OsmAnd/res/values-sq/strings.xml | 46 +++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-sq/strings.xml b/OsmAnd/res/values-sq/strings.xml index c1f92e6688..d676c93787 100644 --- a/OsmAnd/res/values-sq/strings.xml +++ b/OsmAnd/res/values-sq/strings.xml @@ -1,15 +1,16 @@ - - Pasqyrim i hartes: - Ecje me kemb + + + Pasqyrim i hartës + Eskursion Motoçikletë Varkë Avion - Ju lutem vizitoni https://code.google.com/p/osmand/wiki/FAQ qe te shihni pyetjet te parashtruar me se teper. + Ju lutem vizitoni https://code.google.com/p/osmand/wiki/FAQ që të shihni pyetjet të parashtruar më së tepër. Pyetjet e bëra më shpesh - Ju do të fshini %1$d ndryshime nga OSM. A jeni i sigurt? + Ju po fshini %1$d ndryshime nga OSM. A jeni i sigurt? Fshij të gjitha - Ju lutem, fillimisht llogaritni rrugen - Mos harroni zgjedhjen time + Ju lutem, fillimisht llogaritni rrugën + Kujto zgjedhjen time dhe ose @@ -17,7 +18,7 @@ Jo Po Stili Hartës - Versioni: + Versioni : Rreth Informacion versioni, liçensat, anëtarët e projektit Skadon (minuta): %1$s @@ -34,8 +35,33 @@ Njofto… Njofto emrat e rrugëve (TTS) - Njofto limitin e shpejtësisë + Njofto kufizimin e shpejtësisë Njofto kamerat e shpejtësisë Mbaj pikat ndërmjetëse Fshi pikat ndërmjetëse - \ No newline at end of file + Ndriçimi + Hiç numrat e shtëpive + Aksion i krijuar + Aksion i modifikuar + Aksion i fshirë + Fillo + Vendet e mia + Gjurmët e deritanishme të rregjistruara + Shënimet e audio/video + ditët pas + Kujdes + Stil i rrugës + Mbikalim për këmbësorë + Jo v1.9 rregullat e llogaritjes së rrugëtimit + Vlera veriore + Vlera lindore + Shtëpia + Hiç ndërtesat + Përdor filterat e Kalmanit + Shkalla malore e ecjes në këmbë/eskursion (SAC) + Shtoje si pikë rruge të fundit + Shko tek rruga + Faleminderit që përdorni OsmAnd. Për shumë përfitime të këtij programi ju keni nevojë për disa të dhëna regjonale \"offline\" të cilat ju mund ti shkarkoni tek \"Ndryshimet\" → \"Menagjo skedarët e hartave\". Më pas ju do të jeni në gjendje të shihni hartat, gjeni adresat, shikoni pikat e interesit, dhe të gjeni transportin publik. + Shtëpia + Ju jeni përafërsisht të %1$s %2$s elemente. Dëshironi të vazhdoni? + From 2da2481a9da3caba58cb47c2cdab69f3aee3f3b4 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 22 Aug 2015 06:12:36 +0200 Subject: [PATCH 07/14] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 2b58d88886..842b517809 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2004,9 +2004,9 @@ 您要刪除 %1$d 的注解。您確定嗎？ 未啟用位置服務。您想要開啟它嗎？ 預防單獨的日誌記錄 - 當應用程式被停止，將暫停 GPX 日誌記錄 (藉由新近的 apps)。(OsmAnd 睡眠模式指示，從通知列消失。) - 您已下載有舊的且不相容的維基百科資料。您想要將其存檔嗎? - 您想要下載增加的維基百科資料嗎 (%1$s MB)？ + 當應用程式被停止，將暫停 GPX 日誌記錄 (藉由新的應用程式)。(OsmAnd 睡眠模式指示，從通知列消失。) + 您已下載有，舊的且不相容的維基百科資料。您想要將其存檔嗎？ + 您想要下載所增加的維基百科資料 (%1$s MB) 嗎？ 沃拉普克語 泰語 泰盧固語 @@ -2039,7 +2039,7 @@ 盧森堡語 奧塞提亞語 世界語 - 為了徹底的把變更套用，必需手動重新啟動應用程式。 + 為了徹底套用所變更的，必需以手動重新啟動應用程式。 GPX 的顏色 GPX 的寬度 紅色 From f3b0e6204f3efe1f4d0fd74a7fd52fd3fb410086 Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Sat, 22 Aug 2015 03:32:23 +0200 Subject: [PATCH 08/14] Translated using Weblate (German) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-de/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 9419a0e635..71111feb46 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -180,9 +180,9 @@ Mehr Details in Karte Aktivieren Sie das Online-Karten-Plugin, um andere Kartenquellen nutzen zu können Online- und Kachel-Karten - Online-Karten verwenden (lädt Kacheln aus dem Internet und speichert diese auf der SD-Karte) + Online-Karten verwenden (Kacheln auf die SD-Karte herunterladen und zwischenspeichern) Online-Karten - Konfiguration von Kachel-Kartenquellen, sowie Over- & Underlay Einstellungen + Online- oder zwischengespeicherte Kachelkartenquellen konfigurieren "Dieses Plugin ermöglicht die Verwendung zahlreicher Online Kachel-Kartenquellen, von vordefinierten Openstreetmap-Kacheln (wie Mapnik) über Satellitenbilder bis zu speziellen Overlays wie Wetterkarten, Klimakarten, geologischen Karten, Reliefkarten, et.\n\nAlle Karten können sowohl als Hauptkarte wie auch als Overlay oder Unterlage für OsmAnds reguläre Offline-Karten verwendet werden. Um unterleget Karten sichtbarer zu machen, können gewisse Elemente der OsmAnd Offline-Karten im Menü \'Karte konfigurieren\' ausgeblendet werden. verwendet werden).\n\nKarten-Kacheln können direkt online bezogen werden, und werden im OsmAnd Unterordner \'tiles\' zwischengespeichert. Sie können für die Offline-Verwendung auch von anderen Tools als sqlite-Datei vorbereitet und manuell in den OsmAnd \'tiles\' Unterordner kopiert werden. " @@ -338,7 +338,7 @@ Nutzerprofilspezifische Einstellungen (Autofahrer, Radfahrer, Fußgänger) Globale Einstellungen Karten-Management - Laden und Verwalten von Landkarten + Herunterladen und Verwalten von auf Ihrem Gerät gespeicherten Offline-Kartendateien Allgemein Allgemeine Einstellungen Konfiguration der Anzeige und anderer allgemeiner Einstellungen @@ -650,7 +650,7 @@ Sprachansagen (Aufnahmen) Online- und Kachel-Karten - Offline-Karten + Offline-Karten (Vektor) POI-Daten TTS Sprachansage Neue Suche @@ -1177,7 +1177,7 @@ Auswählen für Länder mit Linksverkehr Startpunkt ist noch nicht ermittelt - Möchten Sie den Datei-Download abbrechen? + Möchten Sie das Herunterladen der Datei unterbrechen? Die Basis-Karte wird für die korrekte Benutzung der Anwendungen benötigt und ist für das Herunterladen vorausgewählt. Routing-Daten From 74d063aa2691d8f09d25899cd8fd3f7dee9e51db Mon Sep 17 00:00:00 2001 From: Kudret Emre Date: Fri, 21 Aug 2015 21:28:07 +0200 Subject: [PATCH 09/14] Translated using Weblate (Turkish) Currently translated at 62.5% (1092 of 1745 strings) --- OsmAnd/res/values-tr/strings.xml | 48 +++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index e2fdced6ba..67d3243b72 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -881,8 +881,8 @@ Sokak Bina numarası İnternet sitesi - Kayıt servisleri ve Uyku modu - Seyahatlerin nasıl kaydedileceğini ve uyku modunu yapılandırın + Seyahat kaydetme + Seyahatlerinizi nasıl kaydedeceğinizi yapılandırın Yükleme versiyonu Uygulama teması seç @@ -972,7 +972,7 @@ m Özel süzgeç Belirtilen dizin bulunamıyor. - Depo dizini + Veri depolama dizini Önceki bir OsmAnd sürümü yüklü. Tüm çevrimdışı veri yeni uygulama tarafından desteklenecek. Fakat Favori noktalar eski uygulamada dışa aktarılıp, sonra yeni uygulamada içe aktarılmalıdır. {0} yapımı başarıyla yüklendi ({1}). Yapı indiriliyor… @@ -1349,4 +1349,44 @@ Trafik uyarısı Trafik uyarıları Her zaman sor - + OsmAnd\'a Aktar + Tüm metni oku (çevrimiçi) + OSMC\'ye göre renklendiriliyor + %1$d notu silmek üzeresiniz. Emin misiniz? + %1%d düzenlemeyi OSM\'ye yüklemek üzeresiniz? Emin misiniz? + Deniz haritası görünümü + Kayak haritası görünümü + Yazı boyutu + Haritadaki yazı boyutunu ayarla. + Yakındaki Favorileri bildir + Yakındaki POI\'leri bildir + Süre + Mesafe + Araba + Bisiklet + Yaya + Davet et… + Navigasyonu Duraklat + Navigasyona Devam Et + Yerel isimler + Ev + Binaları gizle + Yazıları gizle + Daha fazla ayrıntı + Daza az ayrıntı + Yol kalitesini göster + Mesafeye göre sırala + İsme göre sırala + "Ortalama hız: %1$s " + "Maksimum hız: %1$s " + Ortalama yükseklik: %1$s + kırmızı + pembe + turuncu + kahverengi + sarı + açık mavi + mavi + yeşil + + From 7d0bf033300e853904221c55ddb7fab5dd743daf Mon Sep 17 00:00:00 2001 From: Denis Jukni Date: Fri, 21 Aug 2015 21:48:59 +0200 Subject: [PATCH 10/14] Translated using Weblate (Albanian) Currently translated at 10.0% (99 of 983 strings) --- OsmAnd/res/values-sq/phrases.xml | 106 ++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sq/phrases.xml b/OsmAnd/res/values-sq/phrases.xml index a6b3daec93..87616770e4 100644 --- a/OsmAnd/res/values-sq/phrases.xml +++ b/OsmAnd/res/values-sq/phrases.xml @@ -1,2 +1,104 @@ - - \ No newline at end of file + +Dyqan + Ushqimore + Urgjenca + Transport + Pengesë rruge + Pikë karburanti + Transport personal + Transport publik + Transport ajror + Transport ujor + Transport biçikletash + Transport ajror + Pikë rrjeti ekskursioni/biçikletash + Rrugë ekskursioni + Trafik i detyrueshëm + Prodhuar nga njeriu + Konstruksion transporti + Furnizim me ujë + Fuqi + Komunikacion + Kosh plehrash + Për blegtori + Arsim + Administratë + Shëndetësia + Zyrë + Sport + Turizëm + Shëtitje + Strehim + Internet + Kohë e lirë + Klub + Ushqim + Kafe dhe restaurant + Shërbim + Mekanik + Finance + Natyrale + Detar + Ushtria + Wikipedia + Sipas përdoruesit + + Faqe paleontologjike + + Furrë buke + Pije alkoolike + Dyqan djathi + Dyqan çokollatash + Dyqan kafeje + Artikuj të ndryshëm + Promenade + Dyqan pijesh + Dyqan mishi + Dyqan delikatesash + Produkte fshati + Fruta perime + Produkte deti + Pastiçeri + Akullore + Supermarket + Produkte çaji + Dyqan makaronash + Produkte brumi + Produkte qumështi + Produkte makinerie + Dyqan vere + + Librari + Dyqan biçikletash + Dyqan kafshësh + Produkte antike + Art + Produkte fëmijësh + Dyqan çantash + Mobilim banjosh + Mobilim dhoma gjumi + Dyqan rrobash + Fotoaparate dhe ojektiva + Dyqan tapetash + Dyqan bamirësie + Farmaci + Dyqan rrobash + Rroba fëmijësh + Dyqan këpucësh + Dyqan qirinjësh + Dyqan kompjuterash + Fotokopje + Dyqan perdesh + Metrazhe + Produkte dhoma gjumi + Produkte polumbari + Dyqan produkte shtëpie + Dyqan erotik + Dyqan mode + Dyqan peshkimi + Dyqan lulesh + Dyqan korniza pikture + Dyqan shpendësh + Dyqan aparate ngrohje + Mobileri + From 73662f4c96801b2bd3cf9ba30a49956fb33507bb Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Sat, 22 Aug 2015 03:20:12 +0200 Subject: [PATCH 11/14] Translated using Weblate (German) Currently translated at 99.7% (981 of 983 strings) --- OsmAnd/res/values-de/phrases.xml | 41 ++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index edc95f7879..1038f5c972 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -962,7 +962,7 @@ Trinkwasser kein Trinkwasser beaufsichtigt - ohen Aufsicht + Ohne Aufsicht mit Ampeln kein Zugang frei für Kunden @@ -970,4 +970,41 @@ frei für Landwirtschaft Zentrum - + Aluminium + Weiße Güter + Speiseöl + Motoröl + Giftmüll + Quecksilber + Tetrapak + Schutt + CDs + Altöl + Blech + Folie + Medikamente + Spanplatte + Gipskartonplatte + Tierischer Abfall + Überwachungsstation + Saisonal + Nicht saisonal + Trockenzeit + Regenzeit + Behälter + Frühling + Sommer + Herbst + Winter + Unkontrolliert + Unmarkiert + + Privater Zugang + Anliegerzugang + Erlaubter Zugang + Unterkunft für Hunde + Unterkunft für Katzen + Unterkunft für Hunde und Katzen + Unterkunft für Vögel + + From 26858f0ac8c9bcb9e5bb80d9d31566409921fd55 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Sat, 22 Aug 2015 16:07:54 +0200 Subject: [PATCH 12/14] Translated using Weblate (Sardinian) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-sc/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 0de594a39b..72c3b09f64 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -2056,4 +2056,7 @@ Brinca OsmAnd Mapas non in lìnia\ne Nàvigu - +Annudda atzione + Imbia PDI +S’ischeda fiat cuada + From 18ca88b6c7902c6cdf6e400c9d21e00344a9d3ec Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sat, 22 Aug 2015 16:08:20 +0200 Subject: [PATCH 13/14] Translated using Weblate (Catalan) Currently translated at 100.0% (1745 of 1745 strings) --- OsmAnd/res/values-ca/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 71f43a8dc3..f5c56a3b20 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2095,4 +2095,5 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Omet OsmAnd Mapes fora de línia\n& Navegació +Publica PDI From 6405bc0ba1f41cd5c11516923df917041e44e360 Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Sat, 22 Aug 2015 17:13:01 +0300 Subject: [PATCH 14/14] change icon color --- OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java index daa46490b2..ce3403b715 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java @@ -189,7 +189,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { final boolean isRecording = app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get(); ImageButton stop = ((ImageButton) v.findViewById(R.id.stop)); if (isRecording) { - stop.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_rec_stop, R.color.recording_color)); + stop.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_rec_stop)); } else { stop.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_rec_start)); }