Use the generic "Sort by" string, drop item-specific variants

UweTrottmann · Nov 28, 2024 · 89daca5 · 89daca5
1 parent 8f2f241
commit 89daca5
Show file tree

Hide file tree

Showing 44 changed files with 5 additions and 160 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
   disabled when no provider is selected. Also tabs are renamed and display icons to differentiate
   filter from sort options.
 * 🔨 Show scrollbars for show filter and sort options.
+* 🔧 Use common "Sort by" action name.
 
 ### 2024.5.1 - 2024-11-21 🧪
 

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt
@@ -318,7 +318,7 @@ class EpisodesFragment : Fragment() {
             R.array.epsortingData,
             EpisodesSettings.getEpisodeSortOrder(requireActivity()).index(),
             EpisodesSettings.KEY_EPISODE_SORT_ORDER,
-            R.string.pref_episodesorting,
+            R.string.sort,
             "episodeSortOrderDialog"
         )
     }

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt
@@ -383,7 +383,7 @@ class SeasonsFragment() : Fragment() {
             parentFragmentManager,
             R.array.sesorting,
             R.array.sesortingData, sortOrder.index,
-            SeasonsSettings.KEY_SEASON_SORT_ORDER, R.string.pref_seasonsorting,
+            SeasonsSettings.KEY_SEASON_SORT_ORDER, R.string.sort,
             "seasonSortOrderDialog"
         )
     }

diff --git a/app/src/main/res/menu/lists_menu.xml b/app/src/main/res/menu/lists_menu.xml
@@ -23,7 +23,7 @@
         android:id="@+id/menu_action_lists_sort"
         android:icon="@drawable/ic_sort_white_24dp"
         android:orderInCategory="3"
-        android:title="@string/action_lists_sort"
+        android:title="@string/sort"
         app:showAsAction="never">
         <menu>
             <item

diff --git a/app/src/main/res/menu/movies_lists_menu.xml b/app/src/main/res/menu/movies_lists_menu.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/menu_action_movies_sort"
         android:icon="@drawable/ic_sort_white_24dp"
-        android:title="@string/action_movies_sort"
+        android:title="@string/sort"
         app:showAsAction="ifRoom">
         <menu>
             <item

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -284,7 +284,6 @@
     <string name="list_item_remove">إزالة من القائمة</string>
     <string name="ack_list_item_removed">Removed from list</string>
     <string name="list_empty">يمكنك إضافة مسلسلات إلى هذه القائمة</string>
-    <string name="action_lists_sort">ترتيب القوائم</string>
     <string name="action_lists_reorder">إعادة ترتيب القوائم</string>
     <string name="ack_lists_reordered">Lists reordered</string>
     <string name="error_name_already_exists">يوجد بالفعل قائمة بهذا الإسم</string>
@@ -306,7 +305,6 @@
     <string name="trailer">العرض الدعائي</string>
     <string name="movie_cast">طاقم التمثيل</string>
     <string name="movie_crew">طاقم</string>
-    <string name="action_movies_sort">فرز الأفلام</string>
     <string name="action_movies_sort_title">العنوان</string>
     <string name="action_movies_sort_release">تاريخ الإصدار</string>
     <string name="title_similar_movies">Similar movies</string>
@@ -432,8 +430,6 @@
     <string name="pref_exactdates_summary">\"31 أكتوبر\" بدلاً من \"في 3 أيام\"</string>
     <string name="pref_nospoilers">منع المفسدين</string>
     <string name="pref_nospoilers_summary">إخفاء التفاصيل حتى هو شاهد الحلقة</string>
-    <string name="pref_seasonsorting">ترتيب المواسم حسب&#8230;</string>
-    <string name="pref_episodesorting">ترتيب الحلقات حسب&#8230;</string>
     <string name="pref_language">اللغة المفضلة</string>
     <string name="pref_language_fallback">اللغة البديلة</string>
     <string name="pref_updatewifionly">تحميل الصور بواسطة الواي فاي فقط</string>

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Премахване от списъка</string>
     <string name="ack_list_item_removed">Премахнато от списъка</string>
     <string name="list_empty">Добавете сериали в този списък</string>
-    <string name="action_lists_sort">Подреждане на списъка</string>
     <string name="action_lists_reorder">Пренареждане на списъците</string>
     <string name="ack_lists_reordered">Списъците са подредени</string>
     <string name="error_name_already_exists">Списък с това име вече съществува</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Трейлър</string>
     <string name="movie_cast">В ролите</string>
     <string name="movie_crew">Екип</string>
-    <string name="action_movies_sort">Подреждане на филми</string>
     <string name="action_movies_sort_title">Заглавие</string>
     <string name="action_movies_sort_release">Дата на издаване</string>
     <string name="title_similar_movies">Подобни филми</string>
