[strings] Normalize bookmark categories/sets/groups to lists

@TODO: Normalize all other languages too.

Signed-off-by: Alexander Borsuk <me@alex.bio>

android/res/layout/edit_bookmark_common.xml

@@ -43,7 +43,7 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:text="@string/set"
+      android:text="@string/list"
       android:textAppearance="@style/MwmTextAppearance.Body3" />
     <TextView
       android:id="@+id/tv__bookmark_set"
@@ -91,4 +91,4 @@
       android:hint="@string/edit_description_hint"
       android:inputType="textMultiLine" />
   </com.mapswithme.maps.widget.CustomTextInputLayout>
-</RelativeLayout>
+</RelativeLayout>

android/res/layout/fragment_bookmark_category_settings.xml

@@ -28,18 +28,14 @@
       android:paddingTop="@dimen/margin_half_plus"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
-      <TextView
-        android:text="@string/bookmark_category_name"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
       <LinearLayout
         android:orientation="horizontal"
         android:id="@+id/edit_name_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <EditText
-          android:id="@+id/edit_category_name_view"
+          android:id="@+id/edit_list_name_view"
+          android:hint="@string/list"
           android:layout_weight="1"
           android:layout_width="0dp"
           android:background="@null"
@@ -58,7 +54,7 @@
     <EditText
       android:id="@+id/edit_description"
       android:background="@null"
-      android:hint="@string/bookmark_category_description_hint"
+      android:hint="@string/bookmark_list_description_hint"
       android:minHeight="@dimen/height_item_multiline"
       android:paddingStart="@dimen/margin_base"
       android:paddingEnd="@dimen/margin_base"

android/res/layout/item_bookmark_group_list_header.xml

@@ -27,7 +27,7 @@
     android:layout_centerVertical="true"
     android:background="?selectableItemBackground"
     android:paddingTop="@dimen/margin_half_plus"
-    android:text="@string/bookmarks_groups_hide_all"
+    android:text="@string/bookmark_lists_hide_all"
     android:textAllCaps="true"
     android:textColor="?colorAccent" />
 </RelativeLayout>

android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java

@@ -115,7 +115,7 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
       HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
       headerViewHolder.setAction(mMassOperationAction,
           BookmarkManager.INSTANCE.areAllCategoriesInvisible());
-      headerViewHolder.getText().setText(R.string.bookmarks_groups);
+      headerViewHolder.getText().setText(R.string.bookmark_lists);
       break;
     }
     case TYPE_CATEGORY_ITEM:

android/src/com/mapswithme/maps/bookmarks/BookmarkCategorySettingsFragment.java

@@ -61,7 +61,7 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
 
   private void initViews(@NonNull View root)
   {
-    mEditCategoryNameView = root.findViewById(R.id.edit_category_name_view);
+    mEditCategoryNameView = root.findViewById(R.id.edit_list_name_view);
     mEditCategoryNameView.setText(mCategory.getName());
     InputFilter[] f = { new InputFilter.LengthFilter(TEXT_LENGTH_LIMIT) };
     mEditCategoryNameView.setFilters(f);

android/src/com/mapswithme/maps/bookmarks/Holders.java

@@ -87,8 +87,8 @@ public class Holders
                    final boolean showAll)
     {
       mButton.setText(showAll
-                      ? R.string.bookmarks_groups_show_all
-                      : R.string.bookmarks_groups_hide_all);
+                      ? R.string.bookmark_lists_show_all
+                      : R.string.bookmark_lists_hide_all);
       mButton.setOnClickListener(new ToggleShowAllClickListener(action, showAll));
     }
 
@@ -96,8 +96,8 @@ public class Holders
                    final boolean showAll)
     {
       mButton.setText(showAll
-                      ? R.string.bookmarks_groups_show_all
-                      : R.string.bookmarks_groups_hide_all);
+                      ? R.string.bookmark_lists_show_all
+                      : R.string.bookmark_lists_hide_all);
       mButton.setOnClickListener(new ToggleShowAllChildCategoryClickListener(
           action, showAll));
     }

data/strings/strings.txt

@@ -1380,9 +1380,9 @@
     zh-Hant = %@ 下載失敗
 
   [add_new_set]
-    comment = Add New Bookmark Set dialog title
+    comment = "Add new bookmark list" dialog title
     tags = android, ios
