From 1f65840dd4334f2f29e16007015668773d076bf1 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 23 Sep 2020 16:29:16 +0300 Subject: [PATCH 01/80] Fix button width in plan route and divider in follow track --- OsmAnd/res/layout/fragment_measurement_tool.xml | 6 ++++-- .../plus/routepreparationmenu/FollowTrackFragment.java | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml index fe1ba9b1d7..d4b7f7ea57 100644 --- a/OsmAnd/res/layout/fragment_measurement_tool.xml +++ b/OsmAnd/res/layout/fragment_measurement_tool.xml @@ -216,10 +216,12 @@ + android:minWidth="@dimen/measurement_tool_button_width" /> + diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java index ee2bf6b38e..42ff2f94e6 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java @@ -205,7 +205,6 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca SelectTrackCard selectTrackCard = new SelectTrackCard(mapActivity); selectTrackCard.setListener(this); cardsContainer.addView(selectTrackCard.build(mapActivity)); - cardsContainer.addView(buildDividerView(cardsContainer, false)); ApplicationMode mode = app.getRoutingHelper().getAppMode(); @@ -213,13 +212,16 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute(); boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND; if (rparams != null && osmandRouter) { - if (!gpxFile.hasRoute() || gpxFile.hasRtePt()) { + boolean showReverseCard = !gpxFile.hasRoute() || gpxFile.hasRtePt(); + if (showReverseCard) { + cardsContainer.addView(buildDividerView(cardsContainer, false)); + ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse()); reverseTrackCard.setListener(this); cardsContainer.addView(reverseTrackCard.build(mapActivity)); } if (!gpxFile.hasRtePt() && !gpxFile.hasRoute()) { - cardsContainer.addView(buildDividerView(cardsContainer, true)); + cardsContainer.addView(buildDividerView(cardsContainer, showReverseCard)); AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity); attachTrackCard.setListener(this); From 95af82e531b5b00083072a0682a11ca0d25bdd4d Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 23 Sep 2020 23:18:44 +0300 Subject: [PATCH 02/80] Select current navigation profile in attach roads --- .../src/main/java/net/osmand/util/Algorithms.java | 8 +++++--- OsmAnd/src/net/osmand/AndroidUtils.java | 10 ---------- OsmAnd/src/net/osmand/plus/MapMarkersHelper.java | 3 +-- .../measurementtool/GpxApproximationFragment.java | 15 ++++++++++++--- .../measurementtool/MeasurementToolFragment.java | 8 ++++++-- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java index ea2869aaa3..bff9377ec3 100644 --- a/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java +++ b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java @@ -119,9 +119,11 @@ public class Algorithms { } public static String getFileNameWithoutExtension(String name) { - int i = name.lastIndexOf('.'); - if (i >= 0) { - name = name.substring(0, i); + if (name != null) { + int index = name.lastIndexOf('.'); + if (index != -1) { + return name.substring(0, index); + } } return name; } diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java index 740c826ab5..0efdd133f3 100644 --- a/OsmAnd/src/net/osmand/AndroidUtils.java +++ b/OsmAnd/src/net/osmand/AndroidUtils.java @@ -153,16 +153,6 @@ public class AndroidUtils { R.color.icon_color_default_light, R.color.wikivoyage_active_dark); } - public static String trimExtension(String src) { - if (src != null) { - int index = src.lastIndexOf('.'); - if (index != -1) { - return src.substring(0, index); - } - } - return src; - } - public static String addColon(OsmandApplication app, @StringRes int stringRes) { return app.getString(R.string.ltr_or_rtl_combine_via_colon, app.getString(stringRes), "").trim(); } diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java index 636fcddb72..c168047ba9 100644 --- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java +++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java @@ -8,7 +8,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import net.osmand.AndroidUtils; import net.osmand.FileUtils; import net.osmand.GPXUtilities; import net.osmand.GPXUtilities.GPXFile; @@ -526,7 +525,7 @@ public class MapMarkersHelper { private MapMarkersGroup createGPXMarkerGroup(File fl) { return new MapMarkersGroup(getMarkerGroupId(fl), - AndroidUtils.trimExtension(fl.getName()), + Algorithms.getFileNameWithoutExtension(fl.getName()), MapMarkersGroup.GPX_TYPE); } diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java index 87edaaf71b..924cea3ab0 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java @@ -298,13 +298,15 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment return (menuState & (MenuState.HEADER_ONLY | MenuState.HALF_SCREEN)) != 0; } - public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment, @NonNull LocationsHolder locationsHolder) { + public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment, + @NonNull LocationsHolder locationsHolder, @Nullable ApplicationMode appMode) { try { if (!fm.isStateSaved()) { GpxApproximationFragment fragment = new GpxApproximationFragment(); fragment.setRetainInstance(true); fragment.setTargetFragment(targetFragment, REQUEST_CODE); fragment.setLocationsHolder(locationsHolder); + fragment.setSnapToRoadAppMode(appMode); fm.beginTransaction() .replace(R.id.fragmentContainer, fragment, TAG) .addToBackStack(TAG) @@ -348,12 +350,19 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment @Override public void onProfileSelect(ApplicationMode applicationMode) { - if (snapToRoadAppMode != applicationMode) { - snapToRoadAppMode = applicationMode; + if (setSnapToRoadAppMode(applicationMode)) { calculateGpxApproximation(); } } + public boolean setSnapToRoadAppMode(ApplicationMode appMode) { + if (appMode != null && snapToRoadAppMode != appMode) { + snapToRoadAppMode = appMode; + return true; + } + return false; + } + public LocationsHolder getLocationsHolder() { return locationsHolder; } diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index 7d6818a9d6..42b176201b 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -706,8 +706,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route case SnapTrackWarningFragment.CONTINUE_RESULT_CODE: MapActivity mapActivity = getMapActivity(); if (mapActivity != null) { + ApplicationMode mode = editingCtx.getAppMode(); + if (mode == ApplicationMode.DEFAULT || "public_transport".equals(mode.getRoutingProfile())) { + mode = null; + } GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(), - this, new LocationsHolder(editingCtx.getPoints())); + this, new LocationsHolder(editingCtx.getPoints()), mode); } break; } @@ -1522,7 +1526,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date()); displayedName = FileUtils.createUniqueFileName(requireMyApplication(), suggestedName, GPX_INDEX_DIR, GPX_FILE_EXT); } else { - displayedName = AndroidUtils.trimExtension(new File(gpxData.getGpxFile().path).getName()); + displayedName = Algorithms.getFileNameWithoutExtension(new File(gpxData.getGpxFile().path).getName()); } return displayedName; } From bd10c798f817b9b60df5c7e2b8b26c88cd7eeea3 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 25 Sep 2020 13:14:38 +0300 Subject: [PATCH 03/80] Fix track name and select app mode from gpx in follow track --- .../MeasurementToolFragment.java | 12 ++++++++-- .../ChooseRouteFragment.java | 2 +- .../FollowTrackFragment.java | 22 +++++++++++-------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index 42b176201b..8089d3a012 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -1521,8 +1521,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route private String getSuggestedFileName() { GpxData gpxData = editingCtx.getGpxData(); - String displayedName; - if (gpxData == null) { + String displayedName = null; + if (gpxData != null) { + GPXFile gpxFile = gpxData.getGpxFile(); + if (!Algorithms.isEmpty(gpxFile.path)) { + displayedName = Algorithms.getFileNameWithoutExtension(new File(gpxFile.path).getName()); + } else if (!Algorithms.isEmpty(gpxFile.tracks)) { + displayedName = gpxFile.tracks.get(0).name; + } + } + if (gpxData == null || displayedName == null) { String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date()); displayedName = FileUtils.createUniqueFileName(requireMyApplication(), suggestedName, GPX_INDEX_DIR, GPX_FILE_EXT); } else { diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java index 407f65295f..62827e1e67 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java @@ -487,7 +487,7 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements ContextMe String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date()); fileName = FileUtils.createUniqueFileName(app, suggestedName, IndexConstants.GPX_INDEX_DIR, GPX_FILE_EXT); } else { - fileName = AndroidUtils.trimExtension(new File(paramsBuilder.getFile().path).getName()); + fileName = Algorithms.getFileNameWithoutExtension(new File(paramsBuilder.getFile().path).getName()); } SaveAsNewTrackBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), ChooseRouteFragment.this, null, fileName, diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java index 42ff2f94e6..8937f4ce5d 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java @@ -25,6 +25,7 @@ import net.osmand.AndroidUtils; import net.osmand.CallbackWithObject; import net.osmand.GPXUtilities.GPXFile; import net.osmand.GPXUtilities.TrkSegment; +import net.osmand.GPXUtilities.WptPt; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; import net.osmand.ValueHolder; @@ -433,14 +434,11 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca if (mapActivity != null) { if (card instanceof ImportTrackCard) { importTrack(); - } else if (card instanceof TrackEditCard) { - openPlanRoute(true); + } else if (card instanceof TrackEditCard || card instanceof AttachTrackToRoadsCard) { + openPlanRoute(); close(); } else if (card instanceof SelectTrackCard) { updateSelectionMode(true); - } else if (card instanceof AttachTrackToRoadsCard) { - openPlanRoute(false); - close(); } else if (card instanceof ReverseTrackCard || card instanceof NavigateTrackOptionsCard) { updateMenu(); @@ -488,6 +486,14 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca MapActivity mapActivity = getMapActivity(); if (mapActivity != null) { this.gpxFile = gpxFile; + List points = gpxFile.getRoutePoints(); + if (!points.isEmpty()) { + ApplicationMode mode = ApplicationMode.valueOfStringKey(points.get(0).getProfileType(), null); + if (mode != null) { + app.getRoutingHelper().setAppMode(mode); + app.initVoiceCommandPlayer(mapActivity, mode, true, null, false, false, true); + } + } mapActivity.getMapActions().setGPXRouteParams(gpxFile); app.getTargetPointsHelper().updateRouteAndRefresh(true); app.getRoutingHelper().recalculateRouteDueToSettingsChange(); @@ -544,7 +550,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca } } - public void openPlanRoute(boolean useAppMode) { + public void openPlanRoute() { MapActivity mapActivity = getMapActivity(); if (mapActivity != null && gpxFile != null) { editingTrack = true; @@ -554,9 +560,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca GpxData gpxData = new GpxData(gpxFile, rect, actionType, segment); MeasurementEditingContext editingContext = new MeasurementEditingContext(); editingContext.setGpxData(gpxData); - if (useAppMode) { - editingContext.setAppMode(app.getRoutingHelper().getAppMode()); - } + editingContext.setAppMode(app.getRoutingHelper().getAppMode()); MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), editingContext, true); } } From 41e4654a626bf8d034ef9bb6daf2a7898beb83b9 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 25 Sep 2020 13:44:45 +0300 Subject: [PATCH 04/80] Fix saved track name --- .../routepreparationmenu/ChooseRouteFragment.java | 15 +++++++++++---- .../RouteOptionsBottomSheet.java | 11 +++++++++-- .../routepreparationmenu/cards/TracksCard.java | 10 ++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java index 62827e1e67..5c283c670d 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java @@ -37,6 +37,7 @@ import androidx.viewpager.widget.ViewPager; import net.osmand.AndroidUtils; import net.osmand.FileUtils; import net.osmand.GPXUtilities; +import net.osmand.GPXUtilities.GPXFile; import net.osmand.IndexConstants; import net.osmand.data.LatLon; import net.osmand.data.PointDescription; @@ -482,12 +483,18 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements ContextMe OsmandApplication app = mapActivity.getMyApplication(); GPXRouteParamsBuilder paramsBuilder = app.getRoutingHelper().getCurrentGPXRoute(); - String fileName; - if (paramsBuilder == null || paramsBuilder.getFile() == null || paramsBuilder.getFile().path == null) { + String fileName = null; + if (paramsBuilder != null && paramsBuilder.getFile() != null) { + GPXFile gpxFile = paramsBuilder.getFile(); + if (!Algorithms.isEmpty(gpxFile.path)) { + fileName = Algorithms.getFileNameWithoutExtension(new File(gpxFile.path).getName()); + } else if (!Algorithms.isEmpty(gpxFile.tracks)) { + fileName = gpxFile.tracks.get(0).name; + } + } + if (Algorithms.isEmpty(fileName)) { String suggestedName = new SimpleDateFormat("EEE dd MMM yyyy", Locale.US).format(new Date()); fileName = FileUtils.createUniqueFileName(app, suggestedName, IndexConstants.GPX_INDEX_DIR, GPX_FILE_EXT); - } else { - fileName = Algorithms.getFileNameWithoutExtension(new File(paramsBuilder.getFile().path).getName()); } SaveAsNewTrackBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), ChooseRouteFragment.this, null, fileName, diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java index 0d23e78673..d18537bfb8 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java @@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import net.osmand.AndroidUtils; +import net.osmand.GPXUtilities.GPXFile; import net.osmand.StateChangedListener; import net.osmand.plus.OsmAndLocationSimulation; import net.osmand.plus.OsmandApplication; @@ -47,6 +48,7 @@ import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.router.GeneralRouter; +import net.osmand.util.Algorithms; import java.io.File; import java.util.Arrays; @@ -342,14 +344,19 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment { private BaseBottomSheetItem createGpxRoutingItem(final LocalRoutingParameter optionsItem) { RouteProvider.GPXRouteParamsBuilder routeParamsBuilder = mapActivity.getRoutingHelper().getCurrentGPXRoute(); - String description; + String description = null; int descriptionColorId; if (routeParamsBuilder == null) { descriptionColorId = nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light; description = mapActivity.getString(R.string.follow_track_descr); } else { descriptionColorId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light; - description = new File(routeParamsBuilder.getFile().path).getName(); + GPXFile gpxFile = routeParamsBuilder.getFile(); + if (!Algorithms.isEmpty(gpxFile.path)) { + description = new File(gpxFile.path).getName(); + } else if (!Algorithms.isEmpty(gpxFile.tracks)) { + description = gpxFile.tracks.get(0).name; + } } return new BottomSheetItemWithDescription.Builder() diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java index 78bd52085e..3312371a56 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TracksCard.java @@ -12,6 +12,7 @@ import androidx.appcompat.view.ContextThemeWrapper; import androidx.core.content.ContextCompat; import net.osmand.AndroidUtils; +import net.osmand.GPXUtilities; import net.osmand.GPXUtilities.GPXFile; import net.osmand.IndexConstants; import net.osmand.plus.GPXDatabase.GpxDataItem; @@ -19,6 +20,7 @@ import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.helpers.GpxUiHelper.GPXInfo; +import net.osmand.plus.settings.backend.ApplicationMode; import java.io.File; import java.util.ArrayList; @@ -115,6 +117,14 @@ public class TracksCard extends BaseCard { v.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + List points = item.file.getRoutePoints(); + if (!points.isEmpty()) { + ApplicationMode mode = ApplicationMode.valueOfStringKey(points.get(0).getProfileType(), null); + if (mode != null) { + app.getRoutingHelper().setAppMode(mode); + app.initVoiceCommandPlayer(mapActivity, mode, true, null, false, false, true); + } + } mapActivity.getMapActions().setGPXRouteParams(item.file); app.getTargetPointsHelper().updateRouteAndRefresh(true); } From db17418c4f7013e852ad3b29cfbf31910f6ac69b Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 25 Sep 2020 14:41:02 +0300 Subject: [PATCH 05/80] Fix reverse track availability --- .../osmand/plus/routepreparationmenu/FollowTrackFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java index 8937f4ce5d..fd0d22f6fc 100644 --- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java @@ -213,7 +213,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute(); boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND; if (rparams != null && osmandRouter) { - boolean showReverseCard = !gpxFile.hasRoute() || gpxFile.hasRtePt(); + boolean showReverseCard = !routingHelper.isCurrentGPXRouteV2(); if (showReverseCard) { cardsContainer.addView(buildDividerView(cardsContainer, false)); From 6426f8808c30385e532dcf70bb5ec58ee6b8ccdc Mon Sep 17 00:00:00 2001 From: aceman444 Date: Fri, 9 Oct 2020 00:16:59 +0200 Subject: [PATCH 06/80] Update strings.xml Fix missing spaces --- OsmAnd/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index e46bf65ab5..9c07ff1418 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -21,7 +21,7 @@ Development Avoid footways Avoid footways - Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings. + Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period (month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings. Subscription charged per selected period. Cancel it on AppGallery at any time. Thank you for purchasing \'Contour lines\' Start/finish icons @@ -249,7 +249,7 @@ Extra maps Combine POI types from different categories. Tap switch to select all, tap left side to category selection. Search for POI types - Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings. + Payment will be charged to your Google Play account at the confirmation of purchase.\n\n Subscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period (month/three month/year) only on the renewal date.\n\n You can manage and cancel your subscriptions by going to your Google Play settings. %1$s / %2$s Custom color Lombard From 02627729ed514b852b67465d36063166cb798b2c Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 9 Oct 2020 15:50:06 +0300 Subject: [PATCH 07/80] println removed --- .../src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java index 4f1410dc4c..1be623825b 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java @@ -179,7 +179,6 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity { protected void onNewIntent(Intent intent) { super.onNewIntent(intent); Uri uri = intent.getData(); - System.out.println("URI=" + uri); if (uri != null && uri.toString().startsWith("osmand-oauth")) { String oauthVerifier = uri.getQueryParameter("oauth_verifier"); client.authorize(oauthVerifier); From 116abf1e2851d21c052800b177e5002eedae28c7 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 9 Oct 2020 17:51:39 +0300 Subject: [PATCH 08/80] image added --- .../plus/mapcontextmenu/builders/cards/IPFSImageCard.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java index 45495ca8d0..0d58add034 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java @@ -1,8 +1,10 @@ package net.osmand.plus.mapcontextmenu.builders.cards; import android.view.View; +import androidx.core.content.ContextCompat; import net.osmand.AndroidNetworkUtils; import net.osmand.PlatformUtil; +import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; @@ -24,6 +26,7 @@ public class IPFSImageCard extends ImageCard { url = BASE_URL + cid; imageHiresUrl = BASE_URL + cid; imageUrl = BASE_URL + cid; + icon = ContextCompat.getDrawable(getMyApplication(), R.drawable.ic_logo_openplacereview); if (!Algorithms.isEmpty(getUrl())) { View.OnClickListener onClickListener = new View.OnClickListener() { @Override From 9e39f31e1e25e2b9855c43a2a054170fa3934122 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Fri, 9 Oct 2020 06:39:28 +0000 Subject: [PATCH 09/80] Translated using Weblate (French) Currently translated at 99.8% (3495 of 3500 strings) --- OsmAnd/res/values-fr/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 401664b66e..7df1ec9127 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1532,7 +1532,7 @@ Limite de hauteur Précisez la hauteur du véhicule à respecter sur les routes. Recalcule intelligent de l\'itinéraire - Pour les longs trajets, recalculer uniquement le début de l\'itinéraire + Recalculer uniquement le début de l\'itinéraire (utile pour les longs trajets). Se déconnecter Désactivé Couleur de l\'itinéraire basée sur les symboles de randonnée OSMC @@ -3888,4 +3888,7 @@ Abonnement facturé pour chaque période sélectionnée. Annulation possible à tout moment sur AppGallery. Éviter les trottoirs Éviter les trottoirs + Développement + OsmAnd Live data + OsmAnd Live data \ No newline at end of file From e4754acfeadc13f7379a6db706c05997ab3ec350 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 9 Oct 2020 15:46:48 +0000 Subject: [PATCH 10/80] Translated using Weblate (German) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-de/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index fcfcca7c77..3282153385 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3918,4 +3918,11 @@ \n Sie können Ihre Abonnements verwalten und kündigen, indem Sie zu Ihren AppGallery-Einstellungen gehen. Vermeidet Fußwege Keine Fußwege + Entwicklung + OsmAnd Live Daten + OsmAnd Live Daten + Komplexe Routenberechnung + Zwei-Phasen-Routenberechnung für die Autonavigation. + Native ÖPNV Entwicklung + Wechseln zu Java (sicher) Berechnung des ÖPNV-Routings \ No newline at end of file From 130b08ad4350923c5810451efcb3abd8045d6cfb Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Fri, 9 Oct 2020 07:49:52 +0000 Subject: [PATCH 11/80] Translated using Weblate (German) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 3282153385..fbf1ccc31f 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1570,7 +1570,7 @@ Höhe des Fahrzeugs für Routenberechnung angeben. Wikipedia Schnelle Routenneuberechnung - Bei längeren Routen nur den Anfangsteil neu berechnen. + Nur den Anfangsteil neu berechnen. Kann bei längeren Routen benutzt werden. Spanisch (Argentinien) Thailändisch Malaysisch From 500c3c4e5fa595f12d600fc0a2cadaaf4cc48a99 Mon Sep 17 00:00:00 2001 From: Nikita Epifanov Date: Fri, 9 Oct 2020 19:34:49 +0000 Subject: [PATCH 12/80] Translated using Weblate (Russian) Currently translated at 99.9% (3497 of 3500 strings) --- OsmAnd/res/values-ru/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 968f4e898e..b3698c7cfd 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -3911,4 +3911,8 @@ \nПодписка продлевается автоматически, если она не будет отменена до даты продления. С вашего счета будет взиматься плата за период продления (месяц/три месяца/год) только в дату продления. \n \nВы можете управлять своими подписками и отменять их, перейдя в настройки AppGallery. + Данные OsmAnd Live + Данные OsmAnd Live + Комплексная маршрутизация + Двухфазная маршрутизация для автомобильной навигации. \ No newline at end of file From 855fb2dd61914a67cb358937b3abc9ed272ecfe1 Mon Sep 17 00:00:00 2001 From: Deelite <556xxy@gmail.com> Date: Fri, 9 Oct 2020 16:54:51 +0000 Subject: [PATCH 13/80] Translated using Weblate (Russian) Currently translated at 99.9% (3497 of 3500 strings) --- OsmAnd/res/values-ru/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index b3698c7cfd..e2e139db16 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1177,8 +1177,8 @@ Рестораны Достопримечательности Последний промежуточный пункт - Сделать начальной остановкой - Сделать последней остановкой + Первый промежуточный пункт + Последний промежуточный пункт Первый промежуточный пункт Заменить пункт назначения Пункт назначения уже задан @@ -1819,7 +1819,7 @@ Предельная высота Укажите высоту транспортного средства для учёта при построении маршрута. Умный пересчёт маршрута - Для больших маршрутов пересчитывать только начало. + Пересчитывается только начальная часть маршрута. Может использоваться для дальних поездок. Удалить правки OSM Выключено Раскраска по сетевой принадлежности @@ -2668,8 +2668,8 @@ Копировать местоположение/название POI Место без названия Текущий - Добавить последним промежуточным пунктом - Добавить первым промежуточным пунктом + Добавить последнюю остановку на маршруте + Добавить первую остановку на маршруте Ранее выбранный пункт назначения станет последним промежуточным пунктом Показать закрытые заметки Показать/скрыть заметки OSM на карте. From 31b3f6456b91fac4f541f52d5da67df26055426a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Fri, 9 Oct 2020 00:02:12 +0000 Subject: [PATCH 14/80] Translated using Weblate (Turkish) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-tr/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 071ecab230..2f28ba412b 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -1393,7 +1393,7 @@ Bu eklentiyi yüklemek için çevrim içi olmanız gerekmektedir. Al Akıllı rota yeniden hesaplama - Uzun seyahatler için rotanın yalnızca ilk bölümünü yeniden hesapla. + Güzergahın yalnızca ilk bölümünü yeniden hesaplar. Uzun yolculuklar için kullanılabilir. OsmAnd\'ı Sevdinizmi? Fikir ve geri bildirimleriniz değerlidir. Bu Uygulamayı Oyla @@ -3869,4 +3869,11 @@ \n AppGallery ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz. Yaya yollarından kaçın Yaya yollarından kaçın + Geliştirme + OsmAnd Live verileri + OsmAnd Live verileri + Karmaşık yönlendirme + Araç navigasyonu için iki aşamalı yönlendirme. + Yerel Toplu Taşıma geliştirme + Java (güvenli) Toplu Taşıma yönlendirme hesaplamasına geçin \ No newline at end of file From 69de08e8f688f9aa5bd9b1c912e90d9ad329b48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Babos=20G=C3=A1bor?= Date: Fri, 9 Oct 2020 06:52:35 +0000 Subject: [PATCH 15/80] Translated using Weblate (Hungarian) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-hu/strings.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index b903ccb8da..3ad0016443 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1534,7 +1534,7 @@ Magasságkorlátozás Adja meg az útvonalakon a járművekre vonatkozó magasságkorlátozást. Intelligens útvonal újraszámítás - Hosszú utaknál csak az útvonal kezdeti részének újraszámítása. + Csak az útvonal kezdeti részét számítja újra. Hosszú utakhoz használható. Naplózás ki Letiltva Színezés hálózathoz tartozás szerint @@ -3898,4 +3898,19 @@ Név: A–Z Kiindulás/érkezés ikonjai Köszönjük, hogy megvásárolta a szintvonalbővítményt (Contour lines) + Az előfizetés díja a kiválasztott időszakonként lesz kiszámítva. Bármikor törölheti az AppGallery webhelyen. + A fizetést a vásárlás visszaigazolásakor az AppGallery számlájára terheljük. +\n +\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondják. A megújítási időszakra (hónap / 3 hónap / év) a számláját csak a megújítás napján terheljük meg. +\n +\nAz előfizetéseket az AppGallery beállításai között kezelheti és törölheti. + Gyalogutak elkerülése + Gyalogutak elkerülése + Fejlesztés + OsmAnd Live adatok + OsmAnd Live adatok + Összetett útvonaltervezés + Kétszakaszos útvonaltervezés autós navigációhoz. + Natív tömegközlekedési fejlesztés + Váltás Java (biztonságos) tömegközlekedési útvonaltervezésre \ No newline at end of file From f91fe96f6b9718e62e69d85bad9187d866354690 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Fri, 9 Oct 2020 22:14:49 +0000 Subject: [PATCH 16/80] Translated using Weblate (Slovak) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-sk/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index f9b8f23366..5ec6c7732b 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1537,7 +1537,7 @@ Výškový limit Zadajte výšku vozidla, ktorá musí byť povolená na cestách. Inteligentné prepočítanie trasy - Pri dlhých výletoch prepočítať iba začiatočný úsek trasy. + Prepočíta iba začiatočný úsek trasy. Môže byť použité pre dlhé výlety. Odhlásiť Vypnuté Zafarbenie podľa príslušnosti k sieti @@ -3914,4 +3914,11 @@ \n Vaše predplatné môžete spravovať a zrušiť v nastaveniach AppGallery. Vyhnúť sa chodníkom pre chodcov Vyhnúť sa chodníkom + Vývoj + Údaje OsmAnd Live + Údaje OsmAnd Live + Komplexný výpočet trasy + Dvojfázový výpočet trasy pre navigáciu auta. + Natívny vývoj hromadnej dopravy + Prepnúť na výpočet trasy hromadnej dopravy v Jave (bezpečné) \ No newline at end of file From 09203a72aad03cc6fb0e05a22e9821d831aff91e Mon Sep 17 00:00:00 2001 From: iman Date: Fri, 9 Oct 2020 13:43:56 +0000 Subject: [PATCH 17/80] Translated using Weblate (Persian) Currently translated at 99.8% (3494 of 3500 strings) --- OsmAnd/res/values-fa/strings.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 68b4a4511d..c7674bb67d 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -2063,7 +2063,7 @@ بازگشایی دریافت محاسبهٔ مجدد هوشمند - برای سفرهای طولانی فقط بخش ابتدایی مسیر را مجدداً محاسبه می‌کند. + فقط بخش ابتدایی مسیر را مجدداً محاسبه می‌کند. برای سفرهای طولانی مفید است. آیا از OsmAnd راضی هستید؟ دیدگاه و بازخورد شما ارزشمند است. به این برنامه امتیاز بدهید @@ -3933,4 +3933,13 @@ اسکوتر موتوری ویلچر رو به جلو فاصله آستانه + نمادهای ابتدا/انتها + راه‌های پیاده + از راه‌های پیاده پرهیز می‌کند + توسعه + دادهٔ OsmAnd Live + دادهٔ OsmAnd Live + مسیریابی دومرحله‌ای برای ناوبری خودرویی. + مسیریابی پیچیده + برای مسیریابی حمل‌ونقل عمومی از محاسبات جاوا (امن) استفاده می‌کند \ No newline at end of file From 28c32e77e016785ea723f8785784de5d1a3f3492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 9 Oct 2020 23:22:57 +0000 Subject: [PATCH 18/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 18.2% (640 of 3500 strings) --- OsmAnd/res/values-nb/strings.xml | 109 ++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 9c24c2aa7c..a2c915b903 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -3672,11 +3672,11 @@ Lydstyrkeknapper til forstørring Last ned Wikipedia-kart Tilgjengelighetsmodus er slått av i Android-systemet. - + Angitt %1$s finnes allerede i OsmAnd. Navigasjonsinstruks - + Start opp programmet igjen for å slette all fotoboksdata. Avinstaller og start på nytt - + Nåværende målpunkt på ruten vil slettes. Hvis det er målet, vil navigasjonen stoppe. Rullestol Gokart Planlegg en rute @@ -3758,4 +3758,107 @@ %s sporfiler valgt Sett turopptak på pause Gjenoppta turopptak + Punkt i sporet å navigere + Merk: Hastighet > 0-sjekk: De fleste GPS-brikkesett rapporterer en hastighetsverdi kun hvis algoritmen fastslår at du er i bevegelse, og ingen hvis du ikke er det. Derav vil bruk av > 0-innstillingen i dette filteret bruke bevegelsesoppdagelsen fra GPS-brikkesettet. Selv om det ikke filtreres har ved opptak, har man fremdeles denne funksjonen i GPX-analyse for å fastslå korrigert distanse, altså verdien som vises i feltet er distanse tatt opp i bevegelse. + Anbefaling: Prøv å bruke bevegelsesoppdagelse via avstandsfilteret for minimumsmåling (B) først, det kan gi bedre resultater, og du vil ikke gå glipp av data. Hvis dine spor fremdeles er fulle av støy ved lave hastigheter, kan du prøve andre verdier enn null her. Merk at noen målinger ikke rapporterer hastighetsverdi i det hele tatt (som nettverksbaserte metoder), og i sådant fall vil du ikke ta opp noe. + Bieffekt: Sporet ditt vil mangle alle deler der minimumshastigheten ikke er oppfylt (f.eks. når du dytter sykkelen din opp en bratt bakke). Pauser går også tapt siden det ikke er noen bevegelse. Dette forringer også analyse eller etterbehandling, som å forsøke å anslå total turlengde, tid i bevegelse, eller gjennomsnittshastighet. + Dette lavhastighetsfilteret tar ikke opp punkter under en gitt hastighet. Dette kan gjøre innspilte spor jevnere når de vises på kartet. + Dette tar opp punkter målt med minimal nøyaktighetsindikasjon (i meter/fot, som det rapporteres av Android av brikkesettet ditt). Nøyaktighet er nærheten av målinger til sann posisjon, og er ikke direkte relatert til presisjon, som er en spredning av gjentatte målinger. + Bivirkning: Som et resultat av filtrering etter nøyaktighet, kan noen punkter mangle helt, f.eks. under broer, under trær, mellom høye bygninger, eller under gitte værforhold. + Anbefaling: Det er vanskelig å forutsi hva som blir tatt opp og ikke, det kan være best å skru dette filteret av. + Merk: Hvis GPS har vært av rett før et opptak, kan første punkt ha dårligere nøyaktighet, slik at man fra kodehold kan la det gå et sekund før et punkt blir tatt opp (eller man tar opp det beste av 3 punkter), men dette er ikke implementert enda. + Filteret unngår dupliserte punkter fra å bli tatt opp der det er for lite bevegelse. Lager et penere resultat uten bruk av etterbehandling. + Bivirkning: Pauseperioder tas ikke opp i det hele tatt, eller kun med ett punkt. Små (faktiske) bevegelser (f.eks. til siden, for å markere en mulig avkjørsel i turen din) kan bli filtrert ut. Din fil inneholder mindre info for etterbehandling, og har dårligere data ved å filtrere ut åpenbart overflødige punkter ved opptak, mens arte-fakter potensielt blir beholdt som følge av dårlige forhold eller GPS-brikkesetteffekter. + Anbefaling: En innstilling på 5 meter kan fungere for deg hvis du ikke vil fange finmaskede detaljer, og ikke ønsker å ta opp data mens du har pause. + Angi nettadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}. + Opptaksoppdeling + Kunne ikke tolke geo-intensjon «%s». + Autorisert + Avskrudd som forvalg: Skjermen vil ikke slås av så lenge OsmAnd kjører i forgrunnen. +\n +\nHvis påskrudd vil OsmAnd bruke systemets innstilling for skjermtidsavbrudd. + Skru på for å vise relieffskygge eller skråningskart. Du kan lese mer om disse karttypene på siden vår. + «Tilbakestill til forvalg» gjenoppretter sorteringsrekkefølgen til installasjonsforvalg. + Relieffskyggekart som bruker mørke skygger for å vise skråninger, topper og lavland. + Ruten vil regnes ut igjen hvis avstanden fra ruten til nåværende posisjon er mer enn valgt verdi. + Betaling vil bli belastet din Google Play-konto ved bekreftelse av kjøp. +\n +\n Abonnement fornyes automatisk med mindre det avbrytes før fornyelsesdatoen. Din konto vil bli belastet for fornyelsesperioden (måned/tre måneder/år) kun på fornyelsesdatoen. +\n +\n Du kan håndtere og avbryte dine abonnementer ved å gå til dine Google Play-innstillinger. + Angi når skjermen skal vekkes opp (forsikre deg om at OsmAnd er i forgrunnen når enheten låses): + Sett minste og største forstørrelsesnivå å vise eller laste inn på nettbasert kart. + Har innvirkning på om skjermen skal brukes som kart eller overlag/underlag. +\n +\n%1$s: Kartet er begrenset til valgt forstørrelsesrekkevidde. +\n +\n%2$s er nivåene de opprinnelige flisene vil være synlige, oppskalering eller nedskalering finner sted utenfor disse verdiene. + Rulleskøyter + I noen land og områder, er bruk av fotoboksvarsling forbudt ved lov. +\n +\nDu må vurdere dette selv i henhold til lovene i ditt land. +\n +\nVelg %1$s og du vil motta varsler og advarsler om fotobokser. +\n +\nVelg %1$s. All data som har med fotobokser å gjøre, varsler, merknader og interessepunkter vil bli slettet til OsmAnd reinstalleres helt og holdent. + Å utføre disse endringene vil tømme hurtiglagret data for denne fliskilden. + Hent info om interessepunkter fra Wikipedia. Det er din frakoblede lommeguide - bare skru på Wikipedia-programtillegget og få artikler om objekter rundt deg. + Utfylt + Betaling vil bli belastet din programgalleri-konto ved bekreftelse av kjøp. +\n +\nAbonnementet fornyes automatisk med mindre det avbrytes før fornyelsesdatoen. Din konto bil bli belastet for fornyelse for hver fornyelsesperiode (måned/tre måneder/år) kun på fornyelsesdatoen. +\n +\nDu kan håndtere og avbryte ditt abonnement ved å gå gjennom dine programgalleri-innstillinger. + OsmAnd-GPX er feilformatert, kontakt brukerstøtte for videre etterforskning. + Skrur av skjermen i henhold til systemets skjermtidsavbrudd. + Angi lengden på ditt kjøretøy, noen rutebegrensninger kan gjelde for lange kjøretøy. + Avskrudd. Krever «Behold skjerm på» under «Tidsavbrudd etter oppvåkning». + Å trykke på enhetens på-knapp vil skru skjermen på med OsmAnd på toppen av låseskjermen. + Pseudo-Mercatorprojeksjon + Behold på + Fotoboksvarsling er forbudt ved lov i noen land. + Bryter for å vise eller skjule Mapillary-lag på kartet. + Denne enheten har ikke fotobokser. + I tilfelle motsatt retning + Kun rutelinjen vil lagres, rutepunktene vil slettes. + Legg til spor-rutepunkt + Legg til spor-rutepunkt + To-delt ruting for bilkjøring. + Abonnement påløper per valgte periode. Avbryt det når som helst fra programgalleriet. + Følg veier + Minimumsforskyvning + Radiuspasser + Hver navigasjonsinstruksjon skrur skjermen på. + Velg skjermtidsavbrudd etter oppvåkning. («%1$s» skrur av tidsavbrudd.) + Levn skjermen av + Hurtiglagrede filer vil bli lastet ned igjen etter et gitt antall minutter. La dette feltet stå tomt for å aldri gjenoppfriske flis for denne kilden. +\n +\nÉn dag er 1440 minutter. +\nÉn uke er 10080 minutter. +\nÉn måned er 43829 minutter. + Hvis «%1$s» er på, vil aktivitetstiden avhenge av den. + Angi kjøretøylengde som tillates på rutene. + Lengdebegrensning + Er du sikker på at du ønsker å forkaste alle endringer i planlagt rute ved å lukke den\? + Naviger fra min posisjon til sporet + Innebygd utvikling for offentlig transport + Bytt til Java (trykk) ruteberegning for offentlig transport + Takk for at du kjøpte «Koter» + Kompleks ruting + Unngå turstier + Unngå turstier + Ekstra rett segment mellom min posisjon og utregnet rute vil bli vist til den er regnet ut på ny + OsmAnd sjekker %1$d for duplikater med eksisterende elementer i programmet. +\n +\nDet kan ta sin tid. + Du kan eksportere eller importere hurtighandlinger med programprofiler. + Er du sikker på at du vil slette %d hurtighandlinger for godt\? + Skjermtidsavbrudd + Forvalgt skjermtidsavbrudd + Gatenivåbildedata + Beskjær før + Beskjær før + Utvikling + OsmAnd-sanntidsdata + OsmAnd-sanntidsdata \ No newline at end of file From 214dac57bc5dafdaaaa7eb72b15bb6b2e433ee63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1ns?= Date: Thu, 8 Oct 2020 23:45:38 +0000 Subject: [PATCH 19/80] Translated using Weblate (Galician) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-gl/strings.xml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index 628e97198e..8e7a90f00a 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -1061,7 +1061,7 @@ Compartir Favoritos compartidos mediante OsmAnd Non foi posíbel cargar o GPX. - Send report + Enviar denuncia Non foi posíbel atopar datos para as rexións no cartón de memoria. Escribir para atopar un PDI Calquera @@ -1554,7 +1554,7 @@ Lon %2$s Publicado Precisas estar conectado para instalar este plugin. Obter - Nas viaxes longas, recalcula só o anaco inicial da rota. + Recalcular só a parte inicial da ruta para viaxes longas. Gosta do OsmAnd? A túa opinión e comentarios son valorados. Avalía esta aplicación @@ -3454,7 +3454,7 @@ Lon %2$s OSM A icona amósase mentres se navega ou se move pola pantalla. A icona amósase en asueto. - Verifica e comparte os rexistros detallados da aplicación + Verifica e comparte rexistros detallados da aplicación Non foi posíbel analizar a intención xeográfica \'%s\'. Precísase permiso para empregar esta opción. Este é un filtro de corte de baixa velocidade para non gravar puntos por baixo dunha determinada velocidade. Isto pode facer que as pistas gravadas parezan máis suaves cando se amosan no mapa. @@ -3928,4 +3928,21 @@ Lon %2$s Última modificación Nome: Z – A Nome: A – Z + Iconas de comezo/final + Grazas por mercar \'Curvas de nivel\' + Subscrición cobrada por período escollido. Cancélaa na AppGallery en calquera intre. + O pagamento será cargado na túa conta da AppGallery no mesmo intre da confirmación da compra. +\n +\nA subscrición é renovada de xeito automático a menos que sexa cancelada antes da data de renovación. A túa conta será cargada polo período de renovación (mes/trimestre/ano) só na data de renovación. +\n +\nPodes xestionar e cancelar as túas subscricións indo ós axustes da AppGallery. + Evitar sendas peonís, camiños e beirarrúas + Evitar sendas peonís + Desenvolvemento + Datos do OsmAnd Live + Datos do OsmAnd Live + Enrutamento complexo + Enrutamento de dúas fases para a navegación de automóbil + Desenvolvemento do transporte público nativo + Activar cálculo de enrutamento de transporte público do Java (seguro) \ No newline at end of file From 13144aa5f20e6129b65b9b790858dc02ed267bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1ns?= Date: Thu, 8 Oct 2020 23:44:33 +0000 Subject: [PATCH 20/80] Translated using Weblate (Galician) Currently translated at 100.0% (3825 of 3825 strings) --- OsmAnd/res/values-gl/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml index 82048f8ed6..a840ae5d86 100644 --- a/OsmAnd/res/values-gl/phrases.xml +++ b/OsmAnd/res/values-gl/phrases.xml @@ -3837,4 +3837,5 @@ Pequenos aparellos eléctricos Taboleiro de saídas Recarga de auga potábel + GNL \ No newline at end of file From 60f9a20b93a48286a4751797ce0d4186cbb389af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 9 Oct 2020 22:49:43 +0000 Subject: [PATCH 21/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 41.6% (1592 of 3825 strings) --- OsmAnd/res/values-nb/phrases.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml index b7c1e63c18..b77c5c96e8 100644 --- a/OsmAnd/res/values-nb/phrases.xml +++ b/OsmAnd/res/values-nb/phrases.xml @@ -1618,4 +1618,10 @@ Retning: med urviseren Retning: nord-nordvest Retning: nordvest + Drikkevannspåfylling + Pil + Vibrasjon + Video + Status + Type \ No newline at end of file From 8a2f86d917f449552f479008db05bb0ffc52c96c Mon Sep 17 00:00:00 2001 From: Franco Date: Fri, 9 Oct 2020 16:22:58 +0000 Subject: [PATCH 22/80] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index c6f59f41ea..63a69f908a 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -1541,7 +1541,7 @@ Límite de altura Indica la altura permitida del vehículo en rutas. Recálculo inteligente de ruta - Para viajes largos, recalcula sólo la parte inicial de la ruta. + Recalcula sólo la parte inicial de la ruta. Puede usarse para viajes largos. Cerrar sesión Desactivado Color por red de afiliación @@ -3917,4 +3917,11 @@ \nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery. Evita pasar por las veredas o aceras Evitar veredas/aceras + Desarrollo + Datos de «OsmAnd Live» + Datos de «OsmAnd Live» + Navegación compleja + Navegación bifásica en automóvil. + Desarrollo nativo del transporte público + Cambiar al cálculo de ruta Java (seguro) del transporte público \ No newline at end of file From e85f82d8171f54e89bc1df5bf95bde97d35ecb2d Mon Sep 17 00:00:00 2001 From: Eduardo Addad de Oliveira Date: Fri, 9 Oct 2020 14:17:17 +0000 Subject: [PATCH 23/80] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 457106d81c..5bc547a5da 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -1538,7 +1538,7 @@ Limite de altura Especifique a altura permitida do veículo nas rotas. Recálculo de rota inteligente - Recalcular apenas a parte inicial da rota para viagens longas. + Recalcular apenas a parte inicial da rota. Pode ser usado para viagens longas. Desativado Cor por afiliação de rede Cor por símbolo de caminhada OSMC @@ -3909,4 +3909,11 @@ \nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do AppGallery. Evite passarelas Evite passarelas + Desenvolvimento + Dados do OsmAnd Live + Dados do OsmAnd Live + Roteamento complexo + Roteamento de duas fases para navegação automotiva. + Desenvolvimento de transporte público nativo + Mudar para cálculo de roteamento de transporte público em Java (seguro) \ No newline at end of file From 4db16d9e742f958d7b050bd4fa18c8f2aa861b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Fri, 9 Oct 2020 08:39:22 +0000 Subject: [PATCH 24/80] Translated using Weblate (Estonian) Currently translated at 99.2% (3474 of 3500 strings) --- OsmAnd/res/values-et/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index fe5cbbfa20..512c1bf5b3 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -271,7 +271,7 @@ Arvutatud teekond on tühi. Kasuta internetti teekonna arvutamiseks. Tark teekonna arvutamine - Pikemate vahemaade korral arvuta uuesti ainult teekonna algusosa. + Arvuta uuesti ainult teekonna algusosa. Seda võid kasutada pikemate vahemaade korral. Simuleeri arvutatud või salvestatud GPX teekonda. Künkavarjutuse kiht keelatud Ratsutamisteed @@ -3773,4 +3773,5 @@ \n \nTellimust saad hallata ja tühistada AppGallery seadistustest. Arveldame tellimuse eest valitud ajavahemiku alusel. Seda saad sa vabalt valitud ajal tühistada AppGallery\'s. + Keeruka teekonna koostamine \ No newline at end of file From e0783845d276c5dc67efa6e3e02b9843150790aa Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Fri, 9 Oct 2020 02:59:38 +0000 Subject: [PATCH 25/80] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (3500 of 3500 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 1d6615754e..216b28aad5 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1534,7 +1534,7 @@ 高度限制 指定被許可在道路上行駛的車輛高度。 智慧路線重新計算 - 對於長途航行，只重算路線的初始部分。 + 僅重新計算路線的初始部份。可用於長途旅程。 登出 已停用 依網絡從屬著色 @@ -3909,4 +3909,11 @@ \n您可以在您的 AppGallery 設定中管理與取消您的訂閱。 避免人行道 避免人行道 + 開發 + OsmAnd Live 資料 + OsmAnd Live 資料 + 複雜路線 + 汽車導航的兩階段路線。 + 原生公共運輸發展 + 切換到 Java（安全）公共運輸路線計算 \ No newline at end of file From 2ef9b1695bb725b17eeb57815173b88987fc066b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1ns?= Date: Thu, 8 Oct 2020 23:46:00 +0000 Subject: [PATCH 26/80] Translated using Weblate (Galician) Currently translated at 100.0% (271 of 271 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/gl/ --- OsmAnd-telegram/res/values-gl/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd-telegram/res/values-gl/strings.xml b/OsmAnd-telegram/res/values-gl/strings.xml index e9e462d42a..28f6b19d1a 100644 --- a/OsmAnd-telegram/res/values-gl/strings.xml +++ b/OsmAnd-telegram/res/values-gl/strings.xml @@ -268,4 +268,8 @@ Escolle a zona horaria que desexas amosar nas mensaxes de localización. Tempo de caducidade do búfer Tempo máximo para almacenar puntos no búfer + Exportar + Búfer de Logcat + Verifica e comparte rexistros detallados da aplicación + Enviar denuncia \ No newline at end of file From 374a19d18fb6440a675b689007ab22e28271b2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 9 Oct 2020 05:02:16 +0000 Subject: [PATCH 27/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (271 of 271 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/nb_NO/ --- OsmAnd-telegram/res/values-nb/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml index 6b42727c8a..8fd7b0eb17 100644 --- a/OsmAnd-telegram/res/values-nb/strings.xml +++ b/OsmAnd-telegram/res/values-nb/strings.xml @@ -267,4 +267,8 @@ Siste respons: %1$s siden %1$s siden FEIL + Logcat-mellomlager + Eksporter + Sjekk og del detaljert loggføring fra programmet + Send rapport \ No newline at end of file From 47c609be76d4a7be2a38904f90150b53e8fa3040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 10 Oct 2020 22:41:01 +0000 Subject: [PATCH 28/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 24.6% (865 of 3505 strings) --- OsmAnd/res/values-nb/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index a2c915b903..151add0fc3 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -3861,4 +3861,7 @@ Utvikling OsmAnd-sanntidsdata OsmAnd-sanntidsdata + Utfør OAuth-innlogging for å bruke osmedit-funksjoner + Fjern OpenStreetmap-OAuth-symbol + Logg inn via OAuth \ No newline at end of file From 53da50540db4b21dbf50f95f1e5860bd38404856 Mon Sep 17 00:00:00 2001 From: ovl-1 Date: Sat, 10 Oct 2020 13:33:55 +0000 Subject: [PATCH 29/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 24.6% (865 of 3505 strings) --- OsmAnd/res/values-nb/strings.xml | 44 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 151add0fc3..332729485d 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -346,7 +346,7 @@ Kartjustering: Kartorientering Rutedetaljer - Favoritter er importert + Favoritter importert GPX-fil som inneholder favoritter er ikke funnet på {0} Favoritter lagret til {0} Ingen favorittpunkter å lagre @@ -418,7 +418,7 @@ Erstatt Vis rute Start veiledning - Velg reisemål først + Angi reisemålet først Anvisninger Åpningstider Interessepunkt @@ -443,7 +443,7 @@ Vis synsretning Aktiver 3D-visning av kartet. 3D-kartvisning - Vis sist valgte interessepunktsoverlegg. + Vis sist brukte interessepunktoverlegg. Vis interessepunktoverlegg Velg kilde for nettbaserte eller hurtiglagrede kart. Fliskartkilde @@ -469,7 +469,7 @@ Gåing Senter Nederst - Oppfør bredde- og lengdegrad i det valgte formatet (G - grader, M - minutter, S - sekunder) + Angi bredde- og lengdegrad i det valgte formatet (G - grader, M - minutter, S - sekunder) Breddegrad Lengdegrad DDD.DDDDD @@ -489,7 +489,7 @@ Nei Oppfør favorittnavn Favoritt - Favorittpunkt \'\'{0}\'\' er lagt til. + Favorittpunkt \'\'{0}\'\' lagt til. Rediger favoritt Slett favoritt Slett favorittpunkt \'%s\'\? @@ -945,7 +945,7 @@ Laster opp… Bakgrunnsmodus OsmAnd kjører i bakgrunnen med skjermen av. - Endre overleggsgjennomsiktigheten. + Juster overleggsgjennomsiktighet. Overleggsgjennomsiktighet Juster gjennomsiktighet for basiskartet. Gjennomsiktighet for basiskart @@ -1285,7 +1285,7 @@ Nylige steder Nå lagret her: %1$s Ny versjon - Første steg med OsmAnd + Første trinn med OsmAnd Funksjoner Hjelp til med å forbedre OsmAnd Programtillegg @@ -1458,7 +1458,7 @@ Klarte ikke å laste opp Kjøp Ofte stilte spørsmål - Antall endringer + Antall redigeringer Antall bidragsytere Morgen Natt @@ -2218,7 +2218,7 @@ Yandex-trafikk Stedsbestemmelsestjeneste Bakgrunnsnavigeringen krever aktivert stedsbestemmelsestjeneste. - Åpningstidsformat kan ikke endres. + Kan ikke endre åpningstidsformat. Kunne ikke laste inn data fra tjener. Identitetsbekreftelse mislyktes Kunne ikke lagre GPX-fil. @@ -2248,7 +2248,7 @@ Skjerm %d Legg til kartmarkør Endre kartstil - Kartstil endret til «%s». + Kartstil endret til \"%s\". Nytt lydnotat Nytt videonotat Nytt bildenotat @@ -2463,7 +2463,7 @@ Last ned (\'nettfrakoblede\') data for å kunne bruke kart nettfrakoblet. Online OSM – kartklassifisering med bilder. Hurtighandlingsnavn endret til %1$s for å unngå duplisering. - Navneduplisering for hurtighandling + Navneduplikat for hurtighandling OSM-mottakere Donasjoner totalt Skriv inn filnavnet. @@ -2475,9 +2475,9 @@ Valgfritt punktnavn Ruter i nærheten innen Innenfor - Oppfør lengdegrad - Oppfør breddegrad - Oppfør bredde- og lengdegrad + Angi lengdegrad + Angi breddegrad + Angi bredde- og lengdegrad GG°MM′SS″ GG,GGGGGG° GG,GGGGG° @@ -2966,7 +2966,7 @@ Vei Gate Tjeneste - Tursti + Gangvei Turvei Ridesti Trapper @@ -3086,8 +3086,8 @@ Programprofiler Bruk WunderLINQ for styring Alpint/utfor - Slede - Løyper for sledebruk. + Kjelke + Løyper for kjelkebruk. Tillat avanserte ruter Tillat ekspertruter Tillat løyper kun for skøyting @@ -3830,8 +3830,8 @@ Radiuspasser Hver navigasjonsinstruksjon skrur skjermen på. Velg skjermtidsavbrudd etter oppvåkning. («%1$s» skrur av tidsavbrudd.) - Levn skjermen av - Hurtiglagrede filer vil bli lastet ned igjen etter et gitt antall minutter. La dette feltet stå tomt for å aldri gjenoppfriske flis for denne kilden. + Hold skjermen av + Hurtiglagrede fliser blir lastet ned på nytt etter det angitte antall minutter. La dette feltet stå tomt for å aldri gjenoppfriske fliser for denne kilden. \n \nÉn dag er 1440 minutter. \nÉn uke er 10080 minutter. @@ -3845,8 +3845,8 @@ Bytt til Java (trykk) ruteberegning for offentlig transport Takk for at du kjøpte «Koter» Kompleks ruting - Unngå turstier - Unngå turstier + Unngå gangveier + Unngå gangveier Ekstra rett segment mellom min posisjon og utregnet rute vil bli vist til den er regnet ut på ny OsmAnd sjekker %1$d for duplikater med eksisterende elementer i programmet. \n @@ -3864,4 +3864,6 @@ Utfør OAuth-innlogging for å bruke osmedit-funksjoner Fjern OpenStreetmap-OAuth-symbol Logg inn via OAuth + Hva er nytt + Vellykket utlogging \ No newline at end of file From 5d06a7ce4b1c2b2cdee723cd471fe258243df84f Mon Sep 17 00:00:00 2001 From: ssantos Date: Sat, 10 Oct 2020 11:05:52 +0000 Subject: [PATCH 30/80] Translated using Weblate (Portuguese) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-pt/strings.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index cae1cc8c1e..12f7810ed8 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -2691,7 +2691,7 @@ Definir o tamanho da imagem da câmara Obter Recálculo de rota inteligente - Recalcular apenas a parte inicial da rota para viagens longas. + Recalcula apenas a parte inicial da rota. Pode ser usado para viagens longas. Está a gostar do OsmAnd\? A sua opinião e o seu feedback são importantes. Avalie esta aplicação @@ -3916,4 +3916,16 @@ \nPode gerir e cancelar as suas subscrições a ir às definições da sua AppGallery. Evitar passeios Evitar passeios + Novidades + Desenvolvimento + Dados do OsmAnd ao vivo + Dados do OsmAnd ao vivo + Roteamento complexo + Roteamento em duas fases para a navegação automotiva. + Desenvolvimento nativos de transportes públicos + Mudar para Cálculo de rotas de transporte público Java (seguro) + Realize um login OAuth para usar as funcionalidades do osmedit + Fazer login via OAuth + Limpar token do OpenStreetMap OAuth + Logout bem sucedido \ No newline at end of file From 6147e614fe0d80aaf70522094fe362ce79639e09 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Sat, 10 Oct 2020 18:31:12 +0000 Subject: [PATCH 31/80] Translated using Weblate (French) Currently translated at 99.9% (3504 of 3505 strings) --- OsmAnd/res/values-fr/strings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 7df1ec9127..c26f611f14 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -3891,4 +3891,13 @@ Développement OsmAnd Live data OsmAnd Live data + Basculer vers le calcul d\'itinéraire Transport Public Java (sécurisé) + Connectez-vous avec OAuth pour utiliser les fonctionnalités osmedit + Nouveautés + Routage complexe + Routage en 2 phases pour la navigation en voiture. + Développement du transport public autochtone + Connectez-vous avec OAuth + Supprimer le jeton OAuth d\'OpenStreetMap + Déconnexion réussie \ No newline at end of file From 17b0f6c2da1fad7b9b635db94d0ec961d51850cb Mon Sep 17 00:00:00 2001 From: syl Date: Sat, 10 Oct 2020 15:16:04 +0000 Subject: [PATCH 32/80] Translated using Weblate (French) Currently translated at 99.9% (3504 of 3505 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 c26f611f14..7df4716103 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2610,7 +2610,7 @@ Lire l\'article complet Lire l\'article Tous les points du groupe - Ouvert du + Ouvre à Ouvert jusqu\'à Ferme à Ouvre à From cad1ba6c4af77b101021a7a762a732d0c2390457 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Sat, 10 Oct 2020 15:28:08 +0000 Subject: [PATCH 33/80] Translated using Weblate (Russian) Currently translated at 99.8% (3500 of 3505 strings) --- OsmAnd/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index e2e139db16..2de46cc412 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2668,7 +2668,7 @@ Копировать местоположение/название POI Место без названия Текущий - Добавить последнюю остановку на маршруте + Добавляет промежуточную остановку Добавить первую остановку на маршруте Ранее выбранный пункт назначения станет последним промежуточным пунктом Показать закрытые заметки From 7cfe77ec16c4bbf4d3ac819016653110274a782b Mon Sep 17 00:00:00 2001 From: Nikita Epifanov Date: Sat, 10 Oct 2020 06:37:10 +0000 Subject: [PATCH 34/80] Translated using Weblate (Russian) Currently translated at 99.8% (3500 of 3505 strings) --- OsmAnd/res/values-ru/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 2de46cc412..d2c1dfd578 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -3915,4 +3915,9 @@ Данные OsmAnd Live Комплексная маршрутизация Двухфазная маршрутизация для автомобильной навигации. + Что нового + Выполните вход OAuth, чтобы использовать функции osmedit + Войти через OAuth + Очистить токен OAuth OpenStreetMap + Выход выполнен \ No newline at end of file From eb52ae80131b222cd6118becd8450d8ffffea407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sat, 10 Oct 2020 07:22:47 +0000 Subject: [PATCH 35/80] Translated using Weblate (Turkish) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-tr/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 2f28ba412b..38dec6907b 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -3876,4 +3876,9 @@ Araç navigasyonu için iki aşamalı yönlendirme. Yerel Toplu Taşıma geliştirme Java (güvenli) Toplu Taşıma yönlendirme hesaplamasına geçin + Yenilikler + osmedit özelliklerini kullanmak için OAuth oturum açma işlemi gerçekleştirin + OAuth ile oturum aç + OpenStreetMap OAuth belirtecini temizle + Oturum kapatma başarılı \ No newline at end of file From 655ab6e71fcec10c629a83719b4e0cca4b281240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Babos=20G=C3=A1bor?= Date: Sat, 10 Oct 2020 20:30:59 +0000 Subject: [PATCH 36/80] Translated using Weblate (Hungarian) Currently translated at 99.9% (3504 of 3505 strings) --- OsmAnd/res/values-hu/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 3ad0016443..be5f333f2a 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -3901,7 +3901,7 @@ Az előfizetés díja a kiválasztott időszakonként lesz kiszámítva. Bármikor törölheti az AppGallery webhelyen. A fizetést a vásárlás visszaigazolásakor az AppGallery számlájára terheljük. \n -\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondják. A megújítási időszakra (hónap / 3 hónap / év) a számláját csak a megújítás napján terheljük meg. +\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondja. A megújítási időszakra (hónap / 3 hónap / év) vonatkozóan a számláját csak a megújítás napján terheljük meg. \n \nAz előfizetéseket az AppGallery beállításai között kezelheti és törölheti. Gyalogutak elkerülése @@ -3913,4 +3913,9 @@ Kétszakaszos útvonaltervezés autós navigációhoz. Natív tömegközlekedési fejlesztés Váltás Java (biztonságos) tömegközlekedési útvonaltervezésre + Újdonságok + Az OSM-szerkesztési funkciók használatához jelentkezzék be az OAuth segítségével + Bejelentkezés OAuth segítségével + OpenStreetMap OAuth token törlése + Sikeresen kijelentkezett \ No newline at end of file From 949f366eb5fd2bb8834c94f7a836abf9289de17e Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Sat, 10 Oct 2020 22:01:24 +0000 Subject: [PATCH 37/80] Translated using Weblate (Ukrainian) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-uk/strings.xml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index fda15847c5..8ba9a9906f 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -1542,7 +1542,7 @@ Обмеження по висоті Вкажіть висоту транспортного засобу для розрахунку маршрутів. Інтелектуальне переобчислення маршруту - Для довгих подорожей перераховувати лише початкову частину маршруту. + Перераховувати лише початкову частину маршруту. Можна застосовувати для тривалих мандрівок. Світла Темна П’ємонтський @@ -3902,4 +3902,24 @@ За назвою: А — Я Значки початку/завершення Дякуємо за придбання «Горизонталей» + Що нового + Передплата стягується за вибраний період. Скасуйте її в AppGallery у будь-який час. + Оплату буде стягнено з вашого рахунку AppGallery за підтвердження покупки. +\n +\nПередплата автоматично поновлюється, якщо її скасувати до дати поновлення. З вашого рахунку буде стягнено плату за період поновлення (місяць/три місяці/рік) лише на дату поновлення. +\n +\nВи можете керувати та скасовувати передплати, переходячи до налаштувань AppGallery. + OsmAnd дані в реальному часі + Комплексна маршрутизація + Двофазна маршрутизація для автомобільної навігації. + Розвиток власного громадського транспорту + Перемкнутися на розрахунок маршруту громадським транспортом за допомогою Java (безпечний) + Виконати вхід OAuth для користування функцією osmedit + Увійти через OAuth + Очистити токен OAuth OpenStreetMap + Ви успішно вийшли + OsmAnd дані в реальному часі + Уникати пішохідних шляхів + Уникати пішохідних шляхів + Розробка \ No newline at end of file From d36a3f4a12be00a35ebd879012401a6ca1b4934e Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Sat, 10 Oct 2020 13:40:24 +0000 Subject: [PATCH 38/80] Translated using Weblate (Italian) Currently translated at 89.8% (3148 of 3505 strings) --- OsmAnd/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 919b6123a8..86af4a4f07 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -19,7 +19,7 @@ Indirizzo internet per il tracking in diretta Registra la traccia usando il widget GPX o le impostazioni \'Registrazione viaggi\'. Visualizza la traccia corrente - Puoi scaricare o caricare %1$s mappe. + Puoi scaricare o aggiornare %1$s mappe. Versione gratuita Visualizza descrizione PDI. Wikipedia (offline) From 25bec069282928472766c420f10099bcfa168e04 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 10 Oct 2020 09:23:39 +0000 Subject: [PATCH 39/80] Translated using Weblate (Slovak) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-sk/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 5ec6c7732b..dc0af642be 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -3921,4 +3921,9 @@ Dvojfázový výpočet trasy pre navigáciu auta. Natívny vývoj hromadnej dopravy Prepnúť na výpočet trasy hromadnej dopravy v Jave (bezpečné) + Čo je nové + Vykonať prihlásenie cez OAuth pre použitie funkcií upravovania OSM + Prihlásiť pomocou OAuth + Vymazať token OpenStreetMap OAuth + Odhlásenie úspešné \ No newline at end of file From 80fccb2bc8fadf787be5b7c10d0065f0b081b9f1 Mon Sep 17 00:00:00 2001 From: Branko Kokanovic Date: Sat, 10 Oct 2020 22:04:33 +0000 Subject: [PATCH 40/80] Translated using Weblate (Serbian) Currently translated at 98.2% (3442 of 3505 strings) --- OsmAnd/res/values-sr/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml index fb598f330b..e0ac87a53f 100644 --- a/OsmAnd/res/values-sr/strings.xml +++ b/OsmAnd/res/values-sr/strings.xml @@ -3863,4 +3863,10 @@ Скрати после Промените врсту руте пре Промените врсту руте након + Шта је ново + Име фајла + + Паузирај снимање пута + Додајте бар две тачке. + Одјава успешна \ No newline at end of file From c317054b34278f4840e97ebcfb0ab077ffd4d402 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Sat, 10 Oct 2020 06:38:57 +0000 Subject: [PATCH 41/80] Translated using Weblate (Hebrew) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-iw/strings.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml index 6b405f881a..756dfe73dd 100644 --- a/OsmAnd/res/values-iw/strings.xml +++ b/OsmAnd/res/values-iw/strings.xml @@ -2171,7 +2171,7 @@ צריך חיבור לאינטרנט כדי להתקין את התוסף הזה. קבלה חישוב חכם לנתיב מחדש - לטיולים ארוכים, יש לחשב מחדש רק את החלק ההתחלתי של הנתיב. + לחשב מחדש רק את החלק ההתחלתי של המסלול, יכול לשמש לטיולים ארוכים. OsmAnd נושא חן בעיניך? הדעה והמשוב שלך יקרים לנו. דירוג היישומון הזה @@ -3919,4 +3919,16 @@ \nהמינוי מתחדש אוטומטי אלא אם כן בוטל בטרם תאריך החידוש. החשבון שלך יחויב על תקופת החידוש (חודש/שלושה חודשים/שנה) רק בתאריך החידוש. \n \nניתן לנהל ולבטל את המינויים שלך דרך ההגדרות ב־AppGallery שלך. + מה חדש + פיתוח + נתוני זמן אמת של OsmAnd + נתוני זמן אמת של OsmAnd + חישוב מורכב של מסלול + חישוב מסלול דו־שלבי לניווט במכונית. + פיתוח עצמי לתחבורה ציבורית + מעבר לחישוב ניווט בתחבורה ציבורית ב־Java (בטוח) + יש להיכנס עם OAuth כדי להשתמש ביכולות של osmedit + להיכנס דרך OAuth + למחוק את אסימון ה־OAuth של OpenStreetMap + היציאה הצליחה \ No newline at end of file From 706e795a8c3b6a0874e266d398c226188503916b Mon Sep 17 00:00:00 2001 From: WaldiS Date: Sat, 10 Oct 2020 10:38:57 +0000 Subject: [PATCH 42/80] Translated using Weblate (Polish) Currently translated at 99.3% (3483 of 3505 strings) --- OsmAnd/res/values-pl/strings.xml | 34 ++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index c7ba4f0c15..c94fb854dc 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -264,7 +264,7 @@ Brak ulubionych punktów do zapisania Importuj Nie można wczytać GPX. - Wyślij zgłoszenie + Wyślij raport Nie znaleziono pobranych map na karcie pamięci. Napisz, aby odnaleźć POI Jakiekolwiek @@ -1319,7 +1319,7 @@ Kontrola graniczna Punkt poboru opłat Znak Stop - Spowolnienie ruchu + Uspokojenie ruchu Fotoradar Ostrzeżenia drogowe Kliknij istniejący element, aby zobaczyć szczegóły, naciśnij i przytrzymaj, aby wyłączyć lub usunąć. Aktualne dane na urządzeniu (%1$s wolne): @@ -1541,7 +1541,7 @@ Ograniczenie wysokości Określa dozwoloną wysokość pojazdu na trasach. Inteligentne przeliczanie trasy - Wyznacza ponownie tylko początkową część trasy dla długich podróży. + Ponownie oblicza tylko początkową część trasy. Może być stosowany do długich podróży. Wyloguj się Linia w kolorze oznakowania OSMC Wyłączenie @@ -3431,7 +3431,7 @@ OSM Ikona wyświetlana podczas nawigacji lub ruchu. Ikona wyświetlana podczas spoczynku. - Sprawdź i udostępnij szczegółowe dzienniki aplikacji + Sprawdzanie i udostępnianie szczegółowych logów aplikacji Brak reguł wyznaczania trasy w „%1$s”. Proszę wybrać inny plik. Wymagane jest zezwolenie na korzystanie z tej opcji. Proszę wybrać obsługiwany plik z rozszerzeniem %1$s. @@ -3802,7 +3802,7 @@ Przyciski głośności jako powiększenie Wózek inwalidzki Gokart - Zamknięte Uwagi OSM + Zamknięta notatka OSM Aby kontynuować, musisz ustawić dni robocze Droga pomiędzy punktami Zaplanuj trasę @@ -3859,7 +3859,7 @@ Importowanie lub rejestrowanie plików śladu Dodaj punkt trasy Dodaj punkt trasy - Rejestrowanie śladu + Rejestrowanie śladów Zapisz jako plik śladu Wybiera plik śladu do podążania Wybierz inną trasę @@ -3911,4 +3911,26 @@ Ostatnia modyfikacja Nazwa: Z – A Nazwa: A – Z + Co nowego + Ikony start/koniec + Dziękujemy za zakup linii konturowych + Subskrypcja naliczona za wybrany okres. Anuluj ją w AppGallery w dowolnym momencie. + Płatność zostanie pobrana z konta AppGallery po potwierdzeniu zakupu. +\n +\nSubskrypcja jest automatycznie odnawiana, chyba że zostanie anulowana przed datą odnowienia. Twoje konto zostanie obciążone opłatą za okres odnowienia (miesiąc/trzy miesiące/rok) tylko w dniu odnowienia. +\n +\nMożesz zarządzać subskrypcjami i anulować je, przechodząc do ustawień Galerii aplikacji. + Unikaj chodników + Unikaj chodników + Rozwój + Dane na żywo z OsmAnd + Dane na żywo z OsmAnd + Routing złożony + Dwufazowe wyznaczanie tras do nawigacji samochodowej. + Rozwój rodzimego transportu publicznego + Przejdź do (bezpiecznego) obliczania tras transportu publicznego w języku Java + Wykonaj logowanie OAuth, aby korzystać z funkcji osmedit + Zaloguj się przez OAuth + Wyczyść token OpenStreetMap OAuth + Wylogowanie powiodło się \ No newline at end of file From 242704e31307ce76abdf807022cd8f4a91929e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 10 Oct 2020 22:41:55 +0000 Subject: [PATCH 43/80] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 24.6% (865 of 3505 strings) --- OsmAnd/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 332729485d..97364e7f2d 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -3865,5 +3865,5 @@ Fjern OpenStreetmap-OAuth-symbol Logg inn via OAuth Hva er nytt - Vellykket utlogging + Utlogget \ No newline at end of file From 2cb5ac7f7b1122d7e9b256195a8ade78e94fab10 Mon Sep 17 00:00:00 2001 From: Manuel Tassi Date: Sun, 11 Oct 2020 09:16:18 +0000 Subject: [PATCH 44/80] Translated using Weblate (Italian) Currently translated at 73.4% (2810 of 3825 strings) --- OsmAnd/res/values-it/phrases.xml | 47 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml index dd7427f84a..203079b8db 100644 --- a/OsmAnd/res/values-it/phrases.xml +++ b/OsmAnd/res/values-it/phrases.xml @@ -93,7 +93,7 @@ Negozio di moto Strumenti musicali Optometrista - Alimenti biologici + Prodotti biologici Negozio articoli per l\'attività all\'aperto Negozio articoli pittura Negozio animali domestici @@ -748,7 +748,7 @@ Costi Fumatori Consegna - Drive in + Drive-in Cibo da asporto Cocktail Microbirrificio @@ -1057,7 +1057,7 @@ sì Senza pavimentazione tattile sì - no + Suono: no Solo quando è consentito camminare Stazione di soccorso Posto per birdwatching @@ -1077,7 +1077,7 @@ Classic + skating no Giardino: residenziale - Tipo di giardino: comunità + Tipo di giardino: comunitario Giardino: privato Giardino: botanica Giardino: cucina @@ -1164,7 +1164,7 @@ Assegni PIKEPASS PIKEPASS non accettato - PIKEPASS (indicato) + PIKEPASS (riservato) Carte di debito Visa Carte di debito Visa non accettato Cryptomonete non accettate @@ -1384,13 +1384,13 @@ Riparazione di veicoli elettrici Riparazione Motocicli sì - No Self-Service + No sì Non automatizzato Servizio completo sì Senza spazzola: no - Lavaggio auto: no + No Bagno pubblico Esterno sì @@ -1505,7 +1505,7 @@ Ponte pedonale Ponte di biciclette Ponte ferroviera - Struttura ponte: fascio + Struttura ponte: trave Struttura ponte: sospensione semplice Struttura ponte: sospensione Struttura ponte: arco @@ -1801,7 +1801,7 @@ Profondità Sale Sale: no - indicato + Riservato Campo estivo Campana di attraversamento Campana di attraversamento: no @@ -2559,7 +2559,7 @@ Stato della pompa: rotta Riparazioni elettroniche Chiusa - Privata + Privato Rotta Nessuno Cloro @@ -2579,30 +2579,30 @@ sì sì sì - indicato + Riservato permissiva sì - indicato + Riservato sì - indicato + Riservato sì - indicato + Riservato sì - indicato + Riservato sì permissiva - indicato + Riservato sì - indicato + Riservato sì - indicato + Riservato sì permissiva - indicato + Riservato sì - indicato + Riservato sì - indicato + Riservato Metodista unita Accesso alle motoslitte Accesso agli autobus @@ -2655,7 +2655,7 @@ Accesso al rimorchio: no Accesso all\'autobus: no Accesso all\'autobus turistico: sì - Accesso all\'autobus turistico: designato + Accesso autobus turistici: riservato Accesso all\'autobus turistico: no Accesso sci: sì Accesso sci: no @@ -2664,7 +2664,7 @@ Accesso agricolo: sì Accesso agricolo: no Accesso taxi: sì - Accesso taxi: designato + Accesso taxi: riservato Accesso taxi: no Accesso per disabili: no Destinazione @@ -2819,4 +2819,5 @@ Aggregato Berillio Negozio all\'ingrosso + Accesso PSV: riservato \ No newline at end of file From f5639551102c67a9071c547535c891333740ecad Mon Sep 17 00:00:00 2001 From: WaldiS Date: Sat, 10 Oct 2020 10:38:03 +0000 Subject: [PATCH 45/80] Translated using Weblate (Polish) Currently translated at 99.7% (3816 of 3825 strings) --- OsmAnd/res/values-pl/phrases.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index faec609ff4..d2fcba034d 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -3834,7 +3834,14 @@ Stan pompy: brak wiązki Strzałka: nie Winda - Małogabarytowe urządzenia elektryczne - Tablica odjazdów/odlotów + Małe urządzenia elektryczne + Tablica odlotów Uzupełnianie wody pitnej + LNG + Sklep z orzechami + Rozkład jazdy + Czas rzeczywisty + Opóźnienie + Tak + Tablica odlotów: nie \ No newline at end of file From c1d149970c043ef5d0804f3696345378b97a5cb6 Mon Sep 17 00:00:00 2001 From: syl Date: Sat, 10 Oct 2020 15:26:26 +0000 Subject: [PATCH 46/80] Translated using Weblate (French) Currently translated at 99.9% (3823 of 3825 strings) --- OsmAnd/res/values-fr/phrases.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml index 91dc180070..1196bb8b8b 100644 --- a/OsmAnd/res/values-fr/phrases.xml +++ b/OsmAnd/res/values-fr/phrases.xml @@ -968,7 +968,7 @@ Poubelle (sacs noirs) Carton Magazines - Petits appareils électriques + Petits appareils Papier aluminium Blocaille Ampoules électriques @@ -3834,4 +3834,14 @@ Arrondissement Flèche : non État de la pompe : faisceau manquant + Délai + GNL + Ruche + Tableau horaire + Temps réel + Petits appareils électriques + Oui + Tableau des départs : non + Ascenseur + Tableau des départs \ No newline at end of file From 994df2572581b01175ea759d8ddd8e302145d3dd Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 10 Oct 2020 18:31:32 +0000 Subject: [PATCH 47/80] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 63a69f908a..5e5fae0268 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -3924,4 +3924,9 @@ Navegación bifásica en automóvil. Desarrollo nativo del transporte público Cambiar al cálculo de ruta Java (seguro) del transporte público + Novedades + Inicia sesión con OAuth para usar las funciones de edición de OSM + Ingresar a través de OAuth + Vaciar llave OAuth de OpenStreetMap + Sesión finalizada \ No newline at end of file From 4e5f6ebc036099c5ba25cce11a0c34b446b95c2b Mon Sep 17 00:00:00 2001 From: Eduardo Addad de Oliveira Date: Sat, 10 Oct 2020 19:02:41 +0000 Subject: [PATCH 48/80] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 5bc547a5da..8f1641cca9 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -3916,4 +3916,9 @@ Roteamento de duas fases para navegação automotiva. Desenvolvimento de transporte público nativo Mudar para cálculo de roteamento de transporte público em Java (seguro) + O que há de novo + Entre no OAuth para usar os recursos de edição do osm + Entrar via OAuth + Limpar token do OpenStreetMap OAuth + Saída bem sucedida \ No newline at end of file From 9bd32a6d43c6e6b380e15525726addd0e037094f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Sun, 11 Oct 2020 06:43:47 +0000 Subject: [PATCH 49/80] Translated using Weblate (Estonian) Currently translated at 99.2% (3477 of 3505 strings) --- OsmAnd/res/values-et/strings.xml | 45 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index 512c1bf5b3..c580533de8 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -245,7 +245,7 @@ Teekonna simuleerimise kiirus: Jaga teekonda GPX failina OsmAnd abil jagatud teekond - Ringristmik: vali %1d väljumine ja sõida otse + Ringristmik: vali %1$d väljumine ja sõida otse Hoia vasakule ja sõida otse Hoia paremale ja sõida otse Kasuta helkivaid värve radade ja teekondade kuvamisel. @@ -1720,25 +1720,25 @@ \n \n OsmAnd on aktiivselt arendamisel ning meie projekt ja selle jätkuv edasiminek sõltub rahalisest toetusest uute funktsioonide väljatöötamiseks ja testimiseks. Palun kaalu OsmAnd+ ostmist või konkreetsete uute funktsioonide rahastamist või üldise annetuse tegemist leheküljel https://osmand.net. OsmAnd+ kaardid ja navigeerimine - OsmAnd+ (OSM automatiseeritud navigeerimisjuhised) -\n -\n OsmAnd+ on avatud lähtekoodiga tarkvara navigeerimisrakendus, millel on juurdepääs paljudele globaalsetele OpenStreetMap (OSM) andmetele. Kõiki kaardiandmeid (vektor- või paanikaarte) saab salvestada telefoni mälukaardile võrguühenduseta kasutamiseks. Pakutakse ka võrguühenduseta ja veebipõhist teekonna leidmise funktsiooni, sealhulgas hääljuhiseid. -\n -\n OsmAnd+ on rakenduse tasuline versioon, seda ostes toetate projekti, rahastate uute funktsioonide arendamist ja saate kõige värskemaid uuendusi. -\n -\n Mõned põhifunktsioonid: -\n - Täielik võrguühenduseta funktsioon (salvestage alla laetud vektor- või paanikaardid seadme mällu) -\n - Saadaval on kompaktsed võrguühenduseta vektorkaardid üle kogu maailma -\n - Riigi või piirkonna kaartide piiramatu allalaadimine otse rakendusest -\n - Võrguühenduseta Vikipeedia funktsioon (laadige Vikipeedia huvipunktid alla), sobib suurepäraselt vaatamisväärsustega tutvumiseks -\n - Võimalik on mitme kaardikihi ülekatmine, näiteks GPX või navigeerimisrajad, huvipunktid, eelistused, kõrgusjooned, ühistranspordi peatused, täiendavad kaardid kohandatava läbipaistvusega -\n -\n - Aadresside ja kohtade (huvipunktide) otsing võrguühenduseta -\n - Võrguühenduseta teekonna leidmine keskmise vahemaa jaoks -\n - Auto-, jalgratta- ja jalakäijarežiim valikuliselt: -\n - Automatiseeritud päeva/öö ekraanivaate vahetamine -\n - Kiirusest sõltuv kaardi suurendustase -\n - Kaardi joondamine vastavalt kompassile või liikumissuunale + OsmAnd+ (OSM automatiseeritud navigeerimisjuhised) +\n +\n OsmAnd+ on avatud lähtekoodiga tarkvara navigeerimisrakendus, millel on juurdepääs paljudele globaalsetele OpenStreetMap (OSM) andmetele. Kõiki kaardiandmeid (vektor- ja paanikaarte) saab salvestada telefoni mälukaardile võrguühenduseta kasutamiseks. Võimalik on nii võrguühenduseta kui ka -ühendusega teekonna leidmise funktsioon, milles on ka hääljuhiseid. +\n +\n OsmAnd+ on rakenduse tasuline versioon, mida ostes toetate projekti, rahastate uute funktsioonide arendamist ja saate kõige värskemaid uuendusi. +\n +\n Mõned põhifunktsioonid: +\n - Täielik võrguühenduseta funktsioon (salvestage alla laetud vektor- ja paanikaardid seadme mällu) +\n - Saadaval on kompaktsed kogu maailma vektorkaardid (võrguühenduseta režiim) +\n - Riigi või piirkonna kaartide piiramatu allalaadimine otse rakendusest +\n - Võrguühenduseta Vikipeedia funktsioon (laadige Vikipeedia huvipunktid alla), sobib suurepäraselt vaatamisväärsustega tutvumiseks +\n - Võimalik on mitme kaardikihi ülekatmine, näiteks GPX või navigeerimisrajad, huvipunktid, eelistused, kõrgusjooned, ühistranspordi peatused, täiendavad kaardid kohandatava läbipaistvusega +\n +\n - Aadresside ja kohtade (huvipunktide) otsing võrguühenduseta +\n - Võrguühenduseta teekonna leidmine keskmise vahemaa jaoks +\n - Auto-, jalgratta- ja jalakäijarežiim valikuliselt: +\n - Automatiseeritud päeva/öö ekraanivaate vahetamine +\n - Kiirusest sõltuv kaardi suurendustase +\n - Kaardi joondamine vastavalt kompassile või liikumissuunale \n - Raja juhtimine, kiiruspiirangu kuvamine, salvestatud ja kõnesünteesi hääled \n Loo huvipunktide filter @@ -3719,8 +3719,8 @@ \nVastavalt oma maa seadustele pead sa otsuse tegema. \n \nValides %1$s sa saad kiiruskaamerate-kohaseid teateid ja hoiatusi. -\n -\nValides %s$s kustutatakse kõik kiiruskaameratega seotud andmed, nagu hoiatused, teated ja huvipunktid seniks, kuni sa OsmAnd\'ile ei tee täiesti uut paigaldust. +\n +\nValides %2$s kustutatakse kõik kiiruskaameratega seotud andmed, nagu hoiatused, teated ja huvipunktid seniks, kuni sa OsmAnd\'ile ei tee täiesti uut paigaldust. Praegune teekonna vahepunkt saab kustutatud. Kui ta osutub sihtkohaks, siis navigatsioon lõppeb. Muuda teekonna tüüpi pärast Muuda teekonna tüüpi enne @@ -3774,4 +3774,5 @@ \nTellimust saad hallata ja tühistada AppGallery seadistustest. Arveldame tellimuse eest valitud ajavahemiku alusel. Seda saad sa vabalt valitud ajal tühistada AppGallery\'s. Keeruka teekonna koostamine + Väljalogimine õnnestus \ No newline at end of file From 1688ccc51fd2ccd8391a5be30062e87002d23fee Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 10 Oct 2020 18:37:16 +0000 Subject: [PATCH 50/80] Translated using Weblate (Spanish (American)) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-es-rUS/strings.xml | 38 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml index c42f0e0c5b..8cbb5a9aeb 100644 --- a/OsmAnd/res/values-es-rUS/strings.xml +++ b/OsmAnd/res/values-es-rUS/strings.xml @@ -385,15 +385,15 @@ \nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible. \n \nDescarga las teselas de los mapas directamente en línea, o prepáralo para su uso sin conexión (copiar manualmente en la carpeta de datos OsmAnd) como una base de datos SQLite que puede ser producida por una variedad de herramientas de preparación de mapas de terceros. - Este complemento activa la funcionalidad para registrar y guardar tus trazas manualmente pulsando el widget de grabación GPX en el mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX. -\n + Activa la funcionalidad para registrar y guardar tus trazas manualmente pulsando el widget de grabación GPX en el mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX. +\n \nLas trazas grabadas pueden ser compartidas con tus amigos o ser usadas para contribuir a OSM. Los atletas pueden usar las trazas grabadas para seguir sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente en OsmAnd, como tiempos por vuelta, velocidad media, etc., y por supuesto las trazas pueden analizarse posteriormente con herramientas de análisis de terceros. Complemento de curvas de nivel - Este complemento proporciona una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. -\n + Proporciona una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. +\n \nLos datos globales (entre 70° norte y 70° sur) se basan en mediciones de SRTM (Shuttle Radar Topography Mission, o en español Misión de Topografía por Radar desde Transbordador) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, o en español Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de captura de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems). - Este complemento proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. (Note que las curvas de nivel y/o los datos de relieve están disponibles en descargas adicionales separadas luego de activar el complemento.) -\n + Proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada, que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje. (Note que las curvas de nivel y/o los datos de relieve están disponibles en descargas adicionales separadas luego de activar el complemento.) +\n \nLos datos globales (entre 70° norte y 70° sur) se basan en mediciones de SRTM (Shuttle Radar Topography Mission, o en español Misión de Topografía por Radar Shuffle) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, o en español Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de captura de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems). Activando esta vista cambia el estilo del mapa OsmAnd a la «Vista turística», que es una vista de alto detalle especial para viajeros y conductores profesionales. \n @@ -406,13 +406,13 @@ \nNo es necesario descargar un mapa especial, la vista es creada a partir de nuestros mapas estándar. \n \nEsta vista puede ser revertida desactivando de nuevo aquí, o cambiando el «Estilo del mapa» desde «Configurar mapa» cuando lo desees. - Este complemento enriquece el mapa y la navegación de OsmAnd al producir también mapas náuticos para el canotaje, vela y otros tipos de deportes acuáticos. -\n -\nUn mapa especial complementado para OsmAnd proporcionará toda las marcas de navegación náutica y símbolos cartográficos para el interior, así como para la navegación cerca de la costa. La descripción de cada marca de navegación proporciona los datos necesarios para su identificación y su significado (categoría, forma, color, número, referencia, etc.). -\n + Enriquece el mapa y la navegación de OsmAnd al producir también mapas náuticos para el canotaje, vela y otros tipos de deportes acuáticos. +\n +\nUn mapa especial complementado para OsmAnd proporcionará toda las marcas de navegación náutica y símbolos cartográficos para el interior, así como para la navegación cerca de la costa. La descripción de cada marca de navegación proporciona los datos necesarios para su identificación y su significado (categoría, forma, color, número, referencia, etc.). +\n \nPara volver a uno de los estilos del mapas convencionales de OsmAnd, simplemente desactiva este complemento de nuevo, o cambia el «Estilo del mapa» en «Configurar mapa» cuando lo desees. - Este complemento para OsmAnd pone a tu alcance detalles sobre pistas de esquí de descenso, de travesía, rutas de esquí alpino, teleféricos y remontes a nivel mundial. Las rutas y pistas se muestran por código de color en función de su dificultad y representados con un estilo del mapa especial «Invierno» que lo asemeja a un paisaje invernal nevado. -\n + Detalles sobre pistas de esquí de descenso, de travesía, rutas de esquí alpino, teleféricos y remontes a nivel mundial. Las rutas y pistas se muestran por código de color en función de su dificultad y representados con un estilo del mapa especial «Invierno» que lo asemeja a un paisaje invernal nevado. +\n \nActivando esta vista, cambia el estilo del mapa a «Invierno y esquí», mostrando las características del terreno en condiciones invernales. Esta vista se puede revertir desactivando de nuevo aquí o cambiando el «Estilo del mapa» en «Configurar mapa» cuando lo desees. Toma notas de audio, fotografía y/o video durante un viaje, usando un botón en el mapa o el menú contextual de la ubicación. Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda. @@ -1541,7 +1541,7 @@ Límite de altura Indica la altura permitida del vehículo en rutas. Recálculo inteligente de ruta - Para viajes largos, recalcula sólo la parte inicial de la ruta. + Recalcula sólo la parte inicial de la ruta. Puede usarse para viajes largos. Cerrar sesión Desactivado Color por red de afiliación @@ -3914,4 +3914,16 @@ \nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery. Evita pasar por aceras o veredas Evitar aceras + Novedades + Cambiar al cálculo de ruta Java (seguro) del transporte público + Desarrollo nativo del transporte público + Datos de «OsmAnd Live» + Datos de «OsmAnd Live» + Navegación compleja + Inicia sesión con OAuth para usar las funciones de edición de OSM + Ingresar a través de OAuth + Sesión finalizada + Desarrollo + Navegación bifásica en automóvil. + Vaciar llave OAuth de OpenStreetMap \ No newline at end of file From bb88d5ef9bdcc79dc0b19dab7e2644cf1d2b668b Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 11 Oct 2020 04:28:03 +0000 Subject: [PATCH 51/80] Translated using Weblate (Chinese (Simplified)) Currently translated at 70.7% (2479 of 3505 strings) --- OsmAnd/res/values-zh-rCN/strings.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml index 6de13e20e3..393b9c049b 100644 --- a/OsmAnd/res/values-zh-rCN/strings.xml +++ b/OsmAnd/res/values-zh-rCN/strings.xml @@ -1164,8 +1164,8 @@ 地图上标签显示的偏好语言（如果不可用，将会切换至英文或者本地名称） 点亮屏幕 选择您在导航时想要避开的道路。 - 避开通勤火车 - 避开通勤火车 + 无区间列车 + 避免使用区间列车 避开道路… 无收费公路 避开收费公路 @@ -1570,8 +1570,8 @@ 卡布列语 柏柏尔文 已下载的旧的不兼容维基百科的数据。你想要将其存档吗？ - 按线路从属标色 - 由 OSMC 徒步旅行符号标色 + 按网络从属着色 + 按 OSMC 徒步旅行标志着色 你想 OsmAnd 也将其数据文件复制到新的目标吗？ 不能在指定目录中创建地图 在许多国家（德国、法国、意大利和其它）法律上不容许使用测速照相警示。如果您违反了法律，OsmAnd 并不承担任何的责任。请只在您有资格使用此功能时，才按下 \"是\" 。 @@ -2891,7 +2891,7 @@ 坡度使用颜色来可视化地形陡度。 选择图标、颜色与名称 实线 - 马路 + 紧凑的 卵石 草坪砖 细砂砾 @@ -3147,4 +3147,5 @@ 删除地址 添加地址 输入地址 + REC \ No newline at end of file From 18012e0891237e842fd0fc11271ac9f431e5597f Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Sun, 11 Oct 2020 02:25:39 +0000 Subject: [PATCH 52/80] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 216b28aad5..a5eb5c24fb 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -3916,4 +3916,9 @@ 汽車導航的兩階段路線。 原生公共運輸發展 切換到 Java（安全）公共運輸路線計算 + 有什麼新鮮事 + 執行 OAuth 登入以使用 osmedit 功能 + 透過 OAuth 登入 + 清除 OpenStreetMap OAuth 權杖 + 成功登出 \ No newline at end of file From 13a354ed602ee7678f58855f255bff8e96422e16 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 11 Oct 2020 04:35:12 +0000 Subject: [PATCH 53/80] Translated using Weblate (Chinese (Simplified)) Currently translated at 19.0% (730 of 3825 strings) --- OsmAnd/res/values-zh-rCN/phrases.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-zh-rCN/phrases.xml b/OsmAnd/res/values-zh-rCN/phrases.xml index cb78dcd3ce..fb547e6724 100644 --- a/OsmAnd/res/values-zh-rCN/phrases.xml +++ b/OsmAnd/res/values-zh-rCN/phrases.xml @@ -40,7 +40,7 @@ 献血 地标 车辆租赁 - 洗手间 + 洗手间; 厕所 淋浴 吸烟区 网咖 @@ -101,13 +101,13 @@ 金融 自然 军事 - 酒商店 + 贩酒商店 巧克力店 咖啡馆 饮料店 冰淇淋馆 茶馆 - 葡萄酒店 + 葡萄酒商店 书店 自行车店 袋子店 @@ -407,7 +407,7 @@ 是 是 是 - 否 + 声音：无 铁道交口 骑马 花园 From b6c9b6ea3ef3f26c4e01d56d0c0762e7a08c743a Mon Sep 17 00:00:00 2001 From: WaldiS Date: Sat, 10 Oct 2020 10:39:07 +0000 Subject: [PATCH 54/80] Translated using Weblate (Polish) Currently translated at 99.6% (270 of 271 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/pl/ --- OsmAnd-telegram/res/values-pl/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml index 22e12de229..f5f13c5c0d 100644 --- a/OsmAnd-telegram/res/values-pl/strings.xml +++ b/OsmAnd-telegram/res/values-pl/strings.xml @@ -267,4 +267,8 @@ ERR Ostatnia odpowiedź: %1$s Ostatnia odpowiedź: %1$s temu + Eksportuj + Bufor katalogu dziennika + Sprawdzanie i udostępnianie szczegółowych logów aplikacji + Wyślij raport \ No newline at end of file From d880c063c7525b44a317b4150343efc511ea91aa Mon Sep 17 00:00:00 2001 From: ssantos Date: Sat, 10 Oct 2020 10:44:32 +0000 Subject: [PATCH 55/80] Translated using Weblate (Portuguese (Portugal)) Currently translated at 100.0% (271 of 271 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/pt_PT/ --- OsmAnd-telegram/res/values-pt-rPT/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd-telegram/res/values-pt-rPT/strings.xml b/OsmAnd-telegram/res/values-pt-rPT/strings.xml index 6cbbce3ee6..3675efa298 100644 --- a/OsmAnd-telegram/res/values-pt-rPT/strings.xml +++ b/OsmAnd-telegram/res/values-pt-rPT/strings.xml @@ -267,4 +267,8 @@ Última resposta: %1$s Última atualização do Telegram: %1$s ERR + Exportar + Buffer de logcat + Verifique e compartilhe registos detalhados da app + Enviar o relatório \ No newline at end of file From c37b21fae040471f4172b37ab88fc954134c1b13 Mon Sep 17 00:00:00 2001 From: sergosm Date: Sun, 11 Oct 2020 23:02:58 +0300 Subject: [PATCH 56/80] Obsolete 'Import' duplication of GPX files --- OsmAnd/res/values/strings.xml | 1 + .../ImportGpxBottomSheetDialogFragment.java | 8 ++- .../plus/importfiles/GpxImportTask.java | 12 +++- .../GpxOrFavouritesImportTask.java | 28 ++++++--- .../osmand/plus/importfiles/ImportHelper.java | 57 +++++++++++++------ .../plus/importfiles/KmlImportTask.java | 21 +++++-- .../plus/importfiles/KmzImportTask.java | 15 +++-- 7 files changed, 104 insertions(+), 38 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 85e8ad3147..582183f383 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + File is already imported in OsmAnd Logout successful Clear OpenStreetMap OAuth token Log in via OAuth diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ImportGpxBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/ImportGpxBottomSheetDialogFragment.java index 4bc4e1589a..b0b9587781 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ImportGpxBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ImportGpxBottomSheetDialogFragment.java @@ -23,6 +23,8 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra private GPXFile gpxFile; private String fileName; + private long fileSize; + private boolean save; private boolean useImportDir; @@ -38,6 +40,10 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra this.fileName = fileName; } + public void setFileSize(long fileSize) { + this.fileSize = fileSize; + } + public void setSave(boolean save) { this.save = save; } @@ -84,7 +90,7 @@ public class ImportGpxBottomSheetDialogFragment extends MenuBottomSheetDialogFra .setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - importHelper.handleGpxImport(gpxFile, fileName, save, useImportDir); + importHelper.handleGpxImport(gpxFile, fileName, fileSize, save, useImportDir); dismiss(); } }) diff --git a/OsmAnd/src/net/osmand/plus/importfiles/GpxImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/GpxImportTask.java index 4a410172a7..82b6e1d555 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/GpxImportTask.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/GpxImportTask.java @@ -10,6 +10,7 @@ import net.osmand.GPXUtilities.GPXFile; import net.osmand.util.Algorithms; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; class GpxImportTask extends BaseImportAsyncTask { @@ -17,13 +18,15 @@ class GpxImportTask extends BaseImportAsyncTask { private ImportHelper importHelper; private Uri gpxFile; private String fileName; + private long fileSize; + private boolean save; private boolean useImportDir; private boolean showInDetailsActivity; public GpxImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity, - @NonNull Uri gpxFile, @NonNull String fileName, boolean save, boolean useImportDir, - boolean showInDetailsActivity) { + @NonNull Uri gpxFile, @NonNull String fileName, boolean save, boolean useImportDir, + boolean showInDetailsActivity) { super(activity); this.importHelper = importHelper; this.gpxFile = gpxFile; @@ -39,10 +42,13 @@ class GpxImportTask extends BaseImportAsyncTask { try { is = app.getContentResolver().openInputStream(gpxFile); if (is != null) { + fileSize = is.available(); return GPXUtilities.loadGPXFile(is); } } catch (FileNotFoundException e) { // + } catch (IOException e) { + ImportHelper.log.error(e.getMessage(), e); } catch (SecurityException e) { ImportHelper.log.error(e.getMessage(), e); } finally { @@ -54,6 +60,6 @@ class GpxImportTask extends BaseImportAsyncTask { @Override protected void onPostExecute(GPXFile result) { hideProgress(); - importHelper.handleResult(result, fileName, save, useImportDir, false, showInDetailsActivity); + importHelper.handleResult(result, fileName, fileSize, save, useImportDir, false, showInDetailsActivity); } } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/importfiles/GpxOrFavouritesImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/GpxOrFavouritesImportTask.java index ed1a16c3b1..0d8f788e23 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/GpxOrFavouritesImportTask.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/GpxOrFavouritesImportTask.java @@ -10,25 +10,28 @@ import net.osmand.GPXUtilities.GPXFile; import net.osmand.util.Algorithms; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static net.osmand.plus.importfiles.KmlImportTask.loadGpxFromKml; +import static net.osmand.plus.importfiles.KmlImportTask.convertKmlToGpxStream; class GpxOrFavouritesImportTask extends BaseImportAsyncTask { private ImportHelper importHelper; private Uri fileUri; private String fileName; + private long fileSize; + private boolean save; private boolean useImportDir; - private boolean forceImportFavourites; private boolean forceImportGpx; + private boolean forceImportFavourites; public GpxOrFavouritesImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity, - @NonNull Uri fileUri, String fileName, boolean save, boolean useImportDir, - boolean forceImportFavourites, boolean forceImportGpx) { + @NonNull Uri fileUri, String fileName, boolean save, boolean useImportDir, + boolean forceImportFavourites, boolean forceImportGpx) { super(activity); this.importHelper = importHelper; this.fileUri = fileUri; @@ -46,15 +49,24 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask try { is = app.getContentResolver().openInputStream(fileUri); if (is != null) { + fileSize = is.available(); if (fileName != null && fileName.endsWith(ImportHelper.KML_SUFFIX)) { - return loadGpxFromKml(is); + InputStream gpxStream = convertKmlToGpxStream(is); + if (gpxStream != null) { + fileSize = gpxStream.available(); + return GPXUtilities.loadGPXFile(gpxStream); + } } else if (fileName != null && fileName.endsWith(ImportHelper.KMZ_SUFFIX)) { try { zis = new ZipInputStream(is); ZipEntry entry; while ((entry = zis.getNextEntry()) != null) { if (entry.getName().endsWith(ImportHelper.KML_SUFFIX)) { - return loadGpxFromKml(zis); + InputStream gpxStream = convertKmlToGpxStream(is); + if (gpxStream != null) { + fileSize = gpxStream.available(); + return GPXUtilities.loadGPXFile(gpxStream); + } } } } catch (Exception e) { @@ -66,6 +78,8 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask } } catch (FileNotFoundException e) { // + } catch (IOException e) { + ImportHelper.log.error(e.getMessage(), e); } catch (SecurityException e) { ImportHelper.log.error(e.getMessage(), e); } finally { @@ -78,6 +92,6 @@ class GpxOrFavouritesImportTask extends BaseImportAsyncTask @Override protected void onPostExecute(GPXFile result) { hideProgress(); - importHelper.importGpxOrFavourites(result, fileName, save, useImportDir, forceImportFavourites, forceImportGpx); + importHelper.importGpxOrFavourites(result, fileName, fileSize, save, useImportDir, forceImportFavourites, forceImportGpx); } } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java b/OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java index c67ae8834e..1059a46bb0 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java @@ -31,6 +31,8 @@ import net.osmand.plus.activities.ActivityResultListener; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.TrackActivity; import net.osmand.plus.dialogs.ImportGpxBottomSheetDialogFragment; +import net.osmand.plus.helpers.GpxUiHelper; +import net.osmand.plus.helpers.GpxUiHelper.GPXInfo; import net.osmand.plus.measurementtool.MeasurementToolFragment; import net.osmand.plus.settings.backend.SettingsHelper; import net.osmand.plus.settings.backend.SettingsHelper.SettingsItem; @@ -128,8 +130,8 @@ public class ImportHelper { importFavoritesImpl(gpxFile, fileName, false); } - public void handleGpxImport(GPXFile result, String name, boolean save, boolean useImportDir) { - handleResult(result, name, save, useImportDir, false); + public void handleGpxImport(GPXFile result, String name, long fileSize, boolean save, boolean useImportDir) { + handleResult(result, name, fileSize, save, useImportDir, false); } public boolean handleGpxImport(final Uri contentUri, final boolean useImportDir) { @@ -387,12 +389,12 @@ public class ImportHelper { return intent; } - protected void handleResult(GPXFile result, String name, boolean save, + protected void handleResult(GPXFile result, String name, long fileSize, boolean save, boolean useImportDir, boolean forceImportFavourites) { - handleResult(result, name, save, useImportDir, forceImportFavourites, true); + handleResult(result, name, fileSize, save, useImportDir, forceImportFavourites, true); } - protected void handleResult(final GPXFile result, final String name, final boolean save, + protected void handleResult(final GPXFile result, final String name, long fileSize, final boolean save, final boolean useImportDir, boolean forceImportFavourites, boolean showInDetailsActivity) { if (result != null) { if (result.error != null) { @@ -402,9 +404,15 @@ public class ImportHelper { } } else { if (save) { - executeImportTask(new SaveAsyncTask(result, name, useImportDir, showInDetailsActivity)); + String existingFilePath = getExistingFilePath(name, fileSize); + if (existingFilePath != null) { + app.showToastMessage(R.string.file_already_imported); + showGpxInDetailsActivity(existingFilePath); + } else { + executeImportTask(new SaveAsyncTask(result, name, useImportDir, showInDetailsActivity)); + } } else { - showGpxInDetailsActivity(result); + showGpxInDetailsActivity(result.path); } if (gpxImportCompleteListener != null) { gpxImportCompleteListener.onImportComplete(true); @@ -445,6 +453,20 @@ public class ImportHelper { } } + @Nullable + private String getExistingFilePath(String name, long fileSize) { + File dir = app.getAppPath(GPX_INDEX_DIR); + List gpxInfoList = GpxUiHelper.getSortedGPXFilesInfoByDate(dir, true); + for (GPXInfo gpxInfo : gpxInfoList) { + String fileName = gpxInfo.getFileName(); + String nameWithoutDirs = Algorithms.getFileWithoutDirs(fileName); + if (nameWithoutDirs.equals(name) && gpxInfo.getFileSize() == fileSize) { + return fileName; + } + } + return null; + } + private String saveImport(final GPXFile gpxFile, final String fileName, final boolean useImportDir) { final String warning; @@ -531,7 +553,7 @@ public class ImportHelper { } if (success) { if (showInDetailsActivity) { - showGpxInDetailsActivity(result); + showGpxInDetailsActivity(result.path); } else { showPlanRouteFragment(); } @@ -553,10 +575,10 @@ public class ImportHelper { } } - private void showGpxInDetailsActivity(final GPXFile gpxFile) { - if (gpxFile.path != null) { + private void showGpxInDetailsActivity(String gpxFilePath) { + if (!Algorithms.isEmpty(gpxFilePath)) { Intent newIntent = new Intent(activity, app.getAppCustomization().getTrackActivity()); - newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpxFile.path); + newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, gpxFilePath); newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); activity.startActivity(newIntent); } @@ -576,9 +598,9 @@ public class ImportHelper { } } - protected void importGpxOrFavourites(final GPXFile gpxFile, final String fileName, final boolean save, - final boolean useImportDir, final boolean forceImportFavourites, - final boolean forceImportGpx) { + protected void importGpxOrFavourites(final GPXFile gpxFile, final String fileName, final long fileSize, + final boolean save, final boolean useImportDir, + final boolean forceImportFavourites, final boolean forceImportGpx) { if (gpxFile == null || gpxFile.isPointsEmpty()) { if (forceImportFavourites) { final DialogInterface.OnClickListener importAsTrackListener = new DialogInterface.OnClickListener() { @@ -586,7 +608,7 @@ public class ImportHelper { public void onClick(DialogInterface dialog, int which) { switch (which) { case DialogInterface.BUTTON_POSITIVE: - handleResult(gpxFile, fileName, save, useImportDir, true); + handleResult(gpxFile, fileName, fileSize, save, useImportDir, true); break; case DialogInterface.BUTTON_NEGATIVE: dialog.dismiss(); @@ -602,7 +624,7 @@ public class ImportHelper { .setNegativeButton(R.string.shared_string_cancel, importAsTrackListener) .show(); } else { - handleResult(gpxFile, fileName, save, useImportDir, false); + handleResult(gpxFile, fileName, fileSize, save, useImportDir, false); } return; } @@ -611,13 +633,14 @@ public class ImportHelper { importFavoritesImpl(gpxFile, fileName, true); } else if (fileName != null) { if (forceImportGpx) { - handleResult(gpxFile, fileName, save, useImportDir, false); + handleResult(gpxFile, fileName, fileSize, save, useImportDir, false); } else { ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment(); fragment.setUsedOnMap(true); fragment.setImportHelper(this); fragment.setGpxFile(gpxFile); fragment.setFileName(fileName); + fragment.setFileSize(fileSize); fragment.setSave(save); fragment.setUseImportDir(useImportDir); activity.getSupportFragmentManager().beginTransaction() diff --git a/OsmAnd/src/net/osmand/plus/importfiles/KmlImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/KmlImportTask.java index 8d48485b33..bab8e0df78 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/KmlImportTask.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/KmlImportTask.java @@ -12,6 +12,7 @@ import net.osmand.util.Algorithms; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -20,11 +21,13 @@ class KmlImportTask extends BaseImportAsyncTask { private ImportHelper importHelper; private Uri uri; private String name; + private long fileSize; + private boolean save; private boolean useImportDir; public KmlImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity, - @NonNull Uri uri, String name, boolean save, boolean useImportDir) { + @NonNull Uri uri, String name, boolean save, boolean useImportDir) { super(activity); this.importHelper = importHelper; this.uri = uri; @@ -39,12 +42,18 @@ class KmlImportTask extends BaseImportAsyncTask { try { is = app.getContentResolver().openInputStream(uri); if (is != null) { - return loadGpxFromKml(is); + InputStream gpxStream = convertKmlToGpxStream(is); + if (gpxStream != null) { + fileSize = gpxStream.available(); + return GPXUtilities.loadGPXFile(gpxStream); + } } } catch (FileNotFoundException e) { // } catch (SecurityException e) { ImportHelper.log.error(e.getMessage(), e); + } catch (IOException e) { + ImportHelper.log.error(e.getMessage(), e); } finally { Algorithms.closeStream(is); } @@ -54,16 +63,16 @@ class KmlImportTask extends BaseImportAsyncTask { @Override protected void onPostExecute(GPXFile result) { hideProgress(); - importHelper.handleResult(result, name, save, useImportDir, false); + importHelper.handleResult(result, name, fileSize, save, useImportDir, false); } - protected static GPXFile loadGpxFromKml(@NonNull InputStream is) { + protected static InputStream convertKmlToGpxStream(@NonNull InputStream is) { String result = Kml2Gpx.toGpx(is); if (result != null) { try { - return GPXUtilities.loadGPXFile(new ByteArrayInputStream(result.getBytes("UTF-8"))); + return new ByteArrayInputStream(result.getBytes("UTF-8")); } catch (UnsupportedEncodingException e) { - return null; + ImportHelper.log.error(e.getMessage(), e); } } return null; diff --git a/OsmAnd/src/net/osmand/plus/importfiles/KmzImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/KmzImportTask.java index 41d01be264..65b1e80c09 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/KmzImportTask.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/KmzImportTask.java @@ -5,6 +5,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; +import net.osmand.GPXUtilities; import net.osmand.GPXUtilities.GPXFile; import net.osmand.util.Algorithms; @@ -13,18 +14,20 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import static net.osmand.plus.importfiles.ImportHelper.KML_SUFFIX; -import static net.osmand.plus.importfiles.KmlImportTask.loadGpxFromKml; +import static net.osmand.plus.importfiles.KmlImportTask.convertKmlToGpxStream; class KmzImportTask extends BaseImportAsyncTask { private ImportHelper importHelper; private Uri uri; private String name; + private long fileSize; + private boolean save; private boolean useImportDir; public KmzImportTask(@NonNull ImportHelper importHelper, @NonNull FragmentActivity activity, - @NonNull Uri uri, @NonNull String name, boolean save, boolean useImportDir) { + @NonNull Uri uri, @NonNull String name, boolean save, boolean useImportDir) { super(activity); this.importHelper = importHelper; this.uri = uri; @@ -45,7 +48,11 @@ class KmzImportTask extends BaseImportAsyncTask { ZipEntry entry; while ((entry = zis.getNextEntry()) != null) { if (entry.getName().endsWith(KML_SUFFIX)) { - return loadGpxFromKml(is); + InputStream gpxStream = convertKmlToGpxStream(is); + if (gpxStream != null) { + fileSize = gpxStream.available(); + return GPXUtilities.loadGPXFile(gpxStream); + } } } } @@ -61,6 +68,6 @@ class KmzImportTask extends BaseImportAsyncTask { @Override protected void onPostExecute(GPXFile result) { hideProgress(); - importHelper.handleResult(result, name, save, useImportDir, false); + importHelper.handleResult(result, name, fileSize, save, useImportDir, false); } } \ No newline at end of file From 267d1374b579a966355bbcd0dfb1f07e32300f84 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Mon, 12 Oct 2020 13:03:51 +0300 Subject: [PATCH 57/80] Fix compilation --- .../net/osmand/plus/measurementtool/MeasurementToolFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index ed9061204f..b2b9b509b4 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -81,6 +81,7 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControll import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView; import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation; +import net.osmand.util.Algorithms; import java.io.File; import java.lang.ref.WeakReference; From 14d4ca32a8172213c8271053844ea670bc73436a Mon Sep 17 00:00:00 2001 From: xmd5a Date: Mon, 12 Oct 2020 17:37:43 +0300 Subject: [PATCH 58/80] Change rtsa_scale en translations to latin --- OsmAnd/res/values/phrases.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index b58d25a781..87c5c7b4d6 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -3935,20 +3935,20 @@ Tram Ferry - н/к - н/к* - 1А - 1А* - 1Б - 1Б* - 2А - 2А* - 2Б - 2Б* - 3А - 3А* - 3Б - 3Б* + n/c + n/c* + 1A + 1A* + 1B + 1B* + 2A + 2A* + 2B + 2B* + 3A + 3A* + 3B + 3B* Gas flare;Flare stack Deleted object From a09194402b1b4d9940f3b660b926599408c49e53 Mon Sep 17 00:00:00 2001 From: sergosm Date: Mon, 12 Oct 2020 18:26:43 +0300 Subject: [PATCH 59/80] init --- OsmAnd/res/values/strings.xml | 2 +- .../plus/settings/fragments/RouteParametersFragment.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 582183f383..22b7b37b2f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,6 +11,7 @@ Thx - Hardy --> + Use 2-phase A* routing algorithm File is already imported in OsmAnd Logout successful Clear OpenStreetMap OAuth token @@ -20,7 +21,6 @@ Native Public Transport development Recalculates only the initial part of the route. Can be used for long trips. Two-phase routing for car navigation. - Complex routing OsmAnd Live data OsmAnd Live data Development diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java index a17c265645..0e3698644d 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java @@ -162,6 +162,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description)); useOsmLiveForPublicTransport.setSummaryOn(R.string.shared_string_enabled); useOsmLiveForPublicTransport.setSummaryOff(R.string.shared_string_disabled); + useOsmLiveForPublicTransport.setIcon(getContentIcon(R.drawable.ic_action_osm_live)); useOsmLiveForPublicTransport.setIconSpaceReserved(true); getPreferenceScreen().addPreference(useOsmLiveForPublicTransport); } @@ -184,13 +185,14 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description)); useOsmLiveForRouting.setSummaryOn(R.string.shared_string_enabled); useOsmLiveForRouting.setSummaryOff(R.string.shared_string_disabled); + useOsmLiveForRouting.setIcon(getContentIcon(R.drawable.ic_action_osm_live)); useOsmLiveForRouting.setIconSpaceReserved(true); getPreferenceScreen().addPreference(useOsmLiveForRouting); } private void setupDisableComplexRoutingPref() { SwitchPreferenceEx disableComplexRouting = createSwitchPreferenceEx(settings.DISABLE_COMPLEX_ROUTING.getId(), - R.string.use_complex_routing, R.layout.preference_with_descr_dialog_and_switch); + R.string.use_two_phase_routing, R.layout.preference_with_descr_dialog_and_switch); disableComplexRouting.setDescription(getString(R.string.complex_routing_descr)); disableComplexRouting.setSummaryOn(R.string.shared_string_enabled); disableComplexRouting.setSummaryOff(R.string.shared_string_disabled); @@ -204,6 +206,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc)); useFastRecalculation.setSummaryOn(R.string.shared_string_enabled); useFastRecalculation.setSummaryOff(R.string.shared_string_disabled); + useFastRecalculation.setIcon(getContentIcon(R.drawable.ic_action_route_part)); useFastRecalculation.setIconSpaceReserved(true); getPreferenceScreen().addPreference(useFastRecalculation); } From 1eac34aeef1885d8e8aa35fd57cddd9600085ff0 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Mon, 12 Oct 2020 14:14:13 +0000 Subject: [PATCH 60/80] Translated using Weblate (Belarusian) Currently translated at 99.7% (3497 of 3505 strings) --- OsmAnd/res/values-be/strings.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 6839ec5d24..ce32262235 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1576,7 +1576,7 @@ Абмежаванне па вышыні Пазначыць вышыню транспартнага сродку для разліку маршруту. Разумны пераразлік маршруту - Пераразлічваць толькі пачатак маршруту для доўгіх паездак. + Пераразлічваць толькі пачатак маршруту. Падыходзіць для доўгіх паездак. Выйсці Выключана Афарбоўка па пешаходнаму сімвалу OSMC @@ -3957,4 +3957,18 @@ Апошняя змена Назва: Я — А Назва: А — Я + Што новага + Дзякуй за набыццё плагіну «Контурныя лініі» + Плата за падпіску спаганяецца за абраны перыяд. Скасаваць яе на AppGallery можна у любы момант. + Пры пацвярджэнні пакупкі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery. +\n +\nПадпіска аўтаматычна працягваецца, калі вы не скасуеце яе да даты працягу. З вашага рахунка будзе адзін раз спаганяцца аплата за перыяд працягу (месяц/тры месяцы/год). +\n +\nВы можаце кіраваць падпіскамі і скасоўваць іх у наладах AppGallery. + Пазбягаць пешаходныя дарожкі + Пазбягаць пешаходныя дарожкі + Распрацоўка + Дзвюхфазная аўтанавігацыя. + Натыўны грамадскі транспарт (у распрацоўцы) + Увайсці праз OAuth \ No newline at end of file From 49d752c685d069bfef919452e8396fa52aa21f06 Mon Sep 17 00:00:00 2001 From: Hinagiku Zeppeki Date: Mon, 12 Oct 2020 11:45:11 +0000 Subject: [PATCH 61/80] Translated using Weblate (Japanese) Currently translated at 98.5% (3454 of 3505 strings) --- OsmAnd/res/values-ja/strings.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 35f9146fc7..16d59f00aa 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -1553,7 +1553,7 @@ POIの更新は利用できません 高さ制限 ルート上で通行可能な車両の高さを指定します。 スマートなルート再計算 - 経路が長い場合、最初の部分のみ再計算します。 + ルートの最初の部分のみを再計算します。旅程(設定ルート)がとても長い場合に効果的です。 明色 暗色 ピエモンテ語 @@ -3307,7 +3307,7 @@ POIの更新は利用できません アプリ全体に反映されます OsmAnd設定 他のプロファイルからコピー - 画面表示機能 + 画面の復帰設定 ナビゲーション中のマップ表示 ナビゲーション中のマップ表示 その他 @@ -3705,7 +3705,7 @@ POIの更新は利用できません グジャラート語 チュヴァシ語 OsmAnd GPXの形式が正しくありません。サポートチームに連絡しての調査をおすすめします。 - 画面のタイムアウト + 画面の消灯設定 画面復帰オプションを選択します(端末設定でロックされる場合は、OsmAndがバックグラウンド動作でないことを確認してください): 端末側の画面オフ(省電力)設定に従って画面を消灯します。 端末側の画面オフ設定を使用 @@ -3760,7 +3760,7 @@ POIの更新は利用できません 車両の重量を入力してください。一部のルートにおいては、大型車両では通行できない場合があります。 車の長さを入力してください。一部のルートにおいては、長い車両では通行できない場合があります。 常に - 画面制御 + 画面の制御 現在無効。 \'画面を表示する時間\'の下にある\'画面を常に表示\'への設定が必要です。 画面オフを維持 疑似メルカトル図法 @@ -3801,7 +3801,7 @@ POIの更新は利用できません アンインストール 一部の国では、スピードカメラの事前警告は法律で禁止されています。 \"%1$s\"がオンの場合、設定された動作時間はそちらに依存します。 - デフォルトの画面タイムアウト時間 + 端末設定の画面スリープ時間に従う トーン メートル 追加マップの詳細を表示または非表示にします @@ -3900,4 +3900,16 @@ POIの更新は利用できません 最終更新日 名称: 降順(Z-A) 名称: 昇順(A-Z) + Java(セーフモード)での公共交通機関ルーティング計算に切り替えます + OsmEdit機能を利用するには、OAuthでのログインが必要です。 + OAuthでログイン + OpenStreetMapOAuthトークンを消去する + ログアウトしました + 歩道を使わないようにします + 歩道を避ける + 開発 + OsmAnd Liveデータ + OsmAnd Liveデータ + 複雑なルート計算 + カーナビゲーション向けの2段階ルート計算です。 \ No newline at end of file From 91400aaa3fe361ea7118c96edecd976dc4d3ac48 Mon Sep 17 00:00:00 2001 From: Deelite <556xxy@gmail.com> Date: Sun, 11 Oct 2020 20:48:56 +0000 Subject: [PATCH 62/80] Translated using Weblate (Russian) Currently translated at 99.8% (3500 of 3505 strings) --- OsmAnd/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index d2c1dfd578..50a4f8b4f6 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -2269,7 +2269,7 @@ Удалить действие Вы уверены, что хотите удалить действие «%s»\? Показать избранные - Скрыть сохранённые + Скрыть избранные Показать/скрыть POI Показать %1$s Скрыть %1$s From 4e36a12c9e2499d112304d0980a4cc3ce0ad4119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sun, 11 Oct 2020 18:54:59 +0000 Subject: [PATCH 63/80] Translated using Weblate (Turkish) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-tr/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 38dec6907b..21f675f31b 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -633,7 +633,7 @@ Yerel sürüm %1$d/%2$d öge devre dışı bırakıldı. %1$d/%2$d öge silindi. - %1$d/%2$d öge aktifleştirildi. + %1$d/%2$d öge etkinleştirildi. Harita dosyalarını yönetin. Aktifleştir Pasifleştir @@ -641,7 +641,7 @@ Adres Verisi Toplu taşıma verileri Harita Verisi - Pasifleştir + Devre dışı Sesli uyarılar (TTS) Sesli uyarılar (kaydedilmiş) POI Verisi @@ -2094,7 +2094,7 @@ Silindi Değiştirildi Eklendi - İşaretleyici %s aktifleştirildi. + %s işaretleyicisi etkinleştirildi. İçerik menüsünü açmadan, harita üzerinde bir belirtecin üzerine bas ve aktif belirteçlerin üzerine sürükle. \'Tek basış\' aktif Not alın! From 0be0f905a9c0166ffac0c21cfb3a3322aafe62be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Faruk=20=C3=87akmak?= Date: Sun, 11 Oct 2020 13:49:12 +0000 Subject: [PATCH 64/80] Translated using Weblate (Turkish) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-tr/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 21f675f31b..07ec369a18 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -1459,7 +1459,7 @@ İzleme topu kullan Arka plan servisi tarafından kullanılan uyanma aralığı: Arka plan servisi tarafından kullanılan konum yöntemi: - Baş + Düz gidin Ekran yönlendirme Hiçbir adres belirlenmedi Sesli uyarılar @@ -3578,7 +3578,7 @@ Haritadaki Wikipedia makalelerinin dillerini seçin. Makaleyi okurken kullanılabilir herhangi bir dile geçiş yapın. Bazı Wikipedia makaleleri sizin dilinizde mevcut olmayabilir. Kantonca - Güney Min + Güney Mince Yorubaca Varayca Özbekçe @@ -3591,7 +3591,7 @@ Nepalce Napolice Birmanca - Minangkabau dili + Minangkabauca Malgaşça Kırgızca Kazakça From 307ab348f79838f64249706f1fdd94c3e345952a Mon Sep 17 00:00:00 2001 From: Athoss Date: Mon, 12 Oct 2020 08:54:07 +0000 Subject: [PATCH 65/80] Translated using Weblate (Hungarian) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-hu/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index be5f333f2a..1dd28463f8 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -3739,11 +3739,11 @@ Kiegészítő adatok átvétele Az importált profil kiegészítő adatokat is tartalmaz. Koppintson az \"Importál\" gombra kizálólag a profiladatok importálásához vagy válassza a kiegészítő adatokat. Összes adat importálva innen: %1$s, az alábbi gombokkal megnyithatja az alkalmazás megfelelő részét az adatok kezeléséhez. - A fizetés a Google Play fiókhoz lesz felszámítva a vásárlás megerősítésekor. + A fizetést a vásárlás visszaigazolásakor a Google Play számlájára terheljük. \n -\nAz előfizetés automatikusan megújul, kivéve ha a meghosszabbítás napja előtt lemondásra kerül. A fókjához az új időszak (hónap/három hónap/év) díja kizárólag a meghosszabítás napján lesz felszámolva. +\nAz előfizetés automatikusan megújul, kivéve, ha azt a megújítási dátum előtt lemondja. A megújítási időszakra (hónap / 3 hónap / év) vonatkozóan a számláját csak a megújítás napján terheljük meg. \n -\nAz előfizetéseit a Google Play beállításainál tudja kezelni és lemondani. +\nAz előfizetéseket a Google Play beállításai között kezelheti és törölheti. Törli az útvonal soron következő célpontját. Amennyiben ez a végző célpont, a navigáció megáll. Tudjon meg többet az érdekes pontokról a Wikipédiából. Ez az Ön offline zsebútikönyve – egyszerűen kapcsolja be a Wikipédia-bővítményt, és élvezze az Ön körüli objektumokról szóló cikkeket. Salakmotor From f0646f2ebce91faeecd2512985a7e8866ba3f735 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Mon, 12 Oct 2020 14:03:40 +0000 Subject: [PATCH 66/80] Translated using Weblate (Slovak) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-sk/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index dc0af642be..971edf9dda 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -3919,7 +3919,7 @@ Údaje OsmAnd Live Komplexný výpočet trasy Dvojfázový výpočet trasy pre navigáciu auta. - Natívny vývoj hromadnej dopravy + Natívna hromadná doprava (vo vývoji) Prepnúť na výpočet trasy hromadnej dopravy v Jave (bezpečné) Čo je nové Vykonať prihlásenie cez OAuth pre použitie funkcií upravovania OSM From 09734b684c37e852f79e155d9703bb41e362ef88 Mon Sep 17 00:00:00 2001 From: Zmicer Turok Date: Tue, 13 Oct 2020 04:10:02 +0000 Subject: [PATCH 67/80] Translated using Weblate (Belarusian) Currently translated at 99.7% (3497 of 3505 strings) --- OsmAnd/res/values-be/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index ce32262235..fa503e2464 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -3958,7 +3958,7 @@ Назва: Я — А Назва: А — Я Што новага - Дзякуй за набыццё плагіну «Контурныя лініі» + Дзякуй за набыццё ўбудовы «Контурныя лініі» Плата за падпіску спаганяецца за абраны перыяд. Скасаваць яе на AppGallery можна у любы момант. Пры пацвярджэнні пакупкі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery. \n From 2cea371c1c40862221e2ac9dc372fb47f40a4ebe Mon Sep 17 00:00:00 2001 From: Ahmad Alfrhood Date: Sun, 11 Oct 2020 10:24:12 +0000 Subject: [PATCH 68/80] Translated using Weblate (Arabic) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-ar/strings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index c695a1c813..3e067c722c 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -3901,4 +3901,16 @@ \nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الانتقال إلى إعدادات AppGallery. تجنب الممرات تجنب الممرات + ما الجديد + تطوير + بيانات أوسماند لايف + بيانات أوسماند لايف + التوجيه المركب + التوجيه على مرحلتين لملاحة السيارة. + تطوير النقل العام المحلي + قم بالتبديل إلى Java (الآمن) حساب توجيه النقل العام + قم بإجراء تسجيل دخول إلى OAuth لاستخدام ميزات osmedit + تسجيل الدخول عبر OAuth + مسح رمز OpenStreetMap OAuth + تسجيل الخروج بنجاح \ No newline at end of file From 1ec102d2301f034c8900e43f3a02f8ddcd5461fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1ns?= Date: Sun, 11 Oct 2020 23:12:55 +0000 Subject: [PATCH 69/80] Translated using Weblate (Galician) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-gl/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index 8e7a90f00a..0a65bf9b5a 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -3675,7 +3675,7 @@ Lon %2$s %1$s / %2$s "O pagamento será cobrado na túa conta da Google Play na confirmación da compra. \n -\n A subscrición é renovada de xeito automático, a menos que sexa desbotada antes da data de renovación. A túa conta será cobrada polo período de renovación (més/trimestre/ano) soamente na data de renovación. +\n A subscrición é renovada de xeito automático, a menos que sexa desbotada antes da data de renovación. A túa conta será cobrada polo período de renovación (mes/trimestre/ano) soamente na data de renovación. \n \n Podes xestionar e desbotar as túas subscricións entrando nos axustes da Google Play." Procurar tipos de PDI @@ -3945,4 +3945,9 @@ Lon %2$s Enrutamento de dúas fases para a navegación de automóbil Desenvolvemento do transporte público nativo Activar cálculo de enrutamento de transporte público do Java (seguro) + Novidades + Inicia sesión co OAuth para empregar as funcións de edición do OSM + Entrar polo OAuth + Limpar token do OpenStreetMap OAuth + Sesión rematada \ No newline at end of file From 740649651abad238b349b287567079abe2ebfc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1ns?= Date: Mon, 12 Oct 2020 16:54:53 +0000 Subject: [PATCH 70/80] Translated using Weblate (Galician) Currently translated at 100.0% (3825 of 3825 strings) --- OsmAnd/res/values-gl/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml index a840ae5d86..b974255f35 100644 --- a/OsmAnd/res/values-gl/phrases.xml +++ b/OsmAnd/res/values-gl/phrases.xml @@ -65,7 +65,7 @@ Lomba pequena de velocidade Rodas Inspección técnica de vehículos - Lavadura de automóbiles + Lavado de automóbiles Gasolineira;Estación de combustíbel;Estación de servizo Ar comprimido Aparcadoiro From b7d223bcf66664dad8969a3dbc483dd8ba6a6ed2 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Mon, 12 Oct 2020 13:47:41 +0000 Subject: [PATCH 71/80] Translated using Weblate (Slovak) Currently translated at 95.2% (3645 of 3825 strings) --- OsmAnd/res/values-sk/phrases.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml index db5f8d31a6..7dc2cc7a4c 100644 --- a/OsmAnd/res/values-sk/phrases.xml +++ b/OsmAnd/res/values-sk/phrases.xml @@ -3653,4 +3653,15 @@ Nie Áno Kancelária taxislužby + Postbank + DecoTurf + Podológia + Zdravotná špecializácia: pôrodníctvo (cisársky rez): nie + Zdravotná špecializácia: sociálna pediatria: nie + Sociálna pediatria + Zdravotná špecializácia: pôrodníctvo (prenatálne): nie + Pôrodníctvo (prenatálne) + Zdravotná špecializácia: pôrodníctvo (postnatálne): nie + Rašelinisko + Slatina \ No newline at end of file From 5c3835bb66b91a4cf1b4436a0ee45a0cd6179482 Mon Sep 17 00:00:00 2001 From: Eduardo Addad de Oliveira Date: Sun, 11 Oct 2020 17:53:34 +0000 Subject: [PATCH 72/80] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-pt-rBR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 8f1641cca9..514414ef4c 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -2821,7 +2821,7 @@ Renova anualmente Renova trimestralmente Por OsmAnd - %1$,2f %2$s + %1$.2f %2$s Período de pagamento: As doações ajudam a financiar a cartografia no OSM. • Navegação: Corrige barra de progresso, inversão rápida de início e fim de rota From 32a24158bd776e40f72e147a8391d23ebb254491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Sun, 11 Oct 2020 11:25:42 +0000 Subject: [PATCH 73/80] Translated using Weblate (Estonian) Currently translated at 99.2% (3477 of 3505 strings) --- OsmAnd/res/values-et/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index c580533de8..fdd760f307 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -3593,7 +3593,7 @@ Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kõrguspiiranguid, siis palun märkige oma sõiduki kõrgus. Kuna mõnedel marsruutidel võidakse kohaldada piiranguid pikkade sõidukite suhtes, siis palun märkige oma sõiduki pikkus. Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kaalupiiranguid, siis palun märkige oma sõiduki kaal. - OsmAnd GPX faili vorming pole korrektne. Täpsemaks uurimiseks palun suhtle meie tugimeeskonnaga. + OsmAnd GPX-andmestiku vorming on vigane. Täpsemaks uurimiseks palun võta ühendust meie kasutajatoega. Sorteeri kategooria järgi Jätka Imporditavas profiilis leidub täiendavaid andmeid. Vajutades „Impordi“ imporditakse vaid profiili andmed, täiendavate andmete jaoks pead märkima vastava valiku. From 463ce61b8455cc512dccabc4bb85c83e6a99c16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Sun, 11 Oct 2020 20:12:23 +0000 Subject: [PATCH 74/80] Translated using Weblate (Turkish) Currently translated at 78.1% (2988 of 3825 strings) --- OsmAnd/res/values-tr/phrases.xml | 88 +++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-tr/phrases.xml b/OsmAnd/res/values-tr/phrases.xml index 16005d8a23..99b07f5d00 100644 --- a/OsmAnd/res/values-tr/phrases.xml +++ b/OsmAnd/res/values-tr/phrases.xml @@ -366,7 +366,7 @@ Depolama Çöp bertaraf Çöp tenekesi - Sanayi Bölgesi + Sanayi bölgesi Taş ocağı Üzüm bağı Meyve bahçesi @@ -2801,7 +2801,7 @@ Danışma (uyuşturucu): evet Danışma (bağımlılık): evet Danışma (bağımlılık): evet - Sağlık çalışanının işi: psikolog + Sağlık çalışanının rolü: psikolog İlk yardım çantası Duvar Yeraltı @@ -2915,4 +2915,88 @@ Şarküteri Turta Çay dükkanı + Sağlık çalışanının rolü: büyücü + Sağlık çalışanının rolü: teknisyen + Sağlık çalışanının rolü: doktor asistanı + Sağlık çalışanının rolü: terapist + Sağlık çalışanının rolü: podolog + Sağlık çalışanının rolü: doktor + Sağlık çalışanının rolü: sağlık görevlisi + Sağlık çalışanının rolü: hemşire + Sağlık çalışanının rolü: ebe + Sağlık çalışanının rolü: şifacı + Sağlık çalışanının rolü: asistan + Emme noktası + Sağlık tesisi türü: destek grubu evi + Sağlık tesisi türü: huzurevi + Sağlık merkezi türü: bölüm + Sağlık hizmeti: test: hayır + Sağlık hizmeti: test: evet + Sağlık hizmeti: destek: hayır + Sağlık hizmeti: destek: evet + Sağlık hizmeti: önleme: hayır + Sağlık hizmeti: önleme: evet + Sağlık hizmeti: çocuk bakımı: hayır + Sağlık hizmeti: çocuk bakımı: evet + Sağlık hizmeti: muayene: hayır + Sağlık hizmeti: muayene: evet + Sağlık merkezi türü: ilk yardım + Sağlık merkezi türü: dispanser + Sağlık merkezi türü: terapi + Sağlık merkezi türü: danışma merkezi + Tıbbi ofis + Sert serbest uçuş: hayır + Sert + Yelken kanatla uçuş: hayır + Yelken kanatla uçuş + Yamaç paraşütü: hayır + Yamaç paraşütü + Resmi: hayır + Resmi: evet + Eğitim alanı + Çekme alanı + Zirve iniş alanı + İniş alanı + Kalkış alanı + Düğme ile etkinleştirilir: hayır + Düğme ile etkinleştirilir: evet + Serbest uçuş (spor) + Patlama: aygıt + Patlama: savaş başlığı + Patlama: krater çapı + Patlama salvosu: bir salvo testinin ikinci veya daha sonraki patlaması + Patlama salvosu: bir salvo testinin ilk patlaması + Vücut dalgası büyüklüğü + Patlama merkezinin yüksekliği + Patlama boyu + Patlama deliği + Patlama gücü + Patlama amacı: sanayi uygulaması, toprak kaydırma + Patlama amacı: sanayi uygulaması + Patlama amacı: sanayi uygulaması, petrol uyarımı + Patlama amacı: sanayi uygulaması, sismik sondaj + Patlama amacı: sanayi uygulaması, kazı çalışması + Patlama amacı: temel bilim + Patlama amacı: barışçıl uygulamalar için araştırma + Patlama amacı: güvenlik deneyi + Patlama amacı: silah etkileri + Patlama amacı: nükleer silahlarla ilgili + Patlama serisi + Kod adı (ingilizce) + Patlama türü: su altı + Patlama türü: uzay (80 km\'nin üzerindeki yükseklik) + Patlama türü: atmosferik, roket veya füze + Patlama türü: krater patlaması (sığ yüzey altı) + Patlama türü: atmosferik, su yüzeyi, mavna + Patlama türü: atmosferik, yüzey + Patlama türü: atmosferik, balon + Patlama türü: atmosferik, yüzey, kule + Patlama türü: atmosferik, havadan atma + Patlama türü: atmosferik + Patlama türü: yeraltı, kuyu + Patlama: alan + Koruma türü + Bandy + Sokak dolabı + Ateş çukuru \ No newline at end of file From b8d15c06274fa0c4172b533bcf8cdbb9d772d8f6 Mon Sep 17 00:00:00 2001 From: Verdulo Date: Mon, 12 Oct 2020 19:06:28 +0000 Subject: [PATCH 75/80] Translated using Weblate (Esperanto) Currently translated at 100.0% (3505 of 3505 strings) --- OsmAnd/res/values-eo/strings.xml | 34 ++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index 50bc2c4390..727be72322 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -1853,7 +1853,7 @@ Erara formo: %s Vi devas esti konektita al la interreto por instali tiun ĉi kromprogramon. Inteligenta rekalkulado de kurso - Por longaj vojaĝoj, rekalkuli nur komencan parton de kurso. + Rekalkuli nur komencan parton de kurso. Uzebla por longaj kursoj. Taksi tiun ĉi aplikaĵon Via opinio estas grava por ni. Bonvolu taksi OsmAnd ĉe Google Play @@ -1890,7 +1890,7 @@ Ĉiuj nekonservitaj ŝanĝoj estos forigitaj. Ĉu pluigi? ankoraŭ %1$s elŝutoj Vojoj - Elŝutado - %1$s dosiero + Elŝutado – %1$d dosiero Montri reklamaĵon de senpaga versio Montri reklamaĵon de senpaga versio, eĉ se vi havas pagan version. Bonvolu aktivigi la kromprogramon “mara map-vido” @@ -2832,13 +2832,13 @@ Ĉiu-3-monate Ĉiujare %1$s / monato - %1$,2f %2$s / monato + %1$.2f %2$s / monato Ŝparu %1$s Nuna kotizo Reaboni ĉiumonate Reaboni ĉiukvaronjare Reaboni ĉiujare - %1$,2f %2$s + %1$.2f %2$s Intertempo de pagoj: Donacoj helpos fondi kartografion de OSM. De OsmAnd @@ -3651,7 +3651,7 @@ %1$s / %2$s La pago estos prenita el via konto Google Play post konfirmi aĉeton. \n -\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la data de renoviĝo. +\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo. \n \n Vi povas administri kaj rezigni viajn abonojn per agordoj de Google Play. Miksi specojn de interesejoj el diversaj kategorioj. Frapetu ŝaltilon por elekti la tutan kategorion, frapetu ĉe maldekstre por elekti detala(j)n objekto(j)n el la kategorio. @@ -3894,7 +3894,7 @@ Simpligita spuro Nur la linio de kurso estos konservita, la navigadpunktoj estos forigitaj. Dosiernomo - %d dosieroj de spuroj elektitaj + %s dosieroj de spuroj elektitaj Paŭzigos registri spuron je halto de la aplikaĵo (per la menuo de lastaj aplikaĵoj). (Fona emblemo de OsmAnd malaperos de la androida sciiga zono.) Paŭzigi registri spuron Daŭrigi registri spuron @@ -3903,4 +3903,26 @@ Antaŭa segmento Ĉiuj antaŭaj segmentoj Nur la elektita segmento estos rekalkulita uzante la elektitan profilon. + Kio estas nova + La pago estos prenita el via konto AppGallery post konfirmi aĉeton. +\n +\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo. +\n +\n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery. + Emblemoj komenco/fino + Dankon al vi por aĉeti la kromprogramon “nivelkurboj” + Abonpago prenita por la elektita periodo. VI ĉiam povas rezigni abonon ĉe AppGallery. + Eviti irejojn + Sen trotuaroj + Programado + Datumoj OsmAnd Live + Datumoj OsmAnd Live + Komplika kurs-difinado + Du-faza difinado de kurso por aŭtomobila navigo. + Indiĝena metodo de publik-transporta navigo + Aktivigi (sekuran) metodon por kalkuli kursojn de publika transporto uzante programlingvon Java + Ensaluti uzante OAuth por redakti la mapon OSM + Ensaluti per OAuth + Forigi ĵetonon OpenStreetMap OAuth + Sukcese elsalutinta \ No newline at end of file From 928ed7b2a46010946b2933ac5eee3841c78a98df Mon Sep 17 00:00:00 2001 From: Verdulo Date: Mon, 12 Oct 2020 19:08:23 +0000 Subject: [PATCH 76/80] Translated using Weblate (Esperanto) Currently translated at 100.0% (3825 of 3825 strings) --- OsmAnd/res/values-eo/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml index 8dc446b363..df01830535 100644 --- a/OsmAnd/res/values-eo/phrases.xml +++ b/OsmAnd/res/values-eo/phrases.xml @@ -3837,4 +3837,5 @@ prokrasto Tabulo de forveturoj Plenigi per trinkebla akvo + tergaso likva (LNG) \ No newline at end of file From 9e2709cc3689cc3d8c64d9160955082fe2d45b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 12 Oct 2020 18:28:39 +0000 Subject: [PATCH 77/80] Translated using Weblate (Icelandic) Currently translated at 99.8% (3501 of 3505 strings) --- OsmAnd/res/values-is/strings.xml | 79 +++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml index d2404aaba2..c5ce396f03 100644 --- a/OsmAnd/res/values-is/strings.xml +++ b/OsmAnd/res/values-is/strings.xml @@ -530,7 +530,7 @@ Víðværar stillingar Almennt Bakgrunnshamur - Eyða \'%s\'? + Eyða %1$s\? Úthverfi Byggðakjarni Þorp @@ -709,8 +709,8 @@ Leyfa hraðbrautir. Wikipedia-greinar í nágrenninu Útreikningur leiðar - Þú ert ekki með neina GPX-ferla ennþá - Þú getur líka bætt GPX-skrám í möppuna + Þú ert ekki ennþá með neina ferla + Þú getur líka bætt ferilskrám í möppuna Virkja hraðskráningu ferðar Ferð Skráð @@ -723,7 +723,7 @@ Engin internettenging Nauðsynleg til að sækja kort. Leita að stað… - Gagnageymsla OsmAnd (fyrir kort, GPX-ferla, o.s.frv.): %1$s. + Gagnageymsla OsmAnd (fyrir kort, ferilskrár, o.s.frv.): %1$s. Gefa heimild Ekki sýna nýjar útgáfur Komast í gang @@ -1718,7 +1718,7 @@ Stærð leturs fyrir nöfn á kortinu: Aflúsunarupplýsingar myndgerðar Birta afköst myndgerðar. - Snúa við stefnu GPX + Snúa við stefnu ferils Frálag raddleiðsagnar Hljóð í margmiðlun/tónlist Nota rastakort fyrir allt undir þessu aðdráttarstigi. @@ -1746,7 +1746,7 @@ Stigvaxandi leit byggingar Upplýsingum um hnút var ekki hlaðið inn Snjöll endurreiknun leiðar - Einungis endurreikna upphafshluta leiðar fyrir langar ferðir. + Endurreiknar aðeins upphafshluta leiðar. Má nota fyrir langar ferðir. Kortið sem eingöngu er með vegum er ekki nauðsynlegt, þar sem þú ert þegar með staðlaða (fulla útgáfu) kortsins. Sækja það samt? Birta dýptarlínur og punkta. Dýptarlínur sjávar @@ -2116,7 +2116,7 @@ Gat ekki flutt skrána inn. Vinsamlegast athugið hvort OsmAnd hafi réttindi til að lesa skrána þar sem hún er. Opna Mapillary Mapillary græja - Götumyndir + Mapillary götumyndir Mapillary-mynd Mælistika út frá miðju hrings Heimildir @@ -2904,10 +2904,10 @@ Gerðir vega Fara útaf við Fara um borð við stöðvunina - Birta/Fela GPX-ferla - Hnappur til að birta eða fela valda GPX-ferla á kortinu. - Fela GPX-ferla - Birta GPX-ferla + Birta/Fela ferla + Hnappur til að birta eða fela valda ferla á kortinu. + Fela ferla + Birta ferla • Nýr skjár fyrir \'Leiðir\': Birtir leiðarhnappa fyrir \'Heim\' og \'Vinna\', flýtileið á fyrri leið, listi yfir virka GPX-ferla og merki, leitarferill \n \n • Viðbótarupplýsingar undir \'Nánar um leið\': gerð vegar, yfirborð, bratti, áferð @@ -3766,7 +3766,7 @@ Víxlhnappur til að birta eða fela Mapillary-lagið á kortinu. Stefna %1$s eytt - Endurræsing er nauðsynleg til að geta fjarlægt alveg gögn um hraðamyndavélar. + Endurræstu forritið til að fjarlægja öll gögn um hraðamyndavélar. Fjarlægja og endurræsa Fjarlægja Aðvaranir vegna hraðamyndavéla eru bannaðar með lögum í sumum löndum. @@ -3777,19 +3777,19 @@ \n \nVeldu %2$s: öllum gögnum sem tengjast hraðamyndavélum; t.d. aðvaranir, tilkynningar, staðsetningar o.fl. verður eytt þar til OsmAnd er sett inn aftur frá grunni. Veldu ferilskrá þar sem nýjum bút verður bætt inn. - Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra með þessu sniði. + Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra eins og tiltekið er hér að neðan. Allur ferillinn verður endurreiknaður með völdu sniði. Lokaður OSM-minnispunktur Allur ferillinn - Sýna tákn fyrir upphaf/enda + Sýna tákn fyrir upphaf og enda Þetta tæki er ekki með hraðamyndavélar. Gókart - Þú verður að skilgreina virka daga til að halda áfram + Skilgreindu virka daga til að halda áfram Eyða næsta markpunkti Leiðsagnarsnið Hjólastóll áfram Náðu í upplýsingar um merka staði frá Wikipedia. Þetta er þá orðið að vasaleiðsögn án nettengingar - bara virkjaðu Wikipedia-viðbótina og njóttu þess að geta lesið um hlutina í kringum þig. - Virkja þetta til að hægt sé að stýra aðdráttarstigi korts með hljóðstyrkshnöppum. + Stýrðu aðdráttarstigi korts með hljóðstyrkshnöppum tækisins. Tilgreindu lengd farartækis sem leyfð er á leiðum. Ef stefna er öfug Aðeins næsti bútur verður endurreiknaður með völdu sniði. @@ -3840,7 +3840,7 @@ \n Veldu bilið þar sem merki með tíma eða vegalengd á ferlinum verða birt. Tengja við vegina - Ertu viss um að þú viljir loka leiðaskipulagningu án þess að vista\? Þú munt tapa öllum breytingum. + Ertu viss um að þú viljir loka leiðaskipulagningu án þess að vista\? Vista sem ferilskrá Þolvik vegalengdar Skrifa feril í GPX-skrá @@ -3856,11 +3856,9 @@ Upphaf ferils Ferlar Settu inn heimilisfang - Veldu ferilskrá til að fylgja eða flyttu inn úr tæki. + Veldu ferilskrá til að fylgja eða flyttu hana inn úr tækinu þínu. Bæta í ferilskrá - Til að nota þennan valkost þarf OsmAnd að festa ferilinn þinn við vegi á kortinu. -\n -\nÍ næsta skrefi þarftu að velja leiðsagnarsnið svo hægt sé að finna hvaða vegir séu leyfilegir og hvaða þolvik vegalengdar eigi að miða við til að nálga ferilinn þinn við fyrirliggjandi vegi. + Í næsta skrefi þarftu að velja leiðsagnarsnið svo hægt sé að finna hvaða vegir séu leyfilegir og hvaða þolvik vegalengdar eigi að miða við til að nálga ferilinn þinn við fyrirliggjandi vegi. Bæta við ferilskrám Línuskautar Bæta við heimilisfangi @@ -3868,7 +3866,7 @@ Skráning ferðar Næsti punktur Ferlar - GPX + REC Klippa á undan Bæta við leiðarpunkti í feril Skipta um gerð leiðar eftir @@ -3879,4 +3877,41 @@ Skrá leið í feril Velja annan feril Skrifa feril sjálfkrafa í GPX-skrá á meðan leiðsögn stendur + Nýjungar + Einfaldaður ferill + Aðeins leiðarlínan verður vistuð, ferilpunktunum verður eytt. + Skráarheiti + Sjálfgefið í kerfinu + Allir bútar í kjölfarið + Fyrri bútur + Allir fyrri bútar + Aðeins valinn bútur verður endurreiknaður með völdu sniði. + Allir bútar sem á eftir fylgja verða endurreiknaðir með völdu sniði. + Allir fyrri bútar verða endurreiknaðir með völdu sniði. + Opna vistaðan feril + er vistað + Bættu við a.m.k. tveimur punktum. + Endurtaka + Síðast breytt + Nafn: Ö – A + Nafn: A – Ö + Tákn við upphaf/enda + Forðast gangstéttir + Forðast gangstéttir + Þróun + OsmAnd Live gögn + OsmAnd Live gögn + Flókin leiðagerð + Tveggja-þátta leiðagerð fyrir bílaleiðsögn. + Innbyggð þróun almenningssamgangna + Skipta yfir í Java (öruggt) útreikning fyrir almenningssamgöngur + Framkvæma OAuth-innskráningu til að nota osmedit-eiginleika + Skrá inn í gegnum OAuth + Hreinsa OAuth-teikn OpenStreetMap + Útskráning tókst + %s GPX-skrár valdar + Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum skjáinn fyrir nýleg forrit - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.) + Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum fyrir GPX-skráningu á kortinu). + Setja skráningu í bið + Halda áfram með skráningu \ No newline at end of file From 5dd9655c086aeb2b8164845afefd0e386cb12bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 12 Oct 2020 16:19:35 +0000 Subject: [PATCH 78/80] Translated using Weblate (Icelandic) Currently translated at 100.0% (3825 of 3825 strings) --- OsmAnd/res/values-is/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml index 2c6a85bdb4..07ff354d7e 100644 --- a/OsmAnd/res/values-is/phrases.xml +++ b/OsmAnd/res/values-is/phrases.xml @@ -3827,4 +3827,7 @@ Lyfta Smærri raftæki Áfylling drykkjarvatns + LNG + Brottfaratafla: nei + Brottfaratafla \ No newline at end of file From 38228884ef134097777af457183142f834fc9319 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Mon, 12 Oct 2020 13:54:49 +0000 Subject: [PATCH 79/80] Translated using Weblate (Belarusian) Currently translated at 100.0% (271 of 271 strings) Translation: OsmAnd/Telegram Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/be/ --- OsmAnd-telegram/res/values-be/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml index e1c5661a33..18e71dcd2e 100644 --- a/OsmAnd-telegram/res/values-be/strings.xml +++ b/OsmAnd-telegram/res/values-be/strings.xml @@ -267,4 +267,8 @@ Апошні адказ: %1$s таму %1$s таму ERR + Даслаць справаздачу + Экспартаваць + Буфер logcat + Праверце і падзяліцеся падрабязнымі журналамі праграмы \ No newline at end of file From 52d3fae7c76eaa6811d7068a4a9a157956a56bd2 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 13 Oct 2020 11:03:55 +0300 Subject: [PATCH 80/80] Add blog article from help --- OsmAnd/build.gradle | 3 +++ OsmAnd/src/net/osmand/plus/activities/HelpActivity.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index ee9d4dd684..c2361dd165 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -331,6 +331,9 @@ task collectHelpContentsAssets(type: Copy) { from("../../help/website/feature_articles") { include "*.html" } + from("../../help/website/blog_articles") { + include "osmand-3-8-released.html" + } into "assets/feature_articles" } diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index 2d4a0c96c5..b7b3044f97 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -173,7 +173,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView contextMenuAdapter.addItem(createItem(R.string.versions_item, NULL_ID, "feature_articles/changes.html")); contextMenuAdapter.addItem(createItem(R.string.what_is_new, NULL_ID, - "feature_articles/blog.html")); + "feature_articles/osmand-3-8-released.html")); String releasedate = ""; if (!this.getString(R.string.app_edition).equals("")) {