@@ -388,8 +386,6 @@
     <string name="pref_exactdates_summary">\"31 октомври\" вместо \"след 3 дни\"</string>
     <string name="pref_nospoilers">Предотвратяване на спойлери</string>
     <string name="pref_nospoilers_summary">Скрий детайлите, докато е епизода бъде гледан</string>
-    <string name="pref_seasonsorting">Сортирай сезоните по&#8230;</string>
-    <string name="pref_episodesorting">Сортирай епизодите по&#8230;</string>
     <string name="pref_language">Предпочитан език на съдържанието</string>
     <string name="pref_language_fallback">Алтернативен език</string>
     <string name="pref_updatewifionly">Изображения само при Wi-Fi</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Esborra de la llista</string>
     <string name="ack_list_item_removed">Eliminada de la llista</string>
     <string name="list_empty">Pots afegir sèries a aquesta llista</string>
-    <string name="action_lists_sort">Ordena les llistes</string>
     <string name="action_lists_reorder">Reordenar les llistes</string>
     <string name="ack_lists_reordered">Llistes reordenades</string>
     <string name="error_name_already_exists">Ja existeix una llista amb aquest nom</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Tràiler</string>
     <string name="movie_cast">Repartiment</string>
     <string name="movie_crew">Equip</string>
-    <string name="action_movies_sort">Ordena les peŀlícules</string>
     <string name="action_movies_sort_title">Títol</string>
     <string name="action_movies_sort_release">Data de llançament</string>
     <string name="title_similar_movies">Pel·lícules similars</string>
@@ -388,8 +386,6 @@
     <string name="pref_exactdates_summary">\"31 d\'octubre\" enlloc de \"D\'aquí a 3 dies\"</string>
     <string name="pref_nospoilers">Evita els spoilers</string>
     <string name="pref_nospoilers_summary">Amaga els detalls fins que l\'episodi s\'hagi vist</string>
-    <string name="pref_seasonsorting">Ordena les temporades per&#8230;</string>
-    <string name="pref_episodesorting">Ordena els capítols per&#8230;</string>
     <string name="pref_language">Idioma preferit del contingut</string>
     <string name="pref_language_fallback">Idioma alternatiu</string>
     <string name="pref_updatewifionly">Imatges només via xarxa sense fils</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -270,7 +270,6 @@
     <string name="list_item_remove">Odebrat ze seznamu</string>
     <string name="ack_list_item_removed">Odstraněno ze seznamu</string>
     <string name="list_empty">Můžete přidat seriály do tohoto seznamu</string>
-    <string name="action_lists_sort">Třídit seznamy</string>
     <string name="action_lists_reorder">Uspořádat seznamy</string>
     <string name="ack_lists_reordered">Řazení seznamů změněno</string>
     <string name="error_name_already_exists">Seznam s tímto názvem již existuje</string>
@@ -292,7 +291,6 @@
     <string name="trailer">Trailer</string>
     <string name="movie_cast">Obsazení</string>
     <string name="movie_crew">Kolektiv</string>
-    <string name="action_movies_sort">Seřadit filmy</string>
     <string name="action_movies_sort_title">Název</string>
     <string name="action_movies_sort_release">Datum vysílání</string>
     <string name="title_similar_movies">Podobné filmy</string>
@@ -410,8 +408,6 @@
     <string name="pref_exactdates_summary">\"31. října\" místo \"za 3 dny\"</string>
     <string name="pref_nospoilers">Zabraň spoilerům</string>
     <string name="pref_nospoilers_summary">Skrýt podrobnosti, dokud není epizoda zhlédnuta</string>
-    <string name="pref_seasonsorting">Řadit série dle&#8230;</string>
-    <string name="pref_episodesorting">Řadit epizody dle&#8230;</string>
     <string name="pref_language">Preferovaný jazyk obsahu</string>
     <string name="pref_language_fallback">Alternativní jazyk</string>
     <string name="pref_updatewifionly">Obrázky pouze přes Wi-Fi</string>

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
@@ -284,7 +284,6 @@
     <string name="list_item_remove">Tynnu o\'r rhestr</string>
     <string name="ack_list_item_removed">Removed from list</string>
     <string name="list_empty">Gallwch ychwanegu sioeau at y rhestr hon</string>
-    <string name="action_lists_sort">Trefnu rhestrau</string>
     <string name="action_lists_reorder">Rhestrau ail-archebu</string>
     <string name="ack_lists_reordered">Lists reordered</string>
     <string name="error_name_already_exists">Mae rhestr gyda\'r enw hwn eisoes yn bodoli</string>
@@ -306,7 +305,6 @@
     <string name="trailer">Trelar Ffilm</string>
     <string name="movie_cast">Cast Ffilm</string>
     <string name="movie_crew">Criw Ffilm</string>
