diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values-de/strings.xml | 8 | ||||
| -rw-r--r-- | main/res/values-it/strings.xml | 8 | ||||
| -rw-r--r-- | main/res/values-sk/strings.xml | 8 | ||||
| -rwxr-xr-x | main/res/values-sv/strings.xml | 8 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 18 |
6 files changed, 9 insertions, 49 deletions
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index fcce472..6c18d99 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -116,14 +116,6 @@ <string name="log_new_log_text">Log-Text</string> <string name="log_announcement">Ankündigung</string> - <!-- copy --> - <string name="options_context_menu_title">Optionen</string> - <string name="copy_coords">Koordinaten kopieren</string> - <string name="copy_desc">Beschreibung kopieren</string> - <string name="copy_personalnote">Persönliche Notiz kopieren</string> - <string name="copy_hint">Hinweis kopieren</string> - <string name="copy_log">Log kopieren</string> - <!-- translation --> <string name="translate_to_sys_lang">Übersetze in %s</string> <string name="translate_to_english">Übersetze in Englisch</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 034e09f..a3ab64b 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -118,14 +118,6 @@ <string name="log_new_log_text">Testo Log</string> <string name="log_announcement">Annuncio</string> - <!-- copy --> - <string name="options_context_menu_title">Opzioni</string> - <string name="copy_coords">Copia Coordinate</string> - <string name="copy_desc">Copia Descrizione</string> - <string name="copy_personalnote">Copia Note Personali</string> - <string name="copy_hint">Copia Aiuto</string> - <string name="copy_log">Copia Log</string> - <!-- translation --> <string name="translate_to_sys_lang">Traduci in %s</string> <string name="translate_to_english">Traduci in inglese</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 14e5e82..d1b86cd 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -116,14 +116,6 @@ <string name="log_new_log_text">Text logu</string> <string name="log_announcement">Oznámenie</string> - <!-- copy --> - <string name="options_context_menu_title">Možnosti</string> - <string name="copy_coords">Kopírovať súradnice</string> - <string name="copy_desc">Kopírovať popis</string> - <string name="copy_personalnote">Kopírovať vlastnú poznámku</string> - <string name="copy_hint">Kopírovať nápovedu</string> - <string name="copy_log">Kopírovať log</string> - <!-- translation --> <string name="translate_to_sys_lang">Preložiť do jazyka %s</string> <string name="translate_to_english">Preložiť do angličtiny</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 4d262de..f607727 100755 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -117,14 +117,6 @@ <string name="log_new_log_text">Loggtext</string> <string name="log_announcement">Kungörelse</string> - <!-- copy --> - <string name="options_context_menu_title">Välj</string> - <string name="copy_coords">Kopiera koordinaten</string> - <string name="copy_desc">Kopiera beskrivningen</string> - <string name="copy_personalnote">Kopiera personliga anteckningen</string> - <string name="copy_hint">Kopiera hinten</string> - <string name="copy_log">Kopiera loggen</string> - <!-- translation --> <string name="translate_to_sys_lang">Översätt till %s</string> <string name="translate_to_english">Översätt till Engelska</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 7b12738..1f99aa8 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -117,14 +117,6 @@ <string name="log_new_log_text">Log Text</string> <string name="log_announcement">Announcement</string> - <!-- copy --> - <string name="options_context_menu_title">Options</string> - <string name="copy_coords">Copy Coordinates</string> - <string name="copy_desc">Copy Description</string> - <string name="copy_personalnote">Copy Personal Note</string> - <string name="copy_hint">Copy Hint</string> - <string name="copy_log">Copy Log</string> - <!-- translation --> <string name="translate_to_sys_lang">Translate to %s</string> <string name="translate_to_english">Translate to English</string> diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 107e14d..53930b8 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -380,11 +380,11 @@ public class CacheDetailActivity extends AbstractActivity { switch (viewId) { case R.id.value: // coordinates clickedItemText = ((TextView) view).getText(); - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_coords), true); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_coordinates), true); break; case R.id.shortdesc: clickedItemText = ((TextView) view).getText(); - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_desc), false); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_description), false); break; case R.id.longdesc: // combine short and long description @@ -394,19 +394,19 @@ public class CacheDetailActivity extends AbstractActivity { } else { clickedItemText = shortDesc + "\n\n" + ((TextView) view).getText(); } - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_desc), false); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_description), false); break; case R.id.personalnote: clickedItemText = ((TextView) view).getText(); - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_personalnote), true); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_personal_note), true); break; case R.id.hint: clickedItemText = ((TextView) view).getText(); - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_hint), false); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_hint), false); break; case R.id.log: clickedItemText = ((TextView) view).getText(); - buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_log), false); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.cache_logs), false); break; case -1: if (null != cache.getWaypoints()) { @@ -442,9 +442,9 @@ public class CacheDetailActivity extends AbstractActivity { } } - private void buildOptionsContextmenu(ContextMenu menu, int viewId, String copyPrompt, boolean copyOnly) { - menu.setHeaderTitle(res.getString(R.string.options_context_menu_title)); - menu.add(viewId, MENU_FIELD_COPY, 0, copyPrompt); + private void buildOptionsContextmenu(ContextMenu menu, int viewId, String fieldTitle, boolean copyOnly) { + menu.setHeaderTitle(fieldTitle); + menu.add(viewId, MENU_FIELD_COPY, 0, res.getString(android.R.string.copy)); if (!copyOnly) { if (clickedItemText.length() > TranslationUtils.translationTextLengthToWarn) { showToast(res.getString(R.string.translate_length_warning)); |
