diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 1425c5c1..999df5d3 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -362,24 +362,24 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         sortMethodMenu.clear();
 
         if (fragment instanceof AlbumsFragment) {
-            sortMethodMenu.add(0, R.id.action_sort_method_name, 0, R.string.sort_order_name)
+            sortMethodMenu.add(0, R.id.action_sort_method_name, 0, R.string.sort_method_name)
                     .setChecked(currentSortMethod.equals(SortMethod.NAME));
-            sortMethodMenu.add(0, R.id.action_sort_method_artist, 1, R.string.sort_order_artist)
+            sortMethodMenu.add(0, R.id.action_sort_method_artist, 1, R.string.sort_method_artist)
                     .setChecked(currentSortMethod.equals(SortMethod.ARTIST));
-            sortMethodMenu.add(0, R.id.action_sort_method_year, 2, R.string.sort_order_year)
+            sortMethodMenu.add(0, R.id.action_sort_method_year, 2, R.string.sort_method_year)
                     .setChecked(currentSortMethod.equals(SortMethod.YEAR));
-            sortMethodMenu.add(0, R.id.action_sort_method_random, 3, R.string.sort_order_random)
+            sortMethodMenu.add(0, R.id.action_sort_method_random, 3, R.string.sort_method_random)
                     .setChecked(currentSortMethod.equals(SortMethod.RANDOM));
         } else if (fragment instanceof SongsFragment) {
-            sortMethodMenu.add(0, R.id.action_sort_method_name, 0, R.string.sort_order_name)
+            sortMethodMenu.add(0, R.id.action_sort_method_name, 0, R.string.sort_method_name)
                     .setChecked(currentSortMethod.equals(SortMethod.NAME));
-            sortMethodMenu.add(0, R.id.action_sort_method_album, 1, R.string.sort_order_album)
+            sortMethodMenu.add(0, R.id.action_sort_method_album, 1, R.string.sort_method_album)
                     .setChecked(currentSortMethod.equals(SortMethod.ALBUM));
-            sortMethodMenu.add(0, R.id.action_sort_method_artist, 2, R.string.sort_order_artist)
+            sortMethodMenu.add(0, R.id.action_sort_method_artist, 2, R.string.sort_method_artist)
                     .setChecked(currentSortMethod.equals(SortMethod.ARTIST));
-            sortMethodMenu.add(0, R.id.action_sort_method_year, 3, R.string.sort_order_year)
+            sortMethodMenu.add(0, R.id.action_sort_method_year, 3, R.string.sort_method_year)
                     .setChecked(currentSortMethod.equals(SortMethod.YEAR));
-            sortMethodMenu.add(0, R.id.action_sort_method_random, 4, R.string.sort_order_random)
+            sortMethodMenu.add(0, R.id.action_sort_method_random, 4, R.string.sort_method_random)
                     .setChecked(currentSortMethod.equals(SortMethod.RANDOM));
         }
 
@@ -390,9 +390,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         String currentSortOrder = fragment.getSortMethod();
         sortOrderMenu.clear();
 
-        sortOrderMenu.add(0, R.id.action_sort_order_ascending, 0, R.string.sort_order_a_z)
+        sortOrderMenu.add(0, R.id.action_sort_order_ascending, 0, R.string.sort_order_ascending)
                 .setChecked(currentSortOrder.equals(SortOrder.ASCENDING));
-        sortOrderMenu.add(0, R.id.action_sort_order_descending, 1, R.string.sort_order_z_a)
+        sortOrderMenu.add(0, R.id.action_sort_order_descending, 1, R.string.sort_order_descending)
                 .setChecked(currentSortOrder.equals(SortOrder.DESCENDING));
 
         sortOrderMenu.setGroupCheckable(0, true, true);
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1dbe9206..234f0b56 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">تخصيص رؤية وترتيب أقسام المكتبة.</string>
     <string name="you_have_to_select_at_least_one_category">عليك أن تختار قسماً واحداً على الأقل.</string>
     <string name="action_sort_order">ترتيب الفرز</string>