-    <string name="action_movies_sort">Trefnu ffilmiau</string>
     <string name="action_movies_sort_title">Teitl</string>
     <string name="action_movies_sort_release">Dyddiad rhyddhau</string>
     <string name="title_similar_movies">Similar movies</string>
@@ -432,8 +430,6 @@
     <string name="pref_exactdates_summary">\"Hydref 31\" yn lle \"mewn 3 diwrnod\"</string>
     <string name="pref_nospoilers">Atal anrheithwyr</string>
     <string name="pref_nospoilers_summary">Cuddiwch fanylion nes bod pennod yn cael ei gwylio</string>
-    <string name="pref_seasonsorting">Trefnu tymhorau yn ôl&#8230;</string>
-    <string name="pref_episodesorting">Trefnu penodau yn ôl&#8230;</string>
     <string name="pref_language">Yr iaith cynnwys a ffefrir</string>
     <string name="pref_language_fallback">Iaith amgen</string>
     <string name="pref_updatewifionly">Delweddau trwy Wi-Fi yn unig</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Fjern fra liste</string>
     <string name="ack_list_item_removed">Fjernet fra listen</string>
     <string name="list_empty">Du kan tilføje serier til denne liste</string>
-    <string name="action_lists_sort">Sortér lister</string>
     <string name="action_lists_reorder">Omarrangér lister</string>
     <string name="ack_lists_reordered">Lister omarrangeret</string>
     <string name="error_name_already_exists">En liste med dette navn findes allerede</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Trailer</string>
     <string name="movie_cast">Medvirkende</string>
     <string name="movie_crew">Besætning</string>
-    <string name="action_movies_sort">Sortér film</string>
     <string name="action_movies_sort_title">Titel</string>
     <string name="action_movies_sort_release">Udgivelsesdato</string>
     <string name="title_similar_movies">Lignende film</string>
@@ -388,8 +386,6 @@
     <string name="pref_exactdates_summary">\"31. oktober\" i stedet for \"om 3 dage\"</string>
     <string name="pref_nospoilers">Undgå spoilers</string>
     <string name="pref_nospoilers_summary">Skjul detaljer, indtil en episode er set</string>
-    <string name="pref_seasonsorting">Sortér sæsoner efter&#8230;</string>
-    <string name="pref_episodesorting">Sortér episoder efter&#8230;</string>
     <string name="pref_language">Foretrukket indholdssprog</string>
     <string name="pref_language_fallback">Alternativt sprog</string>
     <string name="pref_updatewifionly">Download kun billeder via Wi-Fi</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -258,7 +258,6 @@
     <string name="list_item_remove">Von Liste entfernen</string>
     <string name="ack_list_item_removed">Von Liste entfernt</string>
     <string name="list_empty">Sie können Serien zu dieser Liste hinzufügen</string>
-    <string name="action_lists_sort">Listen sortieren</string>
     <string name="action_lists_reorder">Listen anordnen</string>
     <string name="ack_lists_reordered">Listen neu angeordnet</string>
     <string name="error_name_already_exists">Eine Liste mit diesem Namen ist bereits vorhanden</string>
@@ -280,7 +279,6 @@
     <string name="trailer">Trailer</string>
     <string name="movie_cast">Besetzung</string>
     <string name="movie_crew">Crew</string>
-    <string name="action_movies_sort">Filme sortieren</string>
     <string name="action_movies_sort_title">Titel</string>
     <string name="action_movies_sort_release">Erscheinungsdatum</string>
     <string name="title_similar_movies">Ähnliche Filme</string>
@@ -390,8 +388,6 @@
     <string name="pref_exactdates_summary">\"31. Oktober\" anstelle von \"in 3 Tagen\"</string>
     <string name="pref_nospoilers">Spoiler vermeiden</string>
     <string name="pref_nospoilers_summary">Details ausblenden, bis eine Folge angesehen wurde</string>
-    <string name="pref_seasonsorting">Sortiere Staffeln nach&#8230;</string>
-    <string name="pref_episodesorting">Sortiere Folgen nach&#8230;</string>
     <string name="pref_language">Bevorzugte Sprache der Inhalte</string>
     <string name="pref_language_fallback">Alternative Sprache</string>
     <string name="pref_updatewifionly">Bilder nur über WLAN</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Κατάργηση από τη λίστα</string>
     <string name="ack_list_item_removed">Αφαιρέθηκε από τη λίστα</string>
     <string name="list_empty">Μπορείτε να προσθέσετε σειρές σε αυτή τη λίστα</string>
-    <string name="action_lists_sort">Ταξινόμημένες λίστες</string>
     <string name="action_lists_reorder">Ταξινομημένες λίστες</string>
     <string name="ack_lists_reordered">Οι λίστες αναδιατάχθηκαν</string>
     <string name="error_name_already_exists">Υπάρχει ήδη μία λίστα με αυτό το όνομα</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Τρέιλερ</string>
     <string name="movie_cast">Ηθοποιοί</string>
     <string name="movie_crew">Ομάδα ηθοποιών</string>
