diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 3cba546396..efa2e4f0f1 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -828,7 +828,7 @@
   <string name="context_menu_item_open_bug">Open OSM fout</string>
   <string name="context_menu_item_create_poi">skep interessante plek</string>
   <string name="shared_string_yes">Ja</string>
-  <string name="default_buttons_cancel">Kanseleer</string>
+  <string name="shared_string_cancel">Kanseleer</string>
   <string name="default_buttons_apply">toepas</string>
   <string name="default_buttons_add">Voeg by</string>
   <string name="shared_string_no">Nee</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index b6102a7d85..6dfea7824a 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -273,7 +273,7 @@
 	<string name="default_buttons_add">إضافة</string>
 	<string name="shared_string_no">ليس</string>
 	<string name="shared_string_yes">نعم</string>
-	<string name="default_buttons_cancel">إلغاء</string>
+	<string name="shared_string_cancel">إلغاء</string>
 	<string name="context_menu_item_update_map">تحديث الخريطة</string>
 	<string name="navigate_point_cancel">إلغاء</string>
 	<string name="search_address_top_text">حدد عنوان</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 5efb8602b6..ef679bc142 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -1735,7 +1735,7 @@
 	<string name="context_menu_item_open_bug">Paviedamіć pra pamylku na mapie</string>
 	<string name="context_menu_item_create_poi">Stvaryć cіkavostku</string>
 	<string name="shared_string_yes">Tak</string>
-	<string name="default_buttons_cancel">Skasavać</string>
+	<string name="shared_string_cancel">Skasavać</string>
 	<string name="default_buttons_apply">Zastasavać</string>
 	<string name="default_buttons_add">Dadać</string>
 	<string name="shared_string_no">Nie</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 5269ee32e5..fe06ef23cd 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1385,8 +1385,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="context_menu_item_update_map">Абнавіць мапу</string>
 	<string name="context_menu_item_open_bug">Паведаміць пра памылку на мапе</string>
 	<string name="context_menu_item_create_poi">Стварыць POI</string>
-	<string name="shared_string_yes">Так</string>
-	<string name="default_buttons_cancel">Скасаваць</string>
 	<string name="default_buttons_apply">Застасаваць</string>
 	<string name="default_buttons_add">Дадаць</string>
 	<string name="add_favorite_dialog_top_text">Калі ласка, увядзіце імя пункту</string>
@@ -2048,6 +2046,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="shared_string_ok">OK</string>
 	<string name="shared_string_cancel">Скасаваць</string>
 	<string name="shared_string_dismiss">Скасаваць</string>
+	<string name="shared_string_yes">Так</string>
 	<string name="shared_string_no">Не</string>
 	<string name="shared_string_on">Уключыць</string>
 	<string name="shared_string_off">Выключыць</string>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index fcd514b663..32a4278966 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1469,7 +1469,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="context_menu_item_open_bug">Докладвай за неточност в OSM</string>
 	<string name="context_menu_item_create_poi">Създай POI</string>
 	<string name="shared_string_yes">Да</string>
-	<string name="default_buttons_cancel">Откажи</string>
+	<string name="shared_string_cancel">Откажи</string>
 	<string name="default_buttons_apply">Приложи</string>
 	<string name="default_buttons_add">Добави</string>
 	<string name="shared_string_no">Не</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index fd56ab2ab3..8c927c0472 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -571,7 +571,7 @@
 <string name="navigate_point_latitude">Latitud</string>
 <string name="navigate_point_longitude">Longitud</string>
 <string name="search_address_region">Regió</string>
-<string name="default_buttons_cancel">Cancel·la</string>
+<string name="shared_string_cancel">Cancel·la</string>
 <string name="context_menu_item_create_poi">Crea un PDI</string>
 <string name="poi_query_by_name_matches_categories">S\'han trobat unes quantes categories coincidents amb la consulta:</string>
 <string name="choose_audio_stream">Sortida de guiat per veu</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index d87c66e962..c433702e8f 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -766,7 +766,7 @@
   <string name="context_menu_item_open_bug">Otevřít chybu OSM</string>
   <string name="context_menu_item_create_poi">Vytvořit POI</string>
   <string name="shared_string_yes">Ano</string>
-  <string name="default_buttons_cancel">Zrušit</string>
+  <string name="shared_string_cancel">Zrušit</string>
   <string name="default_buttons_apply">Použít</string>
   <string name="default_buttons_add">Přidat</string>
   <string name="shared_string_no">Ne</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 59321e2261..4af33bcc05 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1032,7 +1032,6 @@
 	<string name="add_favorite_dialog_top_text">Indtast favoritnavn</string>
 	<string name="default_buttons_add">Tilføj</string>
 	<string name="default_buttons_apply">Udfør</string>
-	<string name="default_buttons_cancel">Annuller</string>
 	<string name="context_menu_item_create_poi">Opret interessepunkt</string>
 	<string name="context_menu_item_update_map">Opdater kort</string>
 	<string name="context_menu_item_add_favorite">Tilføj som favorit</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 2f23946ee8..b4267dcb5c 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1109,7 +1109,7 @@
 	<string name="context_menu_item_open_bug">OSM Fehlerbericht einsenden</string>
 	<string name="context_menu_item_create_poi">POI einsenden</string>
 	<string name="shared_string_yes">Ja</string>
-	<string name="default_buttons_cancel">Abbrechen</string>
+	<string name="shared_string_cancel">Abbrechen</string>
 	<string name="default_buttons_apply">Übernehmen</string>
 	<string name="default_buttons_add">Hinzufügen</string>
 	<string name="shared_string_no">Nein</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 4f61b6726e..fa76d90495 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -995,7 +995,7 @@
 	<string name="context_menu_item_open_bug">Άνοιγμα σφάλματος OSM</string>
 	<string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string>
 	<string name="shared_string_yes">Ναι</string>
-	<string name="default_buttons_cancel">Ακύρωση</string>
+	<string name="shared_string_cancel">Ακύρωση</string>
 	<string name="default_buttons_apply">Εφαρμογή</string>
 	<string name="default_buttons_add">Προσθήκη</string>
 	<string name="shared_string_no">Όχι</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 1a6d472da3..c2c058af91 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -701,7 +701,7 @@
   <string name="context_menu_item_open_bug">Abrir fallo OSM</string>
   <string name="context_menu_item_create_poi">Crear PDI</string>
   <string name="shared_string_yes">Sí</string>
-  <string name="default_buttons_cancel">Cancelar</string>
+  <string name="shared_string_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Añadir</string>
   <string name="shared_string_no">No</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index c982ed7abd..af417bf68b 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -1109,7 +1109,7 @@
   <string name="context_menu_item_open_bug">Ireki OSM akats jakinarazpena</string>
   <string name="context_menu_item_create_poi">POIa sortu</string>
   <string name="shared_string_yes">Bai</string>
-  <string name="default_buttons_cancel">Ezeztatu</string>
+  <string name="shared_string_cancel">Ezeztatu</string>
   <string name="default_buttons_apply">Aplikatu</string>
   <string name="default_buttons_add">Gehitu</string>
   <string name="shared_string_no">Ez</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 486b4b040f..9b56d80a09 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -259,7 +259,7 @@
 	<string name="context_menu_item_open_bug">بازکردن اشکال OSM</string>
 	<string name="context_menu_item_create_poi">ایجاد POI</string>
 	<string name="shared_string_yes">بله</string>
-	<string name="default_buttons_cancel">لغو</string>
+	<string name="shared_string_cancel">لغو</string>
 	<string name="default_buttons_apply">بکارگیری</string>
 	<string name="default_buttons_add">افزودن</string>
 	<string name="shared_string_no">خیر</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index fcea7ccc23..d6542bae23 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -409,7 +409,7 @@
 	<string name="search_tabs_location">Sijainti</string>
 	<string name="context_menu_item_add_favorite">Lisää suosikkeihin</string>
 	<string name="context_menu_item_update_map">Päivitä kartta</string>
-	<string name="default_buttons_cancel">Peruuta</string>
+	<string name="shared_string_cancel">Peruuta</string>
 	<string name="default_buttons_apply">Käytä</string>
 	<string name="default_buttons_add">Lisää</string>
 	<string name="add_favorite_dialog_top_text">Anna suosikin nimi</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index ab7d3e06ff..f937988475 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -705,7 +705,7 @@
   <string name="context_menu_item_open_bug">Ouvrir un bogue OSM</string>
   <string name="context_menu_item_create_poi">Créer un point d\'intérêt</string>
   <string name="shared_string_yes">Oui</string>
-  <string name="default_buttons_cancel">Annuler</string>
+  <string name="shared_string_cancel">Annuler</string>
   <string name="default_buttons_apply">Appliquer</string>
   <string name="default_buttons_add">Enregistrer</string>
   <string name="shared_string_no">Non</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 9f49333105..9becd64e13 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1629,7 +1629,7 @@
 	<string name="context_menu_item_open_bug">Abrir un informe de fallos de OSM</string>
 	<string name="context_menu_item_create_poi">Crear un PDI</string>
 	<string name="shared_string_yes">Si</string>
-	<string name="default_buttons_cancel">Cancelar</string>
+	<string name="shared_string_cancel">Cancelar</string>
 	<string name="default_buttons_apply">Aplicar</string>
 	<string name="default_buttons_add">Engadir</string>
 	<string name="shared_string_no">Non</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index f09463c30b..227119f7f3 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1011,7 +1011,7 @@
 	<string name="context_menu_item_update_map">עדכון המפה</string>
 	<string name="context_menu_item_open_bug">פתיחת תקלה ב־OSM</string>
 	<string name="context_menu_item_create_poi">יצירת נ״ע</string>
-	<string name="default_buttons_cancel">ביטול</string>
+	<string name="shared_string_cancel">ביטול</string>
 	<string name="default_buttons_apply">החלה</string>
 	<string name="default_buttons_add">הוספה</string>
 	<string name="add_favorite_dialog_top_text">נא להזין שם למועדף</string>
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 4bea27001b..faabc59fce 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -300,7 +300,7 @@
 	<string name="osb_comment_menu_item">Dodaj komentar</string>
 	<string name="favourites_context_menu_edit">Uredi favorite</string>
 	<string name="favourites_context_menu_delete">Brisanje favorita</string>
-	<string name="default_buttons_cancel">Zatvori</string>
+	<string name="shared_string_cancel">Zatvori</string>
 	<string name="default_buttons_apply">Primijeni</string>
 	<string name="default_buttons_add">Dodaj</string>
 	<string name="shared_string_no">Ne</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index deb3a7bc2a..333486bc12 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -764,7 +764,7 @@
   <string name="context_menu_item_open_bug">OSM Bug nyitása</string>
   <string name="context_menu_item_create_poi">POI készítés</string>
   <string name="shared_string_yes">Igen</string>
-  <string name="default_buttons_cancel">Mégse</string>
+  <string name="shared_string_cancel">Mégse</string>
   <string name="default_buttons_apply">Alkalmaz</string>
   <string name="default_buttons_add">Hozzáad</string>
   <string name="shared_string_no">Nem</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index f0a1bb8829..5de36864ec 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -704,7 +704,6 @@
   <string name="context_menu_item_update_map">Aggiorna la mappa</string>
   <string name="context_menu_item_open_bug">Segnala un errore OSM</string>
   <string name="context_menu_item_create_poi">Crea PDI</string>
-  <string name="default_buttons_cancel">Annulla</string>
   <string name="default_buttons_apply">Applica</string>
   <string name="default_buttons_add">Aggiungi</string>
   <string name="add_favorite_dialog_top_text">Inserisci il nome del preferito</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 994d84e658..03e9627824 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -595,7 +595,7 @@ POIの更新は利用できません</string>
 <string name="context_menu_item_create_poi">POIを作成</string>
 
 <string name="shared_string_yes">はい</string>
-<string name="default_buttons_cancel">キャンセル</string>
+<string name="shared_string_cancel">キャンセル</string>
 <string name="default_buttons_apply">適用</string>
 <string name="default_buttons_add">追加</string>
 <string name="shared_string_no">いいえ</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 0d9c1da0ea..e70b2c1c81 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -760,7 +760,7 @@
   <string name="context_menu_item_open_bug">OSM-ის შეცდომის რეპორტი</string>
   <string name="context_menu_item_create_poi">POI-ის შექმნა</string>
   <string name="shared_string_yes">დიახ</string>
-  <string name="default_buttons_cancel">გაუქმება</string>
+  <string name="shared_string_cancel">გაუქმება</string>
   <string name="default_buttons_apply">გამოყენება</string>
   <string name="default_buttons_add">ჩამატება</string>
   <string name="shared_string_no">არა</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 30a5bd7bc6..5e1ded474b 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -827,8 +827,6 @@
 <string name="context_menu_item_open_bug">OSM 버그 열기</string>
 <string name="context_menu_item_create_poi">POI 생성</string>
 
-<string name="shared_string_yes">예</string>
-<string name="default_buttons_cancel">취소</string>
 <string name="default_buttons_apply">적용</string>
 <string name="default_buttons_add">추가</string>
 <string name="add_favorite_dialog_top_text">즐겨찾기 이름 입력</string>
@@ -2188,6 +2186,7 @@
 	<string name="shared_string_ok">확인</string>
 	<string name="shared_string_cancel">취소</string>
 	<string name="shared_string_dismiss">기각</string>
+	<string name="shared_string_yes">예</string>
 	<string name="shared_string_no">아니오</string>
 	<string name="shared_string_on">켜기</string>
 	<string name="shared_string_off">끄기</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 701a175c82..8acaf2dc08 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -903,7 +903,7 @@
   <string name="context_menu_item_open_bug">Atidaryti OSM klaidą</string>
   <string name="context_menu_item_create_poi">Sukurti LV</string>
   <string name="shared_string_yes">Taip</string>
-  <string name="default_buttons_cancel">Atšaukti</string>
+  <string name="shared_string_cancel">Atšaukti</string>
   <string name="default_buttons_apply">Taikyti</string>
   <string name="default_buttons_add">Pridėti</string>
   <string name="shared_string_no">Ne</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 91f027665e..50893c338b 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -764,7 +764,7 @@
   <string name="context_menu_item_open_bug">Atvērt OSM bug</string>
   <string name="context_menu_item_create_poi">Izveidot POI</string>
   <string name="shared_string_yes">Jā</string>
-  <string name="default_buttons_cancel">Atcelt</string>
+  <string name="shared_string_cancel">Atcelt</string>
   <string name="default_buttons_apply">Pielietot</string>
   <string name="default_buttons_add">Pievienot</string>
   <string name="shared_string_no">Nē</string>
diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml
index 5894ae98d1..a92bfc8a0b 100644
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@@ -309,7 +309,7 @@
   <string name="context_menu_item_update_map">नकाशा अपडेट करा</string>
   <string name="context_menu_item_create_poi">पिओआय तयार करा</string>
   <string name="shared_string_yes">हो</string>
-  <string name="default_buttons_cancel">रद्द करा</string>
+  <string name="shared_string_cancel">रद्द करा</string>
   <string name="shared_string_no">नाही</string>
   <string name="favourites_context_menu_edit">आवडते ठिकण बदला</string>
   <string name="favourites_context_menu_delete">आवडते ठिकाण काढून टाका</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index e3c4d12ec8..631db0ab7e 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -600,7 +600,7 @@
 	<string name="context_menu_item_open_bug">Åpne OSM-feil</string>
 	<string name="context_menu_item_create_poi">Opprett interessepunkt</string>
 	<string name="shared_string_yes">Ja</string>