-    en = Add New Set
+    en = Add New List
     ar = إضافة مجموعة جديدة
     be = Дадаць новую групу
     bg = Добавяне на нова група
@@ -1455,9 +1455,9 @@
     zh-Hant = 書籤顏色
 
   [bookmark_set_name]
-    comment = Add Bookmark Set dialog - hint when set name is empty
+    comment = Add Bookmark list dialog - hint when the list name is empty
     tags = android, ios
-    en = Bookmark Set Name
+    en = Bookmark List Name
     ar = اسم مجموعة الإشارات المرجعية
     be = Назва групы закладак
     bg = Име на група
@@ -1491,9 +1491,9 @@
     zh-Hant = 收藏夾名稱
 
   [bookmark_sets]
-    comment = Bookmark Sets dialog title
+    comment = "Bookmark Lists" dialog title
     tags = ios
-    en = Bookmark Sets
+    en = Bookmark Lists
     ar = مجموعات الإشارات المرجعية
     be = Групы закладак
     cs = Skupiny záložek
@@ -1526,7 +1526,7 @@
     zh-Hant = 收藏夾
 
   [bookmarks]
-    comment = Bookmarks - dialog title
+    comment = "Bookmarks" dialog title
     tags = android, ios
     en = Bookmarks
     ar = الإشارات المرجعية
@@ -1563,7 +1563,7 @@
     zh-Hant = 書籤
 
   [core_my_places]
-    comment = Default bookmarks set name
+    comment = Default bookmark list name
     tags = android, ios
     en = My Places
     ar = أماكني
@@ -1672,10 +1672,10 @@
     zh-Hans = 地址
     zh-Hant = 地址
 
-  [set]
-    comment = Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell
+  [list]
+    comment = Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. TODO: sync with [search_in_table] if all languages will be renamed consistently.
     tags = android
-    en = Set
+    en = List
     ar = المجموعة
     be = Група
     bg = Група
@@ -2675,7 +2675,7 @@
     zh-Hant = 描述說明
 
   [share_bookmarks_email_subject]
-    comment = Email Subject when sharing bookmarks category
+    comment = Email Subject when sharing bookmark list
     tags = android
     en = Organic Maps bookmarks were shared with you
     ar = تم مشاركة اشارات Organic Maps المرجعية معك
@@ -13475,8 +13475,8 @@
     en = Please indicate the reason for deleting the place
     be = Калі ласка, укажыце прычыну выдалення
     ru = Пожалуйста, укажите причину удаления
-    uk = Будь ласка, вкажіть причину видалення
     tr = Lütfen bu yerin silinmesinin nedenini belirtin
+    uk = Будь ласка, вкажіть причину видалення
 
   [text_more_button]
     tags = ios
@@ -15573,7 +15573,7 @@
     zh-Hans = 请输入正确的名称
     zh-Hant = 請輸入正確的名稱
 
-  [bookmarks_groups]
+  [bookmark_lists]
     tags = android, ios
     en = Lists
     ar = قوائم
@@ -15610,7 +15610,8 @@
     zh-Hans = 列表
     zh-Hant = 清單
 
-  [bookmarks_groups_hide_all]
+  [bookmark_lists_hide_all]
+    comment = Do not display all bookmark lists on the map
     tags = android, ios
     en = Hide all
     ar = إخفاء الكل
@@ -15647,7 +15648,7 @@
     zh-Hans = 全部隱藏
     zh-Hant = 隱藏全部
 
-  [bookmarks_groups_show_all]
+  [bookmark_lists_show_all]
     tags = android, ios
     en = Show all
     ar = إظهار الكل
@@ -17596,42 +17597,7 @@
     zh-Hans = 私人访问
     zh-Hant = 私人空間
 
-  [bookmark_category_name]
-    tags = android
-    en = Category
-    ar = الفئة
-    be = Катэгорыя
-    bg = Категория
-    cs = Kategorie
-    da = Kategori
-    de = Kategorie
-    el = Κατηγορία
-    es = Categoría
-    fa = دسته بندی
-    fi = Kategoria
-    fr = Catégorie
-    hu = Kategória
-    id = Kategori
-    it = Categoria
-    ja = カテゴリ
-    ko = 범주
-    nb = Kategori
-    nl = Categorie
-    pl = Kategoria
-    pt = Categoria
-    pt-BR = Categoria
-    ro = Categorie
-    ru = Категория
-    sk = Kategória
-    sv = Kategori
-    th = หมวดหมู่
-    tr = Kategori
-    uk = Категорія
-    vi = Thể loại
-    zh-Hans = 类别
-    zh-Hant = 類別
-
-  [bookmark_category_description_hint]
+  [bookmark_list_description_hint]
     tags = android, ios
     en = Type a description (text or html)
     ar = اكتب وصفًا (نص أو html)

iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.swift

@@ -16,10 +16,10 @@ final class BookmarksListSectionHeader: UITableViewHeaderFooterView {
       visibilityButton.isHidden = true
     case .hideAll:
       visibilityButton.isHidden = false
-      visibilityButton.setTitle(L("bookmarks_groups_hide_all"), for: .normal)
+      visibilityButton.setTitle(L("bookmark_lists_hide_all"), for: .normal)
     case .showAll:
       visibilityButton.isHidden = false
-      visibilityButton.setTitle(L("bookmarks_groups_show_all"), for: .normal)
+      visibilityButton.setTitle(L("bookmark_lists_show_all"), for: .normal)
     }
   }
 }

iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift

@@ -41,7 +41,7 @@ final class BMCViewController: MWMViewController {
     super.viewWillAppear(animated)
     viewModel.reloadData()
   }
-  
+
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
     // Disable all notifications in BM on appearance of this view.
@@ -50,7 +50,7 @@ final class BMCViewController: MWMViewController {
     viewModel.setNotificationsEnabled(false)
     viewModel.addToObserverList()
   }
-  
+
   override func viewDidDisappear(_ animated: Bool) {
     super.viewDidDisappear(animated)
     // Allow to send all notifications in BM.
@@ -91,7 +91,7 @@ final class BMCViewController: MWMViewController {
   private func openCategorySettings(category: BookmarkGroup) {
     let settingsController = CategorySettingsViewController(bookmarkGroup: BookmarksManager.shared().category(withId: category.categoryId))
     settingsController.delegate = self
-    
+
     MapViewController.topViewController().navigationController?.pushViewController(settingsController,
                                                                                    animated: true)
   }
@@ -238,7 +238,7 @@ extension BMCViewController: UITableViewDelegate {
     case .categories:
       let categoriesHeader = tableView.dequeueReusableHeaderFooterView(BMCCategoriesHeader.self)
       categoriesHeader.isShowAll = viewModel.areAllCategoriesHidden()
-      categoriesHeader.title = L("bookmarks_groups")
+      categoriesHeader.title = L("bookmark_lists")
       categoriesHeader.delegate = self
       return categoriesHeader
     case .actions: return actionsHeader
@@ -294,7 +294,7 @@ extension BMCViewController: CategorySettingsViewControllerDelegate {
                                   didEndEditing categoryId: MWMMarkGroupID) {
     navigationController?.popViewController(animated: true)
   }
-  
+
   func categorySettingsController(_ viewController: CategorySettingsViewController,
                                   didDelete categoryId: MWMMarkGroupID) {
     navigationController?.popViewController(animated: true)

iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.swift

@@ -8,7 +8,7 @@ final class BMCCategoriesHeader: UITableViewHeaderFooterView {
 
   var isShowAll = false {
     didSet {
-      let title = L(isShowAll ? "bookmarks_groups_show_all" : "bookmarks_groups_hide_all")
+      let title = L(isShowAll ? "bookmark_lists_show_all" : "bookmark_lists_hide_all")
       UIView.performWithoutAnimation {
         button.setTitle(title, for: .normal)
         button.layoutIfNeeded()

iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift

@@ -79,7 +79,7 @@ final class CategorySettingsViewController: MWMTableViewController {
       } else {
         let cell = tableView.dequeueReusableCell(cell: MWMNoteCell.self, indexPath: indexPath)
         cell.config(with: self, noteText: bookmarkGroup.detailedAnnotation,
-                    placeholder: L("bookmark_category_description_hint"))
+                    placeholder: L("bookmark_list_description_hint"))
         noteCell = cell
         return cell
       }

iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsHeader.swift

@@ -1,7 +1,7 @@
 final class BMCNotificationsHeader: UIView {
   @IBOutlet private weak var label: UILabel! {
     didSet {
-      label.text = L("bookmarks_groups").uppercased()
+      label.text = L("bookmark_lists").uppercased()
     }
   }
 }