From fd9a387b4e2db1506d20dd084b8217971b34aa2f Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Wed, 27 Jan 2021 18:32:44 +0100 Subject: [PATCH] Rename Filter -> Sort in menu and remove old references to Filter --- .../java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java | 4 ---- app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/values-ar-rSA/strings.xml | 2 -- app/src/main/res/values-cs-rCZ/strings.xml | 2 -- app/src/main/res/values-de-rDE/strings.xml | 2 -- app/src/main/res/values-el-rGR/strings.xml | 2 -- app/src/main/res/values-es-rES/strings.xml | 2 -- app/src/main/res/values-eu-rES/strings.xml | 2 -- app/src/main/res/values-fa-rIR/strings.xml | 2 -- app/src/main/res/values-fi-rFI/strings.xml | 2 -- app/src/main/res/values-fr-rFR/strings.xml | 2 -- app/src/main/res/values-hi-rIN/strings.xml | 2 -- app/src/main/res/values-hu-rHU/strings.xml | 2 -- app/src/main/res/values-in-rID/strings.xml | 2 -- app/src/main/res/values-it-rIT/strings.xml | 2 -- app/src/main/res/values-ja-rJP/strings.xml | 2 -- app/src/main/res/values-kn-rIN/strings.xml | 1 - app/src/main/res/values-nl-rNL/strings.xml | 2 -- app/src/main/res/values-pl-rPL/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-pt-rPT/strings.xml | 2 -- app/src/main/res/values-ro-rRO/strings.xml | 2 -- app/src/main/res/values-ru-rRU/strings.xml | 2 -- app/src/main/res/values-sk-rSK/strings.xml | 2 -- app/src/main/res/values-tr-rTR/strings.xml | 2 -- app/src/main/res/values-zh-rCN/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values/strings.xml | 3 +-- 28 files changed, 2 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java index 60fcd2f1..cc1b267d 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java @@ -210,10 +210,6 @@ public class EntryAdapter extends RecyclerView.Adapter implements I String name = entry.getName().toLowerCase(); if (!_groupFilter.isEmpty()) { - if (group == null && _groupFilter.contains(_view.getContext().getString(R.string.filter_ungrouped))) { - return false; - } - if (group == null || !_groupFilter.contains(group)) { return true; } diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 1669b921..4128a9cb 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -16,7 +16,7 @@ android:id="@+id/action_sort" android:icon="@drawable/ic_action_sort" app:showAsAction="always" - android:title="@string/filter"> + android:title="@string/sort"> حدث خطأ أثناء محاولة إضافة خانة جديدة: تعذّر اعادة تعيين مقياس مدة الرسوم المتحركة. أشرطة التقدم ستكون مخفية. التفاصيل - تصفية - تمت إزالتها من المجموعة قفل الاسم بلا مجموعة diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 25970dab..aaafd832 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -196,8 +196,6 @@ Při pokusu o přidání nového slotu došlo k chybě: Měřítko trvání animace nelze resetovat. Ukazatele průběhu nebudou viditelné. Podrobnosti - Filtr - Bez skupiny Uzamknout Název Žádná skupina diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 5d5b8e73..12cd3d8b 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -192,8 +192,6 @@ Beim Versuch, einen neuen Slot hinzuzufügen, ist ein Fehler aufgetreten: Die Skala der Animationsdauer kann nicht zurückgesetzt werden. Fortschrittsbalken werden unsichtbar sein. Details - Filter - Nicht gruppiert Sperren Name Keine Gruppe diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 3429d41f..8dbe9c86 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -192,8 +192,6 @@ Παρουσιάστηκε σφάλμα κατά την προσπάθεια προσθήκης νέας υποδοχής: Δεν είναι δυνατή η επαναφορά της κλίμακας. Οι γραμμές προόδου θα είναι αόρατες. Λεπτομέρειες - Φίλτρο - Χωρίς ομάδα Κλείδωμα Όνομα Χωρίς ομάδα diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 01565e51..42a731e4 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -173,8 +173,6 @@ Se ha producido un error tratando de añadir una nueva clave: No se puede restablecer la escala de duración de la animación. Las barras de progreso serán invisibles. Detalles - Filtrar - Sin agrupar Bloquear Cuenta Sin grupo diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml index 34097650..48cf1a9d 100644 --- a/app/src/main/res/values-eu-rES/strings.xml +++ b/app/src/main/res/values-eu-rES/strings.xml @@ -188,8 +188,6 @@ Errorea gertatu da arteka berria gehitzen saiatzean: Ezin da animazioaren iraupenaren eskala berrezarri. Aurrerapen-barrak ikusezinak izango dira. Xehetasunak - Iragazkia - Taldekatu gabekoak Blokeatu Izena Talderik ez diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 95769dff..8c766181 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -188,8 +188,6 @@ هنگام ایجاد اسلات خطایی رخ داد: عدم توانایی در تنظیم انیمیشن. نمایش درصد تکمیل مخفی می‌شود. جزئیات - فیلتر - گروه‌بندی نشده قفل نام بدون گروه diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index d4099233..1ad3f2e1 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -188,8 +188,6 @@ Uuden paikan lisäämisessä tapahtui virhe: Animaattorin kestoasteikkoa ei voitu nollata. Edistymispalkit ovat näkymättömiä. Tiedot - Suodata - Ryhmittelemättömät Lukitse Nimi Ei ryhmää diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index f93bd43f..85016a20 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -192,8 +192,6 @@ Une erreur est survenue en essayant d\'ajouter un nouvel emplacement : Impossible de réinitialiser l\'échelle de durée d\'animation. Les barres de progression seront invisibles. Détails - Filtre - Non groupés Verrouiller Nom Aucun groupe diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index fd7485cb..80143b0b 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -183,8 +183,6 @@ नया स्लॉट जोड़ने का प्रयास करते समय एक त्रुटि हुई: एनिमेटर अवधि पैमाने को रीसेट करने में असमर्थ। प्रगति पट्टी अदृश्य हो जाएगी। विवरण - फ़िल्टर - असमूहीकृत लॉक करें नाम कोई समूह नहीं diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index f5b2e2ac..7c2965a1 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -152,8 +152,6 @@ Hiba történt az új zár hozzáadásakor: Az animátor hossza nem állítható vissza. A folyamatsávok nem fognak látszódni. Részletek - Szűrő - Csoport nélküli Zárolás Név Nincs csoport diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index b3eb0769..10fc6774 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -187,8 +187,6 @@ Terjadi kesalahan saat menambahkan slot baru: Tidak dapat mengatur ulang skala durasi animasi. Progress bar tidak akan terlihat. Rincian - Saring - Tidak dikelompokkan Kunci Nama Tidak ada kelompok diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index db7e4193..17a39e5c 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -192,8 +192,6 @@ Errore nell\'aggiunta di un nuovo slot: Impossibile ripristinare la durata delle animazioni. Le barre di caricamento non saranno visibili. Dettagli - Filtra - Non raggruppati Blocca Nome Nessun gruppo diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 8e88fc99..0ddc703f 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -188,8 +188,6 @@ 新しいスロットの追加中にエラーが発生しました: アニメーションの継続時間をリセットすることはできません。プログレスバーは表示されません。 詳細 - フィルター - グループ解除 ロックする 名前 グループなし diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml index d2b6afec..963bf50d 100644 --- a/app/src/main/res/values-kn-rIN/strings.xml +++ b/app/src/main/res/values-kn-rIN/strings.xml @@ -100,7 +100,6 @@ ಹೊಸ ಸ್ಲಾಟನ್ನು ಸೇರಿಸಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಒಂದು ದೋಷ ಸಂಭವಿಸಿದೆ: ಆನಿಮೇಟರಿನ ಅವಧಿಯ ಅಳತೆಯನ್ನು ಮರುಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪ್ರಗತಿ ಬಾರುಗಳು ಅಗೋಚರವಿರುತ್ತವೆ. ವಿವರಗಳು - ಮಿತಿಗೊಳಿಸು ಬೀಗ ಹಾಕು ಹೆಸರು ಗುಂಪಿಲ್ಲ diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 318fe066..04e6ab51 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -192,8 +192,6 @@ Er is een fout opgetreden tijdens het toevoegen van een nieuwe vergrendelingssleutel: Niet in staat om de schaal van animatieduur te resetten. Voortgangsbalken zullen niet zichtbaar zijn. Details - Filter - Geen groep Vergrendel Naam Geen groep diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 3b0ef3b6..8151878e 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -198,8 +198,6 @@ Wystąpił błąd podczas próby dodania nowego slotu: Nie można zresetować skali długości animacji. Paski postępu będą niewidoczne. Szczegóły - Filtruj - Bez grupy Zablokuj Nazwa Brak grupy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4aa913f2..d7978b96 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -192,8 +192,6 @@ Um erro ocorreu durante a tentativa de adicionar uma nova chave: Não foi possível resetar a escala de duração da animação. Barras de progresso ficarão invisíveis. Detalhes - Filtrar - Não agrupar Bloquear Conta Sem grupo diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index dbad1553..6f3ff6b1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -192,8 +192,6 @@ Ocorreu um erro ao tentar adicionar um novo slot: Não foi possível redefinir a duração da animação. Barras de progresso ficarão invisíveis. Detalhes - Filtrar - Não agrupado Bloquear Nome Sem grupo diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index b81b7c6f..9039dd76 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -193,8 +193,6 @@ A aparut o eroare în timp ce se încerca adăugarea unui nou slot: Imposibil de a reseta scala duratei animatorului. Barele de progres vor fi invizibile. Detalii - Filtru - Negrupat Blocare Nume Niciun grup diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 3d73f89d..a69d9875 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -198,8 +198,6 @@ Произошла ошибка при попытке добавить новый слот: Не удалось установить продолжительность анимации. Индикаторы прогресса не будут отображаться. Подробнее - Фильтр - Без группировки Заблокировать Имя Нет группы diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index f8590d0b..5fdfc070 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -82,8 +82,6 @@ Chyba: Súbor nenájdený Pri pokuse o prečitanie súboru sa vyskytla chyba Podrobnosti - Filtrovať - Nezoskupené Uzamknúť Meno Žiadna skupina diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 432a59f9..b22cecd3 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -159,8 +159,6 @@ Yeni bir anahtarlık oluşturmaya çalışırken hata oluştu: Animatör süresi ölçeği sıfırlanamıyor. İlerleme çubukları görünmez olacak. Detaylar - Filtrele - Gruplandırılmamış Kilitle Ad Grupsuz diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ed97fe0b..50650a64 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -189,8 +189,6 @@ 试图添加新槽时出错： 无法重置动画持续时间。进度条将不可见。 详细信息 - 筛选 - 未分组 锁定 名称 无群组 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1274ee35..ab85f550 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -180,8 +180,6 @@ 試圖添加新槽時出錯： 無法重置動畫持續時間。進度條將不可見。 詳細信息 - 篩選 - 未分組 鎖定 名稱 無群組 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 913cd64c..c0a10d9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -221,11 +221,10 @@ An error occurred while trying to add a new slot: Unable to reset animator duration scale. Progress bars will be invisible. Details - Filter - Ungrouped Lock Name No group + Sort Issuer (A to Z) Issuer (Z to A) Account (A to Z)