-	<string name="default_buttons_cancel">Avbryt</string>
+	<string name="shared_string_cancel">Avbryt</string>
 	<string name="default_buttons_apply">Bruk</string>
 	<string name="default_buttons_add">Legg til</string>
 	<string name="shared_string_no">Nei</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 4c5d150259..1da5d46a24 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -800,7 +800,6 @@
   <string name="context_menu_item_update_map">Kaart bijwerken</string>
   <string name="context_menu_item_open_bug">Meld fout in OpenStreetMap</string>
   <string name="context_menu_item_create_poi">Maak interessepunt in OSM</string>
-  <string name="default_buttons_cancel">Annuleer</string>
   <string name="default_buttons_apply">Toepassen</string>
   <string name="default_buttons_add">Voeg toe</string>
   <string name="add_favorite_dialog_top_text">Geef de favoriet een naam</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 05f0cfec18..5020098337 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -623,7 +623,7 @@
   <string name="context_menu_item_open_bug">Zgłoś błąd do OSM</string>
   <string name="context_menu_item_create_poi">Utwórz POI</string>
   <string name="shared_string_yes">Tak</string>
-  <string name="default_buttons_cancel">Anuluj</string>
+  <string name="shared_string_cancel">Anuluj</string>
   <string name="default_buttons_apply">Zastosuj</string>
   <string name="default_buttons_add">Dodaj</string>
   <string name="shared_string_no">Nie</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index f52e192a0f..d0cf4807c4 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -385,7 +385,7 @@
   <string name="context_menu_item_open_bug">Reportar problema OSM</string>
   <string name="context_menu_item_create_poi">Criar ponto de interesse</string>
   <string name="shared_string_yes">Sim</string>
-  <string name="default_buttons_cancel">Cancelar</string>
+  <string name="shared_string_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Adicionar</string>
   <string name="shared_string_no">Não</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 7bec7562a8..63d68a0b14 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1039,7 +1039,7 @@
 	<string name="context_menu_item_open_bug">Deschide un Bug OSM</string>
 	<string name="context_menu_item_create_poi">Creează POI</string>
 	<string name="shared_string_yes">Da</string>
-	<string name="default_buttons_cancel">Anulează</string>
+	<string name="shared_string_cancel">Anulează</string>
 	<string name="default_buttons_apply">Aplică</string>
 	<string name="default_buttons_add">Adaugă</string>
 	<string name="shared_string_no">Nu</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 60b738a2e4..cedb2a55c1 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -827,7 +827,7 @@
   <string name="context_menu_item_open_bug">Сообщить об ошибке на карте</string>
   <string name="context_menu_item_create_poi">Добавить POI</string>
   <string name="shared_string_yes">Да</string>
-  <string name="default_buttons_cancel">Отмена</string>
+  <string name="shared_string_cancel">Отмена</string>
   <string name="default_buttons_apply">Применить</string>
   <string name="default_buttons_add">Добавить</string>
   <string name="shared_string_no">Нет</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 7fd08c4b0a..cd3d245a8f 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1604,7 +1604,7 @@
 	<string name="context_menu_item_update_map">Agiorna sa mapa</string>
 	<string name="context_menu_item_open_bug">Sinnala un\'errore OSM</string>
 	<string name="context_menu_item_create_poi">Crea PDI</string>
-	<string name="default_buttons_cancel">Burra</string>
+	<string name="shared_string_cancel">Burra</string>
 	<string name="default_buttons_apply">Aplica</string>
 	<string name="default_buttons_add">Annanghe</string>
 	<string name="add_favorite_dialog_top_text">Inserta su nùmene de su prefèrridu</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index dfeef8bb2e..43ab39ad09 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -902,7 +902,6 @@
   <string name="context_menu_item_update_map">Aktualizovať mapu</string>
   <string name="context_menu_item_open_bug">Otvoriť OSM chybu</string>
   <string name="context_menu_item_create_poi">Vytvoriť POI</string>
