From cd6173bdaa4743d2480880e710d2bd164437371e Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 8 Mar 2015 16:57:38 +0100 Subject: [PATCH] shared_string_delete --- OsmAnd/res/layout/open_hours_list_item.xml | 2 +- OsmAnd/res/layout/search_transport_route_item.xml | 2 +- OsmAnd/res/values-af/strings.xml | 2 +- OsmAnd/res/values-ar/strings.xml | 2 +- OsmAnd/res/values-be-rBY/strings.xml | 2 +- OsmAnd/res/values-be/strings.xml | 1 - 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 | 1 - OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values-el/strings.xml | 2 +- OsmAnd/res/values-es/strings.xml | 2 +- OsmAnd/res/values-eu/strings.xml | 2 +- OsmAnd/res/values-fa/strings.xml | 2 +- OsmAnd/res/values-fi/strings.xml | 2 +- OsmAnd/res/values-fr/strings.xml | 2 +- OsmAnd/res/values-gl/strings.xml | 2 +- OsmAnd/res/values-he/strings.xml | 2 +- OsmAnd/res/values-hr/strings.xml | 2 +- OsmAnd/res/values-hu/strings.xml | 2 +- OsmAnd/res/values-it/strings.xml | 1 - OsmAnd/res/values-ja/strings.xml | 2 +- OsmAnd/res/values-ka/strings.xml | 2 +- OsmAnd/res/values-ko/strings.xml | 1 - OsmAnd/res/values-lt/strings.xml | 2 +- OsmAnd/res/values-lv/strings.xml | 2 +- OsmAnd/res/values-mr/strings.xml | 2 +- OsmAnd/res/values-nb/strings.xml | 2 +- OsmAnd/res/values-nl/strings.xml | 1 - OsmAnd/res/values-pl/strings.xml | 2 +- OsmAnd/res/values-pt/strings.xml | 2 +- OsmAnd/res/values-ro/strings.xml | 2 +- OsmAnd/res/values-ru/strings.xml | 1 - OsmAnd/res/values-sc/strings.xml | 2 +- OsmAnd/res/values-sk/strings.xml | 1 - OsmAnd/res/values-sl/strings.xml | 2 +- OsmAnd/res/values-sv/strings.xml | 2 +- OsmAnd/res/values-tr/strings.xml | 2 +- OsmAnd/res/values-uk/strings.xml | 2 +- OsmAnd/res/values-vi/strings.xml | 2 +- OsmAnd/res/values-zh-rCN/strings.xml | 2 +- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 1 - .../net/osmand/plus/activities/FavoritesTreeFragment.java | 6 +++--- OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java | 2 +- .../net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java | 2 +- OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java | 2 +- 48 files changed, 42 insertions(+), 50 deletions(-) diff --git a/OsmAnd/res/layout/open_hours_list_item.xml b/OsmAnd/res/layout/open_hours_list_item.xml index f2a52fc64f..935f31a90c 100644 --- a/OsmAnd/res/layout/open_hours_list_item.xml +++ b/OsmAnd/res/layout/open_hours_list_item.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/reset_image" - android:contentDescription="@string/default_buttons_delete" + android:contentDescription="@string/shared_string_delete" android:paddingLeft="2dp" android:paddingRight="2dp" android:paddingTop="2dp" /> diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml index 4cacd8d611..a3e1ee7d2f 100644 --- a/OsmAnd/res/layout/search_transport_route_item.xml +++ b/OsmAnd/res/layout/search_transport_route_item.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/reset_image" - android:contentDescription="@string/default_buttons_delete" + android:contentDescription="@string/shared_string_delete" android:paddingLeft="2dp" android:paddingTop="2dp" /> diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml index 25f846a7b8..adefe1bd1d 100644 --- a/OsmAnd/res/values-af/strings.xml +++ b/OsmAnd/res/values-af/strings.xml @@ -859,7 +859,7 @@ Node kan nie gevind word nie of gerief is nie \'n enkele node Verwyder {0} (Lewer kommentaar)? verwyder Interessante plek - verwyder + verwyder die interessante plek is suksesvol verwyder byvoeg verander diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 6c7177bccc..e5325fca2e 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -19,7 +19,7 @@ الاسم إضافة تم حذف بنجاح POI - حذف + حذف حذف POI إنشاء POI تم إغلاق بنجاح الشوائب diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml index 8cf2def209..b753303293 100644 --- a/OsmAnd/res/values-be-rBY/strings.xml +++ b/OsmAnd/res/values-be-rBY/strings.xml @@ -1767,7 +1767,7 @@ POI nie znojdziena abo nie źjaŭliajecca kropkaj Vydalіć {0} (dadać kamientar)? Vydalіć cіkavostku - Vydalіć + Vydalіć Cіkavostka vydalienaja dadać źmianіć diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index cc811eb459..d85c3b62bd 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1398,7 +1398,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві POI не знойдзена або не зьяўляецца кропкай Выдаліць {0} (дадаць каментар)? Выдаліць POI - Выдаліць POI выдаленая дадаць зьмяніць diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index 11455af4bb..8c18e8466d 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -1500,7 +1500,7 @@ OsmAnd е с отворен код и активно да се развива. Точката не може да бъде намерена или избраното съдържа повече от една точка Изтриване на {0} (enter comment)? Изтриване на POI - Изтрий + Изтрий POI беше успешно изтрита добавяне промяна diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 4ef38fbd24..0327937cde 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -438,7 +438,7 @@ Nom afegeix canvia -Elimina +Elimina Tanca l\'error S\'està tancant l\'error Afegeix un comentari diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index bbe717171a..6c4701f717 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -797,7 +797,7 @@ Bod nelze najít nebo hledaný objekt není samostatným bodem Vymazat {0} (vložte komentář) ? Vymazat POI - Vymazat + Vymazat POI byl úspěšně vymazán Přidání Změna diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index ed7fb50683..6107d1361e 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -961,7 +961,6 @@ ændre tilføj Interessepunkt blev slettet - Slet Slet interessepunkt Opret interessepunkt Rediger interessepunkt diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 2ad742fbc0..721756898b 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1140,7 +1140,7 @@ POI wurde nicht gefunden oder die Einrichtung ist kein einzelner Knoten Sicher löschen: {0} (Kommentar eingeben)? POI löschen - Löschen + Löschen POI wurde erfolgreich gelöscht hinzufügen ändern diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 08b26fa4ef..90ea739c14 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1026,7 +1026,7 @@ Ο κόμβος δεν μπορεί να βρεθεί ή η υποδομή δεν είναι απλός κόμβος Διαγραφή {0} (εισαγωγή σχολίου)? Διαγραφή ΣΕ - Διαγραφή + Διαγραφή Το ΣΕ έχει διαγραφεί επιτυχώς προσθήκη αλλαγή diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 91de7ed87f..253415c712 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -732,7 +732,7 @@ No se encontró el nodo o la instalación se compone de varios nodos ¿Borrar {0} (añadir comentario)? Borrar PDI - Borrar + Borrar El PDI fue borrado correctamente añadir cambiar diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index aea0714e68..5dd0fde403 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -1141,7 +1141,7 @@ Ezin da nodoa aurkitu edo erosotasuna ez da puntu bakar bat {0} ezabatu (sartu iruzkina)? POIa ezabatu - Ezabatu + Ezabatu POIa arrakastaz ezabatu da gehitu aldatu diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 60113bde3b..6c94847c21 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -225,7 +225,7 @@ توضیح ایجاد POI حذف POI - حذف + حذف POI حذف شد افزودن تغییردادن diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 2f215eecc0..bb2a883f4e 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -425,7 +425,7 @@ Muokkaa KP:ta Luo KP Poista KP - Poista + Poista KP poistettiin onnistuneesti lisää muuta diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index b1c3605db8..04adfd3ebc 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -736,7 +736,7 @@ Objet introuvable ou l\'équipement n\'est pas un composé d\'un seul objet Voulez-vous vraiment supprimer {0} (inscrire commentaire) ? Supprimer le PI - Supprimer + Supprimer PI supprimé avec succès ajouter modifier diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index 212501959f..b236bb202f 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -1661,7 +1661,7 @@ Non é posíbel atopar o nodo ou esta instalación non é un nodo único Eliminar {0} (introducir un comentario)? Eliminar este POI - Eliminar + Eliminar O PDI foi eliminado correctamente engadir cambiar diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml index 2b55306d93..c9b379681b 100644 --- a/OsmAnd/res/values-he/strings.xml +++ b/OsmAnd/res/values-he/strings.xml @@ -1041,7 +1041,7 @@ לא ניתן למצוא את המפרק או שנותן השירות מפוזר על פני מספר מפרקים האם למחוק את {0} (להזין הערה)? מחיקת נ״ע - מחיקה + מחיקה נ״ע נמחקה בהצלחה הוספה שינוי diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml index 56378e8b05..83d4ab990d 100644 --- a/OsmAnd/res/values-hr/strings.xml +++ b/OsmAnd/res/values-hr/strings.xml @@ -280,7 +280,7 @@ Sve druge oznake su sačuvane Izvršiti Obriši POI - Izbriši + Izbriši POI je uspješno izbrisan dodaj izmjeni diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 1c87ed819c..f34c5f4149 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -795,7 +795,7 @@ A csomópont nem található, vagy a szórakozás nem egy csomópont {0} törlés (megjegyzés bevitele)? POI törlése - Törlés + Törlés POI törlése sikeres hozzáad módosít diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 56e6390b1e..6f27e8beb3 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -719,7 +719,6 @@ Il nodo non è stato trovato o l\'amenità non è un nodo singolo Eliminare {0} (inserire un commento)? Eliminazione PDI - Elimina PDI eliminato correttamente aggiungi cambia diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index ec0f4b69e8..8b476c8e6f 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -635,7 +635,7 @@ POIの更新は利用できません 単独ノードではありません {0} を削除しますか(コメントを入力) ? POIを削除 -削除 +削除 POIは削除されました 追加 変更 diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml index 567dd2af8a..0be7eb2912 100644 --- a/OsmAnd/res/values-ka/strings.xml +++ b/OsmAnd/res/values-ka/strings.xml @@ -791,7 +791,7 @@ POI ვერ მოიძებნა წავშალო {0} (კომენტარი)? POI-ს წაშლა - წაშლა + წაშლა POI წარმატებით წაიშალა ჩამატება შეცვლა diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 4ee56f9742..336576f8c1 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -842,7 +842,6 @@ 노드를 찾을 수 없거나 시설이 단일 노드가 아닙니다 {0}를 삭제할까요(정보를 입력하세요)? POI 삭제 -삭제 POI 가 성공적으로 삭제되었습니다 추가 바꾸기 diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index cf64033944..a3183862cf 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -934,7 +934,7 @@ LV neina rasti arba LV sudaryta iš kelių elementų Ištrinti {0} (įveskite komentarą)? Ištrinti LV - Ištrinti + Ištrinti LV buvo sėkmingai ištrinta pridėti pakeisti diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml index 329dd4f316..cf74721cbe 100644 --- a/OsmAnd/res/values-lv/strings.xml +++ b/OsmAnd/res/values-lv/strings.xml @@ -795,7 +795,7 @@ Nevar atrast nodi, vai arī serviss nav atzīmēts kā viena node Dzēst {0} (ievadiet komentāru)? Dzēst POI - Dzēst + Dzēst POI tika veiksmīgi izdzēsts pievienot mainīt diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml index d6f562cd60..cc93b684cd 100644 --- a/OsmAnd/res/values-mr/strings.xml +++ b/OsmAnd/res/values-mr/strings.xml @@ -316,7 +316,7 @@ पिओआय बदला पिओआय तयार करा पिओआय काढून टाका - काढून टाका + काढून टाका नाव "उघडे असण्याची वेळ" टिप्पणी diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 88bffcd00f..c887f9ed65 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -617,7 +617,7 @@ Opprett interessepunkt Slette {0} (skriv kommentar)? Slett interessepunkt - Slett + Slett Interessepunkt ble vellykket slettet legg til endre diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 92beabe80d..0c4c11db94 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -812,7 +812,6 @@ Punt niet gevonden of voorziening is niet een enkel punt Verwijderen {0} (geef commentaar)? Verwijder interessepunt - Verwijder Interessepunt is verwijderd voeg toe wijzigen diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index c81e57ff0c..4699e5ae03 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -654,7 +654,7 @@ Nie mogę znaleźć węzła albo udogodnienie (amenity) nie jest pojedynczym węzłem Usunąć {0} (wprowadź komentarz)? Usuń POI - Usuń + Usuń POI został pomyślnie usunięty dodaj zmień diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 3a59b3fffd..cbecdc25e9 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -416,7 +416,7 @@ Nó não pode ser encontrado ou POI não é um único nó Você quer mesmo apagar {0} (comentário)? Apagar o POI - Apagar + Apagar POI apagado com sucesso Adicionar Modificar diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml index cfcce76acc..4a73385a4a 100644 --- a/OsmAnd/res/values-ro/strings.xml +++ b/OsmAnd/res/values-ro/strings.xml @@ -1070,7 +1070,7 @@ POI-ul nu poate fi găsit sau punctul de interes nu este singular Ștergeți {0} (introduceți comentariu)? Șterge POI - Șterge + Șterge POI-ul a fost șters Adaugă Schimbă diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 72660f483f..d9a9a61623 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -848,7 +848,6 @@ POI не найдена или не является точкой Вы действительно хотите удалить {0}? Удаление POI - Удалить POI успешно удалена добавления изменения diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 2c13cc3348..912ea21dee 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1635,7 +1635,7 @@ Su nodu no est istadu agatadu o s’amenidade no est unu nodu sìngulu Burrare {0} (insertare unu cummentu)? Burradura PDI - Burra + Burra PDI burradu curretamente Errore ispessadu durante s’esecutzione de s’atzione {0}. Esegui diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 07b44b2bed..28c9066a81 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -914,7 +914,6 @@ Uzol sa nedá nájsť alebo bod záujmu nie je samostatný uzol Vymazať {0} (zadajte komentár) ? Vymazať POI - Vymazať POI bol úspešne vymazaný Pridať Zmeniť diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index ef96729d15..088d536115 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -55,7 +55,7 @@ Točke ni mogoče najti ali pa usluga ni samostojna točka Brisanje {0} (vpišite komentar)? Briši POI - Briši + Briši POI je bila uspešno izbrisana Dodajanje Popravljanje diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index c24e1e8ce5..2acc206ec7 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -935,7 +935,7 @@ Noden kan inte hittas eller bekvämligheten är inte en enda nod Ta bort {0} (ange kommentar)? Ta bort POI - Ta bort + Ta bort Ljud/video spelas in. För att stoppa detta, tryck på AV-knappen på widgeten. Ljud från den angivna inspelningen spelas upp.↵\n%1$s Öppna extern spelare diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 084a37dbc6..13302b4229 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -514,7 +514,7 @@ POI düzenle POI oluştur POI sil - Sil + Sil POI başarıyla silindi ekle değiştir diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index 0b8f5d703a..265e1c64dd 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -858,7 +858,7 @@ POI не знайдена або не є точкою Ви дійсно хочете вилучити {0}? Вилучення POI - Вилучити + Вилучити POI успішно вилучено додати змінити diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml index 2c550eba45..e6e26f467f 100644 --- a/OsmAnd/res/values-vi/strings.xml +++ b/OsmAnd/res/values-vi/strings.xml @@ -645,7 +645,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --> Không tìm thấy Node hoặc amenity không phải là node đơn Xóa {0} (bình luận)? Xóa POI -Xóa +Xóa Đã xóa POI thành công thêm thay đổi diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml index 2f5887ba2a..07a94afa70 100644 --- a/OsmAnd/res/values-zh-rCN/strings.xml +++ b/OsmAnd/res/values-zh-rCN/strings.xml @@ -391,7 +391,7 @@ 申请 加 没有 - 删除 + 删除 山体阴影层 1.1.4 中的修改： diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index a4cd59bfbb..10f248af50 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -970,7 +970,7 @@ 找不到節點或設施不是單一的節點 刪除 {0} (輸入評論)？ 刪除興趣點 - 刪除 + 刪除 興趣點刪除成功 新增 修改 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 3387da29fc..212d6127e2 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -2108,7 +2108,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Node cannot be found or amenity is not a single node Delete {0} (enter comment)? Delete POI - Delete POI was successfully deleted add change diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index e81e32abbc..71a8999679 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -384,7 +384,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); createMenuItem(menu, SELECT_DESTINATIONS_ID, R.string.select_destination_and_intermediate_points, R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); - createMenuItem(menu, DELETE_ID, R.string.default_buttons_delete, R.drawable.ic_action_delete_dark, + createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS); // createMenuItem(menu, EXPORT_ID, R.string.export_fav, R.drawable.ic_action_gsave_light, // R.drawable.ic_action_gsave_dark, MenuItem.SHOW_AS_ACTION_IF_ROOM); @@ -464,7 +464,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { enableSelectionMode(true); - createMenuItem(menu, DELETE_ACTION_ID, R.string.default_buttons_delete, + createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); favoritesSelected.clear(); @@ -537,7 +537,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { Builder b = new AlertDialog.Builder(getActivity()); b.setMessage(getString(R.string.favorite_delete_multiple, favoritesSelected.size(), groupsToDelete.size())); - b.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener() { + b.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if (actionMode != null) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java index d0e7a00270..ca580e37c8 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java @@ -182,7 +182,7 @@ public class EditingPOIActivity implements DialogProvider { ll.addView(closeChangeset); builder.setView(ll); builder.setNegativeButton(R.string.shared_string_cancel, null); - builder.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener(){ + builder.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which) { Node n = (Node) args.getSerializable(KEY_AMENITY_NODE); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java index 08c011d006..a84d8a404c 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java @@ -109,7 +109,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity { } else if (item.getItemId() == DELETE_ID) { Builder b = new AlertDialog.Builder(this); b.setMessage(getString(R.string.local_osm_changes_delete_all_confirm, dataPoints.size())); - b.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener() { + b.setPositiveButton(R.string.shared_string_delete, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { Iterator it = dataPoints.iterator(); diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java index d8c02991af..d4725a76ce 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java @@ -456,7 +456,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); } if ((group != null && !group.isMainGroup()) || (device != null && device.getGroup().isMainGroup())) { - createMenuItem(menu, DELETE_ACTION_ID, R.string.default_buttons_delete, + createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_light, R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); }