From 9948d1e8dd56345525edf271d5e326a5bec13ac1 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 11 Dec 2021 13:28:26 +0100
Subject: [PATCH] [strings] Regenerated

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 android/res/values-ar/strings.xml             |  28 ++-
 android/res/values-be/strings.xml             |  28 ++-
 android/res/values-cs/strings.xml             |  28 ++-
 android/res/values-da/strings.xml             |  28 ++-
 android/res/values-de/strings.xml             |  28 ++-
 android/res/values-el/strings.xml             |  28 ++-
 android/res/values-es-rMX/strings.xml         |   9 +-
 android/res/values-es/strings.xml             |  28 ++-
 android/res/values-fa/strings.xml             |  22 +-
 android/res/values-fi/strings.xml             |  28 ++-
 android/res/values-fr/strings.xml             |  28 ++-
 android/res/values-hu/strings.xml             |  28 ++-
 android/res/values-in/strings.xml             |  28 ++-
 android/res/values-it/strings.xml             |  28 ++-
 android/res/values-ja/strings.xml             |  28 ++-
 android/res/values-ko/strings.xml             |  28 ++-
 android/res/values-nb/strings.xml             |  28 ++-
 android/res/values-nl/strings.xml             |  28 ++-
 android/res/values-pl/strings.xml             |  28 ++-
 android/res/values-pt-rBR/strings.xml         |  28 ++-
 android/res/values-pt/strings.xml             |  28 ++-
 android/res/values-ro/strings.xml             |  28 ++-
 android/res/values-ru/strings.xml             |  28 ++-
 android/res/values-sk/strings.xml             |  28 ++-
 android/res/values-sv/strings.xml             |  28 ++-
 android/res/values-th/strings.xml             |  28 ++-
 android/res/values-tr/strings.xml             | 203 +++++++++--------
 android/res/values-uk/strings.xml             |  28 ++-
 android/res/values-vi/strings.xml             |  28 ++-
 android/res/values-zh-rTW/strings.xml         |  30 ++-
 android/res/values-zh/strings.xml             |  28 ++-
 android/res/values/strings.xml                |  34 ++-
 .../ar.lproj/Localizable.strings              |  30 ++-
 .../be.lproj/Localizable.strings              |  30 ++-
 .../bg.lproj/Localizable.strings              |  32 ++-
 .../cs.lproj/Localizable.strings              |  30 ++-
 .../da.lproj/Localizable.strings              |  30 ++-
 .../de.lproj/Localizable.strings              |  30 ++-
 .../el.lproj/Localizable.strings              |  30 ++-
 .../en-GB.lproj/Localizable.strings           |  36 ++-
 .../en.lproj/Localizable.strings              |  36 ++-
 .../es-MX.lproj/Localizable.strings           |  36 ++-
 .../es.lproj/Localizable.strings              |  30 ++-
 .../fa.lproj/Localizable.strings              |  34 ++-
 .../fi.lproj/Localizable.strings              |  30 ++-
 .../fr.lproj/Localizable.strings              |  30 ++-
 .../hu.lproj/Localizable.strings              |  30 ++-
 .../id.lproj/Localizable.strings              |  30 ++-
 .../it.lproj/Localizable.strings              |  30 ++-
 .../ja.lproj/Localizable.strings              |  30 ++-
 .../ko.lproj/Localizable.strings              |  30 ++-
 .../nb.lproj/Localizable.strings              |  30 ++-
 .../nl.lproj/Localizable.strings              |  30 ++-
 .../pl.lproj/Localizable.strings              |  30 ++-
 .../pt-BR.lproj/Localizable.strings           |  30 ++-
 .../pt.lproj/Localizable.strings              |  30 ++-
 .../ro.lproj/Localizable.strings              |  30 ++-
 .../ru.lproj/Localizable.strings              |  30 ++-
 .../sk.lproj/Localizable.strings              |  30 ++-
 .../sv.lproj/Localizable.strings              |  30 ++-
 .../th.lproj/Localizable.strings              |  30 ++-
 .../tr.lproj/Localizable.strings              | 212 +++++++++---------
 .../tr.lproj/Localizable.stringsdict          |   4 +-
 .../uk.lproj/Localizable.strings              |  30 ++-
 .../vi.lproj/Localizable.strings              |  30 ++-
 .../zh-Hans.lproj/Localizable.strings         |  30 ++-
 .../zh-Hant.lproj/Localizable.strings         |  32 ++-
 67 files changed, 1059 insertions(+), 1227 deletions(-)

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 52e977516a..663b08c1dd 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">استمرار</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">فشلت عملية تنزيل %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">إضافة مجموعة جديدة</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">لون الإشارة المرجعية</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">اسم مجموعة الإشارات المرجعية</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">مجموعات الإشارات المرجعية</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">الإشارات المرجعية</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">أماكني</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">الاسم</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">العنوان</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">المجموعة</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">المجموعة</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">الإعدادات</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">شرطة</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">ملاحظات</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">تم مشاركة اشارات Organic Maps المرجعية معك</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">تحميل الإشارات المرجعية</string>
@@ -366,8 +366,6 @@
 	<string name="show">عرض</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">إخفاء</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">إعادة تسمية</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">فشل في تخطيط المسار</string>
 	<!-- Arrive routing message in navigation view -->
@@ -616,9 +614,10 @@
 	<string name="setting_emulate_bad_storage">محاكاة التخزين السيء</string>
 	<string name="core_entrance">المدخل</string>
 	<string name="error_enter_correct_name">الرجاء إدخال اسم صحيح</string>
-	<string name="bookmarks_groups">قوائم</string>
-	<string name="bookmarks_groups_hide_all">إخفاء الكل</string>
-	<string name="bookmarks_groups_show_all">إظهار الكل</string>
+	<string name="bookmark_lists">قوائم</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">إخفاء الكل</string>
+	<string name="bookmark_lists_show_all">إظهار الكل</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d من الإشارات المرجعية</item>
 	</plurals>
@@ -678,8 +677,7 @@
 	<string name="hide_from_map">إخفاء من الخريطة</string>
 	<string name="public_access">إطلاع الجمهور</string>
 	<string name="limited_access">محدودية فرص حصول</string>
-	<string name="bookmark_category_name">الفئة</string>
-	<string name="bookmark_category_description_hint">اكتب وصفًا (نص أو html)</string>
+	<string name="bookmark_list_description_hint">اكتب وصفًا (نص أو html)</string>
 	<string name="not_shared">خاص</string>
 	<string name="tags_loading_error_subtitle">حدث خطأ أثناء تحميل العلامات ، يرجى المحاولة مرة أخرى</string>
 	<string name="download_button">تحميل</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 6ff5c45fa9..4e48794045 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -67,24 +67,24 @@
 	<string name="continue_download">Працягнуць</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Спампаваць %s не ўдалося</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Дадаць новую групу</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Колер закладкі</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Назва групы закладак</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Групы закладак</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Закладкі</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мае месцы</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Назва</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Адрас</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Група</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Група</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Налады</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -137,7 +137,7 @@
 	<string name="police">Паліцыя</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Нататкі</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">З вамі падзяліліся закладкамі Ogranic Maps</string>
 	<string name="share_bookmarks_email_body">Вітаю!\n\nУ далучаным файле мае закладкі з дататка Organic Maps. Калі ласка, адчыніце іх калі ў вас усталяваны Organic Maps. Калі не, спампуйце дадатак для вашай прылады iOS альбо Andriod па спасылцы: https://omaps.app/get?kmz\n\nПрыемных падарожжаў з Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -374,8 +374,6 @@
 	<string name="show">Паказаць</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Схаваць</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Пераіменаваць</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Памылка пракладання маршрута</string>
 	<!-- Arrive routing message in navigation view -->
@@ -629,9 +627,10 @@
 	<string name="setting_emulate_bad_storage">Эмуляваць дрэннае сховішча</string>
 	<string name="core_entrance">Уваход</string>
 	<string name="error_enter_correct_name">Калі ласка, увядзіце назву правільна</string>
-	<string name="bookmarks_groups">Спісы</string>
-	<string name="bookmarks_groups_hide_all">Схаваць усе</string>
-	<string name="bookmarks_groups_show_all">Паказаць усе</string>
+	<string name="bookmark_lists">Спісы</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Схаваць усе</string>
+	<string name="bookmark_lists_show_all">Паказаць усе</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="few">%d закладкі</item>
 	  <item quantity="one">%d закладка</item>
@@ -699,8 +698,7 @@
 	<string name="hide_from_map">Схаваць з мапы</string>
 	<string name="public_access">Публічны доступ</string>
 	<string name="limited_access">Абмежаваны доступ</string>
-	<string name="bookmark_category_name">Катэгорыя</string>
-	<string name="bookmark_category_description_hint">Дабаўце апісанне (тэкст альбо html)</string>
+	<string name="bookmark_list_description_hint">Дабаўце апісанне (тэкст альбо html)</string>
 	<string name="not_shared">Прыватны</string>
 	<string name="tags_loading_error_subtitle">Адбылася памылка падчас загрузкі метак, калі ласка паспрабуйце зноў</string>
 	<string name="download_button">Спампаваць</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index b13096c755..76956bb94c 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Pokračovat</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Stahování selhalo: %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Přidat novou skupinu záložek</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Barva záložky</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Název záložky</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Skupiny záložek</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Záložky</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje místa</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Název</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresa</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Skupina</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Skupina</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Nastavení</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Policie</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Poznámky</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Sdílené záložky Organic Maps</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Nahrávání záložek</string>
@@ -364,8 +364,6 @@
 	<string name="show">Ukázat</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Skrýt</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Přejmenovat</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Naplánování trasy se nezdařilo</string>
 	<!-- Arrive routing message in navigation view -->
@@ -614,9 +612,10 @@
 	<string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
 	<string name="core_entrance">Vstup</string>
 	<string name="error_enter_correct_name">Zadejte prosím správný název</string>
-	<string name="bookmarks_groups">Seznamy</string>
-	<string name="bookmarks_groups_hide_all">Skrýt vše</string>
-	<string name="bookmarks_groups_show_all">Zobrazit vše</string>
+	<string name="bookmark_lists">Seznamy</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Skrýt vše</string>
+	<string name="bookmark_lists_show_all">Zobrazit vše</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d záložek</item>
 	</plurals>
@@ -678,8 +677,7 @@
 	<string name="hide_from_map">Neukazovat na mapě</string>
 	<string name="public_access">Veřejně přístupné</string>
 	<string name="limited_access">Soukromé</string>
-	<string name="bookmark_category_name">Kategorie</string>
-	<string name="bookmark_category_description_hint">Přidejte popis (text nebo html)</string>
+	<string name="bookmark_list_description_hint">Přidejte popis (text nebo html)</string>
 	<string name="not_shared">Osobní účet</string>
 	<string name="tags_loading_error_subtitle">Během nahrávání tagů se stala chyba, zkuste to prosím ještě jednou</string>
 	<string name="download_button">Stáhnout</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 8b55b92624..71b1e776ee 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Fortsæt</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s download mislykkedes</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Tilføj nyt sæt</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bogmærke Farve</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Indstil bogmærkenavn</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Bogmærk sæt</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Bogmærker</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine Steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Navn</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresse</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Sæt</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Sæt</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Indstillinger</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Politi</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Noter</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps bogmærker er blevet delt med dig</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Indlæser Bogmærker</string>
@@ -364,8 +364,6 @@
 	<string name="show">Vis</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Skjul</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Omdøb</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Ruteplanlægning mislykkedes</string>
 	<!-- Arrive routing message in navigation view -->
@@ -614,9 +612,10 @@
 	<string name="setting_emulate_bad_storage">Emulere beskadiget lager</string>
 	<string name="core_entrance">Indgang</string>
 	<string name="error_enter_correct_name">Angiv et korrekt navn</string>
-	<string name="bookmarks_groups">Lister</string>
-	<string name="bookmarks_groups_hide_all">Skjul alle</string>
-	<string name="bookmarks_groups_show_all">Vis alle</string>
+	<string name="bookmark_lists">Lister</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Skjul alle</string>
+	<string name="bookmark_lists_show_all">Vis alle</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d bogmærker</item>
 	</plurals>
@@ -677,8 +676,7 @@
 	<string name="hide_from_map">Skjul på kort</string>
 	<string name="public_access">Offentlig adgang</string>
 	<string name="limited_access">Begrænset adgang</string>
-	<string name="bookmark_category_name">Kategori</string>
-	<string name="bookmark_category_description_hint">Lav en beskrivelse (tekst eller html)</string>
+	<string name="bookmark_list_description_hint">Lav en beskrivelse (tekst eller html)</string>
 	<string name="not_shared">Privat</string>
 	<string name="tags_loading_error_subtitle">Der skete en fejl under hentning af tags, prøv igen</string>
 	<string name="download_button">Download</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index e4ccb363f4..535ea8cba1 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">Fortfahren</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s Herunterladen fehlgeschlagen</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Neue Gruppe hinzufügen</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Lesezeichenfarbe</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Name des Lesezeichens</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Lesezeichenmappe</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Lesezeichengruppen</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meine Orte</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Name</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresse</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Gruppe</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Gruppe</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Einstellungen</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">Polizeistation</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notizen</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps-Lesezeichen mit Ihnen geteilt</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Lesezeichen werden geladen</string>
@@ -372,8 +372,6 @@
 	<string name="show">Anzeigen</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ausblenden</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Umbenennen</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Routenplanung fehlgeschlagen</string>
 	<!-- Arrive routing message in navigation view -->
@@ -627,9 +625,10 @@
 	<string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
 	<string name="core_entrance">Eingang</string>
 	<string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
-	<string name="bookmarks_groups">Listen</string>
-	<string name="bookmarks_groups_hide_all">Alle verbergen</string>
-	<string name="bookmarks_groups_show_all">Alle anzeigen</string>
+	<string name="bookmark_lists">Listen</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Alle verbergen</string>
+	<string name="bookmark_lists_show_all">Alle anzeigen</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d Lesezeichen</item>
 	</plurals>
@@ -693,8 +692,7 @@
 	<string name="hide_from_map">Auf der Karte ausblenden</string>
 	<string name="public_access">Öffentlicher Zugriff</string>
 	<string name="limited_access">Privater Zugriff</string>
-	<string name="bookmark_category_name">Kategorie</string>
-	<string name="bookmark_category_description_hint">Fügen Sie die Beschreibung hinzu (Text oder html)</string>
+	<string name="bookmark_list_description_hint">Fügen Sie die Beschreibung hinzu (Text oder html)</string>
 	<string name="not_shared">Persönlich</string>
 	<string name="tags_loading_error_subtitle">Während dem Laden der Tags ist ein Fehler aufgetreten, bitte, versuchen Sie es erneut</string>
 	<string name="download_button">Downloaden</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 8e925d1dc2..5573b6e55e 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -65,24 +65,24 @@
 	<string name="continue_download">Συνέχεια</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">η λήψη %s απέτυχε</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Προσθέστε νέο σύνολο</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Χρώμα αγαπημένου</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Όνομα συνόλου αγαπημένων</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Σύνολα αγαπημένων</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Αγαπημένα</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Οι τοποθεσίες μου</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Όνομα</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Διεύθυνση</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Σύνολο</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Σύνολο</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Ρυθμίσεις</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -135,7 +135,7 @@
 	<string name="police">Αστυνομία</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Σημειώσεις</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Κοινοποιήθηκαν αγαπημένα Organic Maps με σας</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Φόρτωση αγαπημένων</string>
@@ -366,8 +366,6 @@
 	<string name="show">Εμφάνιση</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Απόκρυψη</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Μετονομασία</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Ο σχεδιασμός διαδρομής απέτυχε</string>
 	<!-- Arrive routing message in navigation view -->
@@ -604,9 +602,10 @@
 	<string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
 	<string name="core_entrance">Είσοδος</string>
 	<string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
-	<string name="bookmarks_groups">Τόπος αγώνων</string>
-	<string name="bookmarks_groups_hide_all">Απόκρυψη όλων</string>
-	<string name="bookmarks_groups_show_all">Εμφάνιση όλων</string>
+	<string name="bookmark_lists">Τόπος αγώνων</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Απόκρυψη όλων</string>
+	<string name="bookmark_lists_show_all">Εμφάνιση όλων</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d αγαπημένα</item>
 	</plurals>
@@ -667,8 +666,7 @@
 	<string name="hide_from_map">Κρύψε από τον χάρτη</string>
 	<string name="public_access">Δημόσια πρόσβαση</string>
 	<string name="limited_access">Περιορισμένη πρόσβαση</string>
-	<string name="bookmark_category_name">Κατηγορία</string>
-	<string name="bookmark_category_description_hint">Πληκτρολογήστε μια περιγραφή (κείμενο ή html)</string>
+	<string name="bookmark_list_description_hint">Πληκτρολογήστε μια περιγραφή (κείμενο ή html)</string>
 	<string name="not_shared">Προσωπικός</string>
 	<string name="tags_loading_error_subtitle">Ένα σφάλμα συνέβη στο φόρτωμα των ετικετών, παρακαλώ ξαναπροσπαθήστε</string>
 	<string name="download_button">Κατέβασμα</string>
diff --git a/android/res/values-es-rMX/strings.xml b/android/res/values-es-rMX/strings.xml
index f81e907312..3c61974a09 100644
--- a/android/res/values-es-rMX/strings.xml
+++ b/android/res/values-es-rMX/strings.xml
@@ -46,9 +46,10 @@
 	<string name="setting_emulate_bad_storage">Emular el almacenamiento dañado</string>
 	<string name="core_entrance">Entrada</string>
 	<string name="error_enter_correct_name">Introduzca el nombre correcto</string>
-	<string name="bookmarks_groups">Listas</string>
-	<string name="bookmarks_groups_hide_all">Ocultar todo</string>
-	<string name="bookmarks_groups_show_all">Mostrar todo</string>
+	<string name="bookmark_lists">Listas</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ocultar todo</string>
+	<string name="bookmark_lists_show_all">Mostrar todo</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d marcadores</item>
 	</plurals>
@@ -107,7 +108,7 @@
 	<string name="hide_from_map">Ocultar del mapa</string>
 	<string name="public_access">Acceso público</string>
 	<string name="limited_access">Acceso limitado</string>
-	<string name="bookmark_category_description_hint">Introduzca una descripción (texto o html)</string>
+	<string name="bookmark_list_description_hint">Introduzca una descripción (texto o html)</string>
 	<string name="not_shared">Privado</string>
 	<string name="tags_loading_error_subtitle">Ocurrió un error al cargar las etiquetas, por favor intente de nuevo</string>
 	<string name="download_button">Descargar</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 88d00ea57b..4bf8f929c5 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Continuar</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s la descarga ha fallado</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Agregar un grupo nuevo</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Color del marcador</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nombre del grupo de marcadores</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Grupos de marcadores</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Marcadores</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mis lugares</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nombre</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Dirección</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Grupo</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Grupo</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Configuración</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Policía</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notas</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Marcapáginas de Organic Maps compartidos contigo</string>
 	<string name="share_bookmarks_email_body">Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -371,8 +371,6 @@
 	<string name="show">Mostrar</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ocultar</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Renombrar</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Error al planificar la ruta</string>
 	<!-- Arrive routing message in navigation view -->
@@ -625,9 +623,10 @@
 	<string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
 	<string name="core_entrance">Entrada</string>
 	<string name="error_enter_correct_name">Por favor, introduzca el nombre correcto</string>
-	<string name="bookmarks_groups">Listas</string>
-	<string name="bookmarks_groups_hide_all">Ocultar todo</string>
-	<string name="bookmarks_groups_show_all">Mostrar todo</string>
+	<string name="bookmark_lists">Listas</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ocultar todo</string>
+	<string name="bookmark_lists_show_all">Mostrar todo</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d marcadores</item>
 	</plurals>
@@ -693,8 +692,7 @@
 	<string name="hide_from_map">Ocultar en el mapa</string>
 	<string name="public_access">Acceso público</string>
 	<string name="limited_access">Acceso privado</string>
-	<string name="bookmark_category_name">Categoría</string>
-	<string name="bookmark_category_description_hint">Agregue una descripción (texto o html)</string>
+	<string name="bookmark_list_description_hint">Agregue una descripción (texto o html)</string>
 	<string name="not_shared">Privado</string>
 	<string name="tags_loading_error_subtitle">Durante la carga de las etiquetas, se produjo un error, por favor inténtelo de nuevo</string>
 	<string name="download_button">Descargar</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 53aedf37bc..df863eaae6 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -66,20 +66,20 @@
 	<string name="continue_download">ادامه</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s دانلود با شکست مواجه شد</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">اضافه کردن مجموعه جدید</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">رنگ نشانه</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">نشانه ها</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">مکان من</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">نام</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">ادرس</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">مجموعه</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">مجموعه</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">تنظیمات</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -355,8 +355,6 @@
 	<string name="show">نمایش</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">مخفی کردن</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">تغیر نام</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">برنامه ریزی مسیر ناموفق</string>
 	<!-- Arrive routing message in navigation view -->
@@ -602,9 +600,10 @@
 	<string name="setting_emulate_bad_storage">شبیه سازی ذخیره سازی بد</string>
 	<string name="core_entrance">ورودی</string>
 	<string name="error_enter_correct_name">لطفا نام صحیح را وارد کنید</string>
-	<string name="bookmarks_groups">لیست ها</string>
-	<string name="bookmarks_groups_hide_all">پنهان کردن همه</string>
-	<string name="bookmarks_groups_show_all">نمایش همه</string>
+	<string name="bookmark_lists">لیست ها</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">پنهان کردن همه</string>
+	<string name="bookmark_lists_show_all">نمایش همه</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="one">%d نشانه</item>
 	  <item quantity="other">%d نشانه‌ها</item>
@@ -670,8 +669,7 @@
 	<string name="hide_from_map">پنهان کردن از نقشه</string>
 	<string name="public_access">دسترسی عمومی</string>
 	<string name="limited_access">دسترسی محدود</string>
-	<string name="bookmark_category_name">دسته بندی</string>
-	<string name="bookmark_category_description_hint">یک توضیح (متن یا html) تایپ نمایید</string>
+	<string name="bookmark_list_description_hint">یک توضیح (متن یا html) تایپ نمایید</string>
 	<string name="not_shared">خصوصی</string>
 	<string name="tags_loading_error_subtitle">هنگام بارگذاری برچسب خطایی رخ داد، لطفا دوباره امتحان کنید</string>
 	<string name="download_button">دانلود</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 8fba87e051..7509d36ba5 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">Jatka</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s lataus epäonnistui</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Lisää uusi valikoima</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Kirjanmerkin väri</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Kirjanmerkkivalikoiman nimi</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Kirjanmerkkivalikoimat</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Kirjanmerkit</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Paikkani</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nimi</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Osoite</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Aseta</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Aseta</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Asetukset</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">Poliisi</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Muistiinpanot</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Jaetut Organic Maps-kirjanmerkit</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Ladataan kirjanmerkkejä</string>