-    <string name="sort_order_a_z">تصاعدي</string>
-    <string name="sort_order_z_a">تنازلي</string>
-    <string name="sort_order_artist">الفنان</string>
-    <string name="sort_order_album">الألبوم</string>
-    <string name="sort_order_year">السنة</string>
+    <string name="sort_order_ascending">تصاعدي</string>
+    <string name="sort_order_descending">تنازلي</string>
+    <string name="sort_method_artist">الفنان</string>
+    <string name="sort_method_album">الألبوم</string>
+    <string name="sort_method_year">السنة</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 677aaff7..472ea735 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Nastavit viditelnost a pořadí kategorií knihoven.</string>
     <string name="you_have_to_select_at_least_one_category">Musíte zvolit alespoň jednu kategorii.</string>
     <string name="action_sort_order">Seřazení</string>
-    <string name="sort_order_a_z">Vzestupně</string>
-    <string name="sort_order_z_a">Sestupně</string>
-    <string name="sort_order_artist">Interpret</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Rok</string>
+    <string name="sort_order_ascending">Vzestupně</string>
+    <string name="sort_order_descending">Sestupně</string>
+    <string name="sort_method_artist">Interpret</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Rok</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1732fb53..dfb57cd2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Anzeige und Anordnung der einzelnen Kategorien festlegen.</string>
     <string name="you_have_to_select_at_least_one_category">Mindestens eine Kategorie muss ausgewählt sein.</string>
     <string name="action_sort_order">Sortierung</string>
-    <string name="sort_order_a_z">Aufsteigend</string>
-    <string name="sort_order_z_a">Absteigend</string>
-    <string name="sort_order_artist">Interpret</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Jahr</string>
+    <string name="sort_order_ascending">Aufsteigend</string>
+    <string name="sort_order_descending">Absteigend</string>
+    <string name="sort_method_artist">Interpret</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Jahr</string>
     <string name="finish_current_music_sleep_timer">Letzten Song beenden</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 26c43609..e6af8eed 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría.</string>
     <string name="action_sort_order">Orden de clasificación</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_z_a">Descendente</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_year">Año</string>
+    <string name="sort_order_ascending">Ascendente</string>
+    <string name="sort_order_descending">Descendente</string>
+    <string name="sort_method_artist">Artista</string>
+    <string name="sort_method_album">Álbum</string>
+    <string name="sort_method_year">Año</string>
     <string name="finish_current_music_sleep_timer">Terminar la última canción</string>
 </resources>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 0a697964..87d8fe6b 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Configurar la vista y orden de las categorías de la biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría.</string>
     <string name="action_sort_order">Ordenar por</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_z_a">Descendente</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_year">Año</string>
+    <string name="sort_order_ascending">Ascendente</string>
+    <string name="sort_order_descending">Descendente</string>
+    <string name="sort_method_artist">Artista</string>
+    <string name="sort_method_album">Álbum</string>
+    <string name="sort_method_year">Año</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bd830cce..46cff3ad 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Määrittele kirjaston välilehtien näkyvyyttä ja järjestystä.</string>
     <string name="you_have_to_select_at_least_one_category">Sinun täytyy valita vähintään yksi kategoria.</string>
     <string name="action_sort_order">Lajittelu järjestys</string>
-    <string name="sort_order_a_z">Nouseva</string>
-    <string name="sort_order_z_a">Laskeva</string>
-    <string name="sort_order_artist">Artisti</string>
-    <string name="sort_order_album">Albumi</string>
-    <string name="sort_order_year">Vuosi</string>
+    <string name="sort_order_ascending">Nouseva</string>
+    <string name="sort_order_descending">Laskeva</string>
+    <string name="sort_method_artist">Artisti</string>
+    <string name="sort_method_album">Albumi</string>
+    <string name="sort_method_year">Vuosi</string>
     <string name="finish_current_music_sleep_timer">Lopeta viimeinen kappale</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2165fde2..9f2b09eb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Configurer la visibilité et l\'ordre des catégories.</string>
     <string name="you_have_to_select_at_least_one_category">Vous devez sélectionner au moins une catégorie.</string>
     <string name="action_sort_order">Ordre de tri</string>
