From 482ee08bd122435d158bd01a7da157044680f5f6 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 01:14:57 +0100 Subject: [PATCH 01/19] add description for map legend --- OsmAnd/res/values/strings.xml | 1 + OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 65625aa2b7..e7aa66383e 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2056,4 +2056,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Feedback Contact us Map legend + Legend for OsmAnd default map style, Internet connectivity needed to display diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 041089a066..a33be023a7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -148,7 +148,7 @@ public class HelpActivity extends OsmandActionBarActivity { .show(getFragmentManager(), null); } }; - arrayList.add(new HelpMenuItem(legendName, null, onClickListener)); + arrayList.add(new HelpMenuItem(legendName, getActivity().getString(R.string.map_legend_item_description), onClickListener)); return arrayList; } From 4a4afd97370062ebf957d0fab9b5e842fd8950a2 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 8 Nov 2015 01:15:56 +0100 Subject: [PATCH 02/19] Translated using Weblate (Danish) Currently translated at 100.0% (1807 of 1807 strings) --- OsmAnd/res/values-da/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 50d004467d..73527b0585 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2011,4 +2011,5 @@ Skjul foreslåede objekter Læs mere Hvad er nyt i - + Signaturforklaring til OsmAnd standard kort format, internetforbindelse er nødvendig for at vise + From 6f4a9a6c3a4fa3c977684dc573f74473e89915d3 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 01:28:08 +0100 Subject: [PATCH 03/19] sync changes 2.2 string --- OsmAnd/no_translate.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index 95f3e527c0..e53b1bbb28 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -12,11 +12,11 @@ - \u2022 Reworked context-sensitive UI for tapping locations on the map and handling location items on other screens\n\n - \u2022 Chose if primary app control should be Dashboard or Menu based\n\n + \u2022 New context-sensitive UI for tapping locations on the map and on other screens\n\n + \u2022 Choice between Dashboard or Menu as primary app control\n\n \u2022 New Wikipedia data, now downloads per country, and with much more complete data\n\n \u2022 Better route recalculation (after repeated attempts engine now suggests a different route)\n\n - \u2022 POI Search now supports more specific queries (like fuel type and religion specific queries)\n\n + \u2022 POI Search now supports more specific queries\n\n \u2022 Map data download structure and interface reworked\n\n and more... From 5078b43cab4053404fdce923b870439fdb74c0e3 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 8 Nov 2015 01:26:06 +0100 Subject: [PATCH 04/19] Translated using Weblate (Chinese (Taiwan)) Currently translated at 99.9% (1806 of 1807 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index f43b2d81bc..3165d24735 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1,4 +1,5 @@ - + + 選擇道路的色彩調配： 道路的色彩調配 顯示目的地方向 @@ -1945,7 +1946,7 @@ 如何下載地圖、設置基本設定 設置導航 常見問題 - 如何使用外掛元件 + 常見的問題 地圖檢視 地圖查詢中 規劃一次旅程 @@ -1966,4 +1967,6 @@ 更新 隱藏已提出的物件 - +讀取更多 + 有什麼新的在 + From ad40d913b59b2f5ddea31e77e0308513afe64250 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 8 Nov 2015 01:23:03 +0100 Subject: [PATCH 05/19] Translated using Weblate (Danish) Currently translated at 100.0% (1807 of 1807 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 73527b0585..e10725cb43 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2011,5 +2011,5 @@ Skjul foreslåede objekter Læs mere Hvad er nyt i - Signaturforklaring til OsmAnd standard kort format, internetforbindelse er nødvendig for at vise + Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig for at vises From c927f7d92e1de3f1b2d9ece42181f09275d9a9bb Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 8 Nov 2015 01:26:06 +0100 Subject: [PATCH 06/19] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1807 of 1807 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 3165d24735..e6fb7be6a4 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1969,4 +1969,5 @@ 隱藏已提出的物件 讀取更多 有什麼新的在 - + 圖例為 OsmAnd 預設的地圖樣式，網路需連接以去顯示 + From 3513f24cb8c517db964917d1eddb6c7680d0b00d Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 01:33:10 +0100 Subject: [PATCH 07/19] fix build --- OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index a33be023a7..3df7b7d58e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -176,7 +176,7 @@ public class HelpActivity extends OsmandActionBarActivity { String releasedate = ""; if (!this.getString(R.string.app_edition).equals("")) { - releasedate = ", " + this.getString(R.string.shared_string_release).toLowercase() + ": " + this.getString(R.string.app_edition); + releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition); } String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate; ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( From b84183a2e1289fbd12a5258b9dad46db90d7c6cc Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sun, 8 Nov 2015 01:32:34 +0100 Subject: [PATCH 08/19] Translated using Weblate (Danish) Currently translated at 100.0% (1807 of 1807 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index e10725cb43..27dd6ca35e 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2011,5 +2011,5 @@ Skjul foreslåede objekter Læs mere Hvad er nyt i - Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig for at vises + Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig From 65a293761d757ffddbbf35d0337dcbfe47fc8f81 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sun, 8 Nov 2015 01:43:11 +0100 Subject: [PATCH 09/19] Translated using Weblate (Slovak) Currently translated at 100.0% (1807 of 1807 strings) --- OsmAnd/res/values-sk/strings.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index d8b5907540..d0a62486d3 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1,4 +1,4 @@ - + Zobraziť @@ -1941,7 +1941,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Ako sťahovať mapy, urobiť základné nastavenia Nastavenie navigácie Otázky - Ako používať zásuvné moduly + Často kladené otázky Prezeranie mapy Hľadanie na mape Plánovanie výletu @@ -1955,4 +1955,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Aktualizovať Skryť plánované objekty - \ No newline at end of file +Prečítať viac + Čo je nové v + Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet + From 822f25d8f83ce2780f23760ab74ed6786f63ced1 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 02:13:47 +0100 Subject: [PATCH 10/19] implement legend via web page --- OsmAnd/res/values/strings.xml | 2 +- .../osmand/plus/activities/HelpActivity.java | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index e7aa66383e..f028489343 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2056,5 +2056,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Feedback Contact us Map legend - Legend for OsmAnd default map style, Internet connectivity needed to display + diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 3df7b7d58e..52b398d6bd 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -140,15 +140,17 @@ public class HelpActivity extends OsmandActionBarActivity { "feature_articles/find-something-on-map.html", getActivity())); arrayList.add(new HelpMenuItem(R.string.planning_trip_item, -1, -1, "feature_articles/trip-planning.html", getActivity())); - final String legendName = getActivity().getString(R.string.map_legend); - View.OnClickListener onClickListener = new View.OnClickListener() { - @Override - public void onClick(View v) { - HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND, legendName) - .show(getFragmentManager(), null); - } - }; - arrayList.add(new HelpMenuItem(legendName, getActivity().getString(R.string.map_legend_item_description), onClickListener)); + //final String legendName = getActivity().getString(R.string.map_legend); + //View.OnClickListener onClickListener = new View.OnClickListener() { + // @Override + // public void onClick(View v) { + // HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND, legendName) + // .show(getFragmentManager(), null); + // } + //}; + //arrayList.add(new HelpMenuItem(legendName, getActivity().getString(R.string.map_legend_item_description), onClickListener)); + arrayList.add(new HelpMenuItem(R.string.map_legend, -1, -1, + "feature_articles/map-legend.html", getActivity())); return arrayList; } From d8ac9a5668ebf6c0f7caba7c7dbab6d918731a78 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 02:26:59 +0100 Subject: [PATCH 11/19] remove obsolete constant --- OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 52b398d6bd..da59d62626 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -43,7 +43,7 @@ public class HelpActivity extends OsmandActionBarActivity { public static final int DIALOG = 5; final static HelpMenuCategory[] categories = HelpMenuCategory.values(); public static final String OSMAND_POLL_HTML = "http://osmand.net/android-poll.html"; - public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png"; + //public static final String OSMAND_MAP_LEGEND = "http://osmand.net/help/map-legend_default.png"; @Override protected void onCreate(Bundle savedInstanceState) { From 34af6ee1771ddfa79c261d53834d0779955db79e Mon Sep 17 00:00:00 2001 From: Ajeje Brazorf Date: Sun, 8 Nov 2015 03:43:00 +0100 Subject: [PATCH 12/19] Translated using Weblate (Sardinian) Currently translated at 100.0% (1806 of 1806 strings) --- OsmAnd/res/values-sc/strings.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 52483a3ed6..4997c025d6 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1,4 +1,5 @@ - + + Ammustra sa positzione semper a su tzentru Boghe Mistura @@ -1960,7 +1961,7 @@ Comente iscarrigare sas mapas e definire sas impostatziones de base Cunfigura su nàvigu Preguntas fitianas (FAQ) - Comente usare sas estensiones + Dimandas fitianas Visione de sa mapa Chircare in sa mapa Pranificare unu biàgiu @@ -1980,4 +1981,7 @@ Agiorna - \ No newline at end of file + Leghe àteru + Ite b\'est de nou in + Cua sos ogetos propostos + From 4703b4ce909350989ef76ceca76e7929a75f6319 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Sun, 8 Nov 2015 09:52:47 +0300 Subject: [PATCH 13/19] Link Other maps to DownloadActivity --- .../plus/download/DownloadActivity.java | 9 +++++++++ .../plus/download/DownloadResourceGroup.java | 20 +++++++++++++++++++ .../ui/DownloadResourceGroupFragment.java | 5 +++++ .../controllers/MapDataMenuController.java | 14 ++++++++++++- 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java index c2bed57359..6a0098d7e4 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java @@ -78,6 +78,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl List mTabs = new ArrayList(); public static final String FILTER_KEY = "filter"; public static final String FILTER_CAT = "filter_cat"; + public static final String FILTER_GROUP = "filter_group"; public static final String TAB_TO_OPEN = "Tab_to_open"; public static final String LOCAL_TAB = "local"; @@ -91,6 +92,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl private ViewPager viewPager; private String filter; private String filterCat; + private String filterGroup; protected Set> fragSet = new HashSet<>(); private DownloadIndexesThread downloadThread; private DownloadValidationManager downloadValidationManager; @@ -165,6 +167,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl if (intent != null && intent.getExtras() != null) { filter = intent.getExtras().getString(FILTER_KEY); filterCat = intent.getExtras().getString(FILTER_CAT); + filterGroup = intent.getExtras().getString(FILTER_GROUP); } showFirstTimeExternalStorage(); } @@ -605,6 +608,12 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl return res; } + public String getFilterGroupAndClear() { + String res = filterGroup; + filterGroup = null; + return res; + } + @SuppressWarnings("deprecation") public static void updateDescriptionTextWithSize(DownloadActivity activity, View view) { TextView descriptionText = (TextView) view.findViewById(R.id.rightTextView); diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadResourceGroup.java b/OsmAnd/src/net/osmand/plus/download/DownloadResourceGroup.java index f678997253..cefec714d6 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadResourceGroup.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadResourceGroup.java @@ -114,6 +114,26 @@ public class DownloadResourceGroup { } } + public DownloadResourceGroup getRegionGroup(WorldRegion region) { + DownloadResourceGroup res = null; + if (this.region == region) { + res = this; + } else if (groups != null) { + for (DownloadResourceGroup group : groups) { + if (group.region == region) { + res = group; + break; + } else { + res = group.getRegionGroup(region); + if (res != null) { + break; + } + } + } + } + return res; + } + public void trimEmptyGroups() { if(groups != null) { for(DownloadResourceGroup gr : groups) { diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java index dae31b7939..804e3cd2bb 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java @@ -112,6 +112,7 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow reloadData(); String filter = getDownloadActivity().getFilterAndClear(); String filterCat = getDownloadActivity().getFilterCatAndClear(); + String filterGroup = getDownloadActivity().getFilterGroupAndClear(); if (filter != null) { getDownloadActivity().showDialog(getActivity(), SearchDialogFragment.createInstance(filter)); @@ -122,6 +123,10 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow .createInstance(uniqueId); ((DownloadActivity) getActivity()).showDialog(getActivity(), regionDialogFragment); } + } else if (filterGroup != null) { + final DownloadResourceGroupFragment regionDialogFragment = DownloadResourceGroupFragment + .createInstance(filterGroup); + ((DownloadActivity) getActivity()).showDialog(getActivity(), regionDialogFragment); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java index 2f2a188c81..3d2784e875 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java @@ -2,6 +2,7 @@ package net.osmand.plus.mapcontextmenu.controllers; import android.app.AlertDialog; import android.content.DialogInterface; +import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.AsyncTask; @@ -13,8 +14,10 @@ import net.osmand.map.WorldRegion; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.download.DownloadActivity; import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.DownloadIndexesThread; +import net.osmand.plus.download.DownloadResourceGroup; import net.osmand.plus.download.DownloadValidationManager; import net.osmand.plus.download.IndexItem; import net.osmand.plus.helpers.FileNameTranslationHelper; @@ -72,7 +75,16 @@ public class MapDataMenuController extends MenuController { topRightTitleButtonController = new TitleButtonController() { @Override public void buttonPressed() { - // todo other maps + getMapActivity().getContextMenu().close(); + + DownloadResourceGroup group = downloadThread.getIndexes().getRegionGroup(region); + if (group != null) { + final Intent intent = new Intent(getMapActivity(), getMapActivity().getMyApplication() + .getAppCustomization().getDownloadIndexActivity()); + intent.putExtra(DownloadActivity.FILTER_GROUP, group.getUniqueId()); + intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.DOWNLOAD_TAB); + getMapActivity().startActivity(intent); + } } }; topRightTitleButtonController.caption = getMapActivity().getString(R.string.download_select_map_types); From f4e6ffb0f9451e8b6fecafe35745c1267ffff430 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 09:54:35 +0100 Subject: [PATCH 14/19] include legend's html file --- OsmAnd/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 1b75c89e8c..fcf5a8548e 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -212,6 +212,7 @@ task collectHelpContentsAssets(type: Copy) { include "changes.html" include "faq.html" include "technical-articles.html" + include "map-legend.html" } from("../../help/website/feature_articles"){ include "*.html" From 48ea9e6faa3a7a9c5b5737f2e82116e6809205e5 Mon Sep 17 00:00:00 2001 From: Andrius Kaikaris Date: Sun, 8 Nov 2015 08:08:51 +0100 Subject: [PATCH 15/19] Translated using Weblate (Lithuanian) Currently translated at 99.9% (1805 of 1806 strings) --- OsmAnd/res/values-lt/strings.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 529efc6fe4..80264922cb 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1,4 +1,5 @@ - + + Pradžios taškas yra per toli nuo artimiausio kelio. Bendrinta vieta Dėmesio @@ -1970,7 +1971,7 @@ Prašom aktyvuoti SRTM įskiepį Pirmi žngsniai su OsmAnd Galimybės - Kaip naudotis įskiepiais + Dažnai užduodami klausimai Žemėlapio peržiūra @@ -2001,4 +2002,7 @@ Atsiliepimai Legenda Pirmasis paleidimas - \ No newline at end of file + Skaityti toliau + Kas naujo + Paslėpti siūlomus objektus + From 3081a84f5875b16c096291d895a71d7ab1200b75 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sun, 8 Nov 2015 08:02:11 +0100 Subject: [PATCH 16/19] Translated using Weblate (Swedish) Currently translated at 99.2% (1792 of 1806 strings) --- OsmAnd/res/values-sv/strings.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index a21094ba1a..54a78229a5 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1,4 +1,5 @@ - + + För att låsa upp skärmen tryck på låsikonen Välj land Välj stad @@ -1947,7 +1948,7 @@ Hur man hämtar kartor och gör grundinställningar Ställa in navigering Frågor och svar - Hur man använder insticksmoduler + Frågor och svar Kartvisning Söka på kartan Att planera en resa @@ -1968,4 +1969,6 @@ Återkoppling - \ No newline at end of file + Läs mer + Nyheter + From 2f28938b5f43ca7073b606520693ad41565f84d5 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Nov 2015 10:01:37 +0100 Subject: [PATCH 17/19] remove obsolete string --- OsmAnd/res/values-da/strings.xml | 2 +- OsmAnd/res/values-sk/strings.xml | 2 +- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 27dd6ca35e..6e1e388de2 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2011,5 +2011,5 @@ Skjul foreslåede objekter Læs mere Hvad er nyt i - Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig + diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index d0a62486d3..b2fcee9f57 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1957,5 +1957,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Prečítať viac Čo je nové v - Vysvetlivky k základnému mapovému štýlu v OsmAnd. Pre ich zobrazenie je potrebné pripojenie na Internet + diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index e6fb7be6a4..6ad95a06fa 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1969,5 +1969,5 @@ 隱藏已提出的物件 讀取更多 有什麼新的在 - 圖例為 OsmAnd 預設的地圖樣式，網路需連接以去顯示 + From 1c9a77f7f5b98c614e8c6cd29f678bd1ac47969a Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Sun, 8 Nov 2015 13:38:30 +0300 Subject: [PATCH 18/19] Fixed wiki links in download map context menu --- .../controllers/MapDataMenuController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java index 3d2784e875..e8655f5620 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java @@ -150,7 +150,14 @@ public class MapDataMenuController extends MenuController { addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getSizeDescription(getMapActivity()), false); } if (region != null && !Algorithms.isEmpty(region.getParams().getWikiLink())) { - addPlainMenuItem(R.drawable.ic_action_wikipedia, region.getParams().getWikiLink(), true); + String[] items = region.getParams().getWikiLink().split(":"); + String url; + if (items.length > 1) { + url = "https://" + items[0] + ".wikipedia.org/wiki/" + items[1]; + } else { + url = "https://wikipedia.org/wiki/" + items[0]; + } + addPlainMenuItem(R.drawable.ic_world_globe_dark, url, true); } if (indexItem != null) { DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(getMapActivity()); From 5b96a2e30f5eddadc9f91902a576373d69885018 Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Sun, 8 Nov 2015 10:29:27 +0100 Subject: [PATCH 19/19] Translated using Weblate (Italian) Currently translated at 99.8% (1804 of 1806 strings) --- OsmAnd/res/values-it/strings.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 9c6bdf2bfe..ea41891d3e 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1,4 +1,5 @@ - + + Sovrapposizioni fluorescenti Usa colori fluorescenti per visualizzare tracce e percorsi Modifiche offline @@ -2018,7 +2019,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Come scaricare le mappe, imposta le impostazioni di baae Impostazioni di navigazione FAQ - Come utilizzare i componenti aggiuntivi + Domande frequenti Visualizzazione mappa Ricerca sulla mappa Pianifica un viaggio @@ -2038,4 +2039,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz - \ No newline at end of file + Nascondi gli oggetti proposti +