From 351218faf4a870534625da8dba3cd66b5af8cafa Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Thu, 20 Jul 2017 10:43:10 +0300 Subject: [PATCH] Move strings to no translate --- OsmAnd/no_translate.xml | 5 +++++ OsmAnd/res/values/strings.xml | 1 - .../net/osmand/plus/osmedit/EditPoiDialogFragment.java | 2 +- .../plus/osmedit/dialogs/SendPoiDialogFragment.java | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index 5b3ad7728a..564d9b0acb 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -26,5 +26,10 @@ https://twitter.com/osmandapp https://www.facebook.com/osmandapp https://vk.com/osmandapp + Add + Edit + Delete + Reopen + items modified diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9588ca4362..9c74569091 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2654,5 +2654,4 @@ Change button position Long tap and drag the button to change its position on the screen Action name - items modified diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java index ccab123bc6..188915c41e 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java @@ -449,7 +449,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment { if (offlineEdit && !Algorithms.isEmpty(poiTypeTag)) { node.putTagNoLC(EditPoiData.POI_TYPE_TAG, poiTypeTag); } - String actionString = action == OsmPoint.Action.CREATE ? getString(R.string.shared_string_add) : getString(R.string.shared_string_edit); + String actionString = action == OsmPoint.Action.CREATE ? getString(R.string.default_changeset_add) : getString(R.string.default_changeset_edit); comment = actionString + " " + poiTypeTag; } commitNode(action, node, mOpenstreetmapUtil.getEntityInfo(node.getId()), comment, false, diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java index 42d67b0bc6..7f88d51d03 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java @@ -184,19 +184,19 @@ public class SendPoiDialogFragment extends DialogFragment { Map group; switch (i) { case 0: - action = getString(R.string.shared_string_add); + action = getString(R.string.default_changeset_add); group = addGroup; break; case 1: - action = getString(R.string.shared_string_edit); + action = getString(R.string.default_changeset_edit); group = editGroup; break; case 2: - action = getString(R.string.shared_string_delete); + action = getString(R.string.default_changeset_delete); group = deleteGroup; break; case 3: - action = getString(R.string.poi_dialog_reopen);; + action = getString(R.string.default_changeset_reopen);; group = reopenGroup; break; default: