diff --git a/OsmAnd/res/layout/package_delivered.xml b/OsmAnd/res/layout/package_delivered.xml
index e979d08ed1..ff97aaf99c 100644
--- a/OsmAnd/res/layout/package_delivered.xml
+++ b/OsmAnd/res/layout/package_delivered.xml
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:text="@string/default_buttons_yes" />
+            android:text="@string/shared_string_yes" />
 
         <Button
             android:id="@+id/delivered_no"
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index ffa32ad9ea..6925d5a312 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -827,7 +827,7 @@
   <string name="context_menu_item_update_map">opgradeer kaart</string>
   <string name="context_menu_item_open_bug">Open OSM fout</string>
   <string name="context_menu_item_create_poi">skep interessante plek</string>
-  <string name="default_buttons_yes">Ja</string>
+  <string name="shared_string_yes">Ja</string>
   <string name="default_buttons_cancel">Kanseleer</string>
   <string name="default_buttons_apply">toepas</string>
   <string name="default_buttons_add">Voeg by</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 716b036b98..cd51c485bc 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -272,7 +272,7 @@
 	<string name="default_buttons_apply">تطبق</string>
 	<string name="default_buttons_add">إضافة</string>
 	<string name="default_buttons_no">ليس</string>
-	<string name="default_buttons_yes">نعم</string>
+	<string name="shared_string_yes">نعم</string>
 	<string name="default_buttons_cancel">إلغاء</string>
 	<string name="context_menu_item_update_map">تحديث الخريطة</string>
 	<string name="navigate_point_cancel">إلغاء</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 74c5d2b473..4f0b139ae1 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -1734,7 +1734,7 @@
 	<string name="context_menu_item_update_map">Abnavіć mapu</string>
 	<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="default_buttons_yes">Tak</string>
+	<string name="shared_string_yes">Tak</string>
 	<string name="default_buttons_cancel">Skasavać</string>
 	<string name="default_buttons_apply">Zastasavać</string>
 	<string name="default_buttons_add">Dadać</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 08d0dfeb4a..70b39645b1 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1386,7 +1386,7 @@ 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="default_buttons_yes">Так</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>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 692e326873..ad96f08fb4 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1468,7 +1468,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="context_menu_item_update_map">Обнови картата</string>
 	<string name="context_menu_item_open_bug">Докладвай за неточност в OSM</string>
 	<string name="context_menu_item_create_poi">Създай POI</string>
-	<string name="default_buttons_yes">Да</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>
diff --git a/OsmAnd/res/values-bs/strings.xml b/OsmAnd/res/values-bs/strings.xml
index e517a79854..c283856676 100644
--- a/OsmAnd/res/values-bs/strings.xml
+++ b/OsmAnd/res/values-bs/strings.xml
@@ -126,5 +126,5 @@
     
 	<string name="map_widget_gps_info">GPS status</string>
     <string name="default_buttons_no">Ne</string>
-	<string name="default_buttons_yes">Da</string>
+	<string name="shared_string_yes">Da</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 9eb8953031..df9c714de5 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -446,7 +446,7 @@
 <string name="osb_close_menu_item">Tanca l\'error</string>
 <string name="osb_comment_dialog_author">Nom de l\'autor</string>
 <string name="osb_add_dialog_success">L\'error s\'ha creat amb èxit</string>
-<string name="default_buttons_yes">Sí</string>
+<string name="shared_string_yes">Sí</string>
 <string name="default_buttons_no">No</string>
 <string name="default_buttons_add">Afegeix</string>
 <string name="default_buttons_apply">Aplica</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index dfd2f03b6d..bdd9e6045e 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -765,7 +765,7 @@
   <string name="context_menu_item_update_map">Aktualizovat mapu</string>
   <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="default_buttons_yes">Ano</string>
+  <string name="shared_string_yes">Ano</string>
   <string name="default_buttons_cancel">Zrušit</string>
   <string name="default_buttons_apply">Použít</string>
   <string name="default_buttons_add">Přidat</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 9bacac9812..fbe19cb055 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1025,7 +1025,7 @@
 	<string name="transport_route_distance">Rutelængde</string>
 	<string name="transport">Transport</string>
 	<string name="default_buttons_no">Nej</string>
-	<string name="default_buttons_yes">Ja</string>
+	<string name="shared_string_yes">Ja</string>
 	<string name="poi_remove_confirm_template">Slet {0} (indtast kommentar)?</string>
 	<string name="osb_close_dialog_close_button">Luk fejlrapport</string>
 	<string name="osb_comment_dialog_error">Undtagelse opstod: kommentar blev ikke tilføjet</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 5b262004a8..0ad02dc223 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1108,7 +1108,7 @@
 	<string name="context_menu_item_update_map">Karte aktualisieren</string>
 	<string name="context_menu_item_open_bug">OSM Fehlerbericht einsenden</string>
 	<string name="context_menu_item_create_poi">POI einsenden</string>
-	<string name="default_buttons_yes">Ja</string>
+	<string name="shared_string_yes">Ja</string>
 	<string name="default_buttons_cancel">Abbrechen</string>
 	<string name="default_buttons_apply">Übernehmen</string>
 	<string name="default_buttons_add">Hinzufügen</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 744c6157f3..79ee5a4e59 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -994,7 +994,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_yes">Ναι</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>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 2c927f7fde..0759700187 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -700,7 +700,7 @@
   <string name="context_menu_item_update_map">Actualizar mapa</string>
   <string name="context_menu_item_open_bug">Abrir fallo OSM</string>
   <string name="context_menu_item_create_poi">Crear PDI</string>
-  <string name="default_buttons_yes">Sí</string>
+  <string name="shared_string_yes">Sí</string>
   <string name="default_buttons_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Añadir</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index e5c18a4b1c..141aa7d2d7 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -1108,7 +1108,7 @@
   <string name="context_menu_item_update_map">Mapa eguneratu</string>
   <string name="context_menu_item_open_bug">Ireki OSM akats jakinarazpena</string>
   <string name="context_menu_item_create_poi">POIa sortu</string>
