From 7cc3889e82afa2edf886fab1dd155ee31ef51a75 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 15 Jun 2014 13:40:32 +0200 Subject: [PATCH 01/17] Add buttons to right pane, add zoom buttons (optionally), fix navigation start with delay --- OsmAnd/res/values/strings.xml | 3 + OsmAnd/res/xml/navigation_settings.xml | 2 + .../src/net/osmand/plus/OsmandSettings.java | 5 ++ .../SettingsNavigationActivity.java | 2 + .../osmand/plus/views/MapControlsLayer.java | 46 ++++++++++++-- .../plus/views/controls/MapCancelControl.java | 1 + .../plus/views/controls/MapControls.java | 27 +++++++- .../plus/views/controls/MapMenuControls.java | 1 + .../views/controls/MapNavigateControl.java | 62 ++++++++++++------- .../views/controls/MapRouteInfoControl.java | 1 + .../views/controls/MapRoutePlanControl.java | 1 + .../controls/MapRoutePreferencesControl.java | 1 + .../plus/views/controls/MapZoomControls.java | 42 ++++++++----- .../views/controls/SmallMapMenuControls.java | 1 + 14 files changed, 150 insertions(+), 45 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index eccc46bb55..b44479eff5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,9 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + + Show zoom buttons during navigation + Show zoom buttons Save as group of favorites Select waypoints Point labels diff --git a/OsmAnd/res/xml/navigation_settings.xml b/OsmAnd/res/xml/navigation_settings.xml index d998d757fe..8d95cf420e 100644 --- a/OsmAnd/res/xml/navigation_settings.xml +++ b/OsmAnd/res/xml/navigation_settings.xml @@ -19,5 +19,7 @@ android:key="keep_informing" android:title="@string/keep_informing" android:summary="@string/keep_informing_descr" /> + + diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 6d1cf15362..e0ac5f8b0d 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -849,6 +849,11 @@ public class OsmandSettings { // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference SHOW_FAVORITES = new BooleanPreference("show_favorites", false).makeGlobal(); + public final CommonPreference SHOW_ZOOM_BUTTONS_NAVIGATION = new BooleanPreference("show_zoom_buttons_navigation", false).makeProfile().cache(); + { + SHOW_ZOOM_BUTTONS_NAVIGATION.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true); + } + // Json public final OsmandPreference SELECTED_GPX = new StringPreference("selected_gpx", "").makeGlobal(); diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 650fc83625..5227d544a2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -88,6 +88,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity { keepInformingNames[i] = keepInformingValues[i] + " " + getString(R.string.int_min); } registerListPreference(settings.KEEP_INFORMING, screen, keepInformingNames, keepInformingValues); + + registerBooleanPreference(settings.SHOW_ZOOM_BUTTONS_NAVIGATION, screen); autoZoomMapPreference = (ListPreference) screen.findPreference(settings.AUTO_ZOOM_MAP.getId()); autoZoomMapPreference.setOnPreferenceChangeListener(this); diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 6c188d9a1b..28355c9398 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import net.osmand.data.RotatedTileBox; +import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; @@ -23,6 +24,7 @@ import android.graphics.Color; import android.graphics.PointF; import android.os.Handler; import android.view.Gravity; +import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; @@ -39,6 +41,7 @@ public class MapControlsLayer extends OsmandMapLayer { private int shadowColor = -1; private MapZoomControls zoomControls; + private MapZoomControls zoomSideControls; private MapMenuControls mapMenuControls; private RulerControl rulerControl; @@ -55,9 +58,11 @@ public class MapControlsLayer extends OsmandMapLayer { private SeekBar transparencyBar; private LinearLayout transparencyBarLayout; private static CommonPreference settingsToTransparency; + private OsmandSettings settings; public MapControlsLayer(MapActivity activity){ this.mapActivity = activity; + settings = activity.getMyApplication().getSettings(); } @Override @@ -72,10 +77,13 @@ public class MapControlsLayer extends OsmandMapLayer { Handler showUIHandler = new Handler(); int rightGravity = Gravity.RIGHT | Gravity.BOTTOM; int leftGravity = Gravity.LEFT | Gravity.BOTTOM; + int rightCenterGravity = Gravity.RIGHT | Gravity.CENTER; // default buttons zoomControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent, rightGravity); + zoomSideControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent, + rightCenterGravity); mapMenuControls = init(new MapMenuControls(mapActivity, showUIHandler, scaleCoefficient), parent, leftGravity); mapRoutePlanControl = init(new MapRoutePlanControl(mapActivity, showUIHandler, scaleCoefficient), parent, @@ -104,13 +112,26 @@ public class MapControlsLayer extends OsmandMapLayer { } - private T init(T c, FrameLayout parent, int gravity) { - c.init(parent); + private T init(final T c, FrameLayout parent, int gravity) { c.setGravity(gravity); + c.init(parent); allControls.add(c); + c.setNotifyClick(new Runnable() { + + @Override + public void run() { + notifyClicked(c); + } + }); return c; } + protected void notifyClicked(MapControls m) { + if(mapNavigationControl != null) { + mapNavigationControl.stopCounter(); + } + } + @Override public void destroyLayer() { } @@ -134,7 +155,7 @@ public class MapControlsLayer extends OsmandMapLayer { routePlanningMode = true; } boolean routeFollowingMode = !routePlanningMode && rh.isFollowingMode(); - boolean showDefaultButtons = !routeFollowingMode && !routePlanningMode; + boolean showDefaultButtons = !routePlanningMode && (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()); if(routePlanningMode) { forceHideView(zoomControls); forceHideView(mapMenuControls); @@ -152,6 +173,7 @@ public class MapControlsLayer extends OsmandMapLayer { checkVisibilityAndDraw(showRouteCalculationControls, mapInfoNavigationControl, canvas, tileBox, nightMode); checkVisibilityAndDraw(showRouteCalculationControls, mapAppModeControl, canvas, tileBox, nightMode); checkVisibilityAndDraw(showRouteCalculationControls, mapNavigationControl, canvas, tileBox, nightMode); + checkVisibilityAndDraw(showRouteCalculationControls, zoomSideControls, canvas, tileBox, nightMode); // the last one to check other controls visibility int vmargin = mapNavigationControl.isVisible() || zoomControls.isVisible() ? zoomControls.getHeight() : 0; @@ -188,13 +210,25 @@ public class MapControlsLayer extends OsmandMapLayer { @Override public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { + for(MapControls m : allControls) { + if(m.isVisible() && m.onSingleTap(point, tileBox)){ + return true; + } + } + return false; + } + + @Override + public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) { if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode()) { - zoomControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS); - mapMenuControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS); + if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) { + zoomControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS); + mapMenuControls.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS); + } mapRoutePlanControl.showWithDelay((FrameLayout) mapActivity.getMapView().getParent(), TIMEOUT_TO_SHOW_BUTTONS); } for(MapControls m : allControls) { - if(m.isVisible() && m.onSingleTap(point, tileBox)){ + if(m.isVisible() && m.onTouchEvent(event, tileBox)){ return true; } } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java index 38dc20f6f6..f498490ab9 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java @@ -25,6 +25,7 @@ public class MapCancelControl extends MapControls { cancelButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); if(mapActivity.getRoutingHelper().isFollowingMode()) { mapActivity.getMapActions().stopNavigationActionConfirm(mapActivity.getMapView()); } else { diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java index 6a0894d6ff..27bd4571e2 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java @@ -9,6 +9,7 @@ import android.graphics.PointF; import android.graphics.drawable.Drawable; import android.os.Handler; import android.view.Gravity; +import android.view.MotionEvent; import android.view.View; import android.widget.Button; import android.widget.FrameLayout; @@ -29,6 +30,7 @@ public abstract class MapControls { protected int vmargin; protected int width; protected int height; + protected Runnable notifyClick; public MapControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) { this.mapActivity = mapActivity; @@ -65,7 +67,17 @@ public abstract class MapControls { applyAttributes(ctx, parent, button, stringId, resourceId, extraMargin); return button; } - + + public void setNotifyClick(Runnable notifyClick) { + this.notifyClick = notifyClick; + } + + protected void notifyClicked() { + if(notifyClick != null) { + notifyClick.run(); + } + } + private void applyAttributes(Context ctx, FrameLayout parent, View button, int stringId, int resourceId, int extraMargin) { @@ -154,6 +166,14 @@ public abstract class MapControls { return visible; } + protected boolean isLeft() { + return (Gravity.LEFT & gravity) == Gravity.LEFT; + } + + protected boolean isBottom() { + return (Gravity.BOTTOM & gravity) == Gravity.BOTTOM; + } + protected void initControls(FrameLayout layout) { } @@ -165,6 +185,11 @@ public abstract class MapControls { public abstract void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode); + + public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) { + return false; + } + public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { return false; } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java index 9fe04c2987..e156963fcc 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java @@ -40,6 +40,7 @@ public class MapMenuControls extends MapControls { // double lon = activity.getMapView().getLongitude(); // MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon)); mapActivity.getMapActions().openOptionsMenuAsList(); + notifyClicked(); } }); } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java index a6523b9d02..33b7f971bb 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java @@ -4,7 +4,6 @@ import gnu.trove.list.array.TIntArrayList; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import net.osmand.data.RotatedTileBox; import net.osmand.plus.OsmandApplication; @@ -12,8 +11,8 @@ import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.routing.RoutingHelper; -import net.osmand.plus.views.ShadowText; import net.osmand.plus.views.OsmandMapLayer.DrawSettings; +import net.osmand.plus.views.ShadowText; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.content.DialogInterface; @@ -26,6 +25,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Handler; import android.text.TextPaint; +import android.view.MotionEvent; import android.view.View; import android.widget.Button; import android.widget.FrameLayout; @@ -38,7 +38,7 @@ public class MapNavigateControl extends MapControls { private Bitmap mapMagnifier; private TextPaint counterTextPaint; private Paint bitmapPaint; - private static AtomicInteger startCounter = new AtomicInteger(); + private static long startCounter = 0; public MapNavigateControl(MapRouteInfoControl ri, MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) { @@ -53,25 +53,30 @@ public class MapNavigateControl extends MapControls { public void startCounter() { OsmandSettings settings = mapActivity.getMyApplication().getSettings(); - startCounter.set(settings.DELAY_TO_START_NAVIGATION.get()); - delayStart = new Runnable() { - @Override - public void run() { - int cnt = startCounter.decrementAndGet(); - if (cnt == 0) { - startNavigation(); - } else if (cnt > 0) - mapActivity.refreshMap(); - showUIHandler.postDelayed(delayStart, 1000); - } - }; - if(startCounter.get() > 0) { + if (startCounter <= 0) { + startCounter = System.currentTimeMillis() + settings.DELAY_TO_START_NAVIGATION.get() * 1000; + delayStart = new Runnable() { + @Override + public void run() { + if (startCounter > 0) { + if (System.currentTimeMillis() > startCounter) { + startCounter = 0; + startNavigation(); + } else { + mapActivity.refreshMap(); + showUIHandler.postDelayed(delayStart, 1000); + } + } + } + }; delayStart.run(); } + } + private void startNavigation() { - startCounter.set(-1); + stopCounter(); OsmandApplication app = mapActivity.getMyApplication(); RoutingHelper routingHelper = app.getRoutingHelper(); if(routingHelper.isFollowingMode()) { @@ -99,6 +104,7 @@ public class MapNavigateControl extends MapControls { navigateButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); startNavigation(); } }); @@ -117,7 +123,7 @@ public class MapNavigateControl extends MapControls { @Override public void hideControls(FrameLayout layout) { removeButton(layout, navigateButton); - startCounter.set(-1); + stopCounter(); } @Override @@ -127,10 +133,15 @@ public class MapNavigateControl extends MapControls { } } + + public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) { + stopCounter(); + return false; + } + public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { - startCounter.set(-1); + stopCounter(); if (navigateShadow.getBounds().contains((int) point.x, (int) point.y)) { - startCounter.set(-1); openDialog(); return true; } @@ -155,10 +166,10 @@ public class MapNavigateControl extends MapControls { @Override public void onClick(DialogInterface dialog, int which) { + notifyClicked(); dialog.dismiss(); mapActivity.getMyApplication().getSettings().DELAY_TO_START_NAVIGATION.set(opt.get(which)); startCounter(); - } }); bld.show(); @@ -186,8 +197,8 @@ public class MapNavigateControl extends MapControls { if(navigateShadow.getBounds().width() > 0) { navigateShadow.draw(canvas); } - int get = startCounter.get(); - if (get > 0) { + if (startCounter > 0) { + int get = (int) ((startCounter -System.currentTimeMillis()) / 1000l); final String text = get + ""; float length = counterTextPaint.measureText(text); ShadowText.draw(text, canvas, navigateButton.getLeft() + (navigateButton.getWidth() - length - 2) / 2, @@ -208,4 +219,9 @@ public class MapNavigateControl extends MapControls { } return width ; } + + + public void stopCounter() { + startCounter = 0; + } } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index d4baf51694..b43bc3763e 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -90,6 +90,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio infoButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); if(dialog != null) { hideDialog(); } else { diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java index 4bab183be2..5620e5b33c 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java @@ -25,6 +25,7 @@ public class MapRoutePlanControl extends MapControls { routePlanButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); mapActivity.getRoutingHelper().setRoutePlanningMode(true); mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode(); mapActivity.refreshMap(); diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java index 821e83806c..4f21687ef9 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java @@ -119,6 +119,7 @@ public class MapRoutePreferencesControl extends MapControls { @Override public void onClick(View v) { + notifyClicked(); if(dialog != null) { dialog.hide(); dialog = null; diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java index cf0804a22f..b7389a6b38 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java @@ -68,11 +68,19 @@ public class MapZoomControls extends MapControls { @Override protected void showControls(FrameLayout parent) { int minimumWidth = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth(); + int minimumHeight = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth(); + vmargin = 0; zoomInButton = addButton(parent, R.string.zoomIn, R.drawable.map_zoom_in); - zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out, minimumWidth); + if(isBottom()) { + zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out, minimumWidth); + } else { + vmargin = minimumHeight; + zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out); + } zoomInButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); if (view.isZooming()) { mapActivity.changeZoom(2); } else { @@ -86,6 +94,7 @@ public class MapZoomControls extends MapControls { zoomOutButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); mapActivity.changeZoom(-1); } }); @@ -94,7 +103,9 @@ public class MapZoomControls extends MapControls { @Override public void initControls(FrameLayout parent) { - zoomShadow = view.getResources().getDrawable(R.drawable.zoom_background).mutate(); + if(isBottom()) { + zoomShadow = view.getResources().getDrawable(R.drawable.zoom_background).mutate(); + } mapMagnifier = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_magnifier); bitmapPaint = new Paint(); } @@ -147,20 +158,21 @@ public class MapZoomControls extends MapControls { if (zoomOutButton.isEnabled() != zoomOutEnabled) { zoomOutButton.setEnabled(zoomOutEnabled); } - - if (view.isZooming()) { - showZoomLevel = true; - showZoomLevelButton = false; - showUIHandler.removeMessages(SHOW_ZOOM_LEVEL_MSG_ID); - showUIHandler.removeMessages(SHOW_ZOOM_BUTTON_MSG_ID); - } else { - if (isShowZoomLevel() && view.getSettings().SHOW_RULER.get()) { - hideZoomLevelInTime(); + if (isBottom()) { + if (view.isZooming()) { + showZoomLevel = true; + showZoomLevelButton = false; + showUIHandler.removeMessages(SHOW_ZOOM_LEVEL_MSG_ID); + showUIHandler.removeMessages(SHOW_ZOOM_BUTTON_MSG_ID); + } else { + if (isShowZoomLevel() && view.getSettings().SHOW_RULER.get()) { + hideZoomLevelInTime(); + } + } + boolean drawZoomLevel = isShowZoomLevel() || !view.getSettings().SHOW_RULER.get(); + if (drawZoomLevel) { + drawZoomLevel(canvas, tileBox, !showZoomLevelButton); } - } - boolean drawZoomLevel = isShowZoomLevel() || !view.getSettings().SHOW_RULER.get(); - if (drawZoomLevel) { - drawZoomLevel(canvas, tileBox, !showZoomLevelButton); } } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java b/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java index a72f7acf7b..127a23706f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java @@ -25,6 +25,7 @@ public class SmallMapMenuControls extends MapControls { backToMenuButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + notifyClicked(); mapActivity.getMapActions().openOptionsMenuAsList(); } }); From f942b3ed7af923022b948e13e7a55c4555f04b04 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Mon, 16 Jun 2014 00:17:42 +0200 Subject: [PATCH 02/17] Update CREDITS.md --- CREDITS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.md b/CREDITS.md index 5667c609ca..fc290e51ac 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -8,3 +8,4 @@ * Alexey Pelykh - C++ developer, created native library and made application much snappier. * Max (Zahnstocher) - Java contributor, active forum participant. * Harry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant. + * Robin `ypid` Schneider - opening hours contributor From 4b23871687936b5b1015ad1cebd3977a44c903f4 Mon Sep 17 00:00:00 2001 From: Aleksei Polkhirev Date: Sun, 15 Jun 2014 15:11:39 +0200 Subject: [PATCH 03/17] Translated using Weblate (Russian) Currently translated at 99.5% (1415 of 1422 strings) --- OsmAnd/res/values-ru/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 0f7675815d..c19c3d3dde 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -86,8 +86,8 @@ Закрыть changeset Приложение \'Сканнер штрих-кодов\' не найдено. Искать на Маркете? Быстрое построение маршрута (возможно неоптимально) - Загрузите или обновите локальные данные. \nЧтобы получить дополнительную информацию о карте, выделите её в списке. Удерживайте карту, если вы хотите удалить или деактивировать. -Данные на устройстве (%1$s свободно): + Загрузите или обновите локальные файлы карт. +\nЧтобы получить дополнительную информацию о карте, выделите её в списке. Удерживайте карту, если вы хотите удалить или деактивировать. Данные на устройстве (%1$s свободно): Изменения в 0.8.3: \n\t* Промежуточные точки \n\t* Улучшенное сопровождение по маршруту @@ -124,7 +124,7 @@ Онлайн карты (растровые) Локальные карты (векторные) - Загрузка и управление локальными картами + Загрузка и управление локальными файлами карт на вашем устройстве Активируйте плагин онлайн карт, чтобы выбирать различные источники карт Онлайн карты Использовать онлайн карты (кэшируются на SD-носителе) @@ -329,7 +329,7 @@ %1$d из %2$d объектов успешно активированы. Нет объектов, чтобы %1$s Вы собираетесь %1$s %2$s объектов. Вы уверены? - Менеджер локальных данных + Управление файлами карт Активировать Архив Удалить @@ -517,7 +517,7 @@ Перезагрузить Настройки экрана, локализации, единиц измерения и другие Общие - Данные + Управление файлами карт Фоновый режим Запустить OsmAnd в фоновом режиме для записи трека и навигации Скоростной маршрут @@ -802,7 +802,7 @@ Выход Карта Настройки - Избранное + Мои места Поиск Поиск Выберите POI @@ -1414,8 +1414,8 @@ Избегать автомагистралей Предпочитать автомагистрали Предпочитать автомагистрали - Короткий путь - Использовать короткий путь + Кратчайший путь + Использовать кратчайший путь Избегать платных дорог Избегать платных дорог Избегать грунтовые дороги @@ -1423,7 +1423,7 @@ Избегать паромов Избегать паромов Максимальный вес - Уточнить ограничение веса + Уточнить ограничение веса машины Отображение карты: Навигационный знак From 5eba98c81262a07abf4b8a357853a869ce53afc4 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Mon, 16 Jun 2014 00:22:17 +0200 Subject: [PATCH 04/17] Update AUTHORS.MIT --- AUTHORS.MIT | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AUTHORS.MIT b/AUTHORS.MIT index d2162dfcec..43403f553c 100644 --- a/AUTHORS.MIT +++ b/AUTHORS.MIT @@ -1,4 +1,3 @@ -Authors of patches and pull requests: - -Hardy Mueller -Robin `ypid` Schneider +(C) All authors of translations and pull requests could be found in commits history : + - Translations are under special "contributor" name 'weblate' + - Pull requests have 2 committers, first is original contributor and second is project maintainer From ead2f8c22f916bba88c75559797b8cdbfea7beaf Mon Sep 17 00:00:00 2001 From: GiZig Date: Mon, 16 Jun 2014 01:05:04 +0200 Subject: [PATCH 05/17] Update strings.xml Redo changes --- OsmAnd/res/values-fr/strings.xml | 50 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index b90952db8f..74753b8080 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -350,7 +350,7 @@ Nature Service Autre - Magasin + Commerce Sport Restauration Tourisme @@ -365,7 +365,7 @@ m Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté Pour conducteurs - PI le plus proche + PI les plus proches Filtre personnalisé Alimentation Pour voyageurs @@ -376,7 +376,7 @@ La version de l\'\'index \'\'{0}\'\' n\'\'est pas supporté Navigation hors-ligne OsmAnd >20km Utiliser la navigation hors-ligne pour les longues distances (expérimental) - La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n\nLe service utilise alors automatiquement le service en-ligne CloudMade. + La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n\nLe service utilise alors automatiquement le service en ligne CloudMade. Le répertoire spécifié est introuvable. Répertoire de stockage @@ -388,7 +388,7 @@ Chargement des versions disponibles… Sélectionnez la version d\'OsmAnd à installer Fonction spéciale pour la version des contributeurs - L\'application \'GPS Status\' n\'est pas installée. La chercher dans Market ? + L\'application \'GPS Status\' n\'est pas installée. Voulez-vous la chercher dans la boutique d\'application ? Guidage vocal indisponible. Veuillez aller dans les paramètres et choisir les voix à télécharger. Aucune donnée vocale n\'est spécifiée Jour @@ -555,7 +555,7 @@ Mettre à jour les données locales depuis internet ? Ville :\n{0} Rue :\n{0}\n{1} - Intersection :\n{0} x {1} dans {2} + Intersection :\n{0} x {1} à {2} Bâtiment :\n{0} {1}\n{2} Favori Effacer tout @@ -677,14 +677,14 @@ Quitter Carte Paramètres - Favoris + Mes lieux Rechercher Rechercher - Choisir PI + Choix de points d\'intérêt Étendre la recherche - Recherche progressive de ville - Recherche progressive des rues - Recherche progressive des numéros de bâtiment + Choisir une ville + Choisir une rue + Choisir un numéro ou un bâtiment Choisir une région dans la liste Choisir une intersection Équipements à proximité @@ -886,10 +886,10 @@ Recherche de transports en commun Recherche parmi les favoris Historique des recherches - Rond-point : prendre la %1$d sortie et continuez pendant - Serrez à gauche et continuez pendant - Serrez à droite et continuez pendant - Rendre toutes les zones transparentes sur la carte + Rond-point : prendre la %1$d sortie et continuez + Serrez à gauche et continuez + Serrez à droite et continuez + Rendre invisibles les surfaces représentant des éléments de terrain Pas de polygones Profil pour le rendu Optimisation de la carte selon le profil d\'utilisation @@ -1608,6 +1608,12 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Format invalide : %s Annonce de l\'arrivée Choisir à quel moment est annoncée l\'arrivée à destination + +Précoce +Normale +Tardive +Dans les derniers mètres + Partager Favoris partagés via OsmAnd Calculer un intinéraire entre des points @@ -1673,9 +1679,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Afficher la couleur Suivre Se connecter - Pour créer des groupes que vous devez être un utilisateur enregistré d\'OsMo. + Pour créer des groupes, vous devez être un utilisateur enregistré d\'OsMo. Vos identifiants OsMo sont incorrects. - Êtes-vous sûr de régénérer les identifiants personnels ? Tous les appareils connectés à vous ne seront plus capables de vous suivre. + Êtes-vous sûr de souhaiter régénérer vos identifiants personnels ? Les appareils qui vous sont connectés ne seront plus capables de vous suivre. Régénérer l\'identifiant de l\'utilisateur Annuler la cible mobile Centrer sur l\'écran @@ -1691,7 +1697,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et La trace GPX est vide Traces sélectionnées Toutes les\ntraces - Mes\nfavoris + Mes favoris Mes lieux Mes lieux \n\nAppui long pour visualiser sur la carte @@ -1701,14 +1707,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et \n\nAppui long pour afficher les options Sections : %1$s Points de cheminement : %1$s -Distance : %1$s (%2$s points)… +Distance : %1$s (%2$s points) Heure de départ : %1$tF, %1$tT Heure d'arrivée : %1$tF, %1$tT Vitesse moyenne : %1$s Vitesse maximale : %1$s Altitude moyenne : %1$s Amplitude altimétrique : %1$s -Dénivellation : %1$s +Dénivelées : %1$s Durée : %1$s Temps en déplacement : %1$s Segment @@ -1723,7 +1729,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Heure Chargement de %1$s … Enregistrer comme groupe de favoris - Sélectionner les points du chemin - Étiquettes textuelles - Description + Sélectionner les points de cheminement + Étiquette des points + Destination From b6325ac0a41bdd2becc695824716a1e94d0a955e Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 16 Jun 2014 01:21:40 +0200 Subject: [PATCH 06/17] Fix translation --- OsmAnd/res/values-be/strings.xml | 2 +- OsmAnd/res/values-bs/strings.xml | 2 +- OsmAnd/res/values-ca/strings.xml | 6 +++--- OsmAnd/res/values-cs/strings.xml | 2 +- OsmAnd/res/values-da/strings.xml | 2 +- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values-es/strings.xml | 2 +- OsmAnd/res/values-fa/strings.xml | 2 +- OsmAnd/res/values-fr/strings.xml | 4 ++-- OsmAnd/res/values-hy/strings.xml | 2 +- OsmAnd/res/values-id/strings.xml | 2 +- OsmAnd/res/values-it/strings.xml | 2 +- OsmAnd/res/values-ko/strings.xml | 2 +- OsmAnd/res/values-lv/strings.xml | 2 +- OsmAnd/res/values-nl/strings.xml | 2 +- OsmAnd/res/values-pl/strings.xml | 2 +- OsmAnd/res/values-pt/strings.xml | 2 +- OsmAnd/res/values-ru/strings.xml | 2 +- OsmAnd/res/values-sk/strings.xml | 2 +- OsmAnd/res/values-sl/strings.xml | 2 +- OsmAnd/res/values-sv/strings.xml | 2 +- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 4524058ac7..22a02bc491 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1,4 +1,4 @@ - + Без аўтаматычнага масштабіраваньня Зачыніць Для сярэдняга масштаба diff --git a/OsmAnd/res/values-bs/strings.xml b/OsmAnd/res/values-bs/strings.xml index 3b2013aa07..bd78d99de3 100644 --- a/OsmAnd/res/values-bs/strings.xml +++ b/OsmAnd/res/values-bs/strings.xml @@ -1,4 +1,4 @@ - + "Promjene u 0.8.1 : " Što prije Sačuvajte put kao GPX datoteku diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 47e7f55886..55d1911dad 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1,4 +1,4 @@ - + Mostra els missatges d\'avís… Rutes amb fluorescència Mostra el regle @@ -855,8 +855,8 @@ \n\n\'OsmAnd també suporta fonts personalitzades. El menú contextual \'Usa posició\' inclou totes les opcions relatives al punt (posició). - \n\nEstà disponible prement i aguantant a qualsevol punt en el mapa (i llavors seleccionant el seu marcador) o prement el boto de la bola de desplaçament o seleccionant \'Menú\'→ \Usa posició\' (en les dues darreres opcions s'agafa el centre del mapa com referència). - \n\nLa caixa de diàleg s'amaga altre cop prement i aguantant dins seu. + \n\nEstà disponible prement i aguantant a qualsevol punt en el mapa (i llavors seleccionant el seu marcador) o prement el boto de la bola de desplaçament o seleccionant \'Menú\'→ \Usa posició\' (en les dues darreres opcions s\'agafa el centre del mapa com referència). + \n\nLa caixa de diàleg s\'amaga altre cop prement i aguantant dins seu. OsmAnd és una aplicació de navegació amb moltes funcionalitats. \n\nCom a introducció bàsica, s\'enllacen alguns consells i dreceres via \'Menú\'→ \'Concells\' de la pantalla del mapa. diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 2c3283eec1..d4aa1a6c00 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1,4 +1,4 @@ - + Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Offline data), nebo se přepněte na online mapy. "Změny ve verzi 0.7.2 : \n\t- Native rendering pro všechna zařízení diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 701522357a..940c9c4720 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1,4 +1,4 @@ - + Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling. Optag video Optag audio diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 58e9c73c89..72b7830b8a 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Die Route ist wahrscheinlich zu lang um vom OsmAnd-Offline-Router berechnet zu werden. Offline-Routing ist bis ungefähr 200 km Abstand zwischen einzelnen Punkten möglich. Bitte einen oder mehrere Zwischenpunkte setzen um die Route berechnen zu können. Kein Auto-Zoom Auf Nahbereich diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index b79d1474ff..5af7a4af5f 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -1,4 +1,4 @@ - + Iniciar\n seguimiento en directo Parar\n seguimiento en directo Configura pantalla diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 2013027589..a1c4c6dd78 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -1,4 +1,4 @@ - + پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود زمان دقت diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index b90952db8f..70799d3002 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1,4 +1,4 @@ - + Modifications hors-ligne Toujours utiliser l\'édition hors-ligne "Changements en 0.7.1 : @@ -1703,7 +1703,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Points de cheminement : %1$s Distance : %1$s (%2$s points)… Heure de départ : %1$tF, %1$tT -Heure d'arrivée : %1$tF, %1$tT +Heure d\'arrivée : %1$tF, %1$tT Vitesse moyenne : %1$s Vitesse maximale : %1$s Altitude moyenne : %1$s diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml index 433483d2b4..4d3eb0d756 100644 --- a/OsmAnd/res/values-hy/strings.xml +++ b/OsmAnd/res/values-hy/strings.xml @@ -1,4 +1,4 @@ - + Տարածքի ռելիեֆ Տարածքի մգեցված ռելիեֆով քարտեզներ Սկիզբ diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml index 46c7e14a91..dcf05d9a6d 100644 --- a/OsmAnd/res/values-id/strings.xml +++ b/OsmAnd/res/values-id/strings.xml @@ -1,4 +1,4 @@ - + Mencari alamat Koordinat Mencari transportasi diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index fefdb17a99..faa1cac130 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1,4 +1,4 @@ - + Sovrapposizioni fluorescenti Usa colori fluorescenti per visualizzare tracce e percorsi Modifiche offline diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 514c28c640..6e35165cc6 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -1,4 +1,4 @@ - + 벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다. 현재 선택된 음성 명령을 재생합니다 diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 696ffa766a..051a9d14da 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -1,4 +1,4 @@ - + Spraudņu pārvaldnieks Atzīmējiet spraudni, lai to aktivizētu vai deaktivizētu. (Iespējams OsmAnd vajadzēs restartēt.) Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index e0cb83c7fc..5f93b9eabe 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -1,4 +1,4 @@ - + Start\n online tracking Stop\n online tracking Configureer scherm diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index c645c9688f..a4ba58238d 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1,4 +1,4 @@ - + "Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki " Przezroczysty styl diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index a86f5534c0..70e11094c9 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -1,4 +1,4 @@ - + Administrativo Barreira Educação diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index c19c3d3dde..322d27c066 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1,4 +1,4 @@ - + Этот плагин позволяет загружать линии высот (Загрузка данных -> Меню -> "Другие карты") для использования оффлайн. Рассмотрите пожалуйста покупку плагина \"Линии высот\" на Market, чтобы поддержать последующую разработку. Линии высот diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 59e85df6b8..5047a3299a 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1,4 +1,4 @@ - + Zobraziť Fotografia %1$s zachytená dňa %2$s Zachytiť fotografiu diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 3e8b003dce..2f6b0f12ed 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1,4 +1,4 @@ - + Iskanje Iskanje Nastavitve diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 02b3d54b3f..10572b57e9 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1,4 +1,4 @@ - + För att låsa upp skärmen tryck på låsikonen Välj land Välj stad diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 5327b9b83a..c54ef074d9 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ - + 選擇道路的色彩調配： 道路的色彩調配 顯示目的地方向 From 0703a354a853b73a79e1c8befa1b234acf403a21 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 16 Jun 2014 04:35:19 +0200 Subject: [PATCH 07/17] Translated using Weblate (Danish) Currently translated at 100.0% (1424 of 1424 strings) --- OsmAnd/res/values-da/strings.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 940c9c4720..bf65399f6a 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1,4 +1,4 @@ - + Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling. Optag video Optag audio @@ -1895,4 +1895,6 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Vælg rutepunkter Punktetiketter Online OSM kort klassificering med billeder - + Vis zoom-knapperne under navigation + Vis zoom-knapperne + From d1f290b21b8ad05a741164158b0e429d43125709 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 16 Jun 2014 01:48:16 +0200 Subject: [PATCH 08/17] Translated using Weblate. --- OsmAnd/res/values-it/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index faa1cac130..47bcfe4b6b 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1,4 +1,4 @@ - + Sovrapposizioni fluorescenti Usa colori fluorescenti per visualizzare tracce e percorsi Modifiche offline @@ -1894,4 +1894,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Salva come gruppo di preferiti Scegli le tappe Etichette di testo + Mostra i pulsanti per lo zoom From 7ceb5e2c41ac33086452d90fb8c7503972bb5141 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Mon, 16 Jun 2014 04:21:06 +0200 Subject: [PATCH 09/17] Translated using Weblate (Traditional Chinese) Currently translated at 99.9% (1423 of 1424 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index c54ef074d9..0d4342004c 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ - + 選擇道路的色彩調配： 道路的色彩調配 顯示目的地方向 @@ -1878,4 +1878,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 另存為我的最愛群組 選擇中途點 標點標籤 - + 在導航期間顯示縮放按鈕 + 顯示縮放按鈕 + 線上 OSM 地圖的分類與影像 + From d538d2adf1f39e9ceebad09d9bcc1a6db0aeb2b7 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 16 Jun 2014 08:05:04 +0200 Subject: [PATCH 10/17] Translated using Weblate. --- OsmAnd/res/values-ca/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 55d1911dad..0d5eba1671 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1,4 +1,4 @@ - + Mostra els missatges d\'avís… Rutes amb fluorescència Mostra el regle @@ -1859,4 +1859,6 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Guarda com grup de preferits Selecciona punts de pas Etiquetes dels punts + Mostra els botons de zoom mentre la navegació + Mostra els botons de zoom From 8160a12423d7627fccdb7817dd28ff858810c2ac Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 16 Jun 2014 10:49:03 +0200 Subject: [PATCH 11/17] Translated using Weblate. --- OsmAnd/res/values-be/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 22a02bc491..08fbd35030 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1,4 +1,4 @@ - + Без аўтаматычнага масштабіраваньня Зачыніць Для сярэдняга масштаба @@ -1856,4 +1856,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Захаваць як групу упадабаных Абраць кропкі шляху Назвы кропак + Паказваць кнопкі маштабаваньня From 5dca83b523546cd4e1c48291f3e8e77700188935 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 16 Jun 2014 09:59:34 +0200 Subject: [PATCH 12/17] Translated using Weblate (Italian) Currently translated at 99.9% (1423 of 1424 strings) --- OsmAnd/res/values-it/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 47bcfe4b6b..2d8ae56ae5 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1895,4 +1895,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Scegli le tappe Etichette di testo Mostra i pulsanti per lo zoom + Mostra i pulsanti dello zoom durante la navigazione From db0fabfea6f5a5c6983a2f4a66251e5ba3280f5b Mon Sep 17 00:00:00 2001 From: Ivan Gonzalez Martin Date: Mon, 16 Jun 2014 09:30:17 +0200 Subject: [PATCH 13/17] Translated using Weblate (Spanish) Currently translated at 99.9% (1423 of 1424 strings) --- OsmAnd/res/values-es/strings.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 5af7a4af5f..5d9f37d5bb 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -1,4 +1,4 @@ - + Iniciar\n seguimiento en directo Parar\n seguimiento en directo Configura pantalla @@ -949,7 +949,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Nombre de calle Configuración - ¿Dónde estoy? + Dónde estoy Bloquear pantalla Brújula Barra de estado: @@ -1398,7 +1398,7 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb Canadá Europa y Asia Reino Unido, India, Australia y Otros - Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia y otras + Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia y Otras Región de conducción Zoom mínimo Expirar (minutos) @@ -1548,7 +1548,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant Preferir autopistas Prefierir autopistas en el ruteo - Camino corto + Camino más corto Usar el camino corto Evitar peajes Evita las carreteras con peaje @@ -1785,6 +1785,9 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant Tiempo actual Punto de ruta Seleccionar puntos de ruta - Etiquetas de texto + Etiquetas de punto Guardar como grupo de favoritos + Mostrar botones de zoom durante navegación + Mostrar botones de zoom + From b5841f2a419a3a47bf80888a9a2e31d4fca44b2d Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 16 Jun 2014 08:08:28 +0200 Subject: [PATCH 14/17] Translated using Weblate. --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 0d5eba1671..29fa651972 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1858,7 +1858,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània, Traça actual en gravació Guarda com grup de preferits Selecciona punts de pas - Etiquetes dels punts + Etiquetes puntuals Mostra els botons de zoom mentre la navegació Mostra els botons de zoom From 5d8cd92e42b01dca95445f00c3dbb7a9d421bab1 Mon Sep 17 00:00:00 2001 From: Andrius A Date: Mon, 16 Jun 2014 07:47:57 +0200 Subject: [PATCH 15/17] Translated using Weblate. --- OsmAnd/res/values-lt/strings.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index b667183a00..190671b582 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1,4 +1,5 @@ -Pradžios taškas yra per toli nuo artimiausio kelio. + +Pradžios taškas yra per toli nuo artimiausio kelio. Bendrinta vieta Dėmesio Perspėjimas pasiimti automobilį jau buvo įtrauktas į jūsų kalendorių. Perspėjimas ten liks tol, kol jo nepanaikinsite. @@ -1839,4 +1840,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A valandų senumo minučių senumo sekundžių senumo - \ No newline at end of file + Maršruto dalys: %1$s + Tarpiniai taškai: %1$s + Atstumas: %1$s (%2$s taškai/-ų) + Pradžios laikas: %1$tF, %1$tT + Pabaigos laikas: %1$tF, %1$tT + Vidutinis greitis: %1$s + Maksimalus greitis: %1$s + %1$s taškai/-ų + From 4066d147869d333f3cb71e94621bc9cb71890726 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 16 Jun 2014 11:35:18 +0200 Subject: [PATCH 16/17] Translated using Weblate. --- 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 2d8ae56ae5..b81c6895f6 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1894,6 +1894,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Salva come gruppo di preferiti Scegli le tappe Etichette di testo - Mostra i pulsanti per lo zoom + Mostra i pulsanti dello zoom Mostra i pulsanti dello zoom durante la navigazione From e5e729f7d3d7943bbffa9fa7bc07b2a21e7b0155 Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Mon, 16 Jun 2014 11:31:25 +0200 Subject: [PATCH 17/17] Translated using Weblate (Italian) Currently translated at 99.9% (1423 of 1424 strings) --- OsmAnd/res/values-it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index b81c6895f6..246a7d9507 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1146,7 +1146,7 @@ Dati attualmente nel dispositivo (%1$s liberi): Aggiungi come ultimo punto intermedio Aggiungi come primo punto intermedio Sostituisci la destinazione - Hai già una destinazione impostata. + Hai già impostato la destinazione. Punto intermedio %1$s Punti intermedi Servizi di registrazione @@ -1873,7 +1873,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Distanza: %1$s (%2$s punti) Orario di arrivo: %1$tF, %1$tT Dislivello: %1$s - Salite: %1$s + Discesa/salita: %1$s Intervallo di tempo: %1$s Tempo in movimento: %1$s Segmento