From 21428513d1cb20ef5c6be39e00523c90a136d808 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 6 Feb 2020 14:59:16 -0600 Subject: [PATCH] Replace 'Name' with 'Display name' --- app/src/main/res/layout/activity_caldav_calendar_settings.xml | 2 +- app/src/main/res/layout/activity_google_task_list_settings.xml | 2 +- app/src/main/res/layout/activity_tag_settings.xml | 2 +- app/src/main/res/layout/activity_widget_shortcut_content.xml | 2 +- app/src/main/res/layout/custom_filter_activity.xml | 2 +- app/src/main/res/layout/filter_settings_activity.xml | 2 +- app/src/main/res/values-bg-rBG/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-ia/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 37 files changed, 7 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/layout/activity_caldav_calendar_settings.xml b/app/src/main/res/layout/activity_caldav_calendar_settings.xml index d83ab929d..0bc1236d5 100644 --- a/app/src/main/res/layout/activity_caldav_calendar_settings.xml +++ b/app/src/main/res/layout/activity_caldav_calendar_settings.xml @@ -28,7 +28,7 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/name" + android:hint="@string/display_name" android:imeOptions="flagNoExtractUi" android:inputType="textCapSentences|textAutoCorrect"/> diff --git a/app/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml index 6d4d92156..468b86650 100644 --- a/app/src/main/res/layout/activity_google_task_list_settings.xml +++ b/app/src/main/res/layout/activity_google_task_list_settings.xml @@ -25,7 +25,7 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/name" + android:hint="@string/display_name" android:imeOptions="flagNoExtractUi" android:inputType="textCapSentences|textFilter" android:maxLines="1"/> diff --git a/app/src/main/res/layout/activity_tag_settings.xml b/app/src/main/res/layout/activity_tag_settings.xml index 2521c159e..8f5a93acd 100644 --- a/app/src/main/res/layout/activity_tag_settings.xml +++ b/app/src/main/res/layout/activity_tag_settings.xml @@ -25,7 +25,7 @@ android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/name" + android:hint="@string/display_name" android:imeOptions="flagNoExtractUi" android:inputType="textCapSentences|textFilter" android:maxLines="1"/> diff --git a/app/src/main/res/layout/activity_widget_shortcut_content.xml b/app/src/main/res/layout/activity_widget_shortcut_content.xml index 9302813d4..5f2f026d0 100644 --- a/app/src/main/res/layout/activity_widget_shortcut_content.xml +++ b/app/src/main/res/layout/activity_widget_shortcut_content.xml @@ -41,7 +41,7 @@ android:id="@+id/shortcut_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/name"/> + android:hint="@string/display_name"/> + android:text="@string/display_name"/> diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 612240f41..eb519d518 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -3,7 +3,6 @@ Изчисти Картинка Добави коментар... - Име Въведете име на филтъра Резервни копия Импортиране на задачи diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3601aa67a..1defec854 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2,7 +2,6 @@ Odebrat obrázek Přidej comment... - Název Zálohy Importovat úkoly Exportovat úkoly diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a939f661a..5219bc703 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -508,7 +508,6 @@ Änderungshistorie Ungültige Backupdatei Neue Aufgaben oben - Name Sicherungen Google Aufgaben Stoppuhr diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 17610c479..fc83f0ffe 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2,7 +2,6 @@ Borrar imagen Añadir un comentario… - Nombre Introduzca el nombre del filtro Copias de seguridad Importar tareas diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index d052c3e29..56805edbe 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1,6 +1,5 @@ Lisa kommentaar… - Nimi Sisesta filtri nimi Varukoopiad Impordi ülesandeid diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index eca778c76..2559f49ec 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -2,7 +2,6 @@ Garbitu irudia Gehitu iruzkin bat… - Izena Sartu iragazkiaren izena Babes-kopiak Inportatu zereginak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 385b6101f..69682d16f 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -3,7 +3,6 @@ پاک کردن عکس اضافه کردن نظر - نام نام فیلتر را وارد نمایید پشتیبان ها واردکردن وظایف diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7f3ef8c91..79e5f85d4 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3,7 +3,6 @@ Tyhjennä kuva Lisää kommentti... - Nimi Syötä suodattimen nimi Varmuuskopiot Tuo tehtävät diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e86dac60b..9d0b465eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2,7 +2,6 @@ Supprimer l\'image Ajouter un commentaire… - Nom Entrer le nom du filtre Sauvegardes Importer des tâches diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index eeb6e2780..e299b73f8 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -3,7 +3,6 @@ Borrar imagen Añadir un comentario... - Nombre Introduzca el nombre del filtro Copias de seguridad Importar tareas diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e595b6149..8e943abce 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2,7 +2,6 @@ Kép törlése Hozzászólás írása… - Cím Kérem a szűrő nevét Mentések Feladatok importálása diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml index 2935d2e51..0c53d1afb 100644 --- a/app/src/main/res/values-ia/strings.xml +++ b/app/src/main/res/values-ia/strings.xml @@ -1,5 +1,4 @@ Adder un commento… - Nomine \ No newline at end of file diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 90aa23fb4..00b10dad7 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -1,7 +1,6 @@ Tambahkan komentar… - Nama Masukkan nama filter Cadangan Impor tugas diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e2230e113..eadba203d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,7 +3,6 @@ Deseleziona Immagine Aggiungi un commento... - Nome Introduci il nome filtro Salvataggi Importa attività diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 0c1f87f55..9dcf701e6 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -3,7 +3,6 @@ הסר תמונה הוספת הערה… - שם הזן שם מסנן גיבויים ייבוא משימות diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3cbbdbe40..e35fc3096 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3,7 +3,6 @@ 写真を削除 コメントする - 名前 フィルター名を入力 バックアップ タスクのインポート diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d3c1484d1..2b2716332 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3,7 +3,6 @@ 사진 제거하기 댓글 쓰기... - 이름 필터 이름 입력 백업 할일 가져오기 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f1a0acf92..d8b7ac261 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -3,7 +3,6 @@ Išvalyti paveiksliuką Pridėti komentarą... - Pavadinimas Įvesti filtro pavadinimą Atsarginės kopijos Importuoti užduotis diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b6936003d..5e84579c5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -170,7 +170,6 @@ Kombiner flere varsler til ett Tøm bilde Legg til kommentar… - Navn Skriv inn filternavn Er du sikker på at du vil forkaste dine endringer\? Fortsett å redigere diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9d5ba5fb7..d45635422 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2,7 +2,6 @@ Verwijder Foto Voeg een opmerking toe… - Naam Vul een filter naam in Back-ups Taken importeren diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c1ecc6d76..415070c75 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2,7 +2,6 @@ Usuń obrazek Dodaj komentarz… - Nazwa Podaj nazwę filtra Kopie zapasowe Importuj zadania diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 422789c02..d99a7f650 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -3,7 +3,6 @@ Limpar imagem Comentar... - Nome Digite o nome do filtro Importar tarefas Exportar tarefas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d873fac0a..de332e378 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3,7 +3,6 @@ Limpar imagem Adicionar um comentário... - Nome Introduza o nome do fitro Importar tarefas Exportar tarefas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 806bb41b3..203e80abd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2,7 +2,6 @@ Убрать изображение Добавить комментарий… - Название Введите имя фильтра Резервные копии Импортировать задачи diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index cb83dcd9e..37135fa12 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -3,7 +3,6 @@ Odstrániť obrázok Pridať poznámku... - Názov Zadaj názov filtra Zálohy Importovať úlohy diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 48cee3699..58a5bdb4a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2,7 +2,6 @@ Rensa bild Lägg till en kommentar… - Namn Ange ett namn för filtret Säkerhetskopior Importera uppgifter diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 37e153c7a..5b424c0fa 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2,7 +2,6 @@ Resmi sil Yorum gir… - Ad Süzgeç adı girin Yedekler Görevleri içe aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 020a54290..271c2345a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3,7 +3,6 @@ Очистити картинку Додати коментар... - Ім\'я Введіть назву фільтра Резервні копії Імпортувати завдання diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 483e25df0..e6cd305fd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2,7 +2,6 @@ 清除图片 添加一个注释… - 名称 输入过滤器名称 备份 导入任务 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 38e635bf5..3ac4a52cd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -225,7 +225,6 @@ 每年 每 %s 重複 其他主題 - 名稱 輸入過濾名稱 您要放棄更改嗎? 繼續編輯 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b3853ef7f..969794a7e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ Clear Picture Add a comment… - Name + Display name Enter filter name Backups Import tasks