@@ -370,8 +370,6 @@
 	<string name="show">Näytä</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Piilota</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Nimeä uudelleen</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Reitin suunnittelu epäonnistui</string>
 	<!-- Arrive routing message in navigation view -->
@@ -618,9 +616,10 @@
 	<string name="setting_emulate_bad_storage">Jäljittele virheellistä tallennustilaa</string>
 	<string name="core_entrance">Sisäänkäynti</string>
 	<string name="error_enter_correct_name">Anna oikea nimi</string>
-	<string name="bookmarks_groups">Listat</string>
-	<string name="bookmarks_groups_hide_all">Piilota kaikki</string>
-	<string name="bookmarks_groups_show_all">Näytä kaikki</string>
+	<string name="bookmark_lists">Listat</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Piilota kaikki</string>
+	<string name="bookmark_lists_show_all">Näytä kaikki</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d kirjanmerkkiä</item>
 	</plurals>
@@ -683,8 +682,7 @@
 	<string name="hide_from_map">Piilota kartalta</string>
 	<string name="public_access">Julkinen pääsy</string>
 	<string name="limited_access">Yksityinen pääsy</string>
-	<string name="bookmark_category_name">Kategoria</string>
-	<string name="bookmark_category_description_hint">Lisää kuvaus (teksti tai html)</string>
+	<string name="bookmark_list_description_hint">Lisää kuvaus (teksti tai html)</string>
 	<string name="not_shared">Henkilökohtainen</string>
 	<string name="tags_loading_error_subtitle">Tunnisteiden lataamisen aikana tapahtui virhe, yritä uudelleen</string>
 	<string name="download_button">Ladata</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 2402e0be62..3f2c0accd9 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">Continuer</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s, échec lors du téléchargement</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Ajouter un nouveau groupe</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Couleur du signet</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nom du groupe de signets</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Groupes de signets</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Signets</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mes endroits</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nom</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresse</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Groupe</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Groupe</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Paramètres</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">Police</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notes</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Signets Organic Maps partagés</string>
 	<string name="share_bookmarks_email_body">Bonjour !\n\nVous trouverez ci-joint mes signets de l\'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l\'avez pas, téléchargez l\'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz\n\nBon voyage avec Organic Maps !</string>
 	<!-- message title of loading file -->
@@ -373,8 +373,6 @@
 	<string name="show">Afficher</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Masquer</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Renommer</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">La planification de l\'itinéraire a échoué</string>
 	<!-- Arrive routing message in navigation view -->
@@ -628,9 +626,10 @@
 	<string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
 	<string name="core_entrance">Entrée</string>
 	<string name="error_enter_correct_name">Veuillez entrer un nom correct</string>
-	<string name="bookmarks_groups">Listes</string>
-	<string name="bookmarks_groups_hide_all">Tout masquer</string>
-	<string name="bookmarks_groups_show_all">Tout afficher</string>
+	<string name="bookmark_lists">Listes</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Tout masquer</string>
+	<string name="bookmark_lists_show_all">Tout afficher</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d signets</item>
 	</plurals>
@@ -696,8 +695,7 @@
 	<string name="hide_from_map">Masquer de la carte</string>
 	<string name="public_access">Accès publique</string>
 	<string name="limited_access">Accès limité</string>
-	<string name="bookmark_category_name">Catégorie</string>
-	<string name="bookmark_category_description_hint">Tapez une description (texte ou html)</string>
+	<string name="bookmark_list_description_hint">Tapez une description (texte ou html)</string>
 	<string name="not_shared">Personnel</string>
 	<string name="tags_loading_error_subtitle">Une erreur s\'est produite lors du chargement des tags, veuillez réessayer</string>
 	<string name="download_button">Téléchargez</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 16fbcbc619..31b90529bb 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Folytatás</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s letöltése sikertelen</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Új csoport létrehozása</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Könyvjelző színe</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Könyvjelzőcsoport neve</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Könyvjelzőcsoportok</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Könyvjelzők</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Saját helyeim</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Név</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Cím</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Csoport</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Csoport</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Beállítások</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Rendőrség</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Jegyzetek</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Egy Organic Maps könyvjelzőt osztottak meg Önnel</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Könyvjelzők letöltése</string>
@@ -364,8 +364,6 @@
 	<string name="show">Mutat</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Elrejt</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Átnevez</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Sikertelen útvonaltervezés</string>
 	<!-- Arrive routing message in navigation view -->
@@ -611,9 +609,10 @@
 	<string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>
 	<string name="core_entrance">Bejárat</string>
 	<string name="error_enter_correct_name">Kérjük adja meg a helyes nevet</string>
-	<string name="bookmarks_groups">List</string>
-	<string name="bookmarks_groups_hide_all">Összes elrejtése</string>
-	<string name="bookmarks_groups_show_all">Összes megjelenítése</string>
+	<string name="bookmark_lists">List</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Összes elrejtése</string>
+	<string name="bookmark_lists_show_all">Összes megjelenítése</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">könyvjelzők %d</item>
 	</plurals>
@@ -674,8 +673,7 @@
 	<string name="hide_from_map">Lefedés a térképen</string>
 	<string name="public_access">Nyílt hozzáférés</string>
 	<string name="limited_access">Személyes hozzáférés</string>
-	<string name="bookmark_category_name">Kategória</string>
-	<string name="bookmark_category_description_hint">Leírás hozzáadása (szöveg vagy html)</string>
+	<string name="bookmark_list_description_hint">Leírás hozzáadása (szöveg vagy html)</string>
 	<string name="not_shared">Privát</string>
 	<string name="tags_loading_error_subtitle">A tag-ek feltöltésekor hiba történt, kérjük próbálja meg még egyszer</string>
 	<string name="download_button">Letöltés</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index ecc9800a6f..ddabf537df 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">Lanjutkan</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s gagal diunduh</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Tambahkan Set baru</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Warna Penanda</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nama Set Penanda</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Set Penanda</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Penanda</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Tempat-tempat Saya</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nama</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Alamat</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Set</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Set</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Pengaturan</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">Polisi</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Catatan</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Bagikan penanda Organic Maps</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Memuat Penanda</string>
@@ -366,8 +366,6 @@
 	<string name="show">Tampilkan</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Sembunyikan</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Ubah nama</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Sudah sampai di tujuan</string>
 	<!-- Arrive routing message in navigation view -->
@@ -614,9 +612,10 @@
 	<string name="setting_emulate_bad_storage">Emulasi penyimpanan yang buruk</string>
 	<string name="core_entrance">Tempat masuk</string>
 	<string name="error_enter_correct_name">Harap masukkan nama yang benar</string>
-	<string name="bookmarks_groups">Daftar</string>
-	<string name="bookmarks_groups_hide_all">Sembunyikan semua</string>
-	<string name="bookmarks_groups_show_all">Perlihatkan semua</string>
+	<string name="bookmark_lists">Daftar</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Sembunyikan semua</string>
+	<string name="bookmark_lists_show_all">Perlihatkan semua</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d markah</item>
 	</plurals>
@@ -677,8 +676,7 @@
 	<string name="hide_from_map">Sembunyikan dari peta</string>
 	<string name="public_access">Akses umum</string>
 	<string name="limited_access">Akses terbatas</string>
-	<string name="bookmark_category_name">Kategori</string>
-	<string name="bookmark_category_description_hint">Ketikkan deskripsi (teks atau html)</string>
+	<string name="bookmark_list_description_hint">Ketikkan deskripsi (teks atau html)</string>
 	<string name="not_shared">Pribadi</string>
 	<string name="tags_loading_error_subtitle">Kesalahan terjadi saat memuat tag, silakan coba lagi</string>
 	<string name="download_button">Unduh</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index d237e2890a..b45445c8ac 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -64,22 +64,22 @@
 	<string name="continue_download">Continua</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Il download di %s non è riuscito</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Aggiungi un nuovo Set</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Colore del Segnalibro</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Seleziona un nome del segnalibro</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Seleziona un segnalibro</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Segnalibri</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">I miei luoghi</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Indirizzo</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Seleziona</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Seleziona</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Impostazioni</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -132,7 +132,7 @@
 	<string name="police">Polizia</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Note</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Il segnalibri Organic Maps è stato condiviso con te</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Caricamento segnalibri in corso</string>
@@ -362,8 +362,6 @@
 	<string name="show">Mostra</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Nascondi</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Rinomina</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Pianificazione del percorso fallito</string>
 	<!-- Arrive routing message in navigation view -->
@@ -610,9 +608,10 @@
 	<string name="setting_emulate_bad_storage">Simula archivio danneggiato</string>
 	<string name="core_entrance">Ingresso</string>
 	<string name="error_enter_correct_name">Inserisci un nome corretto</string>
-	<string name="bookmarks_groups">Elenchi</string>
-	<string name="bookmarks_groups_hide_all">Nascondi tutto</string>
-	<string name="bookmarks_groups_show_all">Mostra tutto</string>
+	<string name="bookmark_lists">Elenchi</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Nascondi tutto</string>
+	<string name="bookmark_lists_show_all">Mostra tutto</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d preferiti</item>
 	</plurals>
@@ -673,8 +672,7 @@
 	<string name="hide_from_map">Nascondere sulla mappa</string>
 	<string name="public_access">Accesso pubblico</string>
 	<string name="limited_access">Accesso privato</string>
-	<string name="bookmark_category_name">Categoria</string>
-	<string name="bookmark_category_description_hint">Aggiungere la descrizione (testo o html)</string>
+	<string name="bookmark_list_description_hint">Aggiungere la descrizione (testo o html)</string>
 	<string name="not_shared">Personale</string>
 	<string name="tags_loading_error_subtitle">Si è verificato un errore durante il caricamento dei tag. Si prega di riprovare</string>
 	<string name="download_button">Scaricare</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index b99272e316..858c797c4a 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">続行</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%sのダウンロードが失敗しました</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">新しいセットを作成</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">ブックマーク表示色</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">ブックマークセット名称</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">ブックマークセット</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">ブックマーク</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">マイロケーション</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名称</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">住所</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">セット</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">セット</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">設定</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">警察</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">メモ</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Mapsの位置情報シェア</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">ブックマークの読み込み中</string>
@@ -362,8 +362,6 @@
 	<string name="show">表示する</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">隠す</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">名前を変更する</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">ルート検索に失敗</string>
 	<!-- Arrive routing message in navigation view -->
@@ -610,9 +608,10 @@
 	<string name="setting_emulate_bad_storage">壊れたストレージをエミュレート</string>
 	<string name="core_entrance">入口</string>
 	<string name="error_enter_correct_name">正しい名前を入力してください</string>
-	<string name="bookmarks_groups">リスト</string>
-	<string name="bookmarks_groups_hide_all">すべて非表示</string>
-	<string name="bookmarks_groups_show_all">すべて表示</string>
+	<string name="bookmark_lists">リスト</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">すべて非表示</string>
+	<string name="bookmark_lists_show_all">すべて表示</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d個のブックマーク</item>
 	</plurals>
@@ -672,8 +671,7 @@
 	<string name="hide_from_map">マップから隠す</string>
 	<string name="public_access">パブリック・アクセス</string>
 	<string name="limited_access">制限されたアクセス</string>
-	<string name="bookmark_category_name">カテゴリ</string>
-	<string name="bookmark_category_description_hint">説明(テキストまたはhtml)を記入してください</string>
+	<string name="bookmark_list_description_hint">説明(テキストまたはhtml)を記入してください</string>
 	<string name="not_shared">非公開</string>
 	<string name="tags_loading_error_subtitle">タグのロード中にエラーが起きました。もう一度やり直してください</string>
 	<string name="download_button">ダウンロード</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 52e5404a28..2fdac9a638 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">계속</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s다운로드가 실패했습니다</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">새로운 세트 추가</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">색상 즐겨찾기에 추가</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">집합 이름을 즐겨찾기에 추가</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">세트를 즐겨찾기에 추가</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">북마크</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">내 장소</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">이름</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">주소</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">집합</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">집합</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">설정</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">치안대</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">메모</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">귀하와 공유된 Organic Maps 즐겨찾기</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">즐겨찾기 로드</string>
@@ -364,8 +364,6 @@
 	<string name="show">표시</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">숨기기</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">다른 이름으로 변경</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">경로 계획 실패</string>
 	<!-- Arrive routing message in navigation view -->
@@ -612,9 +610,10 @@
 	<string name="setting_emulate_bad_storage">불량 저장소 에뮬레이션</string>
 	<string name="core_entrance">입구</string>
 	<string name="error_enter_correct_name">올바른 이름을 입력하세요.</string>
-	<string name="bookmarks_groups">기울기</string>
-	<string name="bookmarks_groups_hide_all">모두 숨기기</string>
-	<string name="bookmarks_groups_show_all">모두 표시</string>
+	<string name="bookmark_lists">기울기</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">모두 숨기기</string>
+	<string name="bookmark_lists_show_all">모두 표시</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d 북마크</item>
 	</plurals>
@@ -674,8 +673,7 @@
 	<string name="hide_from_map">지도에서 숨기기</string>
 	<string name="public_access">일반 접근</string>
 	<string name="limited_access">제한 접근</string>
-	<string name="bookmark_category_name">범주</string>
-	<string name="bookmark_category_description_hint">묘사를 적으세요 (글자 혹은 html)</string>
+	<string name="bookmark_list_description_hint">묘사를 적으세요 (글자 혹은 html)</string>
 	<string name="not_shared">개인</string>
 	<string name="tags_loading_error_subtitle">태그를 불러오는 중 에러가 발생했습니다. 다시 시도해보세요</string>
 	<string name="download_button">다운로드</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 6e34d538da..f095cd64e2 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">Fortsett</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Nedlasting av %s mislyktes</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Legg til nytt sett</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bokmerk farge</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Bokmerk settnavn</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Bokmerk sett</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Bokmerker</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mine steder</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Navn</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresse</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Sett</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Sett</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Innstillinger</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">Politi</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Merknader</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Delte Organic Maps-bokmerker</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Laster inn bokmerker</string>
@@ -366,8 +366,6 @@
 	<string name="show">Vis</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Skjul</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Nytt navn</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Mislykket ruteplanlegging</string>
 	<!-- Arrive routing message in navigation view -->
@@ -612,9 +610,10 @@
 	<string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
 	<string name="core_entrance">Inngang</string>
 	<string name="error_enter_correct_name">Skriv inn korrekt navn</string>
-	<string name="bookmarks_groups">Lister</string>
-	<string name="bookmarks_groups_hide_all">Skjul alle</string>
-	<string name="bookmarks_groups_show_all">Vis alle</string>
+	<string name="bookmark_lists">Lister</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Skjul alle</string>
+	<string name="bookmark_lists_show_all">Vis alle</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d bokmerker</item>
 	</plurals>
@@ -653,8 +652,7 @@
 	<string name="hide_from_map">Skjul fra kart</string>
 	<string name="public_access">Offentlig tilgang</string>
 	<string name="limited_access">Begrenset adgang</string>
-	<string name="bookmark_category_name">Kategori</string>
-	<string name="bookmark_category_description_hint">Lag en beskrivelse (text or html)</string>
+	<string name="bookmark_list_description_hint">Lag en beskrivelse (text or html)</string>
 	<string name="not_shared">Privat</string>
 	<string name="tags_loading_error_subtitle">Det oppsto en feil under lasting av emneknagger, prøv igjen</string>
 	<string name="download_button">Last ned</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 1c87b5d97e..85b96591f7 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -61,24 +61,24 @@
 	<string name="continue_download">Doorgaan</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s download is mislukt</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Voeg nieuwe groep toe</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bladwijzer-kleur</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Naam van bladwijzergroep</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Bladwijzergroepen</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Bladwijzers</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mijn plaatsen</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Naam</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adres</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Groep</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Groep</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Instellingen</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -131,7 +131,7 @@
 	<string name="police">Politie</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notities</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Bladwijzers van Organic Maps met u gedeeld</string>
 	<string name="share_bookmarks_email_body">Hallo!\n\nBijgesloten zijn mijn bladwijzers uit de Organic Maps app. Open ze als je Organic Maps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://omaps.app/get?kmz\n\nGeniet van het reizen met Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -368,8 +368,6 @@
 	<string name="show">Tonen</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Verbergen</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Naam wijzigen</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Routeberekening mislukt</string>
 	<!-- Arrive routing message in navigation view -->
@@ -616,9 +614,10 @@
 	<string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
 	<string name="core_entrance">Ingang</string>
 	<string name="error_enter_correct_name">Voer een juiste naam in</string>
-	<string name="bookmarks_groups">lijsten</string>
-	<string name="bookmarks_groups_hide_all">Alles verbergen</string>
-	<string name="bookmarks_groups_show_all">Alles weergeven</string>
+	<string name="bookmark_lists">lijsten</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Alles verbergen</string>
+	<string name="bookmark_lists_show_all">Alles weergeven</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d bladwijzers</item>
 	</plurals>
@@ -679,8 +678,7 @@
 	<string name="hide_from_map">Van de kaart verbergen</string>
 	<string name="public_access">Publiek toegang</string>
 	<string name="limited_access">Beperkte toegang</string>
-	<string name="bookmark_category_name">Categorie</string>
-	<string name="bookmark_category_description_hint">Maak een beschrijving aan (tekst of html)</string>
+	<string name="bookmark_list_description_hint">Maak een beschrijving aan (tekst of html)</string>
 	<string name="not_shared">Privé</string>
 	<string name="tags_loading_error_subtitle">Er is een fout opgetreden tijdens het laden van tags, probeer het opnieuw</string>
 	<string name="download_button">Downloaden</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index de7c35c58a..dea3a6ef61 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Kontynuuj</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Nie udało się pobrać %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Dodaj nowy zestaw</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Kolor zakładki</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nazwa zestawu zakładek</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Zestawy zakładek</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Zakładki</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miejsca</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nazwa</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adres</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Zestaw</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Zestaw</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Ustawienia</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Policja</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notatki</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Udostępnione zakładki z Organic Maps</string>
 	<string name="share_bookmarks_email_body">Cześć!\n\nZałączam moje zakładki z aplikacji Organic Maps. Proszę otwórz je jeżeli masz zaintalowane Organic Maps. Lub, jeżeli nie masz, pobierz aplikację na swoje urządzenie iOS/Android za pomocą tego linka: https://omaps.app/get?kmz\n\nMiłego podróżowania z Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -371,8 +371,6 @@
 	<string name="show">Pokaż</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ukryj</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Zmień nazwę</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Planowanie trasy nieudane</string>
 	<!-- Arrive routing message in navigation view -->
@@ -624,9 +622,10 @@
 	<string name="setting_emulate_bad_storage">Emuluj wadliwą pamięć masową</string>
 	<string name="core_entrance">Wejście</string>
 	<string name="error_enter_correct_name">Wprowadź poprawną nazwę</string>
-	<string name="bookmarks_groups">Listy</string>
-	<string name="bookmarks_groups_hide_all">Ukryj wszystkie</string>
-	<string name="bookmarks_groups_show_all">Pokaż wszystkie</string>
+	<string name="bookmark_lists">Listy</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ukryj wszystkie</string>
+	<string name="bookmark_lists_show_all">Pokaż wszystkie</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">Zakładki: %d</item>
 	</plurals>
@@ -691,8 +690,7 @@
 	<string name="hide_from_map">Ukryj mapy</string>
 	<string name="public_access">Dostęp publiczny</string>
 	<string name="limited_access">Dostęp prywatny</string>
-	<string name="bookmark_category_name">Kategoria</string>
-	<string name="bookmark_category_description_hint">Dodaj opis (tekst lub html)</string>
+	<string name="bookmark_list_description_hint">Dodaj opis (tekst lub html)</string>
 	<string name="not_shared">Osobisty</string>
 	<string name="tags_loading_error_subtitle">Wystąpił błąd podczas pobierania tagów, spróbuj ponownie</string>
 	<string name="download_button">Pobierz</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 27ad4a7906..34e7f6843a 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Continuar</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">O download de %s falhou</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Adicionar novo conjunto</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Cor do favorito</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nome do conjunto de favoritos</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Conjuntos de favoritos</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Favoritos</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Meus Locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nome</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Endereço</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Conjunto</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Conjunto</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Configurações</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Polícia</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notas</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Favoritos do Organic Maps foram compartilhados com você</string>
 	<string name="share_bookmarks_email_body">Olá!\n\nSegue em anexo meus favoritos do app Organic Maps. Por favor os abra se você tiver o Organic Maps instalado. Caso não tenha, baixe o app para o seu dispositivo iOS ou Android com o link https://omaps.app/get?kmz\n\nDisfrute viajar com o Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -368,8 +368,6 @@
 	<string name="show">Mostrar</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ocultar</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Renomear</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Falha no planejamento da rota</string>
 	<!-- Arrive routing message in navigation view -->
@@ -617,9 +615,10 @@
 	<string name="setting_emulate_bad_storage">Emular memória ruim</string>
 	<string name="core_entrance">Entrada</string>
 	<string name="error_enter_correct_name">Por favor, digite um nome correto</string>
-	<string name="bookmarks_groups">Listas</string>
-	<string name="bookmarks_groups_hide_all">Ocultar tudo</string>
-	<string name="bookmarks_groups_show_all">Exibir tudo</string>
+	<string name="bookmark_lists">Listas</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ocultar tudo</string>
+	<string name="bookmark_lists_show_all">Exibir tudo</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="one">%d favorito</item>
 	  <item quantity="other">%d favoritos</item>
@@ -687,8 +686,7 @@
 	<string name="hide_from_map">Esconder do mapa</string>
 	<string name="public_access">Acesso público</string>
 	<string name="limited_access">Acesso limitado</string>
-	<string name="bookmark_category_name">Categoria</string>
-	<string name="bookmark_category_description_hint">Digite uma descrição (texto ou html)</string>
+	<string name="bookmark_list_description_hint">Digite uma descrição (texto ou html)</string>
 	<string name="not_shared">Privado</string>
 	<string name="tags_loading_error_subtitle">Um erro ocorreu enquanto carregava as etiquetas, por favor, tente novamente</string>
 	<string name="download_button">Baixar</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index b551069a3f..1325658d1c 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Continuar</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">O descarregamento de %s falhou</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Adicionar conjunto novo</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Cor do favorito</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nome do conjunto de favoritos</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Conjuntos de favoritos</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Favoritos</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Os meus locais</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nome</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Endereço</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Conjunto</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Conjunto</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Configurações</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Polícia</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notas</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Os favoritos do Organic Maps foram partilhados consigo</string>
 	<string name="share_bookmarks_email_body">Olá!\n\nSegue em anexo os meus favoritos da aplicação Organic Maps. Por favor abra-os se tiver o Organic Maps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://omaps.app/get?kmz\n\nDivirta-se a viajar com o Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -371,8 +371,6 @@
 	<string name="show">Mostrar</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ocultar</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Alterar nome</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Falha no planeamento da rota</string>
 	<!-- Arrive routing message in navigation view -->
