diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml index 85866a9fc6..053ca18db4 100644 --- a/android/app/src/main/res/layout/edit_bookmark_common.xml +++ b/android/app/src/main/res/layout/edit_bookmark_common.xml @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/margin_half_double_plus" - android:hint="@string/edit_description_hint" + android:hint="@string/placepage_personal_notes_hint" android:inputType="textMultiLine" /> diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml index 51c9fb4515..cc0551f1f2 100644 --- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml +++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml @@ -52,7 +52,7 @@ - diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 91d633ab6c..9ed238dd9e 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -9014,51 +9014,6 @@ zh-Hans = 保存 zh-Hant = 儲存 - [edit_description_hint] - tags = android - en = Your descriptions (text or html) - af = U besprekings (teks of html) - ar = الوصف (استعمل نص أو html( - az = Təsvirləriniz (mətn və ya html) - be = Ваша апісанне (тэкст або html) - bg = Ваши описания (текст или html) - ca = Les vostres descripcions (text o html) - cs = Popis (HTML nebo text) - da = Dine beskrivelser (tekst eller html) - de = Ihre Beschreibungen (Text oder HTML) - el = Λεπτομέρειες (κείμενο ή html) - es = Sus descripciones (texto o html) - et = Sinu kirjeldused (tekst või html) - eu = Zure deskribapenak (testua edo html) - fa = توضیحات شما (متن یا (html - fi = Kuvauksesi (teksti tai html) - fr = Vos descriptions (version texte ou html) - he = התיאור שלך (טקסט או HTML) - hu = Az ön leírásai (sima szöveg vagy html) - id = Deskripsi Anda (teks atau html) - it = Le tue descrizioni (testo o html) - ja = 詳細(テキストまたはHTML) - ko = 설명(텍스트 또는 HTML) - lt = Jūsų aprašymai (tekstas arba HTML) - lv = Jūsu apraksti (teksts vai HTML) - mr = तुमचे वर्णन (मजकूर किंवा html) - nb = Dine beskrivelser (tekst eller html) - nl = Uw omschrijvingen (tekst of html) - pl = Twoje opisy (tekst lub html) - pt = As suas descrições (texto ou html) - pt-BR = Suas descrições (texto ou html) - ro = Descrierile tale (text sau html) - ru = Ваше описание (текст или html) - sk = Váš popis (text alebo html) - sr = Ваш опис (текст или html) - sv = Dina beskrivningar (text eller html) - th = คำอธิบายของคุณ (ข้อความหรือ html) - tr = Açıklamalarınız (metin veya html) - uk = Ваше описання (текст або html) - vi = Mô tả của bạn (chữ hoặc html) - zh-Hans = 您的描述(文本或 html) - zh-Hant = 您的描述(文字或 html) - [create] tags = android,ios en = create @@ -19203,48 +19158,49 @@ zh-Hant = 書籤名稱 [placepage_personal_notes_hint] - tags = ios - en = Personal notes - af = Persoonlike notas - ar = ملاحظات شخصية - az = Şəxsi qeydlər - be = Асабістыя нататкі - ca = Notes personals - cs = Vlastní poznámka - da = Personlige notater - de = Persönliche Notizen - el = Προσωπικές σημειώσεις - es = Notas personales - et = Isiklikud märkmed - eu = Ohar pertsonalak - fa = یاداشت‌های شخصی - fi = Henkilökohtaiset merkinnät - fr = Remarques personnelles - he = הערות אישיות - hu = Jegyzet - id = Catatan pribadi - it = Note personali - ja = パーソナルメモ - ko = 개인 메모 - lt = Asmeniniai užrašai - lv = Personīgi pieraksti - mr = वैयक्तिक चिठ्ठ्या - nb = Personlige notater - nl = Persoonlijke aantekeningen - pl = Notatki osobiste - pt = Notas pessoais - pt-BR = Anotações pessoais - ro = Însemnări personale - ru = Примечание - sk = Osobné poznámky - sr = Приватна напомена - sv = Personlig anteckning - th = ข้อความส่วนตัว - tr = Kişisel notlar - uk = Примітка - vi = Ghi chú cá nhân - zh-Hans = 个人备注 - zh-Hant = 個人備註 + tags = android,ios + en = Personal notes (text or html) + af = Persoonlike notas (teks of html) + ar = ملاحظات شخصية (نص أو html) + az = Şəxsi qeydlər (mətn və ya html) + be = Асабістыя нататкі (тэкст альбо html) + bg = Лични бележки (текст или html) + ca = Notes personals (text o html) + cs = Vlastní poznámka (text nebo html) + da = Personlige notater (tekst eller html) + de = Persönliche Notizen (Text oder html) + el = Προσωπικές σημειώσεις (κείμενο ή html) + es = Notas personales (texto o html) + et = Isiklikud märkmed (tekst või html) + eu = Ohar pertsonalak (testua edo html) + fa = یادداشت های شخصی (متن یا html) + fi = Henkilökohtaiset merkinnät (teksti tai html) + fr = Remarques personnelles (texte ou html) + he = הערות אישיות (טקסט או HTML) + hu = Jegyzet (szöveg vagy html) + id = Catatan pribadi (teks atau html) + it = Note personali (testo o html) + ja = パーソナルメモ(テキストまたはHTML) + ko = 개인 메모 (글자 혹은 html) + lt = Asmeniniai užrašai (tekstas arba html) + lv = Personīgi pieraksti (teksts vai HTML) + mr = वैयक्तिक चिठ्ठ्या (मजकूर किंवा html) + nb = Personlige notater (text or html) + nl = Persoonlijke aantekeningen (tekst of html) + pl = Notatki osobiste (tekst lub html) + pt = Notas pessoais (texto ou html) + pt-BR = Anotações pessoais (texto ou html) + ro = Însemnări personale (text sau html) + ru = Примечание (текст или html) + sk = Osobné poznámky (text alebo html) + sv = Personlig anteckning (text eller html) + sw = Vidokezo vya kibinafsi (maandishi au HTML) + th = ข้อความส่วนตัว (ข้อความหรือ html) + tr = Kişisel notlar (metin veya html) + uk = Примітка (текст чи html) + vi = Ghi chú cá nhân (văn bản hoặc html) + zh-Hans = 个人备注(文字或 html) + zh-Hant = 個人備註(文字或 html) [placepage_delete_bookmark_button] tags = ios @@ -24736,53 +24692,6 @@ zh-Hans = 不允许访问的私人空间 zh-Hant = 不允許進入的私人空間 - [bookmark_list_description_hint] - tags = android,ios - en = Enter a description (text or html) - af = Voer ’n beskrywing in (teks of html) - ar = اكتب وصفًا (نص أو html) - az = Təsvir yazın (mətn və ya html) - be = Дабаўце апісанне (тэкст альбо html) - bg = Добавяне на описание (текст или html) - ca = Escriviu una descripció (text o html) - cs = Přidejte popis (text nebo html) - da = Lav en beskrivelse (tekst eller html) - de = Fügen Sie die Beschreibung hinzu (Text oder html) - el = Εισάγετε μια περιγραφή (κείμενο ή html) - es = Agregue una descripción (texto o html) - es-MX = Introduzca una descripción (texto o html) - et = Sisesta kirjeldus (tekst või html) - eu = Gehitu deskribapen bat (testua edo html) - fa = یک توضیح (متن یا html) تایپ نمایید - fi = Lisää kuvaus (teksti tai html) - fr = Tapez une description (texte ou html) - he = הזן תיאור (טקסט או HTML) - hu = Leírás hozzáadása (szöveg vagy html) - id = Ketikkan deskripsi (teks atau html) - it = Scrivi una descrizione (testo o html) - ja = 説明(テキストまたはhtml)を記入してください - ko = 묘사를 적으세요 (글자 혹은 html) - lt = Įveskite aprašymą(tekstas arba html) - lv = Aprakstiet (teksts vai HTML) - mr = वर्णन लिहा (मजकूर किंवा html) - nb = Lag en beskrivelse (text or html) - nl = Voer een beschrijving in (tekst of html) - pl = Dodaj opis (tekst lub html) - pt = Introduza uma descrição (texto ou html) - pt-BR = Digite uma descrição (texto ou html) - ro = Adaugă o descriere (text sau html) - ru = Добавьте описание (текст или html) - sk = Zadajte popis (text alebo html) - sr = Унесите опис (текст или html) - sv = Lägg till en beskrivning (text eller html) - sw = Andika maelezo (maneno au html) - th = พิมพ์รายละเอียด (ข้อความหรือ html) - tr = Bir açıklama yazın (metin veya html) - uk = Додайте опис (текст чи html) - vi = Đánh vào một mô tả (văn bản hoặc html) - zh-Hans = 添加说明(文字或 html) - zh-Hant = 增加說明(文字或 html) - [not_shared] tags = android en = Private diff --git a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift index 08749c0a6d..02c99c3e3f 100644 --- a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift @@ -24,7 +24,7 @@ final class CategorySettingsViewController: MWMTableViewController { private var newAnnotation: String? @objc weak var delegate: CategorySettingsViewControllerDelegate? - + @objc init(bookmarkGroup: BookmarkGroup) { self.bookmarkGroup = bookmarkGroup super.init(style: .grouped) @@ -46,11 +46,11 @@ final class CategorySettingsViewController: MWMTableViewController { tableView.registerNib(cell: MWMButtonCell.self) tableView.registerNib(cell: MWMNoteCell.self) } - + override func numberOfSections(in tableView: UITableView) -> Int { Sections.count.rawValue } - + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { switch Sections(rawValue: section) { case .info: @@ -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_list_description_hint")) + placeholder: L("placepage_personal_notes_hint")) noteCell = cell return cell }