-    <string name="action_movies_sort">Ταξινόμηση ταινιών</string>
     <string name="action_movies_sort_title">Τίτλος</string>
     <string name="action_movies_sort_release">Ημερομηνία προβολής</string>
     <string name="title_similar_movies">Παρόμοιες ταινίες</string>
@@ -388,8 +386,6 @@
     <string name="pref_exactdates_summary">\"31 Οκτωβρίου\" αντί για \"σε 3 ημέρες\"</string>
     <string name="pref_nospoilers">Να μην αποκαλύπτεται η υπόθεση των επεισοδίων</string>
     <string name="pref_nospoilers_summary">Απόκρυψη πληροφοριών μέχρι να παρακολουθήσετε το επεισόδιο</string>
-    <string name="pref_seasonsorting">Ταξινόμηση σεζόν κατά&#8230;</string>
-    <string name="pref_episodesorting">Ταξινόμηση επεισοδίων κατά&#8230;</string>
     <string name="pref_language">Προτιμώμενη γλώσσα περιεχομένου</string>
     <string name="pref_language_fallback">Εναλλακτική γλώσσα</string>
     <string name="pref_updatewifionly">Εικόνες μόνο μέσω Wi-Fi</string>

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Forigi el listo</string>
     <string name="ack_list_item_removed">Removed from list</string>
     <string name="list_empty">Vi povas aldoni televidaĵojn al ĉi tiu listo</string>
-    <string name="action_lists_sort">Ordigi listojn</string>
     <string name="action_lists_reorder">Reordigi listojn</string>
     <string name="ack_lists_reordered">Lists reordered</string>
     <string name="error_name_already_exists">Listo kun ĉi tiu nomo jam ekzistas</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Antaŭprezentaĵo</string>
     <string name="movie_cast">Aktoraro</string>
     <string name="movie_crew">Ekipo</string>
-    <string name="action_movies_sort">Ordigi filmojn</string>
     <string name="action_movies_sort_title">Titolo</string>
     <string name="action_movies_sort_release">Eldondato</string>
     <string name="title_similar_movies">Similar movies</string>
@@ -388,8 +386,6 @@
     <string name="pref_exactdates_summary">\"Oktobro 31\" anstataŭ \"en 3 tagoj\"</string>
     <string name="pref_nospoilers">Preventi malkaŝaĵojn</string>
     <string name="pref_nospoilers_summary">Hide details until an episode is watched</string>
-    <string name="pref_seasonsorting">Ordigi sezonojn laŭ&#8230;</string>
-    <string name="pref_episodesorting">Ordigi epizodojn laŭ&#8230;</string>
     <string name="pref_language">Preferata lingvo de enhavo</string>
     <string name="pref_language_fallback">Alternativa lingvo</string>
     <string name="pref_updatewifionly">Bildojn nur per vifio</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -256,7 +256,6 @@
     <string name="list_item_remove">Eliminar de la lista</string>
     <string name="ack_list_item_removed">Eliminado de la lista</string>
     <string name="list_empty">Puedes añadir series a esta lista</string>
-    <string name="action_lists_sort">Ordenar listas</string>
     <string name="action_lists_reorder">Reordenar listas</string>
     <string name="ack_lists_reordered">Listas reordenadas</string>
     <string name="error_name_already_exists">Ya existe una lista con este nombre</string>
@@ -278,7 +277,6 @@
     <string name="trailer">Trailer</string>
     <string name="movie_cast">Reparto</string>
     <string name="movie_crew">Equipo técnico</string>
-    <string name="action_movies_sort">Ordenar películas</string>
     <string name="action_movies_sort_title">Título</string>
     <string name="action_movies_sort_release">Fecha de estreno</string>
     <string name="title_similar_movies">Películas similares</string>
@@ -389,8 +387,6 @@ Asegúrate de quitarla también en tus otros dispositivos conectados.</string>
     <string name="pref_exactdates_summary">\"El 31 de octubre\" en lugar de \"en 3 días\"</string>
     <string name="pref_nospoilers">Evitar spoilers</string>
     <string name="pref_nospoilers_summary">Ocultar detalles hasta que un episodio sea visto</string>
-    <string name="pref_seasonsorting">Ordenar temporadas por&#8230;</string>
-    <string name="pref_episodesorting">Ordenar episodios por&#8230;</string>
     <string name="pref_language">Lenguaje preferido para el contenido</string>
     <string name="pref_language_fallback">Idioma alternativo</string>
     <string name="pref_updatewifionly">Imágenes sólo por Wi-Fi</string>