-  <string name="default_buttons_cancel">Zrušiť</string>
   <string name="default_buttons_apply">Použiť</string>
   <string name="default_buttons_add">Pridať</string>
   <string name="add_favorite_dialog_top_text">Zadajte meno obľúbeného bodu</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index c27c348787..50b126f97a 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -36,7 +36,7 @@
 	<string name="context_menu_item_add_favorite">Dodaj med priljubljene</string>
 	<string name="shared_string_yes">Da</string>
 	<string name="shared_string_no">Ne</string>
-	<string name="default_buttons_cancel">Prekliči</string>
+	<string name="shared_string_cancel">Prekliči</string>
 	<string name="default_buttons_add">Dodaj</string>
 	<string name="default_buttons_apply">Uporabi</string>
 	<string name="context_menu_item_create_poi">Ustvari POI</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index b3242077e6..1618bd47af 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -73,7 +73,7 @@
 <string name="add_favorite_dialog_default_favourite_name">Favorit</string>
 <string name="shared_string_no">Nej</string>
 <string name="shared_string_yes">Ja</string>
-<string name="default_buttons_cancel">Avbryt</string>
+<string name="shared_string_cancel">Avbryt</string>
 <string name="default_buttons_apply">Verkställ</string>
 <string name="default_buttons_add">Lägg till</string>
 <string name="add_favorite_dialog_top_text">Ange namn på favorit</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 03c50a8feb..d5894fc7a6 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -497,7 +497,7 @@
 	<string name="context_menu_item_update_map">Haritayı güncelle</string>
 	<string name="context_menu_item_create_poi">POI oluştur</string>
 	<string name="shared_string_yes">Evet</string>
-	<string name="default_buttons_cancel">İptal et</string>
+	<string name="shared_string_cancel">İptal et</string>
 	<string name="default_buttons_apply">Uygula</string>
 	<string name="default_buttons_add">Ekle</string>
 	<string name="shared_string_no">Hayır</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 91adc6881e..f60781cacf 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -827,7 +827,7 @@
   <string name="context_menu_item_open_bug">Повідомити про помилку на мапі</string>
   <string name="context_menu_item_create_poi">Додати POI</string>
   <string name="shared_string_yes">Так</string>
-  <string name="default_buttons_cancel">Скасувати</string>
+  <string name="shared_string_cancel">Скасувати</string>
   <string name="default_buttons_apply">Застосувати</string>
   <string name="default_buttons_add">Додати</string>
   <string name="shared_string_no">Ні</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index 323fac8c40..3ded84b08e 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -608,7 +608,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 <string name="context_menu_item_create_poi">Tạo POI</string>
 
 <string name="shared_string_yes">OK</string>
-<string name="default_buttons_cancel">Hủy</string>
+<string name="shared_string_cancel">Hủy</string>
 <string name="default_buttons_apply">Áp dụng</string>
 <string name="default_buttons_add">Thêm</string>
 <string name="shared_string_no">Không</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 8d67857252..185d10ec61 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -387,7 +387,7 @@
 	<string name="search_address_street_option">相交的街道</string>
 	<string name="search_tabs_location">位置</string>
 	<string name="shared_string_yes">是</string>
-	<string name="default_buttons_cancel">取消</string>
+	<string name="shared_string_cancel">取消</string>
 	<string name="default_buttons_apply">申请</string>
 	<string name="default_buttons_add">加</string>
 	<string name="shared_string_no">没有</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 5e50f9f8ff..9694b2620e 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -939,7 +939,7 @@
 	<string name="context_menu_item_open_bug">開啟 OSM 錯誤</string>
 	<string name="context_menu_item_create_poi">建立興趣點</string>
 	<string name="shared_string_yes">是</string>
-	<string name="default_buttons_cancel">取消</string>
+	<string name="shared_string_cancel">取消</string>
 	<string name="default_buttons_apply">套用</string>
 	<string name="default_buttons_add">加入</string>
 	<string name="shared_string_no">否</string>