From f5cdd498a072eb4b0dbdab9bfcc57809eb67ad62 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 17 Jan 2016 17:39:16 +0100 Subject: [PATCH] string improvements. Make Delete vs. Remove distincion --- OsmAnd/res/values-bg/strings.xml | 2 +- OsmAnd/res/values-ca/strings.xml | 2 +- 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-rAR/strings.xml | 2 +- OsmAnd/res/values-es/strings.xml | 2 +- OsmAnd/res/values-fr/strings.xml | 2 +- OsmAnd/res/values-he/strings.xml | 2 +- OsmAnd/res/values-it/strings.xml | 2 +- OsmAnd/res/values-nl/strings.xml | 2 +- OsmAnd/res/values-pl/strings.xml | 2 +- OsmAnd/res/values-pt-rBR/strings.xml | 2 +- OsmAnd/res/values-ro/strings.xml | 2 +- OsmAnd/res/values-sc/strings.xml | 2 +- OsmAnd/res/values-sk/strings.xml | 2 +- OsmAnd/res/values-sl/strings.xml | 2 +- OsmAnd/res/values-sr/strings.xml | 2 +- OsmAnd/res/values-sv/strings.xml | 2 +- OsmAnd/res/values-tr/strings.xml | 2 +- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 3 ++- .../osmand/plus/activities/search/SearchHistoryFragment.java | 2 +- .../src/net/osmand/plus/dashboard/DashWaypointsFragment.java | 2 +- OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java | 2 +- OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java | 2 +- .../controllers/ImpassibleRoadsMenuController.java | 2 +- .../mapcontextmenu/controllers/TargetPointMenuController.java | 2 +- .../plus/views/controls/SwipeDismissListViewTouchListener.java | 2 +- 29 files changed, 31 insertions(+), 28 deletions(-) diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index c5630bb40e..010a85e75e 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -2042,7 +2042,7 @@ През нощта Размяна на началната с крайна точка Скриване на POI иконите - Изтрито + Изтрито изтрити елемента ВРЪЩАНЕ НА ВСИЧКО Тип diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index d6906818c6..4c147fdab5 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1909,7 +1909,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Nit Intercanvi entre punts origen i destinació Amaga les icones dels PDI - Element suprimit + Element suprimit elements suprimits DESFÉS-HO TOT Tipus diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 5b51de00d7..3b0167b945 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1883,7 +1883,7 @@ Okamžité aktualizace Aktualizovat nyní Aplikace nemá povolen přístup k SD kartě -Položka smazána +Položka smazána vymazaných položek VRÁTIT ZPĚT VŠE Typ diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 99f929ec56..04db975e74 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2222,7 +2222,7 @@ Vælg måned og land Type Udgangspunkt - Emne slettet + Emne slettet Emner slettet FORTRYD ALLE Skjul IP ikoner diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index f53cf2b5e1..1c52ba831f 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,5 +1,7 @@ + Entfernen + Eintrag entfernt Keine Adresse bekannt Nähe Regionen diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index cb2ca79c96..dea8e0d635 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -2042,7 +2042,7 @@ Elige mes y país Tipo Punto de partida - Elemento borrado + Elemento borrado elementos borrados DESHACER TODO Ocultar iconos de PDI diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 55ecda45d0..9d86b2fcba 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -2040,7 +2040,7 @@ Seleccione mes y país Tipo Punto de partida - Elemento eliminado + Elemento eliminado elementos eliminados DESHACER TODO diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index dcd5d21d98..0b84cab080 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2099,7 +2099,7 @@ Nuit Choisissez un mois et un pays -Élément supprimé +Élément supprimé Éléments supprimés Tout annuler Point de départ diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index b8649d9bf7..130663697c 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -1133,7 +1133,7 @@ הגדרה כיעד יעד %1$s מפות זמינות - הפריט נמחק + הפריט נמחק פריטים נמחקו סוג נקודת המוצא diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index f471c0bb8d..fe30566d16 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2135,7 +2135,7 @@ Tipo Punto di partenza Scegli il mese e lo stato -Oggetto cancellato +Oggetto cancellato oggetti cancellati Annulla tutto Inverti punti di partenza e destinazione diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index cc1f7d0083..8d911e686c 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -2160,7 +2160,7 @@ Kies maand en kaart Startpunt Type - Item verwijderd + Item verwijderd items verwijderd Alles terugzetten Verberg POI-iconen diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 1be5be1f1f..b388609f65 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -2069,7 +2069,7 @@ Ostatnia zmiana mapy: %s Długość nagrania Nie wybrane -Pozycja usunięta +Pozycja usunięta Pozycje usunięta COFNIJ WSZYSTKO Typ diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 105adf079f..dcd537a527 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -1988,7 +1988,7 @@ Selecione o mês e o país Tipo Ponto de partida - Item apagado + Item apagado itens apagados DESFAZER TUDO Ocultar ícones dos POIs diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index ba82d6a042..f55011fc52 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1574,7 +1574,7 @@ OSM POI sters Deschideti OSM Notite OSM Notite redeschis - Articol șters + Articol șters articole șterse Restaurează toate Tip diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 9c92baabd3..3fbce2ab49 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -2077,7 +2077,7 @@ Ischerta mese e istadu Casta Puntu de incumintzu - Elementu burradu + Elementu burradu elementos burrados ANNUDDA TOTU Intervallu de registratzione diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 178dcc1268..d7c21f3345 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1917,7 +1917,7 @@ Typ Východzí bod Zvoľte mesiac a krajinu -Položka vymazaná +Položka vymazaná položiek vymazaných VŠETKO VRÁTIŤ SPÄŤ \ No newline at end of file diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 7cf9db1e4e..b78472a82f 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -2078,7 +2078,7 @@ Razdelilnik posnetkov Uporabi razdelilnik posnetkov Prepiši starejše posnetke, ko velikost posnetka preseže omejitev - Predmet je izbrisan + Predmet je izbrisan izbrisanih predmetov Razveljavi vse Vrsta diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml index 61c8e985df..ada7be8c6d 100644 --- a/OsmAnd/res/values-sr/strings.xml +++ b/OsmAnd/res/values-sr/strings.xml @@ -762,7 +762,7 @@ Омогући рад у позадини ГПИкс-а Уписуј путању у датотеку ГПИкс-а Праћење путање по захтеву - Избрисана ставка + Избрисана ставка избрисане ставке ОПОЗОВИ СВЕ Врста diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 25548a7d71..489117cc97 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -2061,7 +2061,7 @@ Välj månad och land Typ Startpunkt - post raderad + post raderad poster raderade ÅNGRA ALLA Dölj POI-ikoner diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 7848556f48..5460645fe9 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -2026,7 +2026,7 @@ Güncelleme boyutu Ayı ve ülke seçin -Öğe silindi +Öğe silindi öğe silindi UNDO TÜM Tip diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 264771600b..79f49a66a0 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2068,7 +2068,7 @@ 選擇月份與國家 類型 起始標點 - 項目已刪除 + 項目已刪除 項目已刪除 全部取消 隱藏 POI 圖示 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index afa993d41f..221b811306 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,13 +9,14 @@ 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 --> + Remove "You can remove downloaded updates and get back to the original map edition" Add time span Road blocked Select Reverse starting point & destination Hide POI icons - Item deleted + Item deleted items deleted UNDO ALL Type diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 525f319b6c..e109514e9a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -199,7 +199,7 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA private void selectModelOptions(final HistoryEntry model, View v) { final PopupMenu optionsMenu = new PopupMenu(getActivity(), v); MenuItem item = optionsMenu.getMenu().add( - R.string.shared_string_delete).setIcon( + R.string.shared_string_remove).setIcon( getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_delete_dark)); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java index edace008cf..0552ab93a7 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashWaypointsFragment.java @@ -278,7 +278,7 @@ public class DashWaypointsFragment extends DashLocationFragment { } } item = optionsMenu.getMenu().add( - R.string.shared_string_delete).setIcon(getMyApplication().getIconsCache(). + R.string.shared_string_remove).setIcon(getMyApplication().getIconsCache(). getContentIcon(R.drawable.ic_action_remove_dark)); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java b/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java index 8f354239ad..4df3ee6e8b 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java @@ -349,7 +349,7 @@ public class ItemViewHolder { final File fl = indexItem.getTargetFile(context.getMyApplication()); if (fl.exists()) { - item = optionsMenu.getMenu().add(R.string.shared_string_delete).setIcon( + item = optionsMenu.getMenu().add(R.string.shared_string_remove).setIcon( context.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark)); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java index 3fc85eb8ae..3130be5e13 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java @@ -426,7 +426,7 @@ public class WaypointDialogHelper { DirectionsDialogs.setupPopUpMenuIcon(optionsMenu); MenuItem item; item = optionsMenu.getMenu().add( - R.string.shared_string_delete).setIcon(app.getIconsCache(). + R.string.shared_string_remove).setIcon(app.getIconsCache(). getContentIcon(R.drawable.ic_action_remove_dark)); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java index c692b6cd43..779de90fd3 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java @@ -31,7 +31,7 @@ public class ImpassibleRoadsMenuController extends MenuController { getMapActivity().getContextMenu().close(); } }; - rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete); + rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_remove); rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java index fa4f47653f..e76cd89f9b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java @@ -43,7 +43,7 @@ public class TargetPointMenuController extends MenuController { leftTitleButtonController.caption = getMapActivity().getString(R.string.cancel_navigation); leftTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark; } else { - leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete); + leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_remove); leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; } } diff --git a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java index 3df8b94822..429e564876 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java @@ -835,7 +835,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener { msg = mUndoActions.get(mUndoActions.size() - 1).getTitle(); if (msg == null) { - msg = mListView.getResources().getString(R.string.item_deleted); + msg = mListView.getResources().getString(R.string.item_removed); } } mUndoPopupTextView.setText(msg);