@@ -621,9 +619,10 @@
 	<string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
 	<string name="core_entrance">Entrada</string>
 	<string name="error_enter_correct_name">Introduza um nome correto</string>
-	<string name="bookmarks_groups">Listas</string>
-	<string name="bookmarks_groups_hide_all">Ocultar tudo</string>
-	<string name="bookmarks_groups_show_all">Mostrar tudo</string>
+	<string name="bookmark_lists">Listas</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ocultar tudo</string>
+	<string name="bookmark_lists_show_all">Mostrar tudo</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="one">%d favorito</item>
 	  <item quantity="other">%d favoritos</item>
@@ -691,8 +690,7 @@
 	<string name="hide_from_map">Remover do mapa</string>
 	<string name="public_access">Acesso público</string>
 	<string name="limited_access">Acesso limitado</string>
-	<string name="bookmark_category_name">Categoria</string>
-	<string name="bookmark_category_description_hint">Introduza uma descrição (texto ou html)</string>
+	<string name="bookmark_list_description_hint">Introduza uma descrição (texto ou html)</string>
 	<string name="not_shared">Privado</string>
 	<string name="tags_loading_error_subtitle">Surgiu um erro ao carregar as etiquetas, por favor tente novamente</string>
 	<string name="download_button">Descarregar</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index c43004e468..91a1e19d1e 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Continuă</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Descărcarea %s nu a reușit</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Adăugare la „Marcaje”</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Culoare marcaj</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Nume set marcaje</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Seturi marcaje</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Marcaje</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Locurile mele</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Nume</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresă</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Set</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Set</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Setări</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Poliție</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Note</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Marcaje Organic Maps partajate</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Se încarcă marcajele</string>
@@ -363,8 +363,6 @@
 	<string name="show">Afișare</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ascundere</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Redenumire</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Planificarea rutei a eșuat</string>
 	<!-- Arrive routing message in navigation view -->
@@ -611,9 +609,10 @@
 	<string name="setting_emulate_bad_storage">Emulare stocare eronată</string>
 	<string name="core_entrance">Intrare</string>
 	<string name="error_enter_correct_name">Introdu un nume corect</string>
-	<string name="bookmarks_groups">Liste</string>
-	<string name="bookmarks_groups_hide_all">Ascundere toate</string>
-	<string name="bookmarks_groups_show_all">Afișare toate</string>
+	<string name="bookmark_lists">Liste</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ascundere toate</string>
+	<string name="bookmark_lists_show_all">Afișare toate</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d semne de carte</item>
 	</plurals>
@@ -674,8 +673,7 @@
 	<string name="hide_from_map">Ascundeți de pe hartă</string>
 	<string name="public_access">Acces public</string>
 	<string name="limited_access">Acces privat</string>
-	<string name="bookmark_category_name">Categorie</string>
-	<string name="bookmark_category_description_hint">Adăugați o descriere (text sau html)</string>
+	<string name="bookmark_list_description_hint">Adăugați o descriere (text sau html)</string>
 	<string name="not_shared">Personal</string>
 	<string name="tags_loading_error_subtitle">În timpul încărcării tag-urilor s-a produs o eroare, vă rugăm să încercați încă odată</string>
 	<string name="download_button">Descărcați</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 1ef0515b7e..1b93b24e00 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -67,24 +67,24 @@
 	<string name="continue_download">Продолжить</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Не удалось загрузить %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Добавить группу</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Цвет метки</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Название группы</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Группы меток</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Метки</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мои Метки</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Название</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Адрес</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Группа</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Группа</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Настройки</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -137,7 +137,7 @@
 	<string name="police">Полиция</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Примечание</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">С вами поделились метками Organic Maps</string>
 	<string name="share_bookmarks_email_body">Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://omaps.app/get?kmz\n\nСпасибо!</string>
 	<!-- message title of loading file -->
@@ -374,8 +374,6 @@
 	<string name="show">Показать</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Скрыть</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Переименовать</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Ошибка построения маршрута</string>
 	<!-- Arrive routing message in navigation view -->
@@ -632,9 +630,10 @@
 	<string name="setting_emulate_bad_storage">Эмуляция ошибки с внешней памятью</string>
 	<string name="core_entrance">Вход</string>
 	<string name="error_enter_correct_name">Пожалуйста, введите название правильно</string>
-	<string name="bookmarks_groups">Списки</string>
-	<string name="bookmarks_groups_hide_all">Спрятать все</string>
-	<string name="bookmarks_groups_show_all">Показать все</string>
+	<string name="bookmark_lists">Списки</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Спрятать все</string>
+	<string name="bookmark_lists_show_all">Показать все</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="few">%d метки</item>
 	  <item quantity="one">%d метка</item>
@@ -710,8 +709,7 @@
 	<string name="hide_from_map">Скрыть с карты</string>
 	<string name="public_access">Публичный доступ</string>
 	<string name="limited_access">Ограниченный доступ</string>
-	<string name="bookmark_category_name">Категория</string>
-	<string name="bookmark_category_description_hint">Добавьте описание (текст или html)</string>
+	<string name="bookmark_list_description_hint">Добавьте описание (текст или html)</string>
 	<string name="not_shared">Личный</string>
 	<string name="tags_loading_error_subtitle">Во время загрузки тегов произошла ошибка, пожалуйста, попробуйте еще раз</string>
 	<string name="download_button">Скачать</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index e9bf99d9b3..fb92e1bbb2 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Pokračovať</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Sťahovanie zlyhalo: %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Pridať novú skupinu záložiek</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Farba záložky</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Meno záložky</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Skupiny záložiek</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Záložky</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Moje miesta</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Názov</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adresa</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Skupina</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Skupina</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Nastavenia</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Polícia</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Poznámky</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Zdielané záložky Organic Maps</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Načítavanie záložiek</string>
@@ -362,8 +362,6 @@
 	<string name="show">Ukázať</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Skryť</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Premenovať</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Plánovanie trasy zlyhalo</string>
 	<!-- Arrive routing message in navigation view -->
@@ -610,9 +608,10 @@
 	<string name="setting_emulate_bad_storage">Imitovať poškodené úložisko</string>
 	<string name="core_entrance">Vchod  | vjazd</string>
 	<string name="error_enter_correct_name">Prosím, zadajte správne meno</string>
-	<string name="bookmarks_groups">Zoznamy</string>
-	<string name="bookmarks_groups_hide_all">Skryť všetko</string>
-	<string name="bookmarks_groups_show_all">Zobraziť všetko</string>
+	<string name="bookmark_lists">Zoznamy</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Skryť všetko</string>
+	<string name="bookmark_lists_show_all">Zobraziť všetko</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d záložiek</item>
 	</plurals>
@@ -674,8 +673,7 @@
 	<string name="hide_from_map">Skryť z mapy</string>
 	<string name="public_access">Verejný prístup</string>
 	<string name="limited_access">Obmedzený prístup</string>
-	<string name="bookmark_category_name">Kategória</string>
-	<string name="bookmark_category_description_hint">Zadajte popis (text alebo html)</string>
+	<string name="bookmark_list_description_hint">Zadajte popis (text alebo html)</string>
 	<string name="not_shared">Súkromné</string>
 	<string name="tags_loading_error_subtitle">Počas načítavania značiek sa vyskytla chyba, skúste to znova</string>
 	<string name="download_button">Stiahnuť</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index b8e8b07024..e7e55c379e 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Fortsätt</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s nedladdning misslyckades</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Lägg till ny samling</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bokmärkesfärg</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Bokmärkessamlingens namn</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Bokmärkessamlingar</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Bokmärken</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Mina Platser</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Namn</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adress</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Samling</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Samling</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Inställningar</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Polis</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Anteckningar</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps bokmärken har delats med dig</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Läser in bokmärken</string>
@@ -362,8 +362,6 @@
 	<string name="show">Visa</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Göm</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Byt namn</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Ruttplanering misslyckades</string>
 	<!-- Arrive routing message in navigation view -->
@@ -610,9 +608,10 @@
 	<string name="setting_emulate_bad_storage">Emulera dålig lagring</string>
 	<string name="core_entrance">Ingång</string>
 	<string name="error_enter_correct_name">Ange ett korrekt namn</string>
-	<string name="bookmarks_groups">Listor</string>
-	<string name="bookmarks_groups_hide_all">Dölj alla</string>
-	<string name="bookmarks_groups_show_all">Visa alla</string>
+	<string name="bookmark_lists">Listor</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Dölj alla</string>
+	<string name="bookmark_lists_show_all">Visa alla</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d bokmärken</item>
 	</plurals>
@@ -673,8 +672,7 @@
 	<string name="hide_from_map">Dölj från kort</string>
 	<string name="public_access">Allmänhetens åtkomst</string>
 	<string name="limited_access">Privat åtkomst</string>
-	<string name="bookmark_category_name">Kategori</string>
-	<string name="bookmark_category_description_hint">Lägg till en beskrivning (text eller html)</string>
+	<string name="bookmark_list_description_hint">Lägg till en beskrivning (text eller html)</string>
 	<string name="not_shared">Personlig</string>
 	<string name="tags_loading_error_subtitle">Ett fel uppstod när du laddar taggarna, försök igen</string>
 	<string name="download_button">Nedladdning</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 9c7acfac1c..131e154252 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -66,24 +66,24 @@
 	<string name="continue_download">ดำเนินการต่อ</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">การดาวน์โหลด %s ล้มเหลว</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">เพิ่มชุดใหม่</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">สีของบุ๊กมาร์ก</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">ชื่อของชุดบุ๊กมาร์ก</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">ชุดของบุ๊กมาร์ก</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">บุ๊กมาร์ก</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">สถานที่ของฉัน</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">ชื่อ</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">ที่อยู่</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">ชุด</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">ชุด</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">การตั้งค่า</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -136,7 +136,7 @@
 	<string name="police">ตำรวจ</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">บันทึก</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">แชร์บุ๊กมาร์กของ Organic Maps แล้ว</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">กำลังโหลดบุ๊กมาร์ก</string>
@@ -366,8 +366,6 @@
 	<string name="show">แสดง</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">ซ่อน</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">เปลี่ยนชื่อ</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">การวางแผนเส้นทางล้มเหลว</string>
 	<!-- Arrive routing message in navigation view -->
@@ -614,9 +612,10 @@
 	<string name="setting_emulate_bad_storage">จำลองแบบที่เก็บข้อมูลที่ไม่ดี</string>
 	<string name="core_entrance">ทางเข้า</string>
 	<string name="error_enter_correct_name">กรุณาใส่ชื่อที่ถูกต้อง</string>
-	<string name="bookmarks_groups">รายการ</string>
-	<string name="bookmarks_groups_hide_all">ซ่อนทั้งหมด</string>
-	<string name="bookmarks_groups_show_all">แสดงทั้งหมด</string>
+	<string name="bookmark_lists">รายการ</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">ซ่อนทั้งหมด</string>
+	<string name="bookmark_lists_show_all">แสดงทั้งหมด</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d บุ๊กมาร์ก</item>
 	</plurals>
@@ -676,8 +675,7 @@
 	<string name="hide_from_map">ซ่อนจากแผนที่</string>
 	<string name="public_access">เข้าถึงได้โดยสาธารณะ</string>
 	<string name="limited_access">จำกัดการเข้าถึง</string>
-	<string name="bookmark_category_name">หมวดหมู่</string>
-	<string name="bookmark_category_description_hint">พิมพ์รายละเอียด (ข้อความหรือ html)</string>
+	<string name="bookmark_list_description_hint">พิมพ์รายละเอียด (ข้อความหรือ html)</string>
 	<string name="not_shared">ส่วนตัว</string>
 	<string name="tags_loading_error_subtitle">เกิดข้อผิดพลาดขณะโหลดแท็ก โปรดลองใหม่อีกครั้ง</string>
 	<string name="download_button">ดาวน์โหลด</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index c191e05510..c0897cd93b 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -46,7 +46,7 @@
 	<!-- Message to display at the center of the screen when the country download has failed -->
 	<string name="country_status_download_failed">Indirme işlemi başarısız oldu</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
-	<string name="try_again">Tekrar Deneyin</string>
+	<string name="try_again">Tekrar Dene</string>
 	<string name="about_menu_title">Organic Maps Hakkında</string>
 	<string name="connection_settings">Bağlantı Ayarları</string>
 	<string name="close">Kapat</string>
@@ -66,46 +66,46 @@
 	<string name="continue_download">Devam</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s indirme işlemi başarısız oldu</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Yeni Ayar ekle</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Yer İmi Rengi</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
-	<string name="bookmark_set_name">Yer İmi Adını Ayarla</string>
-	<!-- Bookmark Sets dialog title -->
-	<string name="bookmark_sets">Yer İmi Ayarları</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
+	<string name="bookmark_set_name">Yer İmi Listesi Adı</string>
+	<!-- "Bookmark Lists" dialog title -->
+	<string name="bookmark_sets">Yer İmi Listeleri</string>
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Yer İmleri</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Yerlerim</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Adı</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Adres</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Ayarla</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Liste</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Ayarlar</string>
 	<!-- Header of settings activity where user defines storage path -->
-	<string name="maps_storage">Haritaları depolama</string>
+	<string name="maps_storage">Haritaları şuraya kaydet:</string>
 	<!-- Detailed description of Maps Storage settings button -->
 	<string name="maps_storage_summary">Haritaların indirileceği yeri seçin</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
-	<string name="move_maps">Haritaları taşı?</string>
+	<string name="move_maps">Haritalar taşınsın mı?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Bu işlem birkaç dakika sürebilir.\nLütfen bekleyin…</string>
 	<!-- Measurement units title in settings activity -->
-	<string name="measurement_units">Ölçü Birimleri</string>
+	<string name="measurement_units">Ölçü birimleri</string>
 	<!-- Detailed description of Measurement Units settings button -->
 	<string name="measurement_units_summary">Mil veya kilometre seçimini yap</string>
 	<!-- Search category for cafes, bars, restaurants -->
 	<string name="eat">Nerede yenir</string>
 	<!-- Search category for grocery stores -->
-	<string name="food">Bakkaliye</string>
+	<string name="food">Market</string>
 	<!-- Search category -->
 	<string name="transport">Ulaşım</string>
 	<!-- Search category -->
-	<string name="fuel">Benzin</string>
+	<string name="fuel">Yakıt</string>
 	<!-- Search category -->
 	<string name="parking">Otopark</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops -->
@@ -129,15 +129,16 @@
 	<!-- Search category -->
 	<string name="hospital">Hastane</string>
 	<!-- Search category -->
-	<string name="toilet">Tuvalet</string>
+	<string name="toilet">WC</string>
 	<!-- Search category -->
 	<string name="post">Posta</string>
 	<!-- Search category -->
 	<string name="police">Polis</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notlar</string>
-	<!-- Email Subject when sharing bookmarks category -->
-	<string name="share_bookmarks_email_subject">Paylaşılan Organic Maps yer imleri</string>
+	<!-- Email Subject when sharing bookmark list -->
+	<string name="share_bookmarks_email_subject">Seninle paylaşılan Organic Maps yer imleri</string>
+	<string name="share_bookmarks_email_body">Merhaba!\n\nEktekiler benim Organic Maps yer imlerim. Eğer Organic Maps\'i yüklediyseniz lütfen ektekileri açın. Eğer yüklemediyseniz, bu bağlantıyı takip ederek iOS ve Android cihazınız için uygulamayı yükleyebilirsiniz: https://omaps.app/get?kmz\n\nOrganic Maps ile seyahat etmenin keyfini çıkarın!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Yer İmleri Yükleniyor</string>
 	<!-- Kmz file successful loading -->
@@ -151,13 +152,13 @@
 	<!-- Alert message that we can't run Map Storage settings due to some reasons. -->
 	<string name="cant_change_this_setting">Üzgünüz, Harita Depolama ayarları şu anda devre dışı.</string>
 	<!-- Alert message that downloading is in progress. -->
-	<string name="downloading_is_active">Ülke indirme işlemi şu anda sürüyor.</string>
+	<string name="downloading_is_active">Harita indirme işlemi şu anda sürüyor.</string>
 	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Hey, Organic Maps’de geçerli konumumu incele! %1$s veya %2$s Çevrimiçi haritalar sende yok mu? Buradan indir: https://omaps.app/get</string>
+	<string name="my_position_share_sms">Hey, Organic Maps’te geçerli konumumu incele! %1$s veya %2$s Çevrimdışı haritalar sende yok mu? Buradan indir: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hey, Organic Maps haritasında pinimi incele!</string>
 	<!-- Subject for emailed position -->
-	<string name="my_position_share_email_subject">Hey, Organic Maps’de geçerli konumumu incele!</string>
+	<string name="my_position_share_email_subject">Hey, Organic Maps’te geçerli konumumu incele!</string>
 	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Merhaba,\n\nŞu anda bulunduğum yer: %1$s. Yeri haritada görmek için bu bağlantıya %2$s veya şuna %3$s tıkla.\n\nTeşekkürler.</string>
 	<!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
@@ -172,16 +173,22 @@
 	<string name="done">Bitti</string>
 	<!-- Prints version number in About dialog -->
 	<string name="version">Sürüm: %s</string>
+	<!-- Data version in «About» screen -->
+	<string name="data_version">Veri sürümü: %d</string>
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Devam etmek istediğinizden emin misiniz?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks_title">Parçalar</string>
+	<string name="tracks_title">Kayıtlar</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Uzunluk</string>
 	<string name="share_my_location">Yerimi paylaş</string>
+	<!-- Settings general group in settings screen -->
+	<string name="prefs_group_general">Genel ayarlar</string>
+	<!-- Settings information group in settings screen -->
+	<string name="prefs_group_information">Bilgi</string>
 	<string name="prefs_group_route">Navigasyon</string>
 	<string name="pref_zoom_title">Yakınlaştırma butonları</string>
-	<string name="pref_zoom_summary">Ekranda göster</string>
+	<string name="pref_zoom_summary">Haritada göster</string>
 	<!-- Settings «Map» category: «Night style» title -->
 	<string name="pref_map_style_title">Gece Modu</string>
 	<!-- «Map style» entry value -->
@@ -193,7 +200,7 @@
 	<!-- Settings «Map» category: «Perspective view» title -->
 	<string name="pref_map_3d_title">Perspektif görünüm</string>
 	<!-- Settings «Map» category: «3D buildings» title -->
-	<string name="pref_map_3d_buildings_title">3 Boyutlu Binalar</string>
+	<string name="pref_map_3d_buildings_title">3D yapılar</string>
 	<!-- Settings «Route» category: «Tts enabled» title -->
 	<string name="pref_tts_enable_title">Sesli Talimatlar</string>
 	<!-- Settings «Route» category: «Tts language» title -->
@@ -203,7 +210,7 @@
 	<!-- Title for "Other" section in TTS settings. -->
 	<string name="pref_tts_other_section_title">Diğer</string>
 	<!-- Settings «Map» category: «Record track» title -->
-	<string name="pref_track_record_title">En son yol</string>
+	<string name="pref_track_record_title">En sonki kayıt</string>
 	<string name="pref_map_auto_zoom">Otomatik yakınlaştırma</string>
 	<string name="duration_disabled">Kapalı</string>
 	<string name="duration_1_hour">1 saat</string>
@@ -223,9 +230,9 @@
 	<!-- Text in menu -->
 	<string name="help">Yardım</string>
 	<!-- Button in the main Help dialog -->
-	<string name="faq">Sorular ve cevaplar</string>
+	<string name="faq">Sıkça Sorulan Sorular</string>
 	<!-- Button in the main Help dialog -->
-	<string name="how_to_support_us">Bizi nasıl destekleyebilirim?</string>
+	<string name="how_to_support_us">Sizi nasıl destekleyebilirim?</string>
 	<!-- Button in the main Help dialog -->
 	<string name="copyright">Telif hakkı</string>
 	<!-- Text in menu + Button in the main Help dialog -->
@@ -264,7 +271,7 @@
 	<!-- Context menu item for downloader. -->
 	<string name="downloader_download_map">Haritayı indir</string>
 	<!-- Item status in downloader. -->
-	<string name="downloader_retry">Tekrarla</string>
+	<string name="downloader_retry">Tekrar dene</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_delete_map">Haritayı Sil</string>
 	<!-- Item in context menu. -->
@@ -288,7 +295,7 @@
 	<!-- bookmark button text -->
 	<string name="bookmark">yer i̇mi</string>
 	<!-- location service disabled -->
-	<string name="enable_location_services">Lütfen Yer Hizmetlerini etkinleştirin</string>
+	<string name="enable_location_services">Lütfen Konum Hizmetlerini etkinleştirin</string>
 	<string name="save">Kaydet</string>
 	<string name="edit_description_hint">Açıklamalarınız (metin veya html)</string>
 	<string name="create">oluştur</string>
@@ -360,14 +367,12 @@
 	<string name="dialog_routing_download_cross_route">Bu haritanın bir kısmından geçen daha uygun bir güzergah oluşturmak için haritayı indirin.</string>
 
 	<!-- SECTION: Strings for downloading map from search -->
-	<string name="search_without_internet_advertisement">Rotaları aramak ve oluşturmaya başlamak için lütfen haritayı indirin ve artık internet bağlantısına ihtiyacınız yok.</string>
-	<string name="search_select_map">Haritayi Seçin</string>
+	<string name="search_without_internet_advertisement">Rotaları aramak ve oluşturmaya başlamak için lütfen haritayı indirin. İndirdikten sonra artık internet bağlantısına ihtiyacınız olmayacak.</string>
+	<string name="search_select_map">Haritayı Seçin</string>
 	<!-- «Show» context menu -->
 	<string name="show">Göster</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Gizle</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Yeniden Adlandır</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Rota Planlaması Başarısız</string>
 	<!-- Arrive routing message in navigation view -->
@@ -385,12 +390,14 @@
 	<string name="search_not_found">Üzgünüz, hiç bir şey bulamadık.</string>
 	<string name="search_not_found_query">Lütfen başka bir sorgu girin.</string>
 	<string name="search_history_title">Arama Geçmişi</string>
-	<string name="search_history_text">En son yapılan arama sorgularına hızlı erişim.</string>
-	<string name="clear_search">Arama geçmişini temizle</string>
+	<string name="search_history_text">En son yapılan arama sorgularını görüntüle.</string>
+	<string name="clear_search">Arama Geçmişini temizle</string>
+	<!-- Place Page link to Wikipedia article (if map object has it). -->
+	<string name="read_in_wikipedia">Vikipedi</string>
 	<string name="p2p_your_location">Konumunuz</string>
 	<string name="p2p_start">Başla</string>
 	<string name="p2p_from_here">Başlangıç</string>
-	<string name="p2p_to_here">Varış yeri:</string>
+	<string name="p2p_to_here">Varış yeri</string>
 	<string name="p2p_only_from_current">Navigasyon sadece şu anki konumunuzdan mevcut.</string>
 	<string name="p2p_reroute_from_current">Mevcut konumunuzdan bir rota planlamamızı ister misiniz?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
@@ -411,8 +418,8 @@
 	<string name="editor_add_select_location">Konum</string>
 	<string name="editor_done_dialog_1">Dünya haritasını değiştirdiniz. Bunu gizlemeyin! Arkadaşlarınıza anlatın ve birlikte düzenleyin.</string>
 	<string name="share_with_friends">Arkadaşlarınla paylaş</string>
-	<string name="editor_report_problem_desription_1">OpenStreetMap topluluğunun hatayı düzeltmesi için lütfen problemi detaylı bir şekilde tanımlayın.</string>
-	<string name="editor_report_problem_desription_2">Veya bunu adresinden kendiniz yapın https://www.openstreetmap.org/</string>
+	<string name="editor_report_problem_desription_1">OpenStreetMap topluluğunun hatayı düzeltmesi için lütfen problemi detaylı bir şekilde açıklayın.</string>
+	<string name="editor_report_problem_desription_2">Veya bunu https://www.openstreetmap.org/ adresinden kendiniz yapın</string>
 	<string name="editor_report_problem_send_button">Gönder</string>
 	<string name="editor_report_problem_title">Problem</string>
 	<string name="editor_report_problem_no_place_title">Yer mevcut değil</string>
@@ -429,7 +436,7 @@
 	<string name="today">Bugün</string>
 	<string name="add_opening_hours">İş saatlerini ekle</string>
 	<string name="edit_opening_hours">İş saatlerini düzenle</string>
-	<string name="no_osm_account">OpenStreetMap\' hesabın yok mu?</string>
+	<string name="no_osm_account">OpenStreetMap hesabın yok mu?</string>
 	<string name="register_at_openstreetmap">Kaydol</string>
 	<string name="password_8_chars_min">Şifre (en az 8 karakter)</string>
 	<string name="invalid_username_or_password">Geçersiz Kullanıcı Adı veya Şifre.</string>
@@ -442,14 +449,16 @@
 	<string name="last_upload">Son yükleme</string>
 	<string name="thank_you">Teşekkür ederiz</string>
 	<string name="edit_place">Yeri düzenle</string>
-	<string name="place_name">Yer ismi</string>
+	<string name="place_name">Yerin Adı</string>
 	<string name="add_language">Bir dil ekle</string>
 	<string name="street">Sokak</string>
 	<!-- Editable House Number text field (in address block). -->
-	<string name="house_number">Bir ev numarası</string>
+	<string name="house_number">Bina numarası</string>
 	<string name="details">Detaylar</string>
 	<!-- Text field to enter non-existing street name, below list of known streets around -->
 	<string name="add_street">Bir sokak ekle</string>
+	<!-- Error to display when a new street name is not entered in the New street dialog -->
+	<string name="empty_street_name_error">Lütfen bir sokak adı girin</string>
 	<string name="choose_language">Bir dil seç</string>
 	<string name="choose_street">Bir sokak seç</string>
 	<string name="postal_code">Posta kodu</string>
@@ -458,6 +467,7 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-posta veya kullanıcı adı</string>
 	<string name="phone">Telefon</string>
+	<string name="editor_add_phone">Telefon Ekle</string>
 	<string name="please_note">Lütfen dikkat</string>
 	<string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir.</string>
 	<string name="downloader_update_maps">Haritaları güncelle</string>
@@ -469,64 +479,64 @@
 	<string name="downloader_no_space_message">Lütfen gereksiz verileri silin</string>
 	<string name="editor_login_error_dialog">Giriş hatası</string>
 	<string name="editor_profile_changes">Doğrulanan Değişiklikler</string>
-	<string name="editor_focus_map_on_location">Objenin doğru konumunu seçmek için haritayı çekin.</string>
+	<string name="editor_focus_map_on_location">Objenin doğru konumunu seçmek için haritayı sürükleyin.</string>
 	<string name="editor_add_select_category">Kategori seç</string>
 	<string name="editor_add_select_category_popular_subtitle">Popüler</string>
 	<string name="editor_add_select_category_all_subtitle">Tüm kategoriler</string>
 	<string name="editor_edit_place_title">Düzenleme</string>
 	<string name="editor_add_place_title">Ekleme</string>
-	<string name="editor_edit_place_name_hint">Yerin ismi</string>
+	<string name="editor_edit_place_name_hint">Yerin adı</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Sorunun ayrıntılı açıklaması</string>
 	<string name="editor_report_problem_other_title">Farklı bir problem</string>
 	<string name="placepage_add_business_button">Kuruluş ekle</string>
-	<string name="whatsnew_editor_message_1">Doğrudan uygulamadan haritaya yeni yerler ekle ve mevcut yerleri düzenleyin.</string>
+	<string name="whatsnew_editor_message_1">Doğrudan uygulamadan haritaya yeni yerler ekleyin ve mevcut yerleri düzenleyin.</string>
 	<string name="dialog_incorrect_feature_position">Konumu değiştir</string>
 	<string name="message_invalid_feature_position">Buraya bir nesne konumlandırılamıyor</string>
-	<string name="login_to_make_edits_visible">Giriş yapın böylelikle diğer kullanıcılar yaptığınız değişiklikleri görebilirler.</string>
+	<string name="login_to_make_edits_visible">Diğer kullanıcıların yaptığınız değişiklikleri görebilmesi için oturum açın</string>
 	<!-- Error dialog no space -->
 	<string name="migration_no_space_message">İndirmek için daha fazla alana ihtiyacınız var. Lütfen gereksiz verileri silin.</string>
-	<string name="editor_sharing_title">Organic Maps haritalarını iyileştirdim</string>
+	<string name="editor_sharing_title">Organic Maps haritalarını geliştirdim</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d/%2$d</string>
-	<string name="download_over_mobile_header">Hücresel bir ağ bağlantısı kullanarak indir?</string>
-	<string name="download_over_mobile_message">Bu işlem bazı planlarla ya da dolaşım ise büyük ölçüde pahalı olabilir.</string>
-	<string name="error_enter_correct_house_number">Doğru ev numarası girin</string>
+	<string name="download_over_mobile_header">Hücresel bir ağ bağlantısı kullanarak indirilsin mi?</string>
+	<string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir.</string>
+	<string name="error_enter_correct_house_number">Geçerli bir bina numarası girin</string>
 	<string name="editor_storey_number">Kat sayısı (en fazla %d)</string>
 	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than 25 -->
-	<string name="error_enter_correct_storey_number">Binayı en fazla 25 katlı düzenle</string>
+	<string name="error_enter_correct_storey_number">Kat sayısı 25\'i geçmemelidir</string>
 	<string name="editor_zip_code">Posta Kodu</string>
-	<string name="error_enter_correct_zip_code">Doğru Posta Kodunu girin</string>
+	<string name="error_enter_correct_zip_code">Geçerli bir posta kodu girin</string>
 	<!-- Place Page title for long tap -->
 	<string name="core_placepage_unknown_place">Bilinmeyen Yer</string>
 	<string name="editor_other_info">OSM editörlerine bir not gönderin</string>
 	<string name="editor_detailed_description_hint">Ayrıntılı yorum</string>
-	<string name="editor_detailed_description">Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. Organic Maps’de düzenlenemeyen ayrıntıları açıklayın.</string>
+	<string name="editor_detailed_description">Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. Organic Maps’te düzenlenemeyen ayrıntıları açıklayın.</string>
 	<string name="editor_more_about_osm">OpenStreetMap hakkında ek bilgi</string>
 	<string name="editor_operator">İşletmeci</string>
 	<string name="downloader_my_maps_title">Haritalarım</string>
 	<string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
 	<string name="downloader_no_downloaded_maps_message">Çevrimdışı olarak adres bulmak ve gezinmek için haritaları indirin.</string>
 	<!-- Error title that appears after certain time without location. -->
-	<string name="current_location_unknown_title">Geçerli konumunuzuz izlenmeye devam edilsin mi</string>
+	<string name="current_location_unknown_title">Geçerli konumunuzuz izlenmeye devam edilsin mi?</string>
 	<!-- Error that appears after certain time without location. -->
-	<string name="current_location_unknown_message">Geçerli konum bilinmiyor Muhtemelen bir binanın içinde veya tüneldesiniz.</string>
+	<string name="current_location_unknown_message">Geçerli konum bilinmiyor. Muhtemelen bir binanın içinde veya tüneldesiniz.</string>
 	<string name="current_location_unknown_continue_button">Devam</string>
 	<string name="current_location_unknown_stop_button">Dur</string>
 	<string name="current_location_unknown_error_title">Geçerli konum bilinmiyor.</string>
-	<string name="current_location_unknown_error_message">Konumunuz aranırken bir hata oluştu. Cihazının düzgün çalışıp çalışmadığını kontrol edip daha sonra tekrar deneyin.</string>
-	<string name="location_services_disabled_header">Konum tanımlama devre dışı bırakıldı</string>
-	<string name="location_services_disabled_message">Cihaz ayarlarında konum belirlemeye erişimi etkinleştirin</string>
+	<string name="current_location_unknown_error_message">Konumunuz aranırken bir hata oluştu. Cihazınızın düzgün çalışıp çalışmadığını kontrol edin ve daha sonra tekrar deneyin.</string>
+	<string name="location_services_disabled_header">Konum servisleri devre dışı bırakıldı</string>
+	<string name="location_services_disabled_message">Cihaz ayarlarında coğrafi konuma erişimi etkinleştirin</string>
 	<string name="location_services_disabled_1">1. Ayarları Açın</string>
 	<string name="location_services_disabled_2">2. Konuma Dokunun</string>
 	<!-- iOS Dialog for the case when the location permission is not granted -->
-	<string name="location_services_disabled_3">3. Uygulamayı Kullanırken Seç</string>
+	<string name="location_services_disabled_3">3. \"Uygulamayı Kullanırken\"i Seçin</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/s</string>
 	<string name="mile">mil</string>
 	<string name="foot">fit</string>
-	<string name="miles_per_hour">mph</string>
+	<string name="miles_per_hour">saatte mil</string>
 	<string name="hour">sa</string>
 	<string name="minute">dk</string>
 	<string name="placepage_place_description">Açıklama</string>
@@ -542,21 +552,28 @@
 	<string name="editor_comment_hint">Yorum…</string>
 	<string name="editor_reset_edits_message">Tüm yerel değişiklikler sıfırlansın mı?</string>
 	<string name="editor_reset_edits_button">Sıfırla</string>
-	<string name="editor_remove_place_message">Eklenen bir yer kaldırılsın mı?</string>
+	<string name="editor_remove_place_message">Eklenen yer kaldırılsın mı?</string>
 	<string name="editor_remove_place_button">Kaldır</string>
 	<string name="editor_place_doesnt_exist">Bu yer mevcut değil</string>
+	<!-- Error message for "Place doesn't exist" dialog when comment is empty -->
+	<string name="delete_place_empty_comment_error">Lütfen bu yerin silinmesinin nedenini belirtin</string>
 	<string name="text_more_button">…daha fazla</string>
 	<!-- Phone number error message -->
-	<string name="error_enter_correct_phone">Doğru telefon numarası gir</string>
+	<string name="error_enter_correct_phone">Geçerli bir telefon numarası girin</string>
 	<string name="error_enter_correct_web">Geçerli bir web adresi girin</string>
 	<string name="error_enter_correct_email">Geçerli bir e-posta girin</string>
+	<string name="error_enter_correct_facebook_page">Geçerli bir Facebook web adresi, hesap veya sayfa adı girin</string>
+	<string name="error_enter_correct_instagram_page">Geçerli bir İnstagram web adresi veya hesap adı girin</string>
+	<string name="error_enter_correct_twitter_page">Geçerli bir Twitter web adresi veya kullanıcı adı girin</string>
+	<string name="error_enter_correct_vk_page">Geçerli bir VK web adresi veya hesap adı girin</string>
+	<string name="error_enter_correct_line_page">Geçerli bir Line web adresi veya Line ID\'si girin</string>
 	<string name="refresh">Güncelleştirme</string>
 	<string name="placepage_add_place_button">Haritaya bir yer ekleyin</string>
 	<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
 	<string name="editor_share_to_all_dialog_title">Bunu tüm kullanıcılara göndermek ister misiniz?</string>
 	<!-- iOS Dialog before publishing the modifications to the public map. -->
 	<string name="editor_share_to_all_dialog_message_1">Herhangi bir kişisel bilgi girmediğinizden emin olun.</string>
-	<string name="editor_share_to_all_dialog_message_2">Değişikliği kontrol edeceğiz. Eğer herhangi bir sorumuz olursa sizinle e-posta aracılığıyla temasa geçeceğiz.</string>
+	<string name="editor_share_to_all_dialog_message_2">Değişikliği kontrol edeceğiz. Eğer herhangi bir sorumuz olursa sizinle e-posta aracılığıyla iletişime geçeceğiz.</string>
 	<string name="navigation_stop_button">dur</string>
 	<!-- iOS dialog for the case when recent track recording is on and the app comes back from background -->
 	<string name="recent_track_background_dialog_title">En son seyahat edilen rotanızı kaydetmeyi devre dışı bırakmak istiyor musunuz?</string>
@@ -568,9 +585,9 @@
 	<string name="about_description">Organic Maps, ücretsiz ve açık kaynaklı bir çevrimdışı harita uygulamasıdır. Reklamsız. İzleme yok. Haritada bir hata görürseniz, lütfen OpenStreetMap\'te düzeltin. Proje meraklıları tarafından boş zamanlarımızda oluşturulduğundan geri bildiriminize ve desteğinize ihtiyacımız var.</string>
 	<string name="general_settings">Genel ayarlar</string>
 	<!-- For the first routing -->
-	<string name="accept">Kabul</string>
+	<string name="accept">Kabul et</string>
 	<!-- For the first routing -->
-	<string name="decline">Ret</string>
+	<string name="decline">Reddet</string>
 	<!-- noun -->
 	<string name="search_in_table">Liste</string>
 	<string name="mobile_data_dialog">Ayrıntılı bilgileri görüntülemek için mobil internet kullanılsın mı?</string>
@@ -593,10 +610,10 @@
 	<string name="feedback_general">Genel Geribildirim</string>
 	<string name="on">Aç</string>
 	<string name="off">Kapat</string>
-	<string name="prefs_languages_information">Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS\'yi kullanıyor, Uygulamayı, Google Play\'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+	<string name="prefs_languages_information">Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS\'yi kullanıyor. Uygulamayı, Google Play\'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
 	<string name="prefs_languages_information_off">Bazı diller için uygulama mağazasından (Google Play Market, Samsung Apps) farklı bir konuşma sentezleyicisi veya ek bir dil paketi yüklemeniz gerekebilir. Cihaz ayarları → Dil ve Giriş → Konuşma → Metin Okuma sekmelerini açın. Buradan konuşma sentezi ayarlarını yönetebilir (örneğin, çevrimdışı kullanım için bir dil paketini karşıdan yükleyebilir) ve başka bir metin okuma motorunu seçebilirsiniz.</string>
 	<string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin.</string>
-	<string name="transliteration_title">Latince alfabesine çevirme</string>
+	<string name="transliteration_title">Latin alfabesine çevirme</string>
 	<string name="learn_more">Daha fazla bilgi edinin</string>
 	<string name="core_exit">Çık</string>
 	<string name="routing_add_start_point">Güzergâhı planlamak için bir başlangıç noktası ekleyin</string>
@@ -610,17 +627,20 @@
 	<string name="start_from_my_position">Buradan başla</string>
 	<string name="profile_authorization_error">Üzgünüz, bir hata oluştu. Tekrar oturum açmayı deneyin.</string>
 	<string name="dialog_error_storage_title">Depolama alanı erişim sorunu</string>
-	<string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin ve support\@organicmaps.app adresinden bizimle iletişime geçin</string>
+	<string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support\@organicmaps.app adresinden bizimle iletişime geçin</string>
 	<string name="setting_emulate_bad_storage">Bozuk depolama alanını taklit et</string>
 	<string name="core_entrance">Giriş</string>
 	<string name="error_enter_correct_name">Lütfen, doğru bir isim girin</string>
-	<string name="bookmarks_groups">Listeler</string>
-	<string name="bookmarks_groups_hide_all">Tümünü gizle</string>
-	<string name="bookmarks_groups_show_all">Tümünü göster</string>
+	<string name="bookmark_lists">Listeler</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Tümünü gizle</string>
+	<string name="bookmark_lists_show_all">Tümünü göster</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d yer imi</item>
 	</plurals>
 	<string name="bookmarks_create_new_group">Yeni liste oluştur</string>
+	<!-- Bookmark categories screen -->
+	<string name="bookmarks_import">Yer imlerini içe aktar</string>
 	<string name="downloader_hide_screen">Ekranı Gizle</string>
 	<string name="downloader_percent">%1$s (%2$s / %3$s)</string>
 	<string name="downloader_process">%s indiriliyor…</string>
@@ -628,36 +648,36 @@
 	<string name="bookmarks_error_message_share_general">Bir uygulama hatasından dolayı paylaşılamıyor</string>
 	<string name="bookmarks_error_title_share_empty">Paylaşma hatası</string>
 	<string name="bookmarks_error_message_share_empty">Boş bir liste paylaşılamaz</string>
-	<string name="bookmarks_error_title_empty_list_name">Isim boş olamaz</string>
-	<string name="bookmarks_error_message_empty_list_name">Lütfen liste ismini giriniz</string>
+	<string name="bookmarks_error_title_empty_list_name">İsim boş olamaz</string>
+	<string name="bookmarks_error_message_empty_list_name">Lütfen liste ismini girin</string>
 	<string name="bookmarks_new_list_hint">Yeni liste</string>
 	<string name="bookmarks_error_title_list_name_already_taken">Bu isim zaten alınmış</string>
-	<string name="bookmarks_error_message_list_name_already_taken">Lütfen başka bir isim seçiniz</string>
+	<string name="bookmarks_error_message_list_name_already_taken">Lütfen başka bir isim seçin</string>
 	<string name="bookmarks_error_title_list_name_too_long">Bu isim çok uzun</string>
-	<string name="please_wait">Lütfen bekle…</string>
+	<string name="please_wait">Lütfen bekleyin�</string>
 	<string name="phone_number">Telefon numarası</string>
-	<string name="profile">OpenStreetMap profil</string>
+	<string name="profile">OpenStreetMap profili</string>
 	<string name="bookmarks_detect_title">Yeni dosyalar algılandı</string>
 	<plurals name="bookmarks_detect_message">
 	  <item quantity="other">%d dosya bulundu. Dönüşümden sonra onları göreceksiniz.</item>
 	</plurals>
-	<string name="button_convert">Dönüştürmek</string>
+	<string name="button_convert">Dönüştür</string>
 	<string name="bookmarks_convert_error_title">Hata</string>
 	<string name="bookmarks_convert_error_message">Bazı dosyalar dönüştürülmedi.</string>
 	<string name="bookmarks_restore_title">Bu sürümü geri yükle?</string>
 	<string name="common_check_internet_connection_dialog_title">İnternet bağlantısı yok</string>
 	<string name="error_system_message">Bilinmeyen bir hata oluştu</string>
-	<string name="restore">Restore</string>
+	<string name="restore">Geri al</string>
 	<plurals name="objects">
-	  <item quantity="other">%d yer</item>
+	  <item quantity="other">%d obje</item>
 	</plurals>
 	<plurals name="places">
 	  <item quantity="other">%d yer</item>
 	</plurals>
 	<plurals name="tracks">
-	  <item quantity="other">%d izleme</item>
+	  <item quantity="other">%d kayıt</item>
 	</plurals>
-	<string name="subtittle_opt_out">İzleme ayarları</string>
+	<string name="subtittle_opt_out">Kayıt ayarları</string>
 	<string name="crash_reports">Kilitlenme raporu</string>
 	<string name="crash_reports_description">Organic Maps deneyimini geliştirmek için verilerinizi kullanabiliriz. Değişiklikler, uygulama yeniden başlatıldıktan sonra geçerli olur.</string>
 	<string name="privacy_policy">Gizlilik politikası</string>
@@ -670,15 +690,15 @@
 	<string name="bookmarks_empty_list_message">Yer imi eklemek için önce haritadaki bir yere sonrasında ise yıldız simgesine dokunun</string>
 	<string name="category_desc_more">…daha fazla</string>
 	<string name="title_error_downloading_bookmarks">Bir hata oluştu</string>
+	<string name="popular_place">Popüler</string>
 	<string name="export_file">Dosyayı dışa aktar</string>
 	<string name="list_settings">Liste Ayarları</string>
 	<string name="delete_list">Listeyi sil</string>
 	<string name="hide_from_map">Haritadan gizle</string>
 	<string name="public_access">Genel erişim</string>
 	<string name="limited_access">Sınırlı erişim</string>
-	<string name="bookmark_category_name">Kategori</string>
-	<string name="bookmark_category_description_hint">Bir açıklama yazın (metin veya html)</string>
-	<string name="not_shared">Şahsi</string>
+	<string name="bookmark_list_description_hint">Bir açıklama yazın (metin veya html)</string>
+	<string name="not_shared">Gizli</string>
 	<string name="tags_loading_error_subtitle">Etiketler yüklenirken bir hata oluştu, lütfen tekrar deneyin</string>
 	<string name="download_button">İndir</string>
 	<string name="speedcams_alert_title">Hız kameraları</string>
@@ -694,7 +714,7 @@
 	<string name="power_managment_setting_never">Asla</string>
 	<string name="power_managment_setting_auto">Otomatik</string>
 	<string name="power_managment_setting_manual_max">Maksimum güç tasarrufu</string>
-	<string name="enable_logging_warning_message">Seçenek tanı amaçlı, günlüğe kaydetmeyi açar. Uygulamayla ilgili sorunları gideren destek ekibimiz için yardımcı olabilir. Bu seçeneği yalnızca Organic Maps desteğinin isteği üzerine etkinleştirin.</string>
+	<string name="enable_logging_warning_message">Bu seçenek tanılama amacıyla günlüğe kaydetmeyi açar. Ekibimizin uygulamayla ilgili sorunları gidermesine yardımcı olabilir. Sorununuzla ilgili ayrıntılı günlükleri kaydetmek ve bize göndermek için bu seçeneği geçici olarak etkinleştirin.</string>
 	<string name="access_rules_author_only">Çevrimiçi düzenleme</string>
 	<string name="driving_options_title">Sürüş seçenekleri</string>
 	<string name="driving_options_subheader">Her rotada kaçının</string>
@@ -731,7 +751,7 @@
 	<string name="dialog_routing_rebuild_from_current_location_carplay">Rota, mevcut konumunuzdan yeniden oluşturulacak</string>
 	<string name="dialog_routing_rebuild_for_vehicle_carplay">Rota, bir arabalı seyahat rotasına dönüştürülecek</string>
 	<string name="ok">Tamam</string>
-	<string name="avoid_unpaved_carplay_1">Stabilizesiz</string>
+	<string name="avoid_unpaved_carplay_1">Toprak yol yok</string>
 	<string name="avoid_unpaved_carplay_2">Asfaltsız hariç</string>
 	<string name="avoid_ferry_carplay_1">Feribotsuz</string>
 	<string name="avoid_ferry_carplay_2">Feribot hariç</string>
@@ -762,7 +782,7 @@
 	<string name="month_ago_sorttype">Bir ay önce</string>
 	<string name="moremonth_ago_sorttype">Bir aydan daha önce</string>
 	<string name="moreyear_ago_sorttype">Bir yıldan daha önce</string>
-	<string name="near_me_sorttype">Bana yakın</string>
+	<string name="near_me_sorttype">Bana yakınlarda</string>
 	<string name="others_sorttype">Diğerleri</string>
 	<string name="food_places">Yiyecek</string>
 	<string name="tourist_places">Görülecek yerler</string>
@@ -803,9 +823,12 @@
 	<string name="downloader_updating_ios">Güncelleme</string>
 	<string name="downloader_loading_ios">İndir</string>
 	<string name="key_information_title">Anahtar bilgisi</string>
-	<string name="enable_screen_sleep">Ekranın uyumasına izin ver</string>
+	<string name="download_map_title">Dünya haritasını indir</string>
+	<string name="connection_failure">Bağlantı hatası</string>
+	<string name="disconnect_usb_cable_title">USB kablosunu çıkarın</string>
+	<string name="enable_screen_sleep">Ekranın kapanmasına izin ver</string>
 	<!-- Description in preferences -->
-	<string name="enable_screen_sleep_description">Etkinleştirildiğinde ekranın bir süre hareketsiz kaldıktan sonra uykuya geçmesine izin verilir.</string>
+	<string name="enable_screen_sleep_description">Etkinleştirildiğinde ekranın bir süre hareketsiz kaldıktan sonra kapanmasına izin verilir.</string>
 	<!-- Autoupdate dialog on start -->
 	<string name="whats_new_auto_update_title">İndirdiğiniz haritaları güncelleyin</string>
 	<!-- Autoupdate dialog on start -->
@@ -814,6 +837,10 @@
 	<string name="whats_new_auto_update_button_size">Güncelle (%s)</string>
 	<!-- Autoupdate dialog on start -->
 	<string name="whats_new_auto_update_button_later">Daha sonra manüel olarak güncelle</string>
+	<!-- Delete track button on track edit screen -->
+	<string name="placepage_delete_track_button">Kaydı Sil</string>
+	<!-- Placeholder for track name input on track edit screen -->
+	<string name="placepage_track_name_hint">Kayıt Adı</string>
 	<!-- edit track screen title -->
 	<string name="track_title">Rota</string>
 
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index f3d95505af..02dfe6789e 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -67,24 +67,24 @@
 	<string name="continue_download">Продовжити</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">Не вдалося завантажити %s</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Додати групу</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Колір мiтки</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Назва групи</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Групи мiток</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Мітки</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Мої Мітки</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Iм\'я</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Адреса</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Група</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Група</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Налаштування</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -137,7 +137,7 @@
 	<string name="police">Поліція</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Примітка</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">З вами поділилися мiтками Organic Maps</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Завантаження мiток</string>
@@ -367,8 +367,6 @@
 	<string name="show">Показати</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Приховати</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Перейменувати</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Збій планування маршруту</string>
 	<!-- Arrive routing message in navigation view -->
@@ -624,9 +622,10 @@
 	<string name="setting_emulate_bad_storage">Емулювати проблемне сховище</string>
 	<string name="core_entrance">Вхід</string>
 	<string name="error_enter_correct_name">Будь ласка, введіть коректне ім\'я</string>
-	<string name="bookmarks_groups">Списки</string>
-	<string name="bookmarks_groups_hide_all">Приховати всі</string>
-	<string name="bookmarks_groups_show_all">Показати всі</string>
+	<string name="bookmark_lists">Списки</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Приховати всі</string>
+	<string name="bookmark_lists_show_all">Показати всі</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d закладок</item>
 	</plurals>
@@ -688,8 +687,7 @@
 	<string name="hide_from_map">Приховати з карти</string>
 	<string name="public_access">Публічний доступ</string>
 	<string name="limited_access">Приватний доступ</string>
-	<string name="bookmark_category_name">Категорія</string>
-	<string name="bookmark_category_description_hint">Додайте опис (текст чи html)</string>
+	<string name="bookmark_list_description_hint">Додайте опис (текст чи html)</string>
 	<string name="not_shared">Особистий</string>
 	<string name="tags_loading_error_subtitle">Під час завантаження тегів сталася помилка, будь ласка, спробуйте ще раз</string>
 	<string name="download_button">Завантажити</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 07c7b809e7..4b24a466d4 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">Tiếp tục</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s - descărcarea a eșuat</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">Thêm Bộ Mới</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Đánh dấu Màu sắc</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">Đánh dấu Tên Bộ</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">Đánh dấu Bộ</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Đánh dấu</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">Các Địa chỉ của Tôi</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Tên</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Địa chỉ</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Đặt</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">Đặt</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Thiết lập</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">Cảnh sát</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Ghi chú</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Điểm đánh dấu Organic Maps được chia sẻ</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Tải Điểm đánh dấu</string>
@@ -364,8 +364,6 @@
 	<string name="show">Hiện</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Ẩn</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Đổi tên</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Không thể Lập Lộ trình</string>
 	<!-- Arrive routing message in navigation view -->
@@ -612,9 +610,10 @@
 	<string name="setting_emulate_bad_storage">Giả lập ổ lưu trữ hỏng</string>
 	<string name="core_entrance">Lối vào</string>
 	<string name="error_enter_correct_name">Vui lòng nhập một tên chính xác</string>
-	<string name="bookmarks_groups">Danh sách</string>
-	<string name="bookmarks_groups_hide_all">Ẩn tất cả</string>
-	<string name="bookmarks_groups_show_all">Hiển thị tất cả</string>
+	<string name="bookmark_lists">Danh sách</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Ẩn tất cả</string>
+	<string name="bookmark_lists_show_all">Hiển thị tất cả</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d dấu trang</item>
 	</plurals>
@@ -675,8 +674,7 @@
 	<string name="hide_from_map">Ẩn từ bản đồ</string>
 	<string name="public_access">Truy cập công khai</string>
 	<string name="limited_access">Truy cập hạn chế</string>
-	<string name="bookmark_category_name">Thể loại</string>
-	<string name="bookmark_category_description_hint">Đánh vào một mô tả (văn bản hoặc html)</string>
+	<string name="bookmark_list_description_hint">Đánh vào một mô tả (văn bản hoặc html)</string>
 	<string name="not_shared">Riêng tư</string>
 	<string name="tags_loading_error_subtitle">Đã xảy ra lỗi khi tải thẻ, vui lòng thử lại</string>
 	<string name="download_button">Tải</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index a52a9aaea6..577211b442 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">繼續</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s 下載失敗</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">新增收藏夾</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">書籤顏色</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">收藏夾名稱</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">收藏夾</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">書籤</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的地點</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名稱</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">地址</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">收藏夾</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">收藏夾</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">設定</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,9 +134,9 @@
 	<string name="police">警察局</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">描述說明</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">已分享 Organic Maps 書籤</string>
-	<string name="share_bookmarks_email_body">你好！\n\n附件為 Organic Maps app 的書籤，如果你有安裝 Organic Maps 則直接開啟，如果沒有的話，請先在 iOS 或是 Android 裝置，從下面連結下載：https://omaps.app/get?kmz\n\n旅行時用上 Organic Maps！</string>
+	<string name="share_bookmarks_email_body">你好！\n\n附件為 Organic Maps app 的書籤，如果你有安裝 Organic Maps 則直接開啟，如果沒有的話，請先在 iOS 或是 Android 裝置，從下面連結下載：https://omaps.app/get?kmz\n\n旅行時用上 Organic Maps!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">正在載入書籤…</string>
 	<!-- Kmz file successful loading -->
@@ -377,8 +377,6 @@
 	<string name="show">顯示</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">隱藏</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">重新命名</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">路線計劃失敗</string>
 	<!-- Arrive routing message in navigation view -->
@@ -632,9 +630,10 @@
 	<string name="setting_emulate_bad_storage">模擬不良儲存空間</string>
 	<string name="core_entrance">入口</string>
 	<string name="error_enter_correct_name">請輸入正確的名稱</string>
-	<string name="bookmarks_groups">清單</string>
-	<string name="bookmarks_groups_hide_all">隱藏全部</string>
-	<string name="bookmarks_groups_show_all">顯示全部</string>
+	<string name="bookmark_lists">清單</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">隱藏全部</string>
+	<string name="bookmark_lists_show_all">顯示全部</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d 個書籤</item>
 	</plurals>
@@ -697,8 +696,7 @@
 	<string name="hide_from_map">從卡中隱藏</string>
 	<string name="public_access">開放空間</string>
 	<string name="limited_access">私人空間</string>
-	<string name="bookmark_category_name">類別</string>
-	<string name="bookmark_category_description_hint">增加說明(文字或html)</string>
+	<string name="bookmark_list_description_hint">增加說明(文字或html)</string>
 	<string name="not_shared">私人</string>
 	<string name="tags_loading_error_subtitle">載入標籤時出錯，請重試</string>
 	<string name="download_button">下載</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index b80b123dca..6c83119600 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -64,24 +64,24 @@
 	<string name="continue_download">继续</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s下载失败</string>
-	<!-- Add New Bookmark Set dialog title -->
+	<!-- "Add new bookmark list" dialog title -->
 	<string name="add_new_set">添加新的集合</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">书签颜色</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
 	<string name="bookmark_set_name">书签集名称</string>
-	<!-- Bookmark Sets dialog title -->
+	<!-- "Bookmark Lists" dialog title -->
 	<string name="bookmark_sets">书签集</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">书签</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">我的位置</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">名字</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">地址</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">集合</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">集合</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">设置</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -134,7 +134,7 @@
 	<string name="police">警察</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">注释</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps 书签已与您共享</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">加载书签</string>
@@ -374,8 +374,6 @@
 	<string name="show">显示</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">隐藏</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">重命名</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">路线计划失败</string>
 	<!-- Arrive routing message in navigation view -->
@@ -624,9 +622,10 @@
 	<string name="setting_emulate_bad_storage">模拟不良存储空间</string>
 	<string name="core_entrance">入口</string>
 	<string name="error_enter_correct_name">请输入正确的名称</string>
-	<string name="bookmarks_groups">列表</string>
-	<string name="bookmarks_groups_hide_all">全部隱藏</string>
-	<string name="bookmarks_groups_show_all">全部顯示</string>
+	<string name="bookmark_lists">列表</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">全部隱藏</string>
+	<string name="bookmark_lists_show_all">全部顯示</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="other">%d 個書籤</item>
 	</plurals>
@@ -686,8 +685,7 @@
 	<string name="hide_from_map">从卡中隐藏</string>
 	<string name="public_access">公共访问</string>
 	<string name="limited_access">私人访问</string>
-	<string name="bookmark_category_name">类别</string>
-	<string name="bookmark_category_description_hint">请添加说明（文字或html）</string>
+	<string name="bookmark_list_description_hint">请添加说明（文字或html）</string>
 	<string name="not_shared">私人</string>
 	<string name="tags_loading_error_subtitle">加载标签时出错，请重试</string>
 	<string name="download_button">下载</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 31b872e8f8..ad68856af2 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -67,24 +67,24 @@
 	<string name="continue_download">Continue</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s download has failed</string>
-	<!-- Add New Bookmark Set dialog title -->
-	<string name="add_new_set">Add New Set</string>
+	<!-- "Add new bookmark list" dialog title -->
+	<string name="add_new_set">Add New List</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bookmark Color</string>
-	<!-- Add Bookmark Set dialog - hint when set name is empty -->
-	<string name="bookmark_set_name">Bookmark Set Name</string>
-	<!-- Bookmark Sets dialog title -->
-	<string name="bookmark_sets">Bookmark Sets</string>
-	<!-- Bookmarks - dialog title -->
+	<!-- Add Bookmark list dialog - hint when the list name is empty -->
+	<string name="bookmark_set_name">Bookmark List Name</string>
+	<!-- "Bookmark Lists" dialog title -->
+	<string name="bookmark_sets">Bookmark Lists</string>
+	<!-- "Bookmarks" dialog title -->
 	<string name="bookmarks">Bookmarks</string>
-	<!-- Default bookmarks set name -->
+	<!-- Default bookmark list name -->
 	<string name="core_my_places">My Places</string>
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Name</string>
 	<!-- Editor title above street and house number -->
 	<string name="address">Address</string>
-	<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
-	<string name="set">Set</string>
+	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. -->
+	<string name="list">List</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Settings</string>
 	<!-- Header of settings activity where user defines storage path -->
@@ -137,7 +137,7 @@
 	<string name="police">Police</string>
 	<!-- Notes field in Bookmarks view -->
 	<string name="description">Notes</string>
-	<!-- Email Subject when sharing bookmarks category -->
+	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps bookmarks were shared with you</string>
 	<string name="share_bookmarks_email_body">Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don\'t, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!</string>
 	<!-- message title of loading file -->
@@ -390,8 +390,6 @@
 	<string name="show">Show</string>
 	<!-- «Hide» context menu -->
 	<string name="hide">Hide</string>
-	<!-- «Rename» context menu -->
-	<string name="rename">Rename</string>
 	<!-- Failed planning route message in navigation view -->
 	<string name="routing_planning_error">Route Planning Failed</string>
 	<!-- Arrive routing message in navigation view -->
@@ -650,9 +648,10 @@
 	<string name="setting_emulate_bad_storage">Emulate bad storage</string>
 	<string name="core_entrance">Entrance</string>
 	<string name="error_enter_correct_name">Please, enter a correct name</string>
-	<string name="bookmarks_groups">Lists</string>
-	<string name="bookmarks_groups_hide_all">Hide all</string>
-	<string name="bookmarks_groups_show_all">Show all</string>
+	<string name="bookmark_lists">Lists</string>
+	<!-- Do not display all bookmark lists on the map -->
+	<string name="bookmark_lists_hide_all">Hide all</string>
+	<string name="bookmark_lists_show_all">Show all</string>
 	<plurals name="bookmarks_places">
 	  <item quantity="one">%d bookmark</item>
 	  <item quantity="other">%d bookmarks</item>
@@ -720,8 +719,7 @@
 	<string name="hide_from_map">Hide from map</string>
 	<string name="public_access">Public access</string>
 	<string name="limited_access">Limited access</string>
-	<string name="bookmark_category_name">Category</string>
-	<string name="bookmark_category_description_hint">Type a description (text or html)</string>
+	<string name="bookmark_list_description_hint">Type a description (text or html)</string>
 	<string name="not_shared">Private</string>
 	<string name="tags_loading_error_subtitle">An error occurred while loading tags, please try again</string>
 	<string name="download_button">Download</string>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 4a90d81be6..9c698a6f6e 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "فشلت عملية تنزيل %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "إضافة مجموعة جديدة";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "لون الإشارة المرجعية";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "اسم مجموعة الإشارات المرجعية";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "مجموعات الإشارات المرجعية";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "الإشارات المرجعية";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "أماكني";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "العنوان";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "المجموعة";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "المجموعة";
 
 /* Settings button in system menu */
 "settings" = "الإعدادات";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "ملاحظات";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "تم مشاركة اشارات Organic Maps المرجعية معك";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "إخفاء";
 
-/* «Rename» context menu */
-"rename" = "إعادة تسمية";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "فشل في تخطيط المسار";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "الرجاء إدخال اسم صحيح";
 
-"bookmarks_groups" = "قوائم";
+"bookmark_lists" = "قوائم";
 
-"bookmarks_groups_hide_all" = "إخفاء الكل";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "إخفاء الكل";
 
-"bookmarks_groups_show_all" = "إظهار الكل";
+"bookmark_lists_show_all" = "إظهار الكل";
 
 "bookmarks_create_new_group" = "إنشاء قائمة جديدة";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "محدودية فرص حصول";
 
-"bookmark_category_name" = "الفئة";
-
-"bookmark_category_description_hint" = "اكتب وصفًا (نص أو html)";
+"bookmark_list_description_hint" = "اكتب وصفًا (نص أو html)";
 
 "not_shared" = "خاص";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 4605532e55..9877f0ae45 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Спампаваць %@ не ўдалося";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Дадаць новую групу";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Колер закладкі";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Назва групы закладак";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Групы закладак";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Закладкі";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Мае месцы";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Адрас";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Група";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Група";
 
 /* Settings button in system menu */
 "settings" = "Налады";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Нататкі";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "З вамі падзяліліся закладкамі Ogranic Maps";
 
 "share_bookmarks_email_body" = "Вітаю!\n\nУ далучаным файле мае закладкі з дататка Organic Maps. Калі ласка, адчыніце іх калі ў вас усталяваны Organic Maps. Калі не, спампуйце дадатак для вашай прылады iOS альбо Andriod па спасылцы: https://omaps.app/get?kmz\n\nПрыемных падарожжаў з Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Схаваць";
 
-/* «Rename» context menu */
-"rename" = "Пераіменаваць";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Памылка пракладання маршрута";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Калі ласка, увядзіце назву правільна";
 
-"bookmarks_groups" = "Спісы";
+"bookmark_lists" = "Спісы";
 
-"bookmarks_groups_hide_all" = "Схаваць усе";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Схаваць усе";
 
-"bookmarks_groups_show_all" = "Паказаць усе";
+"bookmark_lists_show_all" = "Паказаць усе";
 
 "bookmarks_create_new_group" = "Стварыць новы спіс";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Абмежаваны доступ";
 
-"bookmark_category_name" = "Катэгорыя";
-
-"bookmark_category_description_hint" = "Дабаўце апісанне (тэкст альбо html)";
+"bookmark_list_description_hint" = "Дабаўце апісанне (тэкст альбо html)";
 
 "not_shared" = "Прыватны";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index f18a994a01..98288cebe3 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Изтеглянето на %@ се провали";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Добавяне на нова група";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Цвят на отметка";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Име на група";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Bookmark Lists";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Отметки";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Мои места";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Адрес";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Група";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Група";
 
 /* Settings button in system menu */
 "settings" = "Настройки";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Бележки";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Споделени са с вас отметки за Organic Maps";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Скриване";
 
-/* «Rename» context menu */
-"rename" = "Преименуване";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Неуспешно планиране на маршрут";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Моля, въведете правилно име";
 
-"bookmarks_groups" = "Списъци";
+"bookmark_lists" = "Списъци";
 
-"bookmarks_groups_hide_all" = "Скриване на всичко";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Скриване на всичко";
 
-"bookmarks_groups_show_all" = "Показване на всичко";
+"bookmark_lists_show_all" = "Показване на всичко";
 
 "bookmarks_create_new_group" = "Създаване на нов списък";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Ограничен достъп";
 
-"bookmark_category_name" = "Категория";
-
-"bookmark_category_description_hint" = "Добавяне на описание (текст или html)";
+"bookmark_list_description_hint" = "Добавяне на описание (текст или html)";
 
 "not_shared" = "Лично";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 7a02dd0263..de6d2a2e4c 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Stahování selhalo: %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Přidat novou skupinu záložek";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Barva záložky";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Název záložky";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložek";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Záložky";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Moje místa";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresa";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Skupina";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Skupina";
 
 /* Settings button in system menu */
 "settings" = "Nastavení";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Poznámky";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Sdílené záložky Organic Maps";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Skrýt";
 
-/* «Rename» context menu */
-"rename" = "Přejmenovat";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Naplánování trasy se nezdařilo";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Zadejte prosím správný název";
 
-"bookmarks_groups" = "Seznamy";
+"bookmark_lists" = "Seznamy";
 
-"bookmarks_groups_hide_all" = "Skrýt vše";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Skrýt vše";
 
-"bookmarks_groups_show_all" = "Zobrazit vše";
+"bookmark_lists_show_all" = "Zobrazit vše";
 
 "bookmarks_create_new_group" = "Vytvořte nový seznam";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Soukromé";
 
-"bookmark_category_name" = "Kategorie";
-
-"bookmark_category_description_hint" = "Přidejte popis (text nebo html)";
+"bookmark_list_description_hint" = "Přidejte popis (text nebo html)";
 
 "not_shared" = "Osobní účet";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index c523379bff..3e5cd1ce2d 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ download mislykkedes";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Tilføj nyt sæt";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bogmærke Farve";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Indstil bogmærkenavn";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bogmærk sæt";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bogmærker";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mine Steder";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresse";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Sæt";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Sæt";
 
 /* Settings button in system menu */
 "settings" = "Indstillinger";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Noter";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bogmærker er blevet delt med dig";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Skjul";
 
-/* «Rename» context menu */
-"rename" = "Omdøb";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Ruteplanlægning mislykkedes";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Angiv et korrekt navn";
 
-"bookmarks_groups" = "Lister";
+"bookmark_lists" = "Lister";
 
-"bookmarks_groups_hide_all" = "Skjul alle";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Skjul alle";
 
-"bookmarks_groups_show_all" = "Vis alle";
+"bookmark_lists_show_all" = "Vis alle";
 
 "bookmarks_create_new_group" = "Opret ny liste";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Begrænset adgang";
 
-"bookmark_category_name" = "Kategori";
-
-"bookmark_category_description_hint" = "Lav en beskrivelse (tekst eller html)";
+"bookmark_list_description_hint" = "Lav en beskrivelse (tekst eller html)";
 
 "not_shared" = "Privat";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index e174f6b982..c9c69e6982 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ Herunterladen fehlgeschlagen";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Neue Gruppe hinzufügen";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Lesezeichenfarbe";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Name des Lesezeichens";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Lesezeichenmappe";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Lesezeichengruppen";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Meine Orte";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresse";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Gruppe";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Gruppe";
 
 /* Settings button in system menu */
 "settings" = "Einstellungen";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notizen";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps-Lesezeichen mit Ihnen geteilt";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ausblenden";
 
-/* «Rename» context menu */
-"rename" = "Umbenennen";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Routenplanung fehlgeschlagen";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Bitte geben Sie einen korrekten Namen ein";
 
-"bookmarks_groups" = "Listen";
+"bookmark_lists" = "Listen";
 
-"bookmarks_groups_hide_all" = "Alle verbergen";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Alle verbergen";
 
-"bookmarks_groups_show_all" = "Alle anzeigen";
+"bookmark_lists_show_all" = "Alle anzeigen";
 
 "bookmarks_create_new_group" = "Erstelle eine neue Liste";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Privater Zugriff";
 
-"bookmark_category_name" = "Kategorie";
-
-"bookmark_category_description_hint" = "Fügen Sie die Beschreibung hinzu (Text oder html)";
+"bookmark_list_description_hint" = "Fügen Sie die Beschreibung hinzu (Text oder html)";
 
 "not_shared" = "Persönlich";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 536804845c..2428f53fbf 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "η λήψη %@ απέτυχε";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Προσθέστε νέο σύνολο";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Χρώμα αγαπημένου";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Όνομα συνόλου αγαπημένων";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Σύνολα αγαπημένων";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Αγαπημένα";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Οι τοποθεσίες μου";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Διεύθυνση";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Σύνολο";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Σύνολο";
 
 /* Settings button in system menu */
 "settings" = "Ρυθμίσεις";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Σημειώσεις";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Κοινοποιήθηκαν αγαπημένα Organic Maps με σας";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Απόκρυψη";
 
-/* «Rename» context menu */
-"rename" = "Μετονομασία";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Ο σχεδιασμός διαδρομής απέτυχε";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Εισάγετε ένα σωστό όνομα";
 
-"bookmarks_groups" = "Τόπος αγώνων";
+"bookmark_lists" = "Τόπος αγώνων";
 
-"bookmarks_groups_hide_all" = "Απόκρυψη όλων";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Απόκρυψη όλων";
 
-"bookmarks_groups_show_all" = "Εμφάνιση όλων";
+"bookmark_lists_show_all" = "Εμφάνιση όλων";
 
 "bookmarks_create_new_group" = "Δημιουργία νέας λίστας";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Περιορισμένη πρόσβαση";
 
-"bookmark_category_name" = "Κατηγορία";
-
-"bookmark_category_description_hint" = "Πληκτρολογήστε μια περιγραφή (κείμενο ή html)";
+"bookmark_list_description_hint" = "Πληκτρολογήστε μια περιγραφή (κείμενο ή html)";
 
 "not_shared" = "Προσωπικός";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 83b8269ba2..695ffdbb1a 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ download has failed";
 
-/* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+/* "Add new bookmark list" dialog title */
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Colour";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+/* Add Bookmark list dialog - hint when the list name is empty */
+"bookmark_set_name" = "Bookmark List Name";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Bookmark Lists";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bookmarks";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "My Places";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Address";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "List";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notes";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bookmarks were shared with you";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Hide";
 
-/* «Rename» context menu */
-"rename" = "Rename";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Route Planning Failed";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Please, enter a correct name";
 
-"bookmarks_groups" = "Lists";
+"bookmark_lists" = "Lists";
 
-"bookmarks_groups_hide_all" = "Hide all";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Hide all";
 
-"bookmarks_groups_show_all" = "Show all";
+"bookmark_lists_show_all" = "Show all";
 
 "bookmarks_create_new_group" = "Create new list";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Limited access";
 
-"bookmark_category_name" = "Category";
-
-"bookmark_category_description_hint" = "Type a description (text or html)";
+"bookmark_list_description_hint" = "Type a description (text or html)";
 
 "not_shared" = "Private";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index f16c37034c..06dc5be154 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ download has failed";
 
-/* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+/* "Add new bookmark list" dialog title */
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Color";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+/* Add Bookmark list dialog - hint when the list name is empty */
+"bookmark_set_name" = "Bookmark List Name";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Bookmark Lists";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bookmarks";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "My Places";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Address";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "List";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notes";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bookmarks were shared with you";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Hide";
 
-/* «Rename» context menu */
-"rename" = "Rename";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Route Planning Failed";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Please, enter a correct name";
 
-"bookmarks_groups" = "Lists";
+"bookmark_lists" = "Lists";
 
-"bookmarks_groups_hide_all" = "Hide all";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Hide all";
 
-"bookmarks_groups_show_all" = "Show all";
+"bookmark_lists_show_all" = "Show all";
 
 "bookmarks_create_new_group" = "Create new list";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Limited access";
 
-"bookmark_category_name" = "Category";
-
-"bookmark_category_description_hint" = "Type a description (text or html)";
+"bookmark_list_description_hint" = "Type a description (text or html)";
 
 "not_shared" = "Private";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 06c889776c..3a7066bf4d 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ download has failed";
 
-/* Add New Bookmark Set dialog title */
-"add_new_set" = "Add New Set";
+/* "Add new bookmark list" dialog title */
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Color";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+/* Add Bookmark list dialog - hint when the list name is empty */
+"bookmark_set_name" = "Bookmark List Name";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Bookmark Lists";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bookmarks";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "My Places";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Address";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "List";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notes";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bookmarks were shared with you";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Hide";
 
-/* «Rename» context menu */
-"rename" = "Rename";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Route Planning Failed";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Introduzca el nombre correcto";
 
-"bookmarks_groups" = "Listas";
+"bookmark_lists" = "Listas";
 
-"bookmarks_groups_hide_all" = "Ocultar todo";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ocultar todo";
 
-"bookmarks_groups_show_all" = "Mostrar todo";
+"bookmark_lists_show_all" = "Mostrar todo";
 
 "bookmarks_create_new_group" = "Crear lista nueva";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Acceso limitado";
 
-"bookmark_category_name" = "Category";
-
-"bookmark_category_description_hint" = "Introduzca una descripción (texto o html)";
+"bookmark_list_description_hint" = "Introduzca una descripción (texto o html)";
 
 "not_shared" = "Privado";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 26ca97a433..5f29d82a7a 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ la descarga ha fallado";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Agregar un grupo nuevo";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Color del marcador";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nombre del grupo de marcadores";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Grupos de marcadores";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Marcadores";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mis lugares";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Dirección";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Grupo";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Grupo";
 
 /* Settings button in system menu */
 "settings" = "Configuración";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notas";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Marcapáginas de Organic Maps compartidos contigo";
 
 "share_bookmarks_email_body" = "Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábrelos si tienes instalado Organic Maps. O, si no lo tienes, descarga la aplicación para tu dispositivo iOS o Android siguiendo este link: https://omaps.app/get?kmz\n¡Disfruta viajando con Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ocultar";
 
-/* «Rename» context menu */
-"rename" = "Renombrar";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Error al planificar la ruta";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Por favor, introduzca el nombre correcto";
 
-"bookmarks_groups" = "Listas";
+"bookmark_lists" = "Listas";
 
-"bookmarks_groups_hide_all" = "Ocultar todo";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ocultar todo";
 
-"bookmarks_groups_show_all" = "Mostrar todo";
+"bookmark_lists_show_all" = "Mostrar todo";
 
 "bookmarks_create_new_group" = "Crear nueva lista";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Acceso privado";
 
-"bookmark_category_name" = "Categoría";
-
-"bookmark_category_description_hint" = "Agregue una descripción (texto o html)";
+"bookmark_list_description_hint" = "Agregue una descripción (texto o html)";
 
 "not_shared" = "Privado";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index c3412cdcb6..4336f4f23c 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ دانلود با شکست مواجه شد";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "اضافه کردن مجموعه جدید";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "رنگ نشانه";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Bookmark Set Name";
+/* Add Bookmark list dialog - hint when the list name is empty */
+"bookmark_set_name" = "Bookmark List Name";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Bookmark Sets";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Bookmark Lists";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "نشانه ها";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "مکان من";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "ادرس";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "مجموعه";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "مجموعه";
 
 /* Settings button in system menu */
 "settings" = "تنظیمات";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "یادداشت ها";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bookmarks were shared with you";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "مخفی کردن";
 
-/* «Rename» context menu */
-"rename" = "تغیر نام";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "برنامه ریزی مسیر ناموفق";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "لطفا نام صحیح را وارد کنید";
 
-"bookmarks_groups" = "لیست ها";
+"bookmark_lists" = "لیست ها";
 
-"bookmarks_groups_hide_all" = "پنهان کردن همه";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "پنهان کردن همه";
 
-"bookmarks_groups_show_all" = "نمایش همه";
+"bookmark_lists_show_all" = "نمایش همه";
 
 "bookmarks_create_new_group" = "ایجاد لیست جدید";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "دسترسی محدود";
 
-"bookmark_category_name" = "دسته بندی";
-
-"bookmark_category_description_hint" = "یک توضیح (متن یا html) تایپ نمایید";
+"bookmark_list_description_hint" = "یک توضیح (متن یا html) تایپ نمایید";
 
 "not_shared" = "خصوصی";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index cae2f5266b..6aa59bbbef 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ lataus epäonnistui";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Lisää uusi valikoima";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Kirjanmerkin väri";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Kirjanmerkkivalikoiman nimi";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Kirjanmerkkivalikoimat";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Kirjanmerkit";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Paikkani";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Osoite";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Aseta";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Aseta";
 
 /* Settings button in system menu */
 "settings" = "Asetukset";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Muistiinpanot";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Jaetut Organic Maps-kirjanmerkit";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Piilota";
 
-/* «Rename» context menu */
-"rename" = "Nimeä uudelleen";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Reitin suunnittelu epäonnistui";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Anna oikea nimi";
 
-"bookmarks_groups" = "Listat";
+"bookmark_lists" = "Listat";
 
-"bookmarks_groups_hide_all" = "Piilota kaikki";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Piilota kaikki";
 
-"bookmarks_groups_show_all" = "Näytä kaikki";
+"bookmark_lists_show_all" = "Näytä kaikki";
 
 "bookmarks_create_new_group" = "Luo uusi luettelo";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Yksityinen pääsy";
 
-"bookmark_category_name" = "Kategoria";
-
-"bookmark_category_description_hint" = "Lisää kuvaus (teksti tai html)";
+"bookmark_list_description_hint" = "Lisää kuvaus (teksti tai html)";
 
 "not_shared" = "Henkilökohtainen";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 761e46019b..b5a02f1701 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@, échec lors du téléchargement";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Ajouter un nouveau groupe";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Couleur du signet";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nom du groupe de signets";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Groupes de signets";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Signets";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mes endroits";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresse";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Groupe";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Groupe";
 
 /* Settings button in system menu */
 "settings" = "Paramètres";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notes";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Signets Organic Maps partagés";
 
 "share_bookmarks_email_body" = "Bonjour !\n\nVous trouverez ci-joint mes signets de l'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l'avez pas, téléchargez l'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz\n\nBon voyage avec Organic Maps !";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Masquer";
 
-/* «Rename» context menu */
-"rename" = "Renommer";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "La planification de l'itinéraire a échoué";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Veuillez entrer un nom correct";
 
-"bookmarks_groups" = "Listes";
+"bookmark_lists" = "Listes";
 
-"bookmarks_groups_hide_all" = "Tout masquer";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Tout masquer";
 
-"bookmarks_groups_show_all" = "Tout afficher";
+"bookmark_lists_show_all" = "Tout afficher";
 
 "bookmarks_create_new_group" = "Créer une nouvelle liste";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Accès limité";
 
-"bookmark_category_name" = "Catégorie";
-
-"bookmark_category_description_hint" = "Tapez une description (texte ou html)";
+"bookmark_list_description_hint" = "Tapez une description (texte ou html)";
 
 "not_shared" = "Personnel";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index f381a995b3..49fcf340e1 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ letöltése sikertelen";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Új csoport létrehozása";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Könyvjelző színe";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Könyvjelzőcsoport neve";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Könyvjelzőcsoportok";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Könyvjelzők";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Saját helyeim";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Cím";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Csoport";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Csoport";
 
 /* Settings button in system menu */
 "settings" = "Beállítások";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Jegyzetek";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Egy Organic Maps könyvjelzőt osztottak meg Önnel";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Elrejt";
 
-/* «Rename» context menu */
-"rename" = "Átnevez";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Sikertelen útvonaltervezés";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Kérjük adja meg a helyes nevet";
 
-"bookmarks_groups" = "List";
+"bookmark_lists" = "List";
 
-"bookmarks_groups_hide_all" = "Összes elrejtése";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Összes elrejtése";
 
-"bookmarks_groups_show_all" = "Összes megjelenítése";
+"bookmark_lists_show_all" = "Összes megjelenítése";
 
 "bookmarks_create_new_group" = "Új lista létrehozása";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Személyes hozzáférés";
 
-"bookmark_category_name" = "Kategória";
-
-"bookmark_category_description_hint" = "Leírás hozzáadása (szöveg vagy html)";
+"bookmark_list_description_hint" = "Leírás hozzáadása (szöveg vagy html)";
 
 "not_shared" = "Privát";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 8e6d8591c0..e183027beb 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ gagal diunduh";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Tambahkan Set baru";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Warna Penanda";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nama Set Penanda";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Set Penanda";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Penanda";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Tempat-tempat Saya";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Alamat";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Set";
 
 /* Settings button in system menu */
 "settings" = "Pengaturan";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Catatan";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Bagikan penanda Organic Maps";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Sembunyikan";
 
-/* «Rename» context menu */
-"rename" = "Ubah nama";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Sudah sampai di tujuan";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Harap masukkan nama yang benar";
 
-"bookmarks_groups" = "Daftar";
+"bookmark_lists" = "Daftar";
 
-"bookmarks_groups_hide_all" = "Sembunyikan semua";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Sembunyikan semua";
 
-"bookmarks_groups_show_all" = "Perlihatkan semua";
+"bookmark_lists_show_all" = "Perlihatkan semua";
 
 "bookmarks_create_new_group" = "Buat daftar baru";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Akses terbatas";
 
-"bookmark_category_name" = "Kategori";
-
-"bookmark_category_description_hint" = "Ketikkan deskripsi (teks atau html)";
+"bookmark_list_description_hint" = "Ketikkan deskripsi (teks atau html)";
 
 "not_shared" = "Pribadi";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 3c706d91af..0d1d9e9226 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Il download di %@ non è riuscito";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Aggiungi un nuovo Set";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Colore del Segnalibro";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Seleziona un nome del segnalibro";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Seleziona un segnalibro";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Segnalibri";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "I miei luoghi";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Indirizzo";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Seleziona";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Seleziona";
 
 /* Settings button in system menu */
 "settings" = "Impostazioni";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Note";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Il segnalibri Organic Maps è stato condiviso con te";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Nascondi";
 
-/* «Rename» context menu */
-"rename" = "Rinomina";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Pianificazione del percorso fallito";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Inserisci un nome corretto";
 
-"bookmarks_groups" = "Elenchi";
+"bookmark_lists" = "Elenchi";
 
-"bookmarks_groups_hide_all" = "Nascondi tutto";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Nascondi tutto";
 
-"bookmarks_groups_show_all" = "Mostra tutto";
+"bookmark_lists_show_all" = "Mostra tutto";
 
 "bookmarks_create_new_group" = "Crea una nuova lista";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Accesso privato";
 
-"bookmark_category_name" = "Categoria";
-
-"bookmark_category_description_hint" = "Aggiungere la descrizione (testo o html)";
+"bookmark_list_description_hint" = "Aggiungere la descrizione (testo o html)";
 
 "not_shared" = "Personale";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index e30962682b..c55526e481 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@のダウンロードが失敗しました";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "新しいセットを作成";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "ブックマーク表示色";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "ブックマークセット名称";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ブックマークセット";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "ブックマーク";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "マイロケーション";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "住所";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "セット";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "セット";
 
 /* Settings button in system menu */
 "settings" = "設定";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "メモ";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Mapsの位置情報シェア";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "隠す";
 
-/* «Rename» context menu */
-"rename" = "名前を変更する";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "ルート検索に失敗";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "正しい名前を入力してください";
 
-"bookmarks_groups" = "リスト";
+"bookmark_lists" = "リスト";
 
-"bookmarks_groups_hide_all" = "すべて非表示";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "すべて非表示";
 
-"bookmarks_groups_show_all" = "すべて表示";
+"bookmark_lists_show_all" = "すべて表示";
 
 "bookmarks_create_new_group" = "新しいリストを作成する";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "制限されたアクセス";
 
-"bookmark_category_name" = "カテゴリ";
-
-"bookmark_category_description_hint" = "説明(テキストまたはhtml)を記入してください";
+"bookmark_list_description_hint" = "説明(テキストまたはhtml)を記入してください";
 
 "not_shared" = "非公開";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 5a025ab926..fba548d0bb 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@다운로드가 실패했습니다";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "새로운 세트 추가";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "색상 즐겨찾기에 추가";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "집합 이름을 즐겨찾기에 추가";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "세트를 즐겨찾기에 추가";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "북마크";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "내 장소";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "주소";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "집합";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "집합";
 
 /* Settings button in system menu */
 "settings" = "설정";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "메모";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "귀하와 공유된 Organic Maps 즐겨찾기";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "숨기기";
 
-/* «Rename» context menu */
-"rename" = "다른 이름으로 변경";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "경로 계획 실패";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "올바른 이름을 입력하세요.";
 
-"bookmarks_groups" = "기울기";
+"bookmark_lists" = "기울기";
 
-"bookmarks_groups_hide_all" = "모두 숨기기";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "모두 숨기기";
 
-"bookmarks_groups_show_all" = "모두 표시";
+"bookmark_lists_show_all" = "모두 표시";
 
 "bookmarks_create_new_group" = "새 목록 만들기";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "제한 접근";
 
-"bookmark_category_name" = "범주";
-
-"bookmark_category_description_hint" = "묘사를 적으세요 (글자 혹은 html)";
+"bookmark_list_description_hint" = "묘사를 적으세요 (글자 혹은 html)";
 
 "not_shared" = "개인";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index e1c88140c1..2ad6acc19c 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Nedlasting av %@ mislyktes";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Legg til nytt sett";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bokmerk farge";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Bokmerk settnavn";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmerk sett";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bokmerker";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mine steder";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresse";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Sett";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Sett";
 
 /* Settings button in system menu */
 "settings" = "Innstillinger";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Merknader";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Delte Organic Maps-bokmerker";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Skjul";
 
-/* «Rename» context menu */
-"rename" = "Nytt navn";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Mislykket ruteplanlegging";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Skriv inn korrekt navn";
 
-"bookmarks_groups" = "Lister";
+"bookmark_lists" = "Lister";
 
-"bookmarks_groups_hide_all" = "Skjul alle";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Skjul alle";
 
-"bookmarks_groups_show_all" = "Vis alle";
+"bookmark_lists_show_all" = "Vis alle";
 
 "bookmarks_create_new_group" = "Opprett ny liste";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Begrenset adgang";
 
-"bookmark_category_name" = "Kategori";
-
-"bookmark_category_description_hint" = "Lag en beskrivelse (text or html)";
+"bookmark_list_description_hint" = "Lag en beskrivelse (text or html)";
 
 "not_shared" = "Privat";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index e9fab2929f..862521817a 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ download is mislukt";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Voeg nieuwe groep toe";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bladwijzer-kleur";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Naam van bladwijzergroep";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bladwijzergroepen";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bladwijzers";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mijn plaatsen";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adres";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Groep";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Groep";
 
 /* Settings button in system menu */
 "settings" = "Instellingen";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notities";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Bladwijzers van Organic Maps met u gedeeld";
 
 "share_bookmarks_email_body" = "Hallo!\n\nBijgesloten zijn mijn bladwijzers uit de Organic Maps app. Open ze als je Organic Maps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://omaps.app/get?kmz\n\nGeniet van het reizen met Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Verbergen";
 
-/* «Rename» context menu */
-"rename" = "Naam wijzigen";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Routeberekening mislukt";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Voer een juiste naam in";
 
-"bookmarks_groups" = "lijsten";
+"bookmark_lists" = "lijsten";
 
-"bookmarks_groups_hide_all" = "Alles verbergen";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Alles verbergen";
 
-"bookmarks_groups_show_all" = "Alles weergeven";
+"bookmark_lists_show_all" = "Alles weergeven";
 
 "bookmarks_create_new_group" = "Nieuwe lijst maken";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Beperkte toegang";
 
-"bookmark_category_name" = "Categorie";
-
-"bookmark_category_description_hint" = "Maak een beschrijving aan (tekst of html)";
+"bookmark_list_description_hint" = "Maak een beschrijving aan (tekst of html)";
 
 "not_shared" = "Privé";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 4e150c1e13..b257765daf 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Nie udało się pobrać %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Dodaj nowy zestaw";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Kolor zakładki";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nazwa zestawu zakładek";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Zestawy zakładek";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Zakładki";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Moje miejsca";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adres";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Zestaw";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Zestaw";
 
 /* Settings button in system menu */
 "settings" = "Ustawienia";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notatki";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Udostępnione zakładki z Organic Maps";
 
 "share_bookmarks_email_body" = "Cześć!\n\nZałączam moje zakładki z aplikacji Organic Maps. Proszę otwórz je jeżeli masz zaintalowane Organic Maps. Lub, jeżeli nie masz, pobierz aplikację na swoje urządzenie iOS/Android za pomocą tego linka: https://omaps.app/get?kmz\n\nMiłego podróżowania z Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ukryj";
 
-/* «Rename» context menu */
-"rename" = "Zmień nazwę";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Planowanie trasy nieudane";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Wprowadź poprawną nazwę";
 
-"bookmarks_groups" = "Listy";
+"bookmark_lists" = "Listy";
 
-"bookmarks_groups_hide_all" = "Ukryj wszystkie";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ukryj wszystkie";
 
-"bookmarks_groups_show_all" = "Pokaż wszystkie";
+"bookmark_lists_show_all" = "Pokaż wszystkie";
 
 "bookmarks_create_new_group" = "Utwórz nową listę";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Dostęp prywatny";
 
-"bookmark_category_name" = "Kategoria";
-
-"bookmark_category_description_hint" = "Dodaj opis (tekst lub html)";
+"bookmark_list_description_hint" = "Dodaj opis (tekst lub html)";
 
 "not_shared" = "Osobisty";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index ec92ea44be..362a155b1a 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "O download de %@ falhou";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Adicionar novo conjunto";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Cor do favorito";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nome do conjunto de favoritos";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Favoritos";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Meus Locais";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Endereço";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Conjunto";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Conjunto";
 
 /* Settings button in system menu */
 "settings" = "Configurações";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notas";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Favoritos do Organic Maps foram compartilhados com você";
 
 "share_bookmarks_email_body" = "Olá!\n\nSegue em anexo meus favoritos do app Organic Maps. Por favor os abra se você tiver o Organic Maps instalado. Caso não tenha, baixe o app para o seu dispositivo iOS ou Android com o link https://omaps.app/get?kmz\n\nDisfrute viajar com o Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ocultar";
 
-/* «Rename» context menu */
-"rename" = "Renomear";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Falha no planejamento da rota";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Por favor, digite um nome correto";
 
-"bookmarks_groups" = "Listas";
+"bookmark_lists" = "Listas";
 
-"bookmarks_groups_hide_all" = "Ocultar tudo";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ocultar tudo";
 
-"bookmarks_groups_show_all" = "Exibir tudo";
+"bookmark_lists_show_all" = "Exibir tudo";
 
 "bookmarks_create_new_group" = "Criar nova lista";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Acesso limitado";
 
-"bookmark_category_name" = "Categoria";
-
-"bookmark_category_description_hint" = "Digite uma descrição (texto ou html)";
+"bookmark_list_description_hint" = "Digite uma descrição (texto ou html)";
 
 "not_shared" = "Privado";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 8a350650dc..98034515ff 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "O descarregamento de %@ falhou";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Adicionar conjunto novo";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Cor do favorito";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nome do conjunto de favoritos";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Conjuntos de favoritos";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Favoritos";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Os meus locais";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Endereço";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Conjunto";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Conjunto";
 
 /* Settings button in system menu */
 "settings" = "Configurações";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Notas";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Os favoritos do Organic Maps foram partilhados consigo";
 
 "share_bookmarks_email_body" = "Olá!\n\nSegue em anexo os meus favoritos da aplicação Organic Maps. Por favor abra-os se tiver o Organic Maps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://omaps.app/get?kmz\n\nDivirta-se a viajar com o Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ocultar";
 
-/* «Rename» context menu */
-"rename" = "Alterar nome";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Falha no planeamento da rota";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Introduza um nome correto";
 
-"bookmarks_groups" = "Listas";
+"bookmark_lists" = "Listas";
 
-"bookmarks_groups_hide_all" = "Ocultar tudo";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ocultar tudo";
 
-"bookmarks_groups_show_all" = "Mostrar tudo";
+"bookmark_lists_show_all" = "Mostrar tudo";
 
 "bookmarks_create_new_group" = "Criar nova lista";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Acesso limitado";
 
-"bookmark_category_name" = "Categoria";
-
-"bookmark_category_description_hint" = "Introduza uma descrição (texto ou html)";
+"bookmark_list_description_hint" = "Introduza uma descrição (texto ou html)";
 
 "not_shared" = "Privado";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index a13264c99b..51ae98b9ad 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Descărcarea %@ nu a reușit";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Adăugare la „Marcaje”";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Culoare marcaj";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Nume set marcaje";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Seturi marcaje";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Marcaje";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Locurile mele";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresă";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Set";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Set";
 
 /* Settings button in system menu */
 "settings" = "Setări";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Note";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Marcaje Organic Maps partajate";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ascundere";
 
-/* «Rename» context menu */
-"rename" = "Redenumire";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Planificarea rutei a eșuat";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Introdu un nume corect";
 
-"bookmarks_groups" = "Liste";
+"bookmark_lists" = "Liste";
 
-"bookmarks_groups_hide_all" = "Ascundere toate";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ascundere toate";
 
-"bookmarks_groups_show_all" = "Afișare toate";
+"bookmark_lists_show_all" = "Afișare toate";
 
 "bookmarks_create_new_group" = "Creați o listă nouă";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Acces privat";
 
-"bookmark_category_name" = "Categorie";
-
-"bookmark_category_description_hint" = "Adăugați o descriere (text sau html)";
+"bookmark_list_description_hint" = "Adăugați o descriere (text sau html)";
 
 "not_shared" = "Personal";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 840f4f6b2e..f119b27512 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Не удалось загрузить %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Добавить группу";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Цвет метки";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Название группы";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Группы меток";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Метки";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Мои Метки";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Адрес";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Группа";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Группа";
 
 /* Settings button in system menu */
 "settings" = "Настройки";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Примечание";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "С вами поделились метками Organic Maps";
 
 "share_bookmarks_email_body" = "Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://omaps.app/get?kmz\n\nСпасибо!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Скрыть";
 
-/* «Rename» context menu */
-"rename" = "Переименовать";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Ошибка построения маршрута";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Пожалуйста, введите название правильно";
 
-"bookmarks_groups" = "Списки";
+"bookmark_lists" = "Списки";
 
-"bookmarks_groups_hide_all" = "Спрятать все";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Спрятать все";
 
-"bookmarks_groups_show_all" = "Показать все";
+"bookmark_lists_show_all" = "Показать все";
 
 "bookmarks_create_new_group" = "Создать новый список";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Ограниченный доступ";
 
-"bookmark_category_name" = "Категория";
-
-"bookmark_category_description_hint" = "Добавьте описание (текст или html)";
+"bookmark_list_description_hint" = "Добавьте описание (текст или html)";
 
 "not_shared" = "Личный";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index eb2613407e..1395526cbe 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Sťahovanie zlyhalo: %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Pridať novú skupinu záložiek";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Farba záložky";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Meno záložky";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Skupiny záložiek";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Záložky";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Moje miesta";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adresa";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Skupina";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Skupina";
 
 /* Settings button in system menu */
 "settings" = "Nastavenia";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Poznámky";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Zdielané záložky Organic Maps";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Skryť";
 
-/* «Rename» context menu */
-"rename" = "Premenovať";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Plánovanie trasy zlyhalo";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Prosím, zadajte správne meno";
 
-"bookmarks_groups" = "Zoznamy";
+"bookmark_lists" = "Zoznamy";
 
-"bookmarks_groups_hide_all" = "Skryť všetko";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Skryť všetko";
 
-"bookmarks_groups_show_all" = "Zobraziť všetko";
+"bookmark_lists_show_all" = "Zobraziť všetko";
 
 "bookmarks_create_new_group" = "Vytvoriť nový zoznam";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Obmedzený prístup";
 
-"bookmark_category_name" = "Kategória";
-
-"bookmark_category_description_hint" = "Zadajte popis (text alebo html)";
+"bookmark_list_description_hint" = "Zadajte popis (text alebo html)";
 
 "not_shared" = "Súkromné";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 5eaf71354f..b45c8e9fc3 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ nedladdning misslyckades";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Lägg till ny samling";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bokmärkesfärg";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Bokmärkessamlingens namn";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Bokmärkessamlingar";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Bokmärken";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Mina Platser";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Adress";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Samling";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Samling";
 
 /* Settings button in system menu */
 "settings" = "Inställningar";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Anteckningar";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps bokmärken har delats med dig";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Göm";
 
-/* «Rename» context menu */
-"rename" = "Byt namn";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Ruttplanering misslyckades";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Ange ett korrekt namn";
 
-"bookmarks_groups" = "Listor";
+"bookmark_lists" = "Listor";
 
-"bookmarks_groups_hide_all" = "Dölj alla";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Dölj alla";
 
-"bookmarks_groups_show_all" = "Visa alla";
+"bookmark_lists_show_all" = "Visa alla";
 
 "bookmarks_create_new_group" = "Skapa ny lista";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Privat åtkomst";
 
-"bookmark_category_name" = "Kategori";
-
-"bookmark_category_description_hint" = "Lägg till en beskrivning (text eller html)";
+"bookmark_list_description_hint" = "Lägg till en beskrivning (text eller html)";
 
 "not_shared" = "Personlig";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 4950034d0f..fc0b9506e4 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "การดาวน์โหลด %@ ล้มเหลว";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "เพิ่มชุดใหม่";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "สีของบุ๊กมาร์ก";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "ชื่อของชุดบุ๊กมาร์ก";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "ชุดของบุ๊กมาร์ก";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "บุ๊กมาร์ก";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "สถานที่ของฉัน";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "ที่อยู่";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "ชุด";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "ชุด";
 
 /* Settings button in system menu */
 "settings" = "การตั้งค่า";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "บันทึก";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "แชร์บุ๊กมาร์กของ Organic Maps แล้ว";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "ซ่อน";
 
-/* «Rename» context menu */
-"rename" = "เปลี่ยนชื่อ";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "การวางแผนเส้นทางล้มเหลว";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "กรุณาใส่ชื่อที่ถูกต้อง";
 
-"bookmarks_groups" = "รายการ";
+"bookmark_lists" = "รายการ";
 
-"bookmarks_groups_hide_all" = "ซ่อนทั้งหมด";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "ซ่อนทั้งหมด";
 
-"bookmarks_groups_show_all" = "แสดงทั้งหมด";
+"bookmark_lists_show_all" = "แสดงทั้งหมด";
 
 "bookmarks_create_new_group" = "สร้างรายการใหม่";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "จำกัดการเข้าถึง";
 
-"bookmark_category_name" = "หมวดหมู่";
-
-"bookmark_category_description_hint" = "พิมพ์รายละเอียด (ข้อความหรือ html)";
+"bookmark_list_description_hint" = "พิมพ์รายละเอียด (ข้อความหรือ html)";
 
 "not_shared" = "ส่วนตัว";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 29dff33566..cad07f53fa 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -71,7 +71,7 @@
 "country_status_download_failed" = "Indirme işlemi başarısız oldu";
 
 /* Button text for the button under the country_status_download_failed message */
-"try_again" = "Tekrar Deneyin";
+"try_again" = "Tekrar Dene";
 
 "about_menu_title" = "Organic Maps Hakkında";
 
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ indirme işlemi başarısız oldu";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Yeni Ayar ekle";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Yer İmi Rengi";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
-"bookmark_set_name" = "Yer İmi Adını Ayarla";
+/* Add Bookmark list dialog - hint when the list name is empty */
+"bookmark_set_name" = "Yer İmi Listesi Adı";
 
-/* Bookmark Sets dialog title */
-"bookmark_sets" = "Yer İmi Ayarları";
+/* "Bookmark Lists" dialog title */
+"bookmark_sets" = "Yer İmi Listeleri";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Yer İmleri";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Yerlerim";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,26 +132,26 @@
 /* Editor title above street and house number */
 "address" = "Adres";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Ayarla";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Liste";
 
 /* Settings button in system menu */
 "settings" = "Ayarlar";
 
 /* Header of settings activity where user defines storage path */
-"maps_storage" = "Haritaları depolama";
+"maps_storage" = "Haritaları şuraya kaydet:";
 
 /* Detailed description of Maps Storage settings button */
 "maps_storage_summary" = "Haritaların indirileceği yeri seçin";
 
 /* Question dialog for transferring maps from one storage to another */
-"move_maps" = "Haritaları taşı?";
+"move_maps" = "Haritalar taşınsın mı?";
 
 /* Ask to wait user several minutes (some long process in modal dialog). */
 "wait_several_minutes" = "Bu işlem birkaç dakika sürebilir.\nLütfen bekleyin…";
 
 /* Measurement units title in settings activity */
-"measurement_units" = "Ölçü Birimleri";
+"measurement_units" = "Ölçü birimleri";
 
 /* Detailed description of Measurement Units settings button */
 "measurement_units_summary" = "Mil veya kilometre seçimini yap";
@@ -160,13 +160,13 @@
 "eat" = "Nerede yenir";
 
 /* Search category for grocery stores */
-"food" = "Bakkaliye";
+"food" = "Market";
 
 /* Search category */
 "transport" = "Ulaşım";
 
 /* Search category */
-"fuel" = "Benzin";
+"fuel" = "Yakıt";
 
 /* Search category */
 "parking" = "Otopark";
@@ -202,7 +202,7 @@
 "hospital" = "Hastane";
 
 /* Search category */
-"toilet" = "Tuvalet";
+"toilet" = "WC";
 
 /* Search category */
 "post" = "Posta";
@@ -213,10 +213,10 @@
 /* Notes field in Bookmarks view */
 "description" = "Notlar";
 
-/* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Paylaşılan Organic Maps yer imleri";
+/* Email Subject when sharing bookmark list */
+"share_bookmarks_email_subject" = "Seninle paylaşılan Organic Maps yer imleri";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
+"share_bookmarks_email_body" = "Merhaba!\n\nEktekiler benim Organic Maps yer imlerim. Eğer Organic Maps'i yüklediyseniz lütfen ektekileri açın. Eğer yüklemediyseniz, bu bağlantıyı takip ederek iOS ve Android cihazınız için uygulamayı yükleyebilirsiniz: https://omaps.app/get?kmz\n\nOrganic Maps ile seyahat etmenin keyfini çıkarın!";
 
 /* message title of loading file */
 "load_kmz_title" = "Yer İmleri Yükleniyor";
@@ -237,16 +237,16 @@
 "cant_change_this_setting" = "Üzgünüz, Harita Depolama ayarları şu anda devre dışı.";
 
 /* Alert message that downloading is in progress. */
-"downloading_is_active" = "Ülke indirme işlemi şu anda sürüyor.";
+"downloading_is_active" = "Harita indirme işlemi şu anda sürüyor.";
 
 /* Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. */
-"my_position_share_sms" = "Hey, Organic Maps’de geçerli konumumu incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yok mu? Buradan indir: https://omaps.app/get";
+"my_position_share_sms" = "Hey, Organic Maps’te geçerli konumumu incele! %1$@ veya %2$@ Çevrimdışı haritalar sende yok mu? Buradan indir: https://omaps.app/get";
 
 /* Subject for emailed bookmark */
 "bookmark_share_email_subject" = "Hey, Organic Maps haritasında pinimi incele!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, Organic Maps’de geçerli konumumu incele!";
+"my_position_share_email_subject" = "Hey, Organic Maps’te geçerli konumumu incele!";
 
 /* Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME */
 "my_position_share_email" = "Merhaba,\n\nŞu anda bulunduğum yer: %1$@. Yeri haritada görmek için bu bağlantıya %2$@ veya şuna %3$@ tıkla.\n\nTeşekkürler.";
@@ -270,13 +270,13 @@
 "version" = "Sürüm: %@";
 
 /* Data version in «About» screen */
-"data_version" = "Data version: %d";
+"data_version" = "Veri sürümü: %d";
 
 /* Confirmation in downloading countries dialog */
 "are_you_sure" = "Devam etmek istediğinizden emin misiniz?";
 
 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Parçalar";
+"tracks_title" = "Kayıtlar";
 
 /* Length of track in cell that describes route */
 "length" = "Uzunluk";
@@ -284,16 +284,16 @@
 "share_my_location" = "Yerimi paylaş";
 
 /* Settings general group in settings screen */
-"prefs_group_general" = "General settings";
+"prefs_group_general" = "Genel ayarlar";
 
 /* Settings information group in settings screen */
-"prefs_group_information" = "Information";
+"prefs_group_information" = "Bilgi";
 
 "prefs_group_route" = "Navigasyon";
 
 "pref_zoom_title" = "Yakınlaştırma butonları";
 
-"pref_zoom_summary" = "Ekranda göster";
+"pref_zoom_summary" = "Haritada göster";
 
 /* Settings «Map» category: «Night style» title */
 "pref_map_style_title" = "Gece Modu";
@@ -311,7 +311,7 @@
 "pref_map_3d_title" = "Perspektif görünüm";
 
 /* Settings «Map» category: «3D buildings» title */
-"pref_map_3d_buildings_title" = "3 Boyutlu Binalar";
+"pref_map_3d_buildings_title" = "3D yapılar";
 
 /* Settings «Route» category: «Tts enabled» title */
 "pref_tts_enable_title" = "Sesli Talimatlar";
@@ -326,7 +326,7 @@
 "pref_tts_other_section_title" = "Diğer";
 
 /* Settings «Map» category: «Record track» title */
-"pref_track_record_title" = "En son yol";
+"pref_track_record_title" = "En sonki kayıt";
 
 "pref_map_auto_zoom" = "Otomatik yakınlaştırma";
 
@@ -385,10 +385,10 @@
 "help" = "Yardım";
 
 /* Button in the main Help dialog */
-"faq" = "Sorular ve cevaplar";
+"faq" = "Sıkça Sorulan Sorular";
 
 /* Button in the main Help dialog */
-"how_to_support_us" = "Bizi nasıl destekleyebilirim?";
+"how_to_support_us" = "Sizi nasıl destekleyebilirim?";
 
 /* Button in the main Help dialog */
 "copyright" = "Telif hakkı";
@@ -449,7 +449,7 @@
 "downloader_download_map" = "Haritayı indir";
 
 /* Item status in downloader. */
-"downloader_retry" = "Tekrarla";
+"downloader_retry" = "Tekrar dene";
 
 /* Item in context menu. */
 "downloader_delete_map" = "Haritayı Sil";
@@ -485,7 +485,7 @@
 "bookmark" = "yer i̇mi";
 
 /* location service disabled */
-"enable_location_services" = "Lütfen Yer Hizmetlerini etkinleştirin";
+"enable_location_services" = "Lütfen Konum Hizmetlerini etkinleştirin";
 
 "save" = "Kaydet";
 
@@ -610,9 +610,9 @@
 
 /********** Strings for downloading map from search **********/
 
-"search_without_internet_advertisement" = "Rotaları aramak ve oluşturmaya başlamak için lütfen haritayı indirin ve artık internet bağlantısına ihtiyacınız yok.";
+"search_without_internet_advertisement" = "Rotaları aramak ve oluşturmaya başlamak için lütfen haritayı indirin. İndirdikten sonra artık internet bağlantısına ihtiyacınız olmayacak.";
 
-"search_select_map" = "Haritayi Seçin";
+"search_select_map" = "Haritayı Seçin";
 
 /* «Show» context menu */
 "show" = "Göster";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Gizle";
 
-/* «Rename» context menu */
-"rename" = "Yeniden Adlandır";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Rota Planlaması Başarısız";
 
@@ -654,12 +651,12 @@
 
 "search_history_title" = "Arama Geçmişi";
 
-"search_history_text" = "En son yapılan arama sorgularına hızlı erişim.";
+"search_history_text" = "En son yapılan arama sorgularını görüntüle.";
 
-"clear_search" = "Arama geçmişini temizle";
+"clear_search" = "Arama Geçmişini temizle";
 
 /* Place Page link to Wikipedia article (if map object has it). */
-"read_in_wikipedia" = "Wikipedia";
+"read_in_wikipedia" = "Vikipedi";
 
 "p2p_your_location" = "Konumunuz";
 
@@ -667,7 +664,7 @@
 
 "p2p_from_here" = "Başlangıç";
 
-"p2p_to_here" = "Varış yeri:";
+"p2p_to_here" = "Varış yeri";
 
 "p2p_only_from_current" = "Navigasyon sadece şu anki konumunuzdan mevcut.";
 
@@ -707,9 +704,9 @@
 
 "share_with_friends" = "Arkadaşlarınla paylaş";
 
-"editor_report_problem_desription_1" = "OpenStreetMap topluluğunun hatayı düzeltmesi için lütfen problemi detaylı bir şekilde tanımlayın.";
+"editor_report_problem_desription_1" = "OpenStreetMap topluluğunun hatayı düzeltmesi için lütfen problemi detaylı bir şekilde açıklayın.";
 
-"editor_report_problem_desription_2" = "Veya bunu adresinden kendiniz yapın https://www.openstreetmap.org/";
+"editor_report_problem_desription_2" = "Veya bunu https://www.openstreetmap.org/ adresinden kendiniz yapın";
 
 "editor_report_problem_send_button" = "Gönder";
 
@@ -741,7 +738,7 @@
 
 "edit_opening_hours" = "İş saatlerini düzenle";
 
-"no_osm_account" = "OpenStreetMap' hesabın yok mu?";
+"no_osm_account" = "OpenStreetMap hesabın yok mu?";
 
 "register_at_openstreetmap" = "Kaydol";
 
@@ -766,14 +763,14 @@
 
 "edit_place" = "Yeri düzenle";
 
-"place_name" = "Yer ismi";
+"place_name" = "Yerin Adı";
 
 "add_language" = "Bir dil ekle";
 
 "street" = "Sokak";
 
 /* Editable House Number text field (in address block). */
-"house_number" = "Bir ev numarası";
+"house_number" = "Bina numarası";
 
 "details" = "Detaylar";
 
@@ -781,7 +778,7 @@
 "add_street" = "Bir sokak ekle";
 
 /* Error to display when a new street name is not entered in the New street dialog */
-"empty_street_name_error" = "Please enter a street name";
+"empty_street_name_error" = "Lütfen bir sokak adı girin";
 
 "choose_language" = "Bir dil seç";
 
@@ -798,7 +795,7 @@
 
 "phone" = "Telefon";
 
-"editor_add_phone" = "Add Phone";
+"editor_add_phone" = "Telefon Ekle";
 
 "please_note" = "Lütfen dikkat";
 
@@ -822,7 +819,7 @@
 
 "editor_profile_changes" = "Doğrulanan Değişiklikler";
 
-"editor_focus_map_on_location" = "Objenin doğru konumunu seçmek için haritayı çekin.";
+"editor_focus_map_on_location" = "Objenin doğru konumunu seçmek için haritayı sürükleyin.";
 
 "editor_add_select_category" = "Kategori seç";
 
@@ -834,7 +831,7 @@
 
 "editor_add_place_title" = "Ekleme";
 
-"editor_edit_place_name_hint" = "Yerin ismi";
+"editor_edit_place_name_hint" = "Yerin adı";
 
 "editor_edit_place_category_title" = "Kategori";
 
@@ -844,36 +841,36 @@
 
 "placepage_add_business_button" = "Kuruluş ekle";
 
-"whatsnew_editor_message_1" = "Doğrudan uygulamadan haritaya yeni yerler ekle ve mevcut yerleri düzenleyin.";
+"whatsnew_editor_message_1" = "Doğrudan uygulamadan haritaya yeni yerler ekleyin ve mevcut yerleri düzenleyin.";
 
 "dialog_incorrect_feature_position" = "Konumu değiştir";
 
 "message_invalid_feature_position" = "Buraya bir nesne konumlandırılamıyor";
 
-"login_to_make_edits_visible" = "Giriş yapın böylelikle diğer kullanıcılar yaptığınız değişiklikleri görebilirler.";
+"login_to_make_edits_visible" = "Diğer kullanıcıların yaptığınız değişiklikleri görebilmesi için oturum açın";
 
 /* Error dialog no space */
 "migration_no_space_message" = "İndirmek için daha fazla alana ihtiyacınız var. Lütfen gereksiz verileri silin.";
 
-"editor_sharing_title" = "Organic Maps haritalarını iyileştirdim";
+"editor_sharing_title" = "Organic Maps haritalarını geliştirdim";
 
 /* Downloaded 10 **of** 20 <- it is that "of" */
 "downloader_of" = "%1$d/%2$d";
 
-"download_over_mobile_header" = "Hücresel bir ağ bağlantısı kullanarak indir?";
+"download_over_mobile_header" = "Hücresel bir ağ bağlantısı kullanarak indirilsin mi?";
 
-"download_over_mobile_message" = "Bu işlem bazı planlarla ya da dolaşım ise büyük ölçüde pahalı olabilir.";
+"download_over_mobile_message" = "Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir.";
 
-"error_enter_correct_house_number" = "Doğru ev numarası girin";
+"error_enter_correct_house_number" = "Geçerli bir bina numarası girin";
 
 "editor_storey_number" = "Kat sayısı (en fazla %d)";
 
 /* Error message in Editor when a user tries to set the number of floors for a building higher than 25 */
-"error_enter_correct_storey_number" = "Binayı en fazla 25 katlı düzenle";
+"error_enter_correct_storey_number" = "Kat sayısı 25'i geçmemelidir";
 
 "editor_zip_code" = "Posta Kodu";
 
-"error_enter_correct_zip_code" = "Doğru Posta Kodunu girin";
+"error_enter_correct_zip_code" = "Geçerli bir posta kodu girin";
 
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "Bilinmeyen Yer";
@@ -882,7 +879,7 @@
 
 "editor_detailed_description_hint" = "Ayrıntılı yorum";
 
-"editor_detailed_description" = "Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. Organic Maps’de düzenlenemeyen ayrıntıları açıklayın.";
+"editor_detailed_description" = "Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. Organic Maps’te düzenlenemeyen ayrıntıları açıklayın.";
 
 "editor_more_about_osm" = "OpenStreetMap hakkında ek bilgi";
 
@@ -895,10 +892,10 @@
 "downloader_no_downloaded_maps_message" = "Çevrimdışı olarak adres bulmak ve gezinmek için haritaları indirin.";
 
 /* Error title that appears after certain time without location. */
-"current_location_unknown_title" = "Geçerli konumunuzuz izlenmeye devam edilsin mi";
+"current_location_unknown_title" = "Geçerli konumunuzuz izlenmeye devam edilsin mi?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Geçerli konum bilinmiyor Muhtemelen bir binanın içinde veya tüneldesiniz.";
+"current_location_unknown_message" = "Geçerli konum bilinmiyor. Muhtemelen bir binanın içinde veya tüneldesiniz.";
 
 "current_location_unknown_continue_button" = "Devam";
 
@@ -906,18 +903,18 @@
 
 "current_location_unknown_error_title" = "Geçerli konum bilinmiyor.";
 
-"current_location_unknown_error_message" = "Konumunuz aranırken bir hata oluştu. Cihazının düzgün çalışıp çalışmadığını kontrol edip daha sonra tekrar deneyin.";
+"current_location_unknown_error_message" = "Konumunuz aranırken bir hata oluştu. Cihazınızın düzgün çalışıp çalışmadığını kontrol edin ve daha sonra tekrar deneyin.";
 
-"location_services_disabled_header" = "Konum tanımlama devre dışı bırakıldı";
+"location_services_disabled_header" = "Konum servisleri devre dışı bırakıldı";
 
-"location_services_disabled_message" = "Cihaz ayarlarında konum belirlemeye erişimi etkinleştirin";
+"location_services_disabled_message" = "Cihaz ayarlarında coğrafi konuma erişimi etkinleştirin";
 
 "location_services_disabled_1" = "1. Ayarları Açın";
 
 "location_services_disabled_2" = "2. Konuma Dokunun";
 
 /* iOS Dialog for the case when the location permission is not granted */
-"location_services_disabled_3" = "3. Uygulamayı Kullanırken Seç";
+"location_services_disabled_3" = "3. \"Uygulamayı Kullanırken\"i Seçin";
 
 "meter" = "m";
 
@@ -929,7 +926,7 @@
 
 "foot" = "fit";
 
-"miles_per_hour" = "mph";
+"miles_per_hour" = "saatte mil";
 
 "hour" = "sa";
 
@@ -961,33 +958,33 @@
 
 "editor_reset_edits_button" = "Sıfırla";
 
-"editor_remove_place_message" = "Eklenen bir yer kaldırılsın mı?";
+"editor_remove_place_message" = "Eklenen yer kaldırılsın mı?";
 
 "editor_remove_place_button" = "Kaldır";
 
 "editor_place_doesnt_exist" = "Bu yer mevcut değil";
 
 /* Error message for "Place doesn't exist" dialog when comment is empty */
-"delete_place_empty_comment_error" = "Please indicate the reason for deleting the place";
+"delete_place_empty_comment_error" = "Lütfen bu yerin silinmesinin nedenini belirtin";
 
 "text_more_button" = "…daha fazla";
 
 /* Phone number error message */
-"error_enter_correct_phone" = "Doğru telefon numarası gir";
+"error_enter_correct_phone" = "Geçerli bir telefon numarası girin";
 
 "error_enter_correct_web" = "Geçerli bir web adresi girin";
 
 "error_enter_correct_email" = "Geçerli bir e-posta girin";
 
-"error_enter_correct_facebook_page" = "Enter a valid Facebook web address, account, or page name";
+"error_enter_correct_facebook_page" = "Geçerli bir Facebook web adresi, hesap veya sayfa adı girin";
 
-"error_enter_correct_instagram_page" = "Enter a valid Instagram web address or account name";
+"error_enter_correct_instagram_page" = "Geçerli bir İnstagram web adresi veya hesap adı girin";
 
-"error_enter_correct_twitter_page" = "Enter a valid Twitter web address or username";
+"error_enter_correct_twitter_page" = "Geçerli bir Twitter web adresi veya kullanıcı adı girin";
 
-"error_enter_correct_vk_page" = "Enter a valid VK web address or account name";
+"error_enter_correct_vk_page" = "Geçerli bir VK web adresi veya hesap adı girin";
 
-"error_enter_correct_line_page" = "Enter a valid LINE web address or LINE ID";
+"error_enter_correct_line_page" = "Geçerli bir Line web adresi veya Line ID'si girin";
 
 "refresh" = "Güncelleştirme";
 
@@ -999,7 +996,7 @@
 /* iOS Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "Herhangi bir kişisel bilgi girmediğinizden emin olun.";
 
-"editor_share_to_all_dialog_message_2" = "Değişikliği kontrol edeceğiz. Eğer herhangi bir sorumuz olursa sizinle e-posta aracılığıyla temasa geçeceğiz.";
+"editor_share_to_all_dialog_message_2" = "Değişikliği kontrol edeceğiz. Eğer herhangi bir sorumuz olursa sizinle e-posta aracılığıyla iletişime geçeceğiz.";
 
 "navigation_stop_button" = "dur";
 
@@ -1019,10 +1016,10 @@
 "general_settings" = "Genel ayarlar";
 
 /* For the first routing */
-"accept" = "Kabul";
+"accept" = "Kabul et";
 
 /* For the first routing */
-"decline" = "Ret";
+"decline" = "Reddet";
 
 /* noun */
 "search_in_table" = "Liste";
@@ -1064,13 +1061,13 @@
 
 "off" = "Kapat";
 
-"prefs_languages_information" = "Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS'yi kullanıyor, Uygulamayı, Google Play'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)";
+"prefs_languages_information" = "Sesli talimatlar için TTS sistemini kullanıyoruz. Çoğu Android cihaz, Google TTS'yi kullanıyor. Uygulamayı, Google Play'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)";
 
 "prefs_languages_information_off" = "Bazı diller için uygulama mağazasından (Google Play Market, Samsung Apps) farklı bir konuşma sentezleyicisi veya ek bir dil paketi yüklemeniz gerekebilir. Cihaz ayarları → Dil ve Giriş → Konuşma → Metin Okuma sekmelerini açın. Buradan konuşma sentezi ayarlarını yönetebilir (örneğin, çevrimdışı kullanım için bir dil paketini karşıdan yükleyebilir) ve başka bir metin okuma motorunu seçebilirsiniz.";
 
 "prefs_languages_information_off_link" = "Daha fazla bilgi için lütfen bu kılavuzu inceleyin.";
 
-"transliteration_title" = "Latince alfabesine çevirme";
+"transliteration_title" = "Latin alfabesine çevirme";
 
 "learn_more" = "Daha fazla bilgi edinin";
 
@@ -1098,7 +1095,7 @@
 
 "dialog_error_storage_title" = "Depolama alanı erişim sorunu";
 
-"dialog_error_storage_message" = "Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin ve support@organicmaps.app adresinden bizimle iletişime geçin";
+"dialog_error_storage_message" = "Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support@organicmaps.app adresinden bizimle iletişime geçin";
 
 "setting_emulate_bad_storage" = "Bozuk depolama alanını taklit et";
 
@@ -1106,16 +1103,17 @@
 
 "error_enter_correct_name" = "Lütfen, doğru bir isim girin";
 
-"bookmarks_groups" = "Listeler";
+"bookmark_lists" = "Listeler";
 
-"bookmarks_groups_hide_all" = "Tümünü gizle";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Tümünü gizle";
 
-"bookmarks_groups_show_all" = "Tümünü göster";
+"bookmark_lists_show_all" = "Tümünü göster";
 
 "bookmarks_create_new_group" = "Yeni liste oluştur";
 
 /* Bookmark categories screen */
-"bookmarks_import" = "Import bookmarks";
+"bookmarks_import" = "Yer imlerini içe aktar";
 
 "downloader_hide_screen" = "Ekranı Gizle";
 
@@ -1131,27 +1129,27 @@
 
 "bookmarks_error_message_share_empty" = "Boş bir liste paylaşılamaz";
 
-"bookmarks_error_title_empty_list_name" = "Isim boş olamaz";
+"bookmarks_error_title_empty_list_name" = "İsim boş olamaz";
 
-"bookmarks_error_message_empty_list_name" = "Lütfen liste ismini giriniz";
+"bookmarks_error_message_empty_list_name" = "Lütfen liste ismini girin";
 
 "bookmarks_new_list_hint" = "Yeni liste";
 
 "bookmarks_error_title_list_name_already_taken" = "Bu isim zaten alınmış";
 
-"bookmarks_error_message_list_name_already_taken" = "Lütfen başka bir isim seçiniz";
+"bookmarks_error_message_list_name_already_taken" = "Lütfen başka bir isim seçin";
 
 "bookmarks_error_title_list_name_too_long" = "Bu isim çok uzun";
 
-"please_wait" = "Lütfen bekle…";
+"please_wait" = "Lütfen bekleyin�";
 
 "phone_number" = "Telefon numarası";
 
-"profile" = "OpenStreetMap profil";
+"profile" = "OpenStreetMap profili";
 
 "bookmarks_detect_title" = "Yeni dosyalar algılandı";
 
-"button_convert" = "Dönüştürmek";
+"button_convert" = "Dönüştür";
 
 "bookmarks_convert_error_title" = "Hata";
 
@@ -1163,9 +1161,9 @@
 
 "error_system_message" = "Bilinmeyen bir hata oluştu";
 
-"restore" = "Restore";
+"restore" = "Geri al";
 
-"subtittle_opt_out" = "İzleme ayarları";
+"subtittle_opt_out" = "Kayıt ayarları";
 
 "crash_reports" = "Kilitlenme raporu";
 
@@ -1191,7 +1189,7 @@
 
 "title_error_downloading_bookmarks" = "Bir hata oluştu";
 
-"popular_place" = "Popular";
+"popular_place" = "Popüler";
 
 "export_file" = "Dosyayı dışa aktar";
 
@@ -1205,11 +1203,9 @@
 
 "limited_access" = "Sınırlı erişim";
 
-"bookmark_category_name" = "Kategori";
+"bookmark_list_description_hint" = "Bir açıklama yazın (metin veya html)";
 
-"bookmark_category_description_hint" = "Bir açıklama yazın (metin veya html)";
-
-"not_shared" = "Şahsi";
+"not_shared" = "Gizli";
 
 "tags_loading_error_subtitle" = "Etiketler yüklenirken bir hata oluştu, lütfen tekrar deneyin";
 
@@ -1240,7 +1236,7 @@
 
 "power_managment_setting_manual_max" = "Maksimum güç tasarrufu";
 
-"enable_logging_warning_message" = "Seçenek tanı amaçlı, günlüğe kaydetmeyi açar. Uygulamayla ilgili sorunları gideren destek ekibimiz için yardımcı olabilir. Bu seçeneği yalnızca Organic Maps desteğinin isteği üzerine etkinleştirin.";
+"enable_logging_warning_message" = "Bu seçenek tanılama amacıyla günlüğe kaydetmeyi açar. Ekibimizin uygulamayla ilgili sorunları gidermesine yardımcı olabilir. Sorununuzla ilgili ayrıntılı günlükleri kaydetmek ve bize göndermek için bu seçeneği geçici olarak etkinleştirin.";
 
 "access_rules_author_only" = "Çevrimiçi düzenleme";
 
@@ -1314,7 +1310,7 @@
 
 "ok" = "Tamam";
 
-"avoid_unpaved_carplay_1" = "Stabilizesiz";
+"avoid_unpaved_carplay_1" = "Toprak yol yok";
 
 "avoid_unpaved_carplay_2" = "Asfaltsız hariç";
 
@@ -1369,7 +1365,7 @@
 
 "moreyear_ago_sorttype" = "Bir yıldan daha önce";
 
-"near_me_sorttype" = "Bana yakın";
+"near_me_sorttype" = "Bana yakınlarda";
 
 "others_sorttype" = "Diğerleri";
 
@@ -1451,16 +1447,16 @@
 
 "key_information_title" = "Anahtar bilgisi";
 
-"download_map_title" = "Download the world map";
+"download_map_title" = "Dünya haritasını indir";
 
-"connection_failure" = "Connection failure";
+"connection_failure" = "Bağlantı hatası";
 
-"disconnect_usb_cable_title" = "Disconnect USB cable";
+"disconnect_usb_cable_title" = "USB kablosunu çıkarın";
 
-"enable_screen_sleep" = "Ekranın uyumasına izin ver";
+"enable_screen_sleep" = "Ekranın kapanmasına izin ver";
 
 /* Description in preferences */
-"enable_screen_sleep_description" = "Etkinleştirildiğinde ekranın bir süre hareketsiz kaldıktan sonra uykuya geçmesine izin verilir.";
+"enable_screen_sleep_description" = "Etkinleştirildiğinde ekranın bir süre hareketsiz kaldıktan sonra kapanmasına izin verilir.";
 
 /* Autoupdate dialog on start */
 "whats_new_auto_update_title" = "İndirdiğiniz haritaları güncelleyin";
@@ -1475,10 +1471,10 @@
 "whats_new_auto_update_button_later" = "Daha sonra manüel olarak güncelle";
 
 /* Delete track button on track edit screen */
-"placepage_delete_track_button" = "Delete Track";
+"placepage_delete_track_button" = "Kaydı Sil";
 
 /* Placeholder for track name input on track edit screen */
-"placepage_track_name_hint" = "Track Name";
+"placepage_track_name_hint" = "Kayıt Adı";
 
 /* move track or bookmark from the list button text */
 "move" = "Move";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
index 950f8239a4..63861ef04e 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
@@ -50,7 +50,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d yer</string>
+      <string>%d obje</string>
     </dict>
   </dict>
 
@@ -80,7 +80,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d izleme</string>
+      <string>%d kayıt</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index dfc583aad1..e2e0677124 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "Не вдалося завантажити %@";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Додати групу";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Колір мiтки";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Назва групи";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Групи мiток";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Мітки";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Мої Мітки";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Адреса";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Група";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Група";
 
 /* Settings button in system menu */
 "settings" = "Налаштування";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Примітка";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "З вами поділилися мiтками Organic Maps";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Приховати";
 
-/* «Rename» context menu */
-"rename" = "Перейменувати";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Збій планування маршруту";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Будь ласка, введіть коректне ім'я";
 
-"bookmarks_groups" = "Списки";
+"bookmark_lists" = "Списки";
 
-"bookmarks_groups_hide_all" = "Приховати всі";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Приховати всі";
 
-"bookmarks_groups_show_all" = "Показати всі";
+"bookmark_lists_show_all" = "Показати всі";
 
 "bookmarks_create_new_group" = "Створити новий список";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Приватний доступ";
 
-"bookmark_category_name" = "Категорія";
-
-"bookmark_category_description_hint" = "Додайте опис (текст чи html)";
+"bookmark_list_description_hint" = "Додайте опис (текст чи html)";
 
 "not_shared" = "Особистий";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 19454f3aa6..292985347d 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ - descărcarea a eșuat";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "Thêm Bộ Mới";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Đánh dấu Màu sắc";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Đánh dấu Tên Bộ";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "Đánh dấu Bộ";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "Đánh dấu";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "Các Địa chỉ của Tôi";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "Địa chỉ";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "Đặt";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "Đặt";
 
 /* Settings button in system menu */
 "settings" = "Thiết lập";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "Ghi chú";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Điểm đánh dấu Organic Maps được chia sẻ";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "Ẩn";
 
-/* «Rename» context menu */
-"rename" = "Đổi tên";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Không thể Lập Lộ trình";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "Vui lòng nhập một tên chính xác";
 
-"bookmarks_groups" = "Danh sách";
+"bookmark_lists" = "Danh sách";
 
-"bookmarks_groups_hide_all" = "Ẩn tất cả";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "Ẩn tất cả";
 
-"bookmarks_groups_show_all" = "Hiển thị tất cả";
+"bookmark_lists_show_all" = "Hiển thị tất cả";
 
 "bookmarks_create_new_group" = "Tạo danh sách mới";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "Truy cập hạn chế";
 
-"bookmark_category_name" = "Thể loại";
-
-"bookmark_category_description_hint" = "Đánh vào một mô tả (văn bản hoặc html)";
+"bookmark_list_description_hint" = "Đánh vào một mô tả (văn bản hoặc html)";
 
 "not_shared" = "Riêng tư";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index ea61411572..71882bcdf7 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@下载失败";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "添加新的集合";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "书签颜色";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "书签集名称";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "书签集";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "书签";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "我的位置";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "地址";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "集合";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "集合";
 
 /* Settings button in system menu */
 "settings" = "设置";
@@ -213,7 +213,7 @@
 /* Notes field in Bookmarks view */
 "description" = "注释";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "Organic Maps 书签已与您共享";
 
 "share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "隐藏";
 
-/* «Rename» context menu */
-"rename" = "重命名";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "路线计划失败";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "请输入正确的名称";
 
-"bookmarks_groups" = "列表";
+"bookmark_lists" = "列表";
 
-"bookmarks_groups_hide_all" = "全部隱藏";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "全部隱藏";
 
-"bookmarks_groups_show_all" = "全部顯示";
+"bookmark_lists_show_all" = "全部顯示";
 
 "bookmarks_create_new_group" = "创建新的列表";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "私人访问";
 
-"bookmark_category_name" = "类别";
-
-"bookmark_category_description_hint" = "请添加说明（文字或html）";
+"bookmark_list_description_hint" = "请添加说明（文字或html）";
 
 "not_shared" = "私人";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 7b8b36e7dc..299b75f093 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -108,22 +108,22 @@
 /* Show popup notification on top of the map when country download has failed. */
 "download_country_failed" = "%@ 下載失敗";
 
-/* Add New Bookmark Set dialog title */
+/* "Add new bookmark list" dialog title */
 "add_new_set" = "新增收藏夾";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "書籤顏色";
 
-/* Add Bookmark Set dialog - hint when set name is empty */
+/* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "收藏夾名稱";
 
-/* Bookmark Sets dialog title */
+/* "Bookmark Lists" dialog title */
 "bookmark_sets" = "收藏夾";
 
-/* Bookmarks - dialog title */
+/* "Bookmarks" dialog title */
 "bookmarks" = "書籤";
 
-/* Default bookmarks set name */
+/* Default bookmark list name */
 "core_my_places" = "我的地點";
 
 /* Add bookmark dialog - bookmark name */
@@ -132,8 +132,8 @@
 /* Editor title above street and house number */
 "address" = "地址";
 
-/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
-"set" = "收藏夾";
+/* Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently. */
+"list" = "收藏夾";
 
 /* Settings button in system menu */
 "settings" = "設定";
@@ -213,10 +213,10 @@
 /* Notes field in Bookmarks view */
 "description" = "描述說明";
 
-/* Email Subject when sharing bookmarks category */
+/* Email Subject when sharing bookmark list */
 "share_bookmarks_email_subject" = "已分享 Organic Maps 書籤";
 
-"share_bookmarks_email_body" = "你好！\n\n附件為 Organic Maps app 的書籤，如果你有安裝 Organic Maps 則直接開啟，如果沒有的話，請先在 iOS 或是 Android 裝置，從下面連結下載：https://omaps.app/get?kmz\n\n旅行時用上 Organic Maps！";
+"share_bookmarks_email_body" = "你好！\n\n附件為 Organic Maps app 的書籤，如果你有安裝 Organic Maps 則直接開啟，如果沒有的話，請先在 iOS 或是 Android 裝置，從下面連結下載：https://omaps.app/get?kmz\n\n旅行時用上 Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "正在載入書籤…";
@@ -620,9 +620,6 @@
 /* «Hide» context menu */
 "hide" = "隱藏";
 
-/* «Rename» context menu */
-"rename" = "重新命名";
-
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "路線計劃失敗";
 
@@ -1106,11 +1103,12 @@
 
 "error_enter_correct_name" = "請輸入正確的名稱";
 
-"bookmarks_groups" = "清單";
+"bookmark_lists" = "清單";
 
-"bookmarks_groups_hide_all" = "隱藏全部";
+/* Do not display all bookmark lists on the map */
+"bookmark_lists_hide_all" = "隱藏全部";
 
-"bookmarks_groups_show_all" = "顯示全部";
+"bookmark_lists_show_all" = "顯示全部";
 
 "bookmarks_create_new_group" = "創建新列表";
 
@@ -1205,9 +1203,7 @@
 
 "limited_access" = "私人空間";
 
-"bookmark_category_name" = "類別";
-
-"bookmark_category_description_hint" = "增加說明(文字或html)";
+"bookmark_list_description_hint" = "增加說明(文字或html)";
 
 "not_shared" = "私人";