From e75dfc58e84fc87576aceb7ceef00332464087ca Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 8 May 2018 16:48:27 +0300 Subject: [PATCH 01/15] fix calling startActivity() from outside of an Activity --- .../plus/wikivoyage/explore/ExploreTabFragment.java | 2 +- .../explore/travelcards/StartEditingTravelCard.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java index 87ade48c39..12c0507a75 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java @@ -133,7 +133,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn } } } - items.add(new StartEditingTravelCard(app, nightMode)); + items.add(new StartEditingTravelCard(app, getContext(), nightMode)); adapter.setItems(items); final DownloadIndexesThread downloadThread = app.getDownloadThread(); diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java index 7b57c7a51a..ca742c8d71 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java @@ -1,5 +1,6 @@ package net.osmand.plus.wikivoyage.explore.travelcards; +import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; import android.support.customtabs.CustomTabsIntent; @@ -16,8 +17,11 @@ public class StartEditingTravelCard extends BaseTravelCard { public static final int TYPE = 1; - public StartEditingTravelCard(OsmandApplication app, boolean nightMode) { + private Context context; + + public StartEditingTravelCard(OsmandApplication app, Context context, boolean nightMode) { super(app, nightMode); + this.context = context; } @Override @@ -35,7 +39,7 @@ public class StartEditingTravelCard extends BaseTravelCard { .setToolbarColor(ContextCompat.getColor(app, nightMode ? R.color.actionbar_dark_color : R.color.actionbar_light_color)) .build(); String text = "https://" + app.getLanguage().toLowerCase() + ".m.wikivoyage.org"; - customTabsIntent.launchUrl(app, Uri.parse(text)); + customTabsIntent.launchUrl(context, Uri.parse(text)); } }); } From 1d82dff0652a2d7287741da5a732efdba99a44e7 Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Tue, 8 May 2018 17:52:22 +0300 Subject: [PATCH 02/15] Add the ability to set maxLines for description in BottomSheetItemWithDescription --- .../bottomsheetmenu/BaseBottomSheetItem.java | 1 + ...ottomSheetItemTitleWithDescrAndButton.java | 45 ++++++++++++------- .../BottomSheetItemWithCompoundButton.java | 5 ++- .../BottomSheetItemWithDescription.java | 22 ++++++++- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java index 8917d22975..ee0451ef20 100644 --- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java +++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java @@ -13,6 +13,7 @@ public class BaseBottomSheetItem { public static final int INVALID_POSITION = -1; public static final int INVALID_ID = -1; + public static final int INVALID_VALUE = -1; protected View view; @LayoutRes diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemTitleWithDescrAndButton.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemTitleWithDescrAndButton.java index 12c06b7f65..9fc4da7dc5 100644 --- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemTitleWithDescrAndButton.java +++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemTitleWithDescrAndButton.java @@ -24,22 +24,34 @@ public class BottomSheetItemTitleWithDescrAndButton extends BottomSheetItemWithD private TextView textButtonTV; public BottomSheetItemTitleWithDescrAndButton(View customView, - @LayoutRes int layoutId, - Object tag, - boolean disabled, - View.OnClickListener onClickListener, - int position, - Drawable icon, - String title, - @ColorRes int titleColorId, - CharSequence description, - @ColorRes int descriptionColorId, - String buttonTitle, - View.OnClickListener onButtonClickListener, - Drawable leftCompoundDrawable, - Drawable rightCompoundDrawable, - @ColorRes int buttonTextColor) { - super(customView, layoutId, tag, disabled, onClickListener, position, icon, title, titleColorId, description, descriptionColorId); + @LayoutRes int layoutId, + Object tag, + boolean disabled, + View.OnClickListener onClickListener, + int position, + Drawable icon, + String title, + @ColorRes int titleColorId, + CharSequence description, + @ColorRes int descriptionColorId, + int descriptionMaxLines, + String buttonTitle, + View.OnClickListener onButtonClickListener, + Drawable leftCompoundDrawable, + Drawable rightCompoundDrawable, + @ColorRes int buttonTextColor) { + super(customView, + layoutId, + tag, + disabled, + onClickListener, + position, + icon, + title, + titleColorId, + description, + descriptionColorId, + descriptionMaxLines); this.buttonTitle = buttonTitle; this.onButtonClickListener = onButtonClickListener; this.leftCompoundDrawable = leftCompoundDrawable; @@ -112,6 +124,7 @@ public class BottomSheetItemTitleWithDescrAndButton extends BottomSheetItemWithD titleColorId, description, descriptionColorId, + descriptionMaxLines, buttonTitle, onButtonClickListener, leftCompoundDrawable, diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java index 07bcb93895..a0b1d87107 100644 --- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java +++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithCompoundButton.java @@ -36,6 +36,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri @ColorRes int titleColorId, CharSequence description, @ColorRes int descriptionColorId, + int descriptionMaxLines, boolean checked, ColorStateList buttonTintList, OnCheckedChangeListener onCheckedChangeListener) { @@ -49,7 +50,8 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri title, titleColorId, description, - descriptionColorId); + descriptionColorId, + descriptionMaxLines); this.checked = checked; this.buttonTintList = buttonTintList; this.onCheckedChangeListener = onCheckedChangeListener; @@ -102,6 +104,7 @@ public class BottomSheetItemWithCompoundButton extends BottomSheetItemWithDescri titleColorId, description, descriptionColorId, + descriptionMaxLines, checked, buttonTintList, onCheckedChangeListener); diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java index a0aad799bf..fa26be10e7 100644 --- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java +++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java @@ -16,6 +16,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { protected CharSequence description; @ColorRes private int descriptionColorId = INVALID_ID; + private int descriptionMaxLines = INVALID_VALUE; private TextView descriptionTv; @@ -29,10 +30,12 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { String title, @ColorRes int titleColorId, CharSequence description, - @ColorRes int descriptionColorId) { + @ColorRes int descriptionColorId, + int descriptionMaxLines) { super(customView, layoutId, tag, disabled, onClickListener, position, icon, title, titleColorId); this.description = description; this.descriptionColorId = descriptionColorId; + this.descriptionMaxLines = descriptionMaxLines; } protected BottomSheetItemWithDescription() { @@ -44,6 +47,11 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { descriptionTv.setText(description); } + public void setDescriptionMaxLines(int maxLines) { + this.descriptionMaxLines = maxLines; + descriptionTv.setMaxLines(maxLines); + } + @Override public void inflate(OsmandApplication app, ViewGroup container, boolean nightMode) { super.inflate(app, container, nightMode); @@ -53,6 +61,9 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { if (descriptionColorId != INVALID_ID) { descriptionTv.setTextColor(ContextCompat.getColor(app, descriptionColorId)); } + if (descriptionMaxLines != INVALID_VALUE) { + descriptionTv.setMaxLines(descriptionMaxLines); + } } } @@ -61,6 +72,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { protected CharSequence description; @ColorRes protected int descriptionColorId = INVALID_ID; + protected int descriptionMaxLines = INVALID_POSITION; public Builder setDescription(CharSequence description) { this.description = description; @@ -72,6 +84,11 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { return this; } + public Builder setDescriptionMaxLines(int maxLines) { + this.descriptionMaxLines = maxLines; + return this; + } + public BottomSheetItemWithDescription create() { return new BottomSheetItemWithDescription(customView, layoutId, @@ -83,7 +100,8 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem { title, titleColorId, description, - descriptionColorId); + descriptionColorId, + descriptionMaxLines); } } } From db675f5166da137cac6dd96aacd9533f214978ed Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 8 May 2018 18:10:08 +0300 Subject: [PATCH 03/15] removed OsmandApplication from constructor --- .../osmand/plus/wikivoyage/explore/ExploreTabFragment.java | 2 +- .../explore/travelcards/StartEditingTravelCard.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java index 12c0507a75..e1fa78abfa 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java @@ -133,7 +133,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn } } } - items.add(new StartEditingTravelCard(app, getContext(), nightMode)); + items.add(new StartEditingTravelCard(getContext(), nightMode)); adapter.setItems(items); final DownloadIndexesThread downloadThread = app.getDownloadThread(); diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java index ca742c8d71..c65800aac8 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java @@ -10,8 +10,8 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; public class StartEditingTravelCard extends BaseTravelCard { @@ -19,8 +19,8 @@ public class StartEditingTravelCard extends BaseTravelCard { private Context context; - public StartEditingTravelCard(OsmandApplication app, Context context, boolean nightMode) { - super(app, nightMode); + public StartEditingTravelCard(Context context, boolean nightMode) { + super(((MapActivity) context).getMyApplication(), nightMode); this.context = context; } From 57ea09e8bdb8d96a4b7d643f616b8ba8cf2b25c3 Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 8 May 2018 18:21:07 +0300 Subject: [PATCH 04/15] change mapActivity to activity --- .../osmand/plus/wikivoyage/explore/ExploreTabFragment.java | 2 +- .../explore/travelcards/StartEditingTravelCard.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java index e1fa78abfa..46492fd3ee 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java @@ -133,7 +133,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn } } } - items.add(new StartEditingTravelCard(getContext(), nightMode)); + items.add(new StartEditingTravelCard(app, getMyActivity(), nightMode)); adapter.setItems(items); final DownloadIndexesThread downloadThread = app.getDownloadThread(); diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java index c65800aac8..43ddf6e042 100644 --- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java +++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/StartEditingTravelCard.java @@ -1,5 +1,6 @@ package net.osmand.plus.wikivoyage.explore.travelcards; +import android.app.Activity; import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; @@ -10,8 +11,8 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; public class StartEditingTravelCard extends BaseTravelCard { @@ -19,8 +20,8 @@ public class StartEditingTravelCard extends BaseTravelCard { private Context context; - public StartEditingTravelCard(Context context, boolean nightMode) { - super(((MapActivity) context).getMyApplication(), nightMode); + public StartEditingTravelCard(OsmandApplication app, Activity context, boolean nightMode) { + super(app, nightMode); this.context = context; } From e58c67b7433cd639afbbd35237b5169d668d50ee Mon Sep 17 00:00:00 2001 From: ssantos Date: Tue, 8 May 2018 15:20:21 +0000 Subject: [PATCH 05/15] Translated using Weblate (German) Currently translated at 100.0% (2583 of 2583 strings) --- OsmAnd/res/values-de/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 08f12c88d2..d414a26748 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3122,7 +3122,7 @@ Abgedeckte Fläche: %1$s x %2$s Artikel online öffnen Artikel in einem Webbrowser ansehen. diese Region - Suche nach dem benötigten Wiki-Artikel + Suche nach dem entsprechenden Wiki-Artikel Artikel nicht gefunden Bezahlte App Bezahltes Modul @@ -3136,4 +3136,10 @@ Abgedeckte Fläche: %1$s x %2$s Basierend auf den von Ihnen gespeicherten Artikeln empfehlen wir Ihnen, folgende Karten herunterzuladen: Benötigte Karten + Wikipedia-Link online öffnen + OsmAnd leitet Sie zum Browser weiter und öffnet den Link online. + Holen Sie sich das OsmAnd Live Abonnement, um Wikipedia und Wikivoyage Artikel offline zu lesen. + Wie öffnet man einen Link? + Wikipedia offline lesen + Alles herunterladen From 621b854905224a412d51fa9480d4375fd481536e Mon Sep 17 00:00:00 2001 From: josep constanti Date: Tue, 8 May 2018 12:21:25 +0000 Subject: [PATCH 06/15] Translated using Weblate (Catalan) Currently translated at 92.4% (2388 of 2583 strings) --- OsmAnd/res/values-ca/strings.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index f5b3d137c0..074939fcfb 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -2029,7 +2029,7 @@ L\'espai disponible és només de {2} MB. \n \n i encara més… Subscripció a OsmAnd Live - Cal proporcionar-vos informació d\'aportacions. + Per informar-vos d\'aportacions. Zona de suport Us agraïm haver-vos subscrit a les actualitzacions en directe Una part del vostre donatiu s\'enviarà als usuaris d\'OSM que enviïn modificacions del mapa a aquesta regió. @@ -2433,7 +2433,7 @@ Abasta l\'àrea: %1$s x %2$s Subscriviu-vos a la nostra llista de correu sobre descomptes a la aplicació i aconseguiu 3 baixades de mapa addicionals! Sense superposició Sense sots-posició - Us agraïm la compra de les isòbates + Us agraïm la compra d\' \'Isòbates\' Isòbates Fondària marina puntual a l\'hemisferi sud Fondària marina puntual a l\'hemisferi nord @@ -2527,7 +2527,7 @@ Abasta l\'àrea: %1$s x %2$s Indiqueu el nom d\'usuari Mostra només les imatges afegides per Nom d\'usuari - Podeu filtrar les imatges per remitent o per data. El filtres només s\'apliquen en apropar-se. + Filtreu les imatges per remitent o per data. Només s\'aplicarà en apropar-se. Restableix Emmagatzema les traces enregistrades en carpetes mensuals Emmagatzema les traces enregistrades en sub-carpetes segons el mes d\'enregistrament (tipus 2018-01). @@ -2624,7 +2624,7 @@ Abasta l\'àrea: %1$s x %2$s S\'ha afegit la data Ordena segons: Seleccioneu com indicar la distància i direcció vers els marcadors de mapa a la pantalla del mapa: - Mostra les línies guia + Mostra les línies de direcció Mostra fletxes sobre el mapa Mostra ja passat Amaga ja passat @@ -2707,7 +2707,7 @@ Abasta l\'àrea: %1$s x %2$s Mostra línies guia des de la vostra ubicació a les dels marcadors actius. Mostra una o dues fletxes indicant la direcció dels marcadors actius. Seleccioneu com indicar la distància als marcadors actius. - Trieu quants indicadors de direcció es mostren. + Trieu quants indicadors actius voleu veure. Més Recerca de traces amb fites Crea o modifica objectes OSM @@ -2889,10 +2889,15 @@ Abasta l\'àrea: %1$s x %2$s Viquiviatges sense connexió Baixades il·limitades - Viquipèdia sense conneió + Viquipèdia sense connexió Mapes amb corbes de nivell i ombrejat de relleu Desbloca totes les funcions de OsmAnd "Viquiviatges " Articles de Viquiviatges d\'arreu + Obre l\'enllaç en línia de Viquipèdia + OsmAnd us portarà al navegador i obrirà l\'enllaç en línia. + Com obrir l\'enllaç? + Consulta la Viquipèdia en local + Baixa-ho tot From 9f7f55a1e8223508d51a0ecc29e1946573661b21 Mon Sep 17 00:00:00 2001 From: Boyuan Yang <073plan@gmail.com> Date: Tue, 8 May 2018 11:39:20 +0000 Subject: [PATCH 07/15] Translated using Weblate (Chinese (Simplified)) Currently translated at 73.2% (1892 of 2583 strings) --- OsmAnd/res/values-zh-rCN/strings.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml index e3baa62856..bd364095bf 100644 --- a/OsmAnd/res/values-zh-rCN/strings.xml +++ b/OsmAnd/res/values-zh-rCN/strings.xml @@ -2770,4 +2770,22 @@ 地图更新：每日 无限下载 离线维基百科 - + 在线打开维基百科链接 + OsmAnd 会将您重定向至浏览器并在线打开链接。 + 获取 OsmAnd Live 订阅以离线阅读维基百科和 Wikivoyage 文章。 + 如何打开链接？ + 离线阅读维基百科 + 下载全部 + 重新开始 + 显示图像 + 您已取消 OsmAnd Live 订阅 + 续订以继续使用以下全部功能： + + 基于您保存的文章，我们推荐您下载下列地图： + 您需要的地图 + OsmAnd 团队 + 热门目的地 + 付费应用 + 付费插件 + 新的 Wikivoyage 数据可用，请更新以继续享用。 + From cd8913820eee12b660423a92967b0e23be674e25 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Tue, 8 May 2018 13:58:14 +0000 Subject: [PATCH 08/15] Translated using Weblate (Chinese (Traditional)) Currently translated at 99.6% (2574 of 2583 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index f7cc1df0c1..2ca59292a1 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -3191,4 +3191,10 @@ 根據您已儲存的文章，我們建議您下載下面的地圖： 您需要的地圖 + 線上開啟維基百科連結 + OsmAnd 會將您重新引導到瀏覽器並在線上打開連結。 + 獲得 OsmAnd Live 訂閱可以離線閱讀維基百科和維基導遊文章。 + 如何開啟連結？ + 離線閱讀維基百科 + 全部下載 From f2afe4e70328b92dcf2f257ac553e0d161ecf1d3 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Tue, 8 May 2018 11:52:27 +0000 Subject: [PATCH 09/15] Translated using Weblate (Danish) Currently translated at 99.7% (2577 of 2583 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 3672380cbd..1936abca10 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -3237,4 +3237,9 @@ Repræsenterer område: %1$s x %2$s Forny abonnement for at fortsætte med at bruge alle funktioner: Hent alt + Åbn Wikipedia link online + Omdirigering til webbrowser og åbner linket online. + Få OsmAnd Live-abonnement til at læse Wikipedia og Wikivoyage artikler offline. + Hvordan linket åbnes? + Læs Wikipedia offline From bf19fb260167a398edb304b7715ebdaec80df223 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Tue, 8 May 2018 13:16:29 +0000 Subject: [PATCH 10/15] Translated using Weblate (French) Currently translated at 100.0% (2583 of 2583 strings) --- OsmAnd/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 15e1c0a410..79be78309e 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -3212,7 +3212,7 @@ représentant la zone : %1$s x %2$s Ouvrir le lien Wikipedia Le lien s\'ouvrira dans votre navigateur Internet. - Abonnez vous à OsmAnd Live pour consulter les articles Wikipedia et Wikivoyage hors-ligne. + Abonnez-vous à OsmAnd Live pour lire les articles Wikipedia et Wikivoyage hors-ligne. Comment ouvrir ce lien ? Lisez Wikipedia hors-ligne Télécharger tout From 7e793ea9480a516243be08d5b57a5e5f53ac7e1e Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Tue, 8 May 2018 14:14:33 +0000 Subject: [PATCH 11/15] Translated using Weblate (Hebrew) Currently translated at 99.8% (2580 of 2583 strings) --- OsmAnd/res/values-he/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index f3a7796037..3d718bcba7 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -3128,4 +3128,10 @@ יש לחדש את המינוי כדי להמשיך להשתמש בכל התכונות הבאות: להוריד הכול + פתיחת הקישור של ויקיפדיה בדפדפן + OsmAnd יפנה אותך לדפדפן ויפתח את הקישור. + עליך לערוך מינוי ל־OsmAnd חי כדי לקרוא ערכים מוויקיפדיה ומוויקימסע ללא חיבור לאינטרנט. + כיצד לפתוח קישור? + קריאת ויקיפדיה ללא חיבור לאינטרנט + היטל כדורי From aea9decbf10e8a90a7ef5355f9e9a4a6130c48c4 Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 8 May 2018 11:46:00 +0000 Subject: [PATCH 12/15] Translated using Weblate (Italian) Currently translated at 79.2% (2046 of 2583 strings) --- OsmAnd/res/values-it/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 567897decb..17897a7662 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -3146,4 +3146,11 @@ Rappresenta l\'area: %1$s x %2$s Sto cercando il necessario articolo Wiki Articolo non trovato Come aprire gli articoli di Wikipedia? - +Navigazione +\n • Funziona online (veloce) o offline (nessuna tariffa di roaming quando sei all\'estero) +\n • Guida vocale svolta-dopo-svolta (voci registrate e sintetizzate) +\n • Guida sulla corsia opzionale, visualizzazione dei nomi delle strade, e tempo di arrivo stimato +\n • Supporto per punti intermedi del tuo itinerario +\n • Rielaborazione del percorso automatico ogni volta che si devia +\n • Ricerca di posti per indirizzo, per tipo (es: ristorante, albergo, stazione di servizio, museo) o per coordinate geografiche + From aaee99aca10f938c6f6c54192f3a70c268554e24 Mon Sep 17 00:00:00 2001 From: iman Date: Tue, 8 May 2018 11:28:21 +0000 Subject: [PATCH 13/15] Translated using Weblate (Persian) Currently translated at 99.8% (2580 of 2583 strings) --- OsmAnd/res/values-fa/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 86b33a6cf7..458ccee425 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -3212,7 +3212,7 @@ بازکردن مقالهٔ آنلاین این مقاله را در مرورگر اینترنت مشاهده کنید. این منطقه - جست‌وجو به‌دنبال مقالهٔ همخوان + جست‌وجو به‌دنبال مقالهٔ همخوان از ویکی مقاله پیدا نشد چگونه مقاله‌های ویکی‌پدیا را باز کنیم؟ مقصدهای محبوب @@ -3226,4 +3226,6 @@ اشتراکتان را تجدید کنید تا از همهٔ قابلیت‌ها بهره‌مند شوید: دانلود همه + بازکردن آنلاین لینک ویکی‌پدیا + ‏OsmAnd شما را به مرورگر می‌فرستد و لینک را آنلاین باز می‌کند. From 78ff46b463d8011c26f464b5e85f038be6aa4965 Mon Sep 17 00:00:00 2001 From: Ajeje Brazorf Date: Tue, 8 May 2018 13:51:11 +0000 Subject: [PATCH 14/15] Translated using Weblate (Sardinian) Currently translated at 99.7% (2577 of 2583 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 b52a3e9eb1..445d35a605 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -3191,4 +3191,9 @@ Pro praghere iscrie su còdighe intreu Rinnova s\'abbonamentu tuo pro sighire a impreare totu sas funtzionalidades: Iscàrriga totu + Aberi su ligàmene de wikipedia in lìnia + OsmAnd at a abèrrere su ligàmene in lìnia in s\'esploradore tuo. + Abbona·ti a OsmAnd Live pro lèghere sos artìculos de Wikipedia e Wikivoyage chene connessione. + Comente abèrrere su ligàmene? + Leghe Wikipedia chene connessione From c36e5b3f041641cb69bc1636711c4a8b6b799415 Mon Sep 17 00:00:00 2001 From: Franco Date: Tue, 8 May 2018 12:17:18 +0000 Subject: [PATCH 15/15] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (2583 of 2583 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index c906ff77a6..27a7a43ee6 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -3045,7 +3045,7 @@ Lon %2$s Renueva la suscripción para continuar usando todas las funciones: Abrir enlace de Wikipedia en línea - OsmAnd abrirá el navegador para el enlace en línea. + OsmAnd abrirá el navegador para ver el enlace en línea. Obtén una suscripción de OsmAnd Live para leer artículos de Wikipedia y Wikiviajes, sin conexión. ¿Cómo abrir un enlace? Leer la Wikipedia sin conexión