-  <string name="default_buttons_yes">Bai</string>
+  <string name="shared_string_yes">Bai</string>
   <string name="default_buttons_cancel">Ezeztatu</string>
   <string name="default_buttons_apply">Aplikatu</string>
   <string name="default_buttons_add">Gehitu</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index dbb8d69d4e..d0efb87cf0 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -258,7 +258,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">ایجاد POI</string>
-	<string name="default_buttons_yes">بله</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>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 518ec6e71f..3648a46d3b 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -89,7 +89,7 @@
 	<string name="route_kl">Pysy vasemmalla ja aja suoraan</string>
 	<string name="route_kr">Pysy oikealla ja jatka suoraan</string>
 	<string name="default_buttons_no">Ei</string>
-	<string name="default_buttons_yes">Kyllä</string>
+	<string name="shared_string_yes">Kyllä</string>
 	<string name="email">sähköposti</string>
 <string name="extra_settings">Kehittyneet asetukset</string>
 	<string name="gpx_tags_txt">Avainsanat</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index ff91ac9a61..39076faf97 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -704,7 +704,7 @@
   <string name="context_menu_item_update_map">Mettre à jour la carte</string>
   <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="default_buttons_yes">Oui</string>
+  <string name="shared_string_yes">Oui</string>
   <string name="default_buttons_cancel">Annuler</string>
   <string name="default_buttons_apply">Appliquer</string>
   <string name="default_buttons_add">Enregistrer</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index cd76df3e0b..5975617a81 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1628,7 +1628,7 @@
 	<string name="context_menu_item_update_map">Actualizar o mapa</string>
 	<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="default_buttons_yes">Si</string>
+	<string name="shared_string_yes">Si</string>
 	<string name="default_buttons_cancel">Cancelar</string>
 	<string name="default_buttons_apply">Aplicar</string>
 	<string name="default_buttons_add">Engadir</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index df74bdf392..86d370c9a0 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
 	<string name="default_buttons_no">לא</string>
-	<string name="default_buttons_yes">כן</string>
+	<string name="shared_string_yes">כן</string>
 	<string name="close_changeset">סגירת ערכת השינויים</string>
 	<string name="zxing_barcode_scanner_not_found">יישום סריקת הברקודים ZXing אינו מותקן. לחפש בחנות?</string>
 	<string name="rendering_attr_roadColors_description">בחירת ערכת צבעי דרך:</string>
diff --git a/OsmAnd/res/values-hi/strings.xml b/OsmAnd/res/values-hi/strings.xml
index b75f08b37b..601f500e64 100644
--- a/OsmAnd/res/values-hi/strings.xml
+++ b/OsmAnd/res/values-hi/strings.xml
@@ -8,7 +8,7 @@
          1. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     -->
 <string name="default_buttons_no">नही</string>
-	<string name="default_buttons_yes">हा</string>
+	<string name="shared_string_yes">हा</string>
 	<string name="prefer_motorways">बडी सड़को को प्राधान्य दो</string>
 	<string name="prefer_in_routing_title">प्राधान्य…</string>
 	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index eabae9f9af..4ccf4c2642 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -305,7 +305,7 @@
 	<string name="default_buttons_add">Dodaj</string>
 	<string name="default_buttons_no">Ne</string>
 	<string name="add_favorite_dialog_top_text">Unesite naziv favorita</string>
-	<string name="default_buttons_yes">Da</string>
+	<string name="shared_string_yes">Da</string>
 	<string name="context_menu_item_add_favorite">Dodaj u favorite</string>
 	<string name="context_menu_item_create_poi">Stvori POI</string>
 	<string name="context_menu_item_update_map">Ažuriraj karte</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 3200464ddd..5ce3f37594 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -763,7 +763,7 @@
   <string name="context_menu_item_update_map">Térkép frissítése</string>
   <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="default_buttons_yes">Igen</string>
+  <string name="shared_string_yes">Igen</string>
   <string name="default_buttons_cancel">Mégse</string>
   <string name="default_buttons_apply">Alkalmaz</string>
   <string name="default_buttons_add">Hozzáad</string>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index de840c5777..3fd23e1481 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -148,5 +148,5 @@
 	<string name="routing_attr_weight_description">Կշռի սահմանափակման նշում</string>
     <string name="osmand_distance_planning_plugin_description">Ստեղծել ուղիներ (կամ օգտագործել/փոփոխել առկա GPX ֆայլերը) կետեռի միջև հեռավորության չափման համար։ Պահպանել որպես GPX, որը կարող է օգտագործվել GPX ուղիների պլանավորման համար։</string>
     <string name="default_buttons_no">Ոչ</string>
-	<string name="default_buttons_yes">Այո</string>
+	<string name="shared_string_yes">Այո</string>
 	</resources>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 781dca59eb..2e15d989bc 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -64,5 +64,5 @@
     <string name="tips_and_tricks">Tip</string>
     <string name="local_index_tile_data_downloadable">Dapat di download: %1$s</string>
     <string name="default_buttons_no">No</string>
-	<string name="default_buttons_yes">Yes</string>
+	<string name="shared_string_yes">Yes</string>
 	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 4df946a472..83b70c13aa 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -705,7 +705,7 @@
   <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_yes">Si</string>
+  <string name="shared_string_yes">Si</string>
   <string name="default_buttons_cancel">Annulla</string>
   <string name="default_buttons_apply">Applica</string>
   <string name="default_buttons_add">Aggiungi</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index ecd147a0af..63bac2411b 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -594,7 +594,7 @@ POIの更新は利用できません</string>
 <string name="context_menu_item_open_bug">OSM バグをオープン</string>
 <string name="context_menu_item_create_poi">POIを作成</string>
 
-<string name="default_buttons_yes">はい</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>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 5871e328f9..83c0626d99 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -759,7 +759,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">POI-ის შექმნა</string>
-  <string name="default_buttons_yes">დიახ</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>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index c4bc8d6e0d..ffb32db99c 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -828,7 +828,7 @@
 <string name="context_menu_item_open_bug">OSM 버그 열기</string>
 <string name="context_menu_item_create_poi">POI 생성</string>
 
-<string name="default_buttons_yes">예</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>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 7808cf3d70..7670285ad8 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -902,7 +902,7 @@
   <string name="context_menu_item_update_map">Atnaujinti žemėlapį</string>
   <string name="context_menu_item_open_bug">Atidaryti OSM klaidą</string>
   <string name="context_menu_item_create_poi">Sukurti LV</string>
-  <string name="default_buttons_yes">Taip</string>
+  <string name="shared_string_yes">Taip</string>
   <string name="default_buttons_cancel">Atšaukti</string>
   <string name="default_buttons_apply">Taikyti</string>
   <string name="default_buttons_add">Pridėti</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 74a044f9cd..431cca9e6f 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -763,7 +763,7 @@
   <string name="context_menu_item_update_map">Atjaunot karti</string>
   <string name="context_menu_item_open_bug">Atvērt OSM bug</string>
   <string name="context_menu_item_create_poi">Izveidot POI</string>
-  <string name="default_buttons_yes">Jā</string>
+  <string name="shared_string_yes">Jā</string>
   <string name="default_buttons_cancel">Atcelt</string>
   <string name="default_buttons_apply">Pielietot</string>
   <string name="default_buttons_add">Pievienot</string>
diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml
index de1024dce7..80c8ee6d9f 100644
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@@ -308,7 +308,7 @@
   <string name="context_menu_item_add_favorite">आवडत्या ठिकणात नोंद करा</string>
   <string name="context_menu_item_update_map">नकाशा अपडेट करा</string>
   <string name="context_menu_item_create_poi">पिओआय तयार करा</string>
-  <string name="default_buttons_yes">हो</string>
+  <string name="shared_string_yes">हो</string>
   <string name="default_buttons_cancel">रद्द करा</string>
   <string name="default_buttons_no">नाही</string>
   <string name="favourites_context_menu_edit">आवडते ठिकण बदला</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 99b1e1d95d..3231abe1e9 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -599,7 +599,7 @@
 	<string name="context_menu_item_update_map">Oppdater kart</string>
 	<string name="context_menu_item_open_bug">Åpne OSM-feil</string>
 	<string name="context_menu_item_create_poi">Opprett interessepunkt</string>
-	<string name="default_buttons_yes">Ja</string>
+	<string name="shared_string_yes">Ja</string>
 	<string name="default_buttons_cancel">Avbryt</string>
 	<string name="default_buttons_apply">Bruk</string>
 	<string name="default_buttons_add">Legg til</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 7856268f6f..611356a8ae 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -801,7 +801,7 @@
   <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_yes">Ja</string>
+  <string name="shared_string_yes">Ja</string>
   <string name="default_buttons_cancel">Annuleer</string>
   <string name="default_buttons_apply">Toepassen</string>
   <string name="default_buttons_add">Voeg toe</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index c7afb904c7..42191a7d59 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -622,7 +622,7 @@
   <string name="context_menu_item_update_map">Uaktualnij mapę</string>
   <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="default_buttons_yes">Tak</string>
+  <string name="shared_string_yes">Tak</string>
   <string name="default_buttons_cancel">Anuluj</string>
   <string name="default_buttons_apply">Zastosuj</string>
   <string name="default_buttons_add">Dodaj</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 59a185495c..046a66489b 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -384,7 +384,7 @@
   <string name="context_menu_item_update_map">Atualizar mapa</string>
   <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="default_buttons_yes">Sim</string>
+  <string name="shared_string_yes">Sim</string>
   <string name="default_buttons_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Adicionar</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 681de14120..fc8e3c1e2a 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1038,7 +1038,7 @@
 	<string name="context_menu_item_update_map">Actualizează hartă</string>
 	<string name="context_menu_item_open_bug">Deschide un Bug OSM</string>
 	<string name="context_menu_item_create_poi">Creează POI</string>
-	<string name="default_buttons_yes">Da</string>
+	<string name="shared_string_yes">Da</string>
 	<string name="default_buttons_cancel">Anulează</string>
 	<string name="default_buttons_apply">Aplică</string>
 	<string name="default_buttons_add">Adaugă</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 5939c0df0f..8ff32e04fe 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -826,7 +826,7 @@
   <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="default_buttons_yes">Да</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>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index fc554d2a69..30b0b4662d 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -133,7 +133,7 @@
 	<string name="base_world_map">Mapa mundiale de base</string>
 	<string name="tip_map_styles">Istiles de sa mapa</string>
 	<string name="default_buttons_no">Nono</string>
-	<string name="default_buttons_yes">Eja</string>
+	<string name="shared_string_yes">Eja</string>
 	<string name="tip_map_styles_t">"OsmAnd suportada sa visualizatzione de sas mapas vettoriales in istiles diferentes pro s’adatare a sas esigentzias tuas:
 \n\nDiferentes dae sos istiles balansados preimpostados de sa mapa, los agatas suta \'Menu\' -&gt; \'Cunfigura sa mapa\' -&gt; \'Istile Mapa\' issèbera pro esempru
 \n\t* The \'Touring view\' istile: cuntènnidi sas informatziones prus minujas possìbile pro biagiare e pro visitare, incluidas sas ottimizatziones pro sos ghiadores professionales (contrastu prus distinghìbile pro sas istradas), optzione pro s’escursionismu Alpinu (iscala SAC), itineràrios tziclìsticos, sìmbolos pro s’escursionismu, etc.
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 44095d4d58..b97d459e50 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -903,7 +903,7 @@
   <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_yes">Áno</string>
+  <string name="shared_string_yes">Áno</string>
   <string name="default_buttons_cancel">Zrušiť</string>
   <string name="default_buttons_apply">Použiť</string>
   <string name="default_buttons_add">Pridať</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 0aeff51c73..19602e489c 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -34,7 +34,7 @@
 	<string name="search_address_building_option">Hiša</string>
 	<string name="search_address_street_option">Sekajoča cesta</string>
 	<string name="context_menu_item_add_favorite">Dodaj med priljubljene</string>
-	<string name="default_buttons_yes">Da</string>
+	<string name="shared_string_yes">Da</string>
 	<string name="default_buttons_no">Ne</string>
 	<string name="default_buttons_cancel">Prekliči</string>
 	<string name="default_buttons_add">Dodaj</string>
diff --git a/OsmAnd/res/values-sq/strings.xml b/OsmAnd/res/values-sq/strings.xml
index f820c79dd1..de8da184be 100644
--- a/OsmAnd/res/values-sq/strings.xml
+++ b/OsmAnd/res/values-sq/strings.xml
@@ -15,7 +15,7 @@
     <string name="default_or">ose</string>
 	<string name="auto_zoom_none">Nuk ka afrim automatik</string>
 	<string name="default_buttons_no">Jo</string>
-	<string name="default_buttons_yes">Po</string>
+	<string name="shared_string_yes">Po</string>
 	<string name="tip_map_styles">Stili Hartës</string>
 	<string name="about_version">Versioni:</string>
     <string name="about_settings">Rreth</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 14f8afc934..b37406c18a 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -72,7 +72,7 @@
 <string name="filter_current_poiButton">Filter</string>
 <string name="add_favorite_dialog_default_favourite_name">Favorit</string>
 <string name="default_buttons_no">Nej</string>
-<string name="default_buttons_yes">Ja</string>
+<string name="shared_string_yes">Ja</string>
 <string name="default_buttons_cancel">Avbryt</string>
 <string name="default_buttons_apply">Verkställ</string>
 <string name="default_buttons_add">Lägg till</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 67b56c744b..8eb2fe7867 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -496,7 +496,7 @@
 	<string name="context_menu_item_add_favorite">Favorilere ekle</string>
 	<string name="context_menu_item_update_map">Haritayı güncelle</string>
 	<string name="context_menu_item_create_poi">POI oluştur</string>
-	<string name="default_buttons_yes">Evet</string>
+	<string name="shared_string_yes">Evet</string>
 	<string name="default_buttons_cancel">İptal et</string>
 	<string name="default_buttons_apply">Uygula</string>
 	<string name="default_buttons_add">Ekle</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 1d5ec3dd8c..9fce65e74b 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -826,7 +826,7 @@
   <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="default_buttons_yes">Так</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>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index de553e797e..b68a9f2eeb 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -607,7 +607,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 <string name="context_menu_item_open_bug">Mở OSM bug</string>
 <string name="context_menu_item_create_poi">Tạo POI</string>
 
-<string name="default_buttons_yes">OK</string>
+<string name="shared_string_yes">OK</string>
 <string name="default_buttons_cancel">Hủy</string>
 <string name="default_buttons_apply">Áp dụng</string>
 <string name="default_buttons_add">Thêm</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 4520da6e7e..90dbc026dc 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -386,7 +386,7 @@
 	<string name="search_address_building_option">大厦</string>
 	<string name="search_address_street_option">相交的街道</string>
 	<string name="search_tabs_location">位置</string>
-	<string name="default_buttons_yes">是</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>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 1b2d783c6e..5e802f1ae5 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -938,7 +938,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_yes">是</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>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0a7c318af3..fac34d4aaf 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2115,7 +2115,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="context_menu_item_update_map">Update map</string>
 	<string name="context_menu_item_open_bug">Open OSM bug</string>
 	<string name="context_menu_item_create_poi">Create POI</string>
-	<string name="default_buttons_yes">Yes</string>
 	<string name="default_buttons_apply">Apply</string>
 	<string name="default_buttons_add">Add</string>
 	<string name="default_buttons_no">No</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
index 25c5b00b2d..0c47806dff 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
@@ -73,7 +73,7 @@ public class OsmAndLocationSimulation {
 			final SeekBar speedup = (SeekBar) view.findViewById(R.id.Speedup);
 			speedup.setMax(3);
 			builder.setView(view);
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index d6f07c2471..6437281c6c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -497,7 +497,7 @@ public class OsmandApplication extends Application {
 		if (getNavigationService() != null) {
 			Builder bld = new AlertDialog.Builder(activity);
 			bld.setMessage(R.string.background_service_is_enabled_question);
-			bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					closeApplicationAnyway(activity, true);
diff --git a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
index 9b6a275392..f626a8dca9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
@@ -213,7 +213,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(MessageFormat.format(getString(R.string.install_selected_build), item.tag,
 				AndroidUtils.formatDateTime(getMyApplication(), item.date.getTime()), item.size));
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
index 91b9e80e40..9270766541 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
@@ -164,7 +164,7 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 		ll.addView(editText, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
 		builder.setView(ll);
 		builder.setNegativeButton(R.string.shared_string_cancel, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				PoiLegacyFilter nFilter = new PoiLegacyFilter(editText.getText().toString(), null, filter.getAcceptedTypes(), (OsmandApplication) getApplication());
@@ -187,7 +187,7 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(R.string.edit_filter_delete_dialog_title);
 		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				if (helper.removePoiFilter(filter)) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index c97062a20e..a3f30685c2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -243,7 +243,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setMessage(getString(R.string.favourites_remove_dialog_msg, point.getName()));
 		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				boolean deleted = helper.deleteFavourite(point);
@@ -601,7 +601,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 			if (tosave.exists()) {
 				Builder bld = new AlertDialog.Builder(getActivity());
-				bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						exportTask.execute();
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index f95ff62022..9ebc1566ab 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -407,7 +407,7 @@ public class MapActivityActions implements DialogProvider {
 			Builder bld = new AlertDialog.Builder(mapActivity);
 			if (gpxFiles.size() == 1){
 				bld.setMessage(R.string.use_displayed_track_for_navigation);
-				bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						enterRoutePlanningModeImpl(gpxFiles.get(0), from, fromName);
@@ -990,7 +990,7 @@ public class MapActivityActions implements DialogProvider {
 			// Stop the navigation
 			builder.setTitle(getString(R.string.cancel_route));
 			builder.setMessage(getString(R.string.stop_routing_confirm));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					stopNavigationWithoutConfirm();
@@ -1002,7 +1002,7 @@ public class MapActivityActions implements DialogProvider {
 			// Clear the destination point
 			builder.setTitle(getString(R.string.cancel_navigation));
 			builder.setMessage(getString(R.string.clear_dest_confirm));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					getTargets().clearPointToNavigate(true);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index f03c8b1c47..5e71013161 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -556,7 +556,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		}
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(getString(R.string.application_dir_change_warning2));
-		builder.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				MoveFilesToDifferentDirectory task =
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
index ce8c41ec1e..05819b0768 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
@@ -188,7 +188,7 @@ public class ShareDialog {
 			if (Version.isMarketEnabled((OsmandApplication) activity.getApplication())) {
 				AlertDialog.Builder builder = new AccessibleAlertBuilder(activity);
 				builder.setMessage(activity.getString(R.string.zxing_barcode_scanner_not_found));
-				builder.setPositiveButton(activity.getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(activity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix((OsmandApplication) activity.getApplication()) 
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
index ca61fc51f9..bd3db5c10a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
@@ -175,7 +175,7 @@ public class StartGPSStatus extends OsmAndAction {
 			if (Version.isMarketEnabled(getMyApplication())) {
 				AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
 				builder.setMessage(mapActivity. getString(R.string.gps_status_app_not_found));
-				builder.setPositiveButton(mapActivity.getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(mapActivity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix(getMyApplication()) + g.appName));
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
index 4e5ca7d5d0..bf65722a01 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
@@ -147,7 +147,7 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
 	private void deleteRecording(final Recording r) {
 		AccessibleAlertBuilder bld = new AccessibleAlertBuilder(activity);
 		bld.setMessage(R.string.recording_delete_confirm);
-		bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index 233799b8e3..66c26f58b5 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -202,7 +202,7 @@ public class NotesFragment extends ListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 				builder.setMessage(R.string.recording_delete_confirm);
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						plugin.deleteRecording(recording);
diff --git a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
index a6e36bbcdc..a77b49c527 100644
--- a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
+++ b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
@@ -54,7 +54,7 @@ public class FailSafeFuntions {
 					tv.setText(ma.getString(R.string.continue_follow_previous_route_auto, delay + ""));
 					tv.setPadding(7, 5, 7, 5);
 					builder.setView(tv);
-					builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+					builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							quitRouteRestoreDialog = true;
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index c59ea573db..6568942e53 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -147,7 +147,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 		if (asz != -1 && asz > 0 && sz / asz > 0.4) {
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(MessageFormat.format(getString(R.string.download_files_question_space), list.size(), sz, asz));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					downloadListIndexThread.runDownloadFiles();
@@ -192,7 +192,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 			if (getMyApplication().getSettings().isInternetConnectionAvailable()) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.download_using_mobile_internet));
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						downloadFilesPreCheckSpace();
@@ -217,7 +217,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 		AlertDialog.Builder bld = new AlertDialog.Builder(this);
 		bld.setTitle(getString(R.string.shared_string_cancel));
 		bld.setMessage(R.string.confirm_interrupt_download);
-		bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				dialog.dismiss();
@@ -274,7 +274,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 						AccessibleAlertBuilder ab = new AccessibleAlertBuilder(this);
 						ab.setMessage(getString(R.string.android_19_location_disabled,
 								settings.getExternalStorageDirectory()));
-						ab.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+						ab.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
 								copyFilesForAndroid19(newLoc);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index fb7a0c6f91..a14d988bf3 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -383,7 +383,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 		if(count > 0){
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(getString(R.string.download_additional_maps, s, sz));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					downloadFilesCheckInternet();
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 179a610aea..4416354f57 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -218,7 +218,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			new LocalIndexOperationTask(RESTORE_OPERATION).execute(info);
 		} else if (resId == R.string.local_index_mi_delete) {
 			Builder confirm = new Builder(getActivity());
-			confirm.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			confirm.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					new LocalIndexOperationTask(DELETE_OPERATION).execute(info);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 79792a30e4..e66701d487 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -1042,7 +1042,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 				builder.setMessage(R.string.recording_delete_confirm);
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						operationTask = new DeleteGpxTask();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index 7f49a74e34..84ed9e9dce 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -241,7 +241,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		
 		bldr.setView(view);
 		bldr.setNegativeButton(R.string.default_buttons_no, null);
-		bldr.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		bldr.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index f31fe7c889..2e2af08f8f 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -506,7 +506,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 					bld.setTitle(getString(
 							selectedObject instanceof OsMoDevice ? R.string.delete_confirmation_msg :
 									R.string.osmo_leave_confirmation_msg, name));
-					bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+					bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
@@ -1369,7 +1369,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
         final TIntArrayList list = new TIntArrayList();
         ColorDialogs.setupColorSpinner(this, devColor, colorSpinner, list);
 		
-		bld.setPositiveButton(R.string .default_buttons_yes, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string .shared_string_yes, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
index 2fa5d7c98f..49149022b8 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
@@ -162,7 +162,7 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
 			public void run() {
 				Builder bld = new AlertDialog.Builder(SettingsOsMoActivity.this);
 				bld.setMessage(R.string.osmo_regenerate_login_ids_confirm);
-				bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 					
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index e3c524956a..40b8d4c082 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -281,7 +281,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		confirm.setTitle(activity.getString(R.string.osmand_parking_delete));
 		confirm.setMessage(activity.getString(R.string.osmand_parking_delete_confirm));
 		confirm.setCancelable(true);
-		confirm.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		confirm.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				showDeleteEventWarning(activity);
diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
index 4964f9193c..605181005d 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@@ -209,7 +209,7 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 						Builder builder = new AlertDialog.Builder(view.getContext());
 						builder.setMessage(resources.getString(R.string.favourites_remove_dialog_msg, a.getName()));
 						builder.setNegativeButton(R.string.default_buttons_no, null);
-						builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+						builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
 								favorites.deleteFavourite(a);
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index aeb9eb511b..d5b7ac42d3 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -230,7 +230,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 		Builder builder = new AlertDialog.Builder(ctx);
 		builder.setCancelable(true);
 		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, intentStarter);
+		builder.setPositiveButton(R.string.shared_string_yes, intentStarter);
 		builder.setTitle(titleResID);
 		builder.setMessage(messageResID);
 		return builder;
diff --git a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
index 27c8371abd..5605e08c42 100644
--- a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
+++ b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Address Book Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Address Book Plugin is installed.</string>
diff --git a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
index 01b79ccf16..253aea9426 100644
--- a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
+++ b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
@@ -40,7 +40,7 @@ public class AddressBookPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
diff --git a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
index e020f5b25b..784676d05b 100644
--- a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
+++ b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
@@ -100,7 +100,7 @@ public class ContactAddressPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
diff --git a/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
index 70a2ac2e92..94cc8df0f4 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nee</string>
-    <string name="default_buttons_yes">Ja</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd is nie geïnstalleer nie</string>
     <string name="app_name">OsmAnd Parkering</string>
     <string name="parking_plugin_installed">OsmAnd Parkering inlegmodule is geïnstalleer en aangeskakel in OsmAnd verstellings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
index 3a381d1da7..845d768c96 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">ليس</string>
-    <string name="default_buttons_yes">نعم</string>
+    <string name="shared_string_yes">نعم</string>
     <string name="osmand_app_not_found">لم يتم تثبيت OsmAnd</string>
     <string name="app_name">وقوف السيارات</string>
     <string name="parking_plugin_installed">يتم تثبيت البرنامج المساعد OsmAnd وقوف السيارات وتمكينها في إعدادات OsmAnd</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
index ddcf9bceee..8d6f90557e 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Так</string>
+<resources><string name="shared_string_yes">Так</string>
     <string name="default_buttons_no">Не</string>
     <string name="osmand_app_not_found">OsmAnd не ўсталяваны</string>
     <string name="app_name">Модуль Паркоўкі OsmAnd</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
index 5fa60b0f21..3e205029da 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">Не</string>
-    <string name="default_buttons_yes">Да</string>
+    <string name="shared_string_yes">Да</string>
     <string name="osmand_app_not_found">Приложението OsmAnd не е инсталирано</string>
     <string name="app_name">Добавка Parking за OsmAnd</string>
     <string name="parking_plugin_installed">Добавката Parking е инсталирана и включена в настройките на OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
index 9a7ad48ac9..e008664738 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Da</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
index 589612632c..15c4e91007 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Sí</string>
+<resources><string name="shared_string_yes">Sí</string>
 <string name="default_buttons_no">No</string>
 <string name="osmand_app_not_found">L\'OsmAnd no està instal·lat</string>
 <string name="app_name">OsmAnd Aparcament</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
index 883bce9a9b..af3411de2b 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Ano</string>
+    <string name="shared_string_yes">Ano</string>
     <string name="osmand_app_not_found">OsmAnd není nainstalován</string>
     <string name="app_name">OsmAnd parkování</string>
     <string name="parking_plugin_installed">OsmAnd modul parkování je nainstalován a aktivován v nastavení OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
index a92883c498..fe3b50952b 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nej</string>
-    <string name="default_buttons_yes">Ja</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd er ikke installeret</string>
     <string name="app_name">OsmAnd parkering</string>
     <string name="parking_plugin_installed">OsmAnd udvidelsen Parkering er installeret og aktiveret i OsmAnd indstillinger.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
index 58c6915252..d892d0f205 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nein</string>
-    <string name="default_buttons_yes">Ja</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd ist nicht installiert</string>
     <string name="app_name">OsmAnd Parkplatz-Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parkplatz-Plugin wurde installiert und in den OsmAnd-Einstellungen aktiviert.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
index 226971b771..47f82a4791 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Όχι</string>
-    <string name="default_buttons_yes">Ναι</string>
+    <string name="shared_string_yes">Ναι</string>
     <string name="osmand_app_not_found">Το OsmAnd δεν είναι εγκατεστημένο</string>
     <string name="app_name">Στάθμευση OsmAnd</string>
     <string name="parking_plugin_installed">Το πρόσθετο Στάθμευση OsmAnd είναι εγκατεστημένο και ενεργοποιημένο στις ρυθμίσεις του OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
index 98bf22ee28..039f815381 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Sí</string>
+    <string name="shared_string_yes">Sí</string>
     <string name="osmand_app_not_found">OsmAnd no está instalado</string>
     <string name="app_name">Aparcamiento de OsmAnd</string>
     <string name="parking_plugin_installed">El Plugin Aparcamiento de OsmAnd está instalado y activado en la configuración de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
index e2d524ffe4..28061a18ac 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Ei</string>
-    <string name="default_buttons_yes">Jah</string>
+    <string name="shared_string_yes">Jah</string>
     <string name="osmand_app_not_found">OsmAnd ei ole paigaldatud</string>
     <string name="app_name">OsmAnd Parkimine</string>
     <string name="parking_plugin_installed">OsmAnd Parkimine on paigaldatud ja aktiveeritud OsmAnd seadetes.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
index a754e2c8c1..bafb50e5ef 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Ez</string>
-    <string name="default_buttons_yes">Bai</string>
+    <string name="shared_string_yes">Bai</string>
     <string name="osmand_app_not_found">OsmAnd ez dago instalatuta</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin instalatuta eta aktibatuta dago OsmAnd-en konfigurazioan.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
index bb19b23625..403170adde 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">بله</string>
+<resources><string name="shared_string_yes">بله</string>
     <string name="default_buttons_no">خیر</string>
     <string name="osmand_app_not_found">OsmAnd نصب نشده است</string>
     <string name="app_name">پارکینگ OsmAnd</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
index d124d59015..cb1ecb34da 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <string name="default_buttons_no">Ei</string>
-    <string name="default_buttons_yes">Kyllä</string>
+    <string name="shared_string_yes">Kyllä</string>
     <string name="osmand_app_not_found">OsmAnd ei ole asennettu</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">OsmAnd Parking lisäosa on asennettu ja aktivoitu OsmAnd:in asetuksista.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
index 3bc15e4383..3b66ca5773 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Non</string>
-    <string name="default_buttons_yes">Oui</string>
+    <string name="shared_string_yes">Oui</string>
     <string name="osmand_app_not_found">OsmAnd n\'est pas installé</string>
     <string name="app_name">Greffon Parking pour OsmAnd</string>
     <string name="parking_plugin_installed">Le greffon Parking est installé et activé dans les paramètres de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
index eb0a0b4147..39b298b84e 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Non</string>
-    <string name="default_buttons_yes">Si</string>
+    <string name="shared_string_yes">Si</string>
     <string name="osmand_app_not_found">OsmAnd non está instalado</string>
     <string name="app_name">Aparcar co OsmAnd</string>
     <string name="parking_plugin_installed">O engadido Aparcar co OsmAnd está instalado e xa foi activado na configuración do OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
index 5162b53939..bf1c76c04d 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <string name="default_buttons_no">לא</string>
-    <string name="default_buttons_yes">כן</string>
+    <string name="shared_string_yes">כן</string>
     <string name="osmand_app_not_found">התכנית OsmAnd אינה מותקנת</string>
     <string name="app_name">חנייה עם OsmAnd</string>
     <string name="parking_plugin_installed">תוסף החנייה של OsmAnd מותקן ומופעל בהגדרות של OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
index b9f9455f52..3244ce0440 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="default_buttons_no">नही</string>
-    <string name="default_buttons_yes">हा</string>
+    <string name="shared_string_yes">हा</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">ओएसएमएएनडी पार्किंग प्लगिन</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
index eac16b7083..e8831ca5ba 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Da</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd nije instaliran</string>
     <string name="app_name">OsmAnd Parkiralište</string>
     <string name="parking_plugin_installed">OsmAnd dodatak za parkirališta je instaliran i omogućen u OsmAnd postavkama.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
index 0cf8f2d229..07f3b05ea6 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">Nem</string>
-    <string name="default_buttons_yes">Igen</string>
+    <string name="shared_string_yes">Igen</string>
     <string name="osmand_app_not_found">Az OsmAnd nincs feltelepítve</string>
     <string name="app_name">OsmAnd Parkolás</string>
     <string name="parking_plugin_installed">OsmAnd Parkolási Bővítmény feltelepítve és engedélyezve az OsmAnd beállításaiban.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
index b1e23297f0..e7547dfa83 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="default_buttons_no">Ոչ</string>
-    <string name="default_buttons_yes">Այո</string>
+    <string name="shared_string_yes">Այո</string>
     <string name="osmand_app_not_found">OsmAnd - ը չի տեղադրված</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugiն - ը տեղադրված է և ակտիվացված է OsmAnd-ի կարգավորումներում.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
index 4b839728f1..8978962681 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
index 54da317695..0ea8f47d56 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Si</string>
+    <string name="shared_string_yes">Si</string>
     <string name="osmand_app_not_found">OsmAnd non è installato</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">Il Plugin Parcheggio per OsmAnd è installato e abilitato nelle impostazioni di OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
index 5922c6dff3..8c80e00cd4 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">いいえ</string>
-    <string name="default_buttons_yes">はい</string>
+    <string name="shared_string_yes">はい</string>
     <string name="osmand_app_not_found">OsmAndがインストールされていません</string>
     <string name="app_name">OsmAnd駐車場</string>
     <string name="parking_plugin_installed">OsmAnd駐車場プラグインはインストールされており、設定は有効です。</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
index 8addea2bbb..cf08b9921f 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">არა</string>
-    <string name="default_buttons_yes">დიახ</string>
+    <string name="shared_string_yes">დიახ</string>
     <string name="osmand_app_not_found">OsmAnd ჩადგმული არაა</string>
     <string name="app_name">OsmAnd პარკინგი</string>
     <string name="parking_plugin_installed">OsmAnd-ის პარკინგის დამატება ჩადგმულია და ჩართულია პარამეტრებში.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
index 6a47113e9b..fbfb5bcbf5 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">아니오</string>
-    <string name="default_buttons_yes">예</string>
+    <string name="shared_string_yes">예</string>
     <string name="osmand_app_not_found">OsmAnd는 설치되어 있지 않습니다.</string>
     <string name="app_name">OsmAnd 주차장</string>
     <string name="parking_plugin_installed">OsmAnd 주차 플러그인은 OsmAnd 설정에서 설치되고 활성화 되었습니다.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
index a6e9e3ebad..1f4fb3e6c2 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Taip</string>
+    <string name="shared_string_yes">Taip</string>
     <string name="osmand_app_not_found">OsmAnd programa neįdiegta</string>
     <string name="app_name">OsmAnd parkavimo įskiepis</string>
     <string name="parking_plugin_installed">OsmAnd Parkavimo įskiepis įdiegiamas ir aktyvuojamas OsmAnd nustatymuose.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
index e19efe8800..e5fc0c8e91 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">Nē</string>
-    <string name="default_buttons_yes">Jā</string>
+    <string name="shared_string_yes">Jā</string>
     <string name="osmand_app_not_found">OsmAnd nav instalēts</string>
     <string name="app_name">OsmAnd Parkošanās</string>
     <string name="parking_plugin_installed">OsmAnd parkošanās spraudnis ir instalēts un iespējots OsmAnd uzstādījumos.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
index 9adb8b27be..660d2ed398 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">नाही</string>
-    <string name="default_buttons_yes">हो</string>
+    <string name="shared_string_yes">हो</string>
     <string name="osmand_app_not_found">ओएसएमएएनडि इन्स्टॉल केलेले नाही</string>
     <string name="app_name">ओएसएमएएनडि पार्किंग</string>
     <string name="parking_plugin_installed">ओएसएमएएनडि पार्किंग प्लगिन इन्स्टॉल आणि चालू केले आहे.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
index fd7e092f97..a3ccd04242 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Ja</string>
+<resources><string name="shared_string_yes">Ja</string>
     <string name="default_buttons_no">Nei</string>
     <string name="osmand_app_not_found">OsmAnd er ikke installert</string>
     <string name="app_name">OsmAnd-Parkering</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
index b9f9998bd7..245b510724 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nee</string>
-    <string name="default_buttons_yes">Ja</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd is niet geïnstalleerd</string>
     <string name="app_name">OsmAnd parkeerplugin</string>
     <string name="parking_plugin_installed">OsmAnd parkeerplugin is geïnstalleerd en geactiveerd in de OsmAnd-instellingen.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
index b4817b3311..3e8d499f24 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nie</string>
-    <string name="default_buttons_yes">Tak</string>
+    <string name="shared_string_yes">Tak</string>
     <string name="osmand_app_not_found">Osmand nie jest zainstalowany</string>
     <string name="app_name">Wtyczka parkowania dla OsmAnd</string>
     <string name="parking_plugin_installed">Wtyczka parkowania jest zainstalowana i włączona w ustawieniach OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
index 88ba9b8271..6918249dc1 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Não</string>
-    <string name="default_buttons_yes">Sim</string>
+    <string name="shared_string_yes">Sim</string>
     <string name="osmand_app_not_found">Osmand não está instalado</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin está instalado e activado nas opções OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
index 070f2fe0c6..4de94455d2 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nu</string>
-    <string name="default_buttons_yes">Da</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd nu este instalat</string>
     <string name="app_name">Parcare OsmAnd</string>
     <string name="parking_plugin_installed">Plugin-ul OsmAnd Parking este instalat și activat în setările OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
index 48defb5730..4ddc20d44f 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="default_buttons_no">Нет</string>
-    <string name="default_buttons_yes">Да</string>
+    <string name="shared_string_yes">Да</string>
     <string name="osmand_app_not_found">OsmAnd не установлен</string>
     <string name="app_name">Плагин парковки OsmAnd</string>
     <string name="parking_plugin_installed">Плагин парковки установлен и включен в настройках OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
index d79b4f46ec..b553191486 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Nono</string>
-    <string name="default_buttons_yes">Eja</string>
+    <string name="shared_string_yes">Eja</string>
     <string name="osmand_app_not_found">OsmAnd no est installau</string>
     <string name="app_name">OsmAnd Parchezu</string>
     <string name="parking_plugin_installed">OsmAnd Parchezu est installau e insertau in sas impostaduras de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
index c58aadf41c..15b77bf1e5 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">Nie</string>
-    <string name="default_buttons_yes">Áno</string>
+    <string name="shared_string_yes">Áno</string>
     <string name="osmand_app_not_found">Aplikácia OsmAnd nie je nainštalovaná</string>
     <string name="app_name">OsmAnd parkovanie</string>
     <string name="parking_plugin_installed">Parkovací zásuvný modul pre OsmAnd je nainštalovaný a povolený v nastaveniach aplikácie OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
index 4ab7d814c0..cb7cf2d947 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_yes">Da</string>
+<string name="shared_string_yes">Da</string>
     <string name="default_buttons_no">Ne</string>
     <string name="osmand_app_not_found">OsmAnd ni nameščen</string>
     <string name="app_name">OsmAnd parkiranje</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
index cf74a7a346..5773a385cc 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Jo</string>
-    <string name="default_buttons_yes">Po</string>
+    <string name="shared_string_yes">Po</string>
     <string name="osmand_app_not_found">OsmAnd nuk është instaluar</string>
     <string name="app_name">OsmAnd Parkim</string>
     <string name="parking_plugin_installed">Plugini OsmAnd Parkim është instaluar dhe aktivizuar në OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
index 16d3e4095a..27cbcc35b8 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <string name="default_buttons_no">Nej</string>
-    <string name="default_buttons_yes">Ja</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd är inte installerad</string>
     <string name="app_name">OsmAnd - parkering</string>
     <string name="parking_plugin_installed">OsmAnd-pluginen Parkering är installerad och aktiverad i inställningarna för OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
index 01b39afda6..5b6fa0ad49 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_yes">Evet</string>
+<string name="shared_string_yes">Evet</string>
     <string name="default_buttons_no">Hayır</string>
     </resources>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
index 79037bb19a..eec7ee63b3 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">Ні</string>
-    <string name="default_buttons_yes">Так</string>
+    <string name="shared_string_yes">Так</string>
     <string name="osmand_app_not_found">Osmand не встановлено</string>
     <string name="app_name">Паркування OsmAnd</string>
     <string name="parking_plugin_installed">Плагін Паркування OsmAnd встановлено та увімкнено у налаштуваннях OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
index 27ec4583d1..3545df2bb9 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">是</string>
+<resources><string name="shared_string_yes">是</string>
     <string name="default_buttons_no">没有</string>
     <string name="osmand_app_not_found">OsmAnd 未安装</string>
     <string name="app_name">OsmAnd 停车场</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
index fddffb4952..969a6fae3b 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="default_buttons_no">否</string>
-    <string name="default_buttons_yes">是</string>
+    <string name="shared_string_yes">是</string>
     <string name="osmand_app_not_found">OsmAnd 並未安裝</string>
     <string name="parking_plugin_installed">OsmAnd 停車場外掛元件已安裝，並且已在 OsmAnd 設定裡啟用。</string>
 <string name="app_name">OsmAnd 停車場</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values/strings.xml b/plugins/Osmand-ParkingPlugin/res/values/strings.xml
index 1b12c9740e..4adfb033d6 100644
--- a/plugins/Osmand-ParkingPlugin/res/values/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
index 2eccccfe78..958375e846 100644
--- a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
+++ b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
@@ -40,7 +40,7 @@ public class ParkingPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
diff --git a/plugins/Osmand-SRTMPlugin/res/values/strings.xml b/plugins/Osmand-SRTMPlugin/res/values/strings.xml
index 9ee60d3b8e..dd424461bf 100644
--- a/plugins/Osmand-SRTMPlugin/res/values/strings.xml
+++ b/plugins/Osmand-SRTMPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Contour lines</string>
     <string name="app_label">OsmAnd Contour lines</string>
diff --git a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
index 2ec9462629..a11b4bdb23 100644
--- a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
+++ b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
@@ -41,7 +41,7 @@ public class SRTMPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
diff --git a/plugins/Osmand-Sherpafy/res/values/strings.xml b/plugins/Osmand-Sherpafy/res/values/strings.xml
index 5e29d65327..079fd74a20 100644
--- a/plugins/Osmand-Sherpafy/res/values/strings.xml
+++ b/plugins/Osmand-Sherpafy/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">Sherpafy</string>
     <string name="parking_plugin_installed">OsmAnd Sherpafy is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
index a4577210b3..ce6da5973e 100644
--- a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
+++ b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
@@ -43,7 +43,7 @@ public class SherpafyPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));