string improvements. Make Delete vs. Remove distincion

This commit is contained in:
sonora 2016-01-17 17:39:16 +01:00
parent 5d1eb60e3b
commit f5cdd498a0
29 changed files with 31 additions and 28 deletions

View file

@ -2042,7 +2042,7 @@
<string name="Night">През нощта</string> <string name="Night">През нощта</string>
<string name="switch_start_finish">Размяна на началната с крайна точка</string> <string name="switch_start_finish">Размяна на началната с крайна точка</string>
<string name="rendering_attr_hideIcons_name">Скриване на POI иконите</string> <string name="rendering_attr_hideIcons_name">Скриване на POI иконите</string>
<string name="item_deleted">Изтрито</string> <string name="item_removed">Изтрито</string>
<string name="n_items_deleted">изтрити елемента</string> <string name="n_items_deleted">изтрити елемента</string>
<string name="shared_string_undo_all">ВРЪЩАНЕ НА ВСИЧКО</string> <string name="shared_string_undo_all">ВРЪЩАНЕ НА ВСИЧКО</string>
<string name="shared_string_type">Тип</string> <string name="shared_string_type">Тип</string>

View file

@ -1909,7 +1909,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="Night">Nit</string> <string name="Night">Nit</string>
<string name="switch_start_finish">Intercanvi entre punts origen i destinació</string> <string name="switch_start_finish">Intercanvi entre punts origen i destinació</string>
<string name="rendering_attr_hideIcons_name">Amaga les icones dels PDI</string> <string name="rendering_attr_hideIcons_name">Amaga les icones dels PDI</string>
<string name="item_deleted">Element suprimit</string> <string name="item_removed">Element suprimit</string>
<string name="n_items_deleted">elements suprimits</string> <string name="n_items_deleted">elements suprimits</string>
<string name="shared_string_undo_all">DESFÉS-HO TOT</string> <string name="shared_string_undo_all">DESFÉS-HO TOT</string>
<string name="shared_string_type">Tipus</string> <string name="shared_string_type">Tipus</string>

View file

@ -1883,7 +1883,7 @@
<string name="live_update">Okamžité aktualizace</string> <string name="live_update">Okamžité aktualizace</string>
<string name="update_now">Aktualizovat nyní</string> <string name="update_now">Aktualizovat nyní</string>
<string name="missing_write_external_storage_permission">Aplikace nemá povolen přístup k SD kartě</string> <string name="missing_write_external_storage_permission">Aplikace nemá povolen přístup k SD kartě</string>
<string name="item_deleted">Položka smazána</string> <string name="item_removed">Položka smazána</string>
<string name="n_items_deleted">vymazaných položek</string> <string name="n_items_deleted">vymazaných položek</string>
<string name="shared_string_undo_all">VRÁTIT ZPĚT VŠE</string> <string name="shared_string_undo_all">VRÁTIT ZPĚT VŠE</string>
<string name="shared_string_type">Typ</string> <string name="shared_string_type">Typ</string>

View file

@ -2222,7 +2222,7 @@
<string name="select_month_and_country">Vælg måned og land</string> <string name="select_month_and_country">Vælg måned og land</string>
<string name="shared_string_type">Type</string> <string name="shared_string_type">Type</string>
<string name="starting_point">Udgangspunkt</string> <string name="starting_point">Udgangspunkt</string>
<string name="item_deleted">Emne slettet</string> <string name="item_removed">Emne slettet</string>
<string name="n_items_deleted">Emner slettet</string> <string name="n_items_deleted">Emner slettet</string>
<string name="shared_string_undo_all">FORTRYD ALLE</string> <string name="shared_string_undo_all">FORTRYD ALLE</string>
<string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string> <string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string>

View file

@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources> <resources>
<string name="shared_string_remove">Entfernen</string>
<string name="item_removed">Eintrag entfernt</string>
<string name="no_address_found">Keine Adresse bekannt</string> <string name="no_address_found">Keine Adresse bekannt</string>
<string name="shared_string_near">Nähe</string> <string name="shared_string_near">Nähe</string>
<string name="regions">Regionen</string> <string name="regions">Regionen</string>

View file