-    <string name="sort_order_a_z">Ascendant</string>
-    <string name="sort_order_z_a">Descendant</string>
-    <string name="sort_order_artist">Artiste</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Année</string>
+    <string name="sort_order_ascending">Ascendant</string>
+    <string name="sort_order_descending">Descendant</string>
+    <string name="sort_method_artist">Artiste</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Année</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 22eb0afb..86e76c3e 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
     <string name="action_sort_order">סדר המיון</string>
-    <string name="sort_order_a_z">סדר עולה</string>
-    <string name="sort_order_z_a">סדר יורד</string>
-    <string name="sort_order_artist">אמן</string>
-    <string name="sort_order_album">אלבום</string>
-    <string name="sort_order_year">שנה</string>
+    <string name="sort_order_ascending">סדר עולה</string>
+    <string name="sort_order_descending">סדר יורד</string>
+    <string name="sort_method_artist">אמן</string>
+    <string name="sort_method_album">אלבום</string>
+    <string name="sort_method_year">שנה</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index bb0fb840..161ae794 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Prilagodite vidljivost i poredak kategorija biblioteke</string>
     <string name="you_have_to_select_at_least_one_category">Morate odabrati barem jednu kategoriju</string>
     <string name="action_sort_order">Način sortiranja</string>
-    <string name="sort_order_a_z">Uzlazno</string>
-    <string name="sort_order_z_a">Silazno</string>
-    <string name="sort_order_artist">Izvođač</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Godina</string>
+    <string name="sort_order_ascending">Uzlazno</string>
+    <string name="sort_order_descending">Silazno</string>
+    <string name="sort_method_artist">Izvođač</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Godina</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1fda9f75..85d1de35 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Könyvtár kategóriák láthatóságának és sorrendjének beállítása.</string>
     <string name="you_have_to_select_at_least_one_category">Legalább egy kategóriát ki kell választania.</string>
     <string name="action_sort_order">Sorrend</string>
-    <string name="sort_order_a_z">Növekvő</string>
-    <string name="sort_order_z_a">Csökkenő</string>
-    <string name="sort_order_artist">Előadó</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Év</string>
+    <string name="sort_order_ascending">Növekvő</string>
+    <string name="sort_order_descending">Csökkenő</string>
+    <string name="sort_method_artist">Előadó</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Év</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 17d38647..1884b607 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
     <string name="action_sort_order">Tata urutan</string>
-    <string name="sort_order_a_z">Naik</string>
-    <string name="sort_order_z_a">Turun</string>
-    <string name="sort_order_artist">Artis</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Tahun</string>
+    <string name="sort_order_ascending">Naik</string>
+    <string name="sort_order_descending">Turun</string>
+    <string name="sort_method_artist">Artis</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Tahun</string>
     <string name="finish_current_music_sleep_timer">Selesaikan lagu terakhir</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 17d38647..1884b607 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori perpustakaan.</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
     <string name="action_sort_order">Tata urutan</string>
-    <string name="sort_order_a_z">Naik</string>
-    <string name="sort_order_z_a">Turun</string>
-    <string name="sort_order_artist">Artis</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Tahun</string>
+    <string name="sort_order_ascending">Naik</string>
+    <string name="sort_order_descending">Turun</string>
+    <string name="sort_method_artist">Artis</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Tahun</string>
     <string name="finish_current_music_sleep_timer">Selesaikan lagu terakhir</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 71a2d689..cc0da3d9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Configura visibilità e ordine delle categorie della libreria.</string>
     <string name="you_have_to_select_at_least_one_category">Devi scegliere almeno una categoria.</string>
     <string name="action_sort_order">Ordine</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_z_a">Discendente</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Anno</string>
+    <string name="sort_order_ascending">Ascendente</string>
+    <string name="sort_order_descending">Discendente</string>
+    <string name="sort_method_artist">Artista</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Anno</string>
     <string name="finish_current_music_sleep_timer">Termina l\'ultimo brano</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 22eb0afb..86e76c3e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">הגדר את הנראות והסדר של הקטגוריות בספרייה.</string>
     <string name="you_have_to_select_at_least_one_category">עליך לבחור לפחות קטגוריה אחת.</string>
     <string name="action_sort_order">סדר המיון</string>
-    <string name="sort_order_a_z">סדר עולה</string>
-    <string name="sort_order_z_a">סדר יורד</string>
-    <string name="sort_order_artist">אמן</string>
-    <string name="sort_order_album">אלבום</string>
-    <string name="sort_order_year">שנה</string>
+    <string name="sort_order_ascending">סדר עולה</string>
+    <string name="sort_order_descending">סדר יורד</string>
+    <string name="sort_method_artist">אמן</string>
+    <string name="sort_method_album">אלבום</string>
+    <string name="sort_method_year">שנה</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 434ed4c6..cecd82de 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">ライブラリに表示するカテゴリとその順番を設定します。</string>
     <string name="you_have_to_select_at_least_one_category">最低でも1つのカテゴリを選択を選択してください</string>
     <string name="action_sort_order">並べ替え</string>
-    <string name="sort_order_a_z">昇順</string>
-    <string name="sort_order_z_a">降順</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_year">Ano</string>
+    <string name="sort_order_ascending">昇順</string>
+    <string name="sort_order_descending">降順</string>
+    <string name="sort_method_artist">Artista</string>
+    <string name="sort_method_album">Álbum</string>
+    <string name="sort_method_year">Ano</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ba29ba60..f8c1b9be 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">라이브러리 카테고리의 표시 여부 및 배열 순서를 조정합니다.</string>
     <string name="you_have_to_select_at_least_one_category">적어도 하나의 카테고리는 선택해야 합니다.</string>
     <string name="action_sort_order">순서 정렬하기</string>
-    <string name="sort_order_a_z">오름차순</string>
-    <string name="sort_order_z_a">내림차순</string>
-    <string name="sort_order_artist">아티스트</string>
-    <string name="sort_order_album">앨범</string>
-    <string name="sort_order_year">연도</string>
+    <string name="sort_order_ascending">오름차순</string>
+    <string name="sort_order_descending">내림차순</string>
+    <string name="sort_method_artist">아티스트</string>
+    <string name="sort_method_album">앨범</string>
+    <string name="sort_method_year">연도</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 18777d51..3b6428cc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Configureer de zichtbaarheid en volgorde van categorieën</string>
     <string name="you_have_to_select_at_least_one_category">Je moet tenminste één categorie selecteren.</string>
     <string name="action_sort_order">Sorteervolgorde</string>
-    <string name="sort_order_a_z">Oplopend</string>
-    <string name="sort_order_z_a">Aflopend</string>
-    <string name="sort_order_artist">Artiest</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Jaar</string>
+    <string name="sort_order_ascending">Oplopend</string>
+    <string name="sort_order_descending">Aflopend</string>
+    <string name="sort_method_artist">Artiest</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Jaar</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 65bd44f7..bb2c458d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Ustawia widoczność i kolejność kategorii biblioteki</string>
     <string name="you_have_to_select_at_least_one_category">Musisz wybrać co najmniej jedną kategorię</string>
     <string name="action_sort_order">Kolejność sortowania</string>
-    <string name="sort_order_a_z">Rosnąco</string>
-    <string name="sort_order_z_a">Malejąco</string>
-    <string name="sort_order_artist">Artysta</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Rok</string>
+    <string name="sort_order_ascending">Rosnąco</string>
+    <string name="sort_order_descending">Malejąco</string>
+    <string name="sort_method_artist">Artysta</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Rok</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 09dc3ec8..5569a5b0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Configurar a visibilidade e a ordem das categorias da biblioteca.</string>
     <string name="you_have_to_select_at_least_one_category">Você deve selecionar ao menos uma categoria.</string>
     <string name="action_sort_order">Embaralhar ordem</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_z_a">Descendente</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_year">Ano</string>
+    <string name="sort_order_ascending">Ascendente</string>
+    <string name="sort_order_descending">Descendente</string>
+    <string name="sort_method_artist">Artista</string>
+    <string name="sort_method_album">Álbum</string>
+    <string name="sort_method_year">Ano</string>
     <string name="finish_current_music_sleep_timer">Finalizar última música</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f0773971..80aba711 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Configurați vizibilitatea și ordinea categoriilor din bibliotecă.</string>
     <string name="you_have_to_select_at_least_one_category">Trebuie să selectați cel puțin o categorie.</string>
     <string name="action_sort_order">Ordine de sortare</string>
-    <string name="sort_order_a_z">crescător</string>
-    <string name="sort_order_z_a">descrescător</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">An</string>
+    <string name="sort_order_ascending">crescător</string>
+    <string name="sort_order_descending">descrescător</string>
+    <string name="sort_method_artist">Artist</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">An</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 722cb3d3..3de4242b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -147,10 +147,10 @@
     <string name="pref_summary_library_categories">Настройте видимость и порядок категорий библиотеки.</string>
     <string name="you_have_to_select_at_least_one_category">Вы должны выбрать хотя бы одну категорию.</string>
     <string name="action_sort_order">Сортировка</string>
-    <string name="sort_order_a_z">По возрастанию</string>
-    <string name="sort_order_z_a">По убыванию</string>
-    <string name="sort_order_artist">Исполнитель</string>
-    <string name="sort_order_album">Альбом</string>
-    <string name="sort_order_year">Год</string>
+    <string name="sort_order_ascending">По возрастанию</string>
+    <string name="sort_order_descending">По убыванию</string>
+    <string name="sort_method_artist">Исполнитель</string>
+    <string name="sort_method_album">Альбом</string>
+    <string name="sort_method_year">Год</string>
     <string name="finish_current_music_sleep_timer">Последняя песня завершилась</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 224fc3a4..4552c2e6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -144,9 +144,9 @@
     <string name="pref_summary_library_categories">Kitaplık kategorilerinin görünürlüğünü ve sırasını yapılandırma.</string>
     <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmeniz gerekiyor.</string>
     <string name="action_sort_order">Sıralama düzeni</string>
-    <string name="sort_order_a_z">Artan</string>
-    <string name="sort_order_z_a">Azalan</string>
-    <string name="sort_order_artist">Sanatçı</string>
-    <string name="sort_order_album">Albüm</string>
-    <string name="sort_order_year">Yıl</string>
+    <string name="sort_order_ascending">Artan</string>
+    <string name="sort_order_descending">Azalan</string>
+    <string name="sort_method_artist">Sanatçı</string>
+    <string name="sort_method_album">Albüm</string>
+    <string name="sort_method_year">Yıl</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7088b8da..c28c13d7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -145,9 +145,9 @@
     <string name="pref_summary_library_categories">配置媒体库类别可见性和顺序。</string>
     <string name="you_have_to_select_at_least_one_category">您必需选择至少一个类别。</string>
     <string name="action_sort_order">排序方式</string>
-    <string name="sort_order_a_z">按首字符（正序）</string>
-    <string name="sort_order_z_a">按首字符（倒序）</string>
-    <string name="sort_order_artist">艺术家</string>
-    <string name="sort_order_album">专辑</string>
-    <string name="sort_order_year">年份</string>
+    <string name="sort_order_ascending">按首字符（正序）</string>
+    <string name="sort_order_descending">按首字符（倒序）</string>
+    <string name="sort_method_artist">艺术家</string>
+    <string name="sort_method_album">专辑</string>
+    <string name="sort_method_year">年份</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index dc4e286f..fec9290b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -148,10 +148,10 @@
     <string name="pref_summary_library_categories">調整音樂庫類別的顯示與排序</string>
     <string name="you_have_to_select_at_least_one_category">你至少要選擇 1 個類別</string>
     <string name="action_sort_order">排列方式</string>
-    <string name="sort_order_a_z">升序排列</string>
-    <string name="sort_order_z_a">降序排列</string>
-    <string name="sort_order_artist">演出者</string>
-    <string name="sort_order_album">專輯</string>
-    <string name="sort_order_year">年份</string>
+    <string name="sort_order_ascending">升序排列</string>
+    <string name="sort_order_descending">降序排列</string>
+    <string name="sort_method_artist">演出者</string>
+    <string name="sort_method_album">專輯</string>
+    <string name="sort_method_year">年份</string>
     <string name="finish_current_music_sleep_timer">歌曲全數播放完畢</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 412a0cc3..e488ea19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,6 @@
     <string name="genres">Genres</string>
     <string name="songs">Songs</string>
     <string name="playlists">Playlists</string>
-    <string name="album">Album</string>
     <string name="no_playlists">No playlists</string>
     <string name="no_albums">No albums</string>
     <string name="no_songs">No songs</string>
@@ -59,15 +58,16 @@
     <string name="empty">Empty</string>
     <string name="name">Name</string>
     <string name="song">Song</string>
+    <string name="album">Album</string>
 
     <string name="label_details">Details</string>
-    <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
+    <string name="label_file_name">File Name</string>
+    <string name="label_file_path">File Path</string>
     <string name="label_file_size">Size</string>
     <string name="label_file_format">Format</string>
     <string name="label_track_length">Length</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_sampling_rate">Sampling rate</string>
+    <string name="label_sampling_rate">Sample Rate</string>
 
     <string name="added_title_to_queue">"Added 1 title to the queue."</string>
     <string name="added_x_titles_to_queue">Added %1$d titles to the queue.</string>
@@ -152,6 +152,7 @@
     <string name="version">Version</string>
     <string name="source">Source</string>
     <string name="author">Author</string>
+    <string name="website">Website</string>
     <string name="write_an_email">Write an Email</string>
     <string name="follow_on_twitter">Follow on Twitter</string>
     <string name="visit_website">Visit Website</string>
@@ -169,7 +170,6 @@
     <string name="aleksandar_tesic_summary">Made great improvements to the general design.</string>
     <string name="eugene_cheung_summary">Several amazing contributions to the source code.</string>
     <string name="adrian_summary">Designed the new album page which was then ported to other activities.</string>
-    <string name="website">Website</string>
 
     <string name="app_widget_big_name">Gelli Album</string>
     <string name="app_widget_classic_name">Gelli Classic</string>
@@ -195,14 +195,14 @@
     <string name="permissions_denied">Permissions denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
 
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_z_a">Descending</string>
+    <string name="sort_order_ascending">Ascending</string>
+    <string name="sort_order_descending">Descending</string>
 
-    <string name="sort_order_name">Name</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_random">Random</string>
+    <string name="sort_method_name">Name</string>
+    <string name="sort_method_artist">Artist</string>
+    <string name="sort_method_album">Album</string>
+    <string name="sort_method_year">Year</string>
+    <string name="sort_method_random">Random</string>
 
     <string name="finish_current_music_sleep_timer">Finish last song</string>
     <string name="cancel_current_timer">Cancel current timer</string>