@ -2042,7 +2042,7 @@
<string name="select_month_and_country">Elige mes y país</string> <string name="select_month_and_country">Elige mes y país</string>
<string name="shared_string_type">Tipo</string> <string name="shared_string_type">Tipo</string>
<string name="starting_point">Punto de partida</string> <string name="starting_point">Punto de partida</string>
<string name="item_deleted">Elemento borrado</string> <string name="item_removed">Elemento borrado</string>
<string name="n_items_deleted">elementos borrados</string> <string name="n_items_deleted">elementos borrados</string>
<string name="shared_string_undo_all">DESHACER TODO</string> <string name="shared_string_undo_all">DESHACER TODO</string>
<string name="rendering_attr_hideIcons_name">Ocultar iconos de PDI</string> <string name="rendering_attr_hideIcons_name">Ocultar iconos de PDI</string>

View file

@ -2040,7 +2040,7 @@
<string name="select_month_and_country">Seleccione mes y país</string> <string name="select_month_and_country">Seleccione mes y país</string>
<string name="shared_string_type">Tipo</string> <string name="shared_string_type">Tipo</string>
<string name="starting_point">Punto de partida</string> <string name="starting_point">Punto de partida</string>
<string name="item_deleted">Elemento eliminado</string> <string name="item_removed">Elemento eliminado</string>
<string name="n_items_deleted">elementos eliminados</string> <string name="n_items_deleted">elementos eliminados</string>
<string name="shared_string_undo_all">DESHACER TODO</string> <string name="shared_string_undo_all">DESHACER TODO</string>
</resources> </resources>

View file

@ -2099,7 +2099,7 @@
<string name="Night">Nuit</string> <string name="Night">Nuit</string>
<string name="select_month_and_country">Choisissez un mois et un pays</string> <string name="select_month_and_country">Choisissez un mois et un pays</string>
<string name="item_deleted">Élément supprimé</string> <string name="item_removed">Élément supprimé</string>
<string name="n_items_deleted">Éléments supprimés</string> <string name="n_items_deleted">Éléments supprimés</string>
<string name="shared_string_undo_all">Tout annuler</string> <string name="shared_string_undo_all">Tout annuler</string>
<string name="starting_point">Point de départ</string> <string name="starting_point">Point de départ</string>

View file

@ -1133,7 +1133,7 @@
<string name="context_menu_item_destination_point">הגדרה כיעד</string> <string name="context_menu_item_destination_point">הגדרה כיעד</string>
<string name="destination_point">יעד %1$s</string> <string name="destination_point">יעד %1$s</string>
<string name="available_maps">מפות זמינות</string> <string name="available_maps">מפות זמינות</string>
<string name="item_deleted">הפריט נמחק</string> <string name="item_removed">הפריט נמחק</string>
<string name="n_items_deleted">פריטים נמחקו</string> <string name="n_items_deleted">פריטים נמחקו</string>
<string name="shared_string_type">סוג</string> <string name="shared_string_type">סוג</string>
<string name="starting_point">נקודת המוצא</string> <string name="starting_point">נקודת המוצא</string>

View file

@ -2135,7 +2135,7 @@
<string name="shared_string_type">Tipo</string> <string name="shared_string_type">Tipo</string>
<string name="starting_point">Punto di partenza</string> <string name="starting_point">Punto di partenza</string>
<string name="select_month_and_country">Scegli il mese e lo stato</string> <string name="select_month_and_country">Scegli il mese e lo stato</string>
<string name="item_deleted">Oggetto cancellato</string> <string name="item_removed">Oggetto cancellato</string>
<string name="n_items_deleted">oggetti cancellati</string> <string name="n_items_deleted">oggetti cancellati</string>
<string name="shared_string_undo_all">Annulla tutto</string> <string name="shared_string_undo_all">Annulla tutto</string>
<string name="switch_start_finish">Inverti punti di partenza e destinazione</string> <string name="switch_start_finish">Inverti punti di partenza e destinazione</string>

View file

@ -2160,7 +2160,7 @@
<string name="select_month_and_country">Kies maand en kaart</string> <string name="select_month_and_country">Kies maand en kaart</string>
<string name="starting_point">Startpunt</string> <string name="starting_point">Startpunt</string>
<string name="shared_string_type">Type</string> <string name="shared_string_type">Type</string>
<string name="item_deleted">Item verwijderd</string> <string name="item_removed">Item verwijderd</string>
<string name="n_items_deleted">items verwijderd</string> <string name="n_items_deleted">items verwijderd</string>
<string name="shared_string_undo_all">Alles terugzetten</string> <string name="shared_string_undo_all">Alles terugzetten</string>
<string name="rendering_attr_hideIcons_name">Verberg POI-iconen</string> <string name="rendering_attr_hideIcons_name">Verberg POI-iconen</string>

View file

@ -2069,7 +2069,7 @@
<string name="last_map_change">Ostatnia zmiana mapy: %s</string> <string name="last_map_change">Ostatnia zmiana mapy: %s</string>
<string name="rec_split_clip_length">Długość nagrania</string> <string name="rec_split_clip_length">Długość nagrania</string>
<string name="shared_string_not_selected">Nie wybrane</string> <string name="shared_string_not_selected">Nie wybrane</string>
<string name="item_deleted">Pozycja usunięta</string> <string name="item_removed">Pozycja usunięta</string>
<string name="n_items_deleted">Pozycje usunięta</string> <string name="n_items_deleted">Pozycje usunięta</string>
<string name="shared_string_undo_all">COFNIJ WSZYSTKO</string> <string name="shared_string_undo_all">COFNIJ WSZYSTKO</string>
<string name="shared_string_type">Typ</string> <string name="shared_string_type">Typ</string>

View file

@ -1988,7 +1988,7 @@
<string name="select_month_and_country">Selecione o mês e o país</string> <string name="select_month_and_country">Selecione o mês e o país</string>
<string name="shared_string_type">Tipo</string> <string name="shared_string_type">Tipo</string>
<string name="starting_point">Ponto de partida</string> <string name="starting_point">Ponto de partida</string>
<string name="item_deleted">Item apagado</string> <string name="item_removed">Item apagado</string>
<string name="n_items_deleted">itens apagados</string> <string name="n_items_deleted">itens apagados</string>
<string name="shared_string_undo_all">DESFAZER TUDO</string> <string name="shared_string_undo_all">DESFAZER TUDO</string>
<string name="rendering_attr_hideIcons_name">Ocultar ícones dos POIs</string> <string name="rendering_attr_hideIcons_name">Ocultar ícones dos POIs</string>

View file

@ -1574,7 +1574,7 @@
<string name="osm_edit_deleted_poi">OSM POI sters</string> <string name="osm_edit_deleted_poi">OSM POI sters</string>
<string name="context_menu_item_open_note">Deschideti OSM Notite</string> <string name="context_menu_item_open_note">Deschideti OSM Notite</string>
<string name="osm_edit_reopened_note">OSM Notite redeschis</string> <string name="osm_edit_reopened_note">OSM Notite redeschis</string>
<string name="item_deleted">Articol șters</string> <string name="item_removed">Articol șters</string>
<string name="n_items_deleted">articole șterse</string> <string name="n_items_deleted">articole șterse</string>
<string name="shared_string_undo_all">Restaurează toate</string> <string name="shared_string_undo_all">Restaurează toate</string>
<string name="shared_string_type">Tip</string> <string name="shared_string_type">Tip</string>

View file

@ -2077,7 +2077,7 @@
<string name="select_month_and_country">Ischerta mese e istadu</string> <string name="select_month_and_country">Ischerta mese e istadu</string>
<string name="shared_string_type">Casta</string> <string name="shared_string_type">Casta</string>
<string name="starting_point">Puntu de incumintzu</string> <string name="starting_point">Puntu de incumintzu</string>
<string name="item_deleted">Elementu burradu</string> <string name="item_removed">Elementu burradu</string>
<string name="n_items_deleted">elementos burrados</string> <string name="n_items_deleted">elementos burrados</string>
<string name="shared_string_undo_all">ANNUDDA TOTU</string> <string name="shared_string_undo_all">ANNUDDA TOTU</string>
<string name="rec_split">Intervallu de registratzione</string> <string name="rec_split">Intervallu de registratzione</string>

View file

@ -1917,7 +1917,7 @@
<string name="shared_string_type">Typ</string> <string name="shared_string_type">Typ</string>
<string name="starting_point">Východzí bod</string> <string name="starting_point">Východzí bod</string>
<string name="select_month_and_country">Zvoľte mesiac a krajinu</string> <string name="select_month_and_country">Zvoľte mesiac a krajinu</string>
<string name="item_deleted">Položka vymazaná</string> <string name="item_removed">Položka vymazaná</string>
<string name="n_items_deleted">položiek vymazaných</string> <string name="n_items_deleted">položiek vymazaných</string>
<string name="shared_string_undo_all">VŠETKO VRÁTIŤ SPÄŤ</string> <string name="shared_string_undo_all">VŠETKO VRÁTIŤ SPÄŤ</string>
</resources> </resources>

View file

@ -2078,7 +2078,7 @@
<string name="rec_split">Razdelilnik posnetkov</string> <string name="rec_split">Razdelilnik posnetkov</string>
<string name="rec_split_title">Uporabi razdelilnik posnetkov</string> <string name="rec_split_title">Uporabi razdelilnik posnetkov</string>
<string name="rec_split_desc">Prepiši starejše posnetke, ko velikost posnetka preseže omejitev</string> <string name="rec_split_desc">Prepiši starejše posnetke, ko velikost posnetka preseže omejitev</string>
<string name="item_deleted">Predmet je izbrisan</string> <string name="item_removed">Predmet je izbrisan</string>
<string name="n_items_deleted">izbrisanih predmetov</string> <string name="n_items_deleted">izbrisanih predmetov</string>
<string name="shared_string_undo_all">Razveljavi vse</string> <string name="shared_string_undo_all">Razveljavi vse</string>
<string name="shared_string_type">Vrsta</string> <string name="shared_string_type">Vrsta</string>

View file

@ -762,7 +762,7 @@
<string name="enable_sleep_mode">Омогући рад у позадини ГПИкс-а</string> <string name="enable_sleep_mode">Омогући рад у позадини ГПИкс-а</string>
<string name="save_track_to_gpx_globally">Уписуј путању у датотеку ГПИкс-а</string> <string name="save_track_to_gpx_globally">Уписуј путању у датотеку ГПИкс-а</string>
<string name="save_track_to_gpx_globally_headline">Праћење путање по захтеву</string> <string name="save_track_to_gpx_globally_headline">Праћење путање по захтеву</string>
<string name="item_deleted">Избрисана ставка</string> <string name="item_removed">Избрисана ставка</string>
<string name="n_items_deleted">избрисане ставке</string> <string name="n_items_deleted">избрисане ставке</string>
<string name="shared_string_undo_all">ОПОЗОВИ СВЕ</string> <string name="shared_string_undo_all">ОПОЗОВИ СВЕ</string>
<string name="shared_string_type">Врста</string> <string name="shared_string_type">Врста</string>

View file

@ -2061,7 +2061,7 @@
<string name="select_month_and_country">Välj månad och land</string> <string name="select_month_and_country">Välj månad och land</string>
<string name="shared_string_type">Typ</string> <string name="shared_string_type">Typ</string>
<string name="starting_point">Startpunkt</string> <string name="starting_point">Startpunkt</string>
<string name="item_deleted">post raderad</string> <string name="item_removed">post raderad</string>
<string name="n_items_deleted">poster raderade</string> <string name="n_items_deleted">poster raderade</string>
<string name="shared_string_undo_all">ÅNGRA ALLA</string> <string name="shared_string_undo_all">ÅNGRA ALLA</string>
<string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string> <string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string>

View file

@ -2026,7 +2026,7 @@
<string name="updates_size">Güncelleme boyutu</string> <string name="updates_size">Güncelleme boyutu</string>
<string name="select_month_and_country">Ayı ve ülke seçin</string> <string name="select_month_and_country">Ayı ve ülke seçin</string>
<string name="item_deleted">Öğe silindi</string> <string name="item_removed">Öğe silindi</string>
<string name="n_items_deleted">öğe silindi</string> <string name="n_items_deleted">öğe silindi</string>
<string name="shared_string_undo_all">UNDO TÜM</string> <string name="shared_string_undo_all">UNDO TÜM</string>
<string name="shared_string_type">Tip</string> <string name="shared_string_type">Tip</string>

View file

@ -2068,7 +2068,7 @@
<string name="select_month_and_country">選擇月份與國家</string> <string name="select_month_and_country">選擇月份與國家</string>
<string name="shared_string_type">類型</string> <string name="shared_string_type">類型</string>
<string name="starting_point">起始標點</string> <string name="starting_point">起始標點</string>
<string name="item_deleted">項目已刪除</string> <string name="item_removed">項目已刪除</string>
<string name="n_items_deleted">項目已刪除</string> <string name="n_items_deleted">項目已刪除</string>
<string name="shared_string_undo_all">全部取消</string> <string name="shared_string_undo_all">全部取消</string>
<string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string> <string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string>

View file

@ -9,13 +9,14 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 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 PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="shared_string_remove">Remove</string>
<string name="clear_updates_proposition_message">"You can remove downloaded updates and get back to the original map edition"</string> <string name="clear_updates_proposition_message">"You can remove downloaded updates and get back to the original map edition"</string>
<string name="add_time_span">Add time span</string> <string name="add_time_span">Add time span</string>
<string name="road_blocked">Road blocked</string> <string name="road_blocked">Road blocked</string>
<string name="shared_string_select">Select</string> <string name="shared_string_select">Select</string>
<string name="switch_start_finish">Reverse starting point &amp; destination</string> <string name="switch_start_finish">Reverse starting point &amp; destination</string>
<string name="rendering_attr_hideIcons_name">Hide POI icons</string> <string name="rendering_attr_hideIcons_name">Hide POI icons</string>
<string name="item_deleted">Item deleted</string> <string name="item_removed">Item deleted</string>
<string name="n_items_deleted">items deleted</string> <string name="n_items_deleted">items deleted</string>
<string name="shared_string_undo_all">UNDO ALL</string> <string name="shared_string_undo_all">UNDO ALL</string>
<string name="shared_string_type">Type</string> <string name="shared_string_type">Type</string>

View file

@ -199,7 +199,7 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
private void selectModelOptions(final HistoryEntry model, View v) { private void selectModelOptions(final HistoryEntry model, View v) {
final PopupMenu optionsMenu = new PopupMenu(getActivity(), v); final PopupMenu optionsMenu = new PopupMenu(getActivity(), v);
MenuItem item = optionsMenu.getMenu().add( 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)); getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_delete_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override

View file

@ -278,7 +278,7 @@ public class DashWaypointsFragment extends DashLocationFragment {
} }
} }
item = optionsMenu.getMenu().add( 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)); getContentIcon(R.drawable.ic_action_remove_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override

View file

@ -349,7 +349,7 @@ public class ItemViewHolder {
final File fl = indexItem.getTargetFile(context.getMyApplication()); final File fl = indexItem.getTargetFile(context.getMyApplication());
if (fl.exists()) { 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)); context.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override

View file

@ -426,7 +426,7 @@ public class WaypointDialogHelper {
DirectionsDialogs.setupPopUpMenuIcon(optionsMenu); DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
MenuItem item; MenuItem item;
item = optionsMenu.getMenu().add( 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)); getContentIcon(R.drawable.ic_action_remove_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override

View file

@ -31,7 +31,7 @@ public class ImpassibleRoadsMenuController extends MenuController {
getMapActivity().getContextMenu().close(); 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; rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
} }

View file

@ -43,7 +43,7 @@ public class TargetPointMenuController extends MenuController {
leftTitleButtonController.caption = getMapActivity().getString(R.string.cancel_navigation); leftTitleButtonController.caption = getMapActivity().getString(R.string.cancel_navigation);
leftTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark; leftTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark;
} else { } 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; leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
} }
} }

View file

@ -835,7 +835,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
msg = mUndoActions.get(mUndoActions.size() - 1).getTitle(); msg = mUndoActions.get(mUndoActions.size() - 1).getTitle();
if (msg == null) { if (msg == null) {
msg = mListView.getResources().getString(R.string.item_deleted); msg = mListView.getResources().getString(R.string.item_removed);
} }
} }
mUndoPopupTextView.setText(msg); mUndoPopupTextView.setText(msg);