From 6863bd25da03e25f4565b19b71ce6811280b9dbf Mon Sep 17 00:00:00 2001 From: PhysK Date: Thu, 12 Apr 2018 14:46:02 +0100 Subject: [PATCH 1/4] Updated Library Grouping to have "Album Artist / Album". Translations string XML files have been updated with the additional item under "pref_library_grouping_values" with my best guess at the translations. They have been commented, For someone who is multi-lingual to fix if needed :) --- .../qspool/clementineremote/backend/library/LibraryQuery.java | 3 +++ app/src/main/res/values-ca/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-fr/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-ms-rMY/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/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-sr/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/array.xml | 1 + app/src/main/res/values/strings.xml | 3 ++- 22 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java b/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java index c301032e..3b6e8062 100644 --- a/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java +++ b/app/src/main/java/de/qspool/clementineremote/backend/library/LibraryQuery.java @@ -32,6 +32,9 @@ protected String[] getSelectedFields() { case "artist-album": selectedFields = new String[] {"artist", "album", "title"}; break; + case "albumartist-album": + selectedFields = new String[] {"albumartist", "album", "title"}; + break; case "artist-year": selectedFields = new String[] {"artist", "year", "title"}; break; diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 074fdeb9..909efd8c 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -130,6 +130,7 @@ Artista Artista / Àlbum + Àlbum Artista / Àlbum Artista / Any Àlbum Estil / Àlbum diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4aa916f7..30a30d44 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -134,6 +134,7 @@ Pokud máte díky mé práci skutečně dobrou náladu, malý dar od vás by byl Umělec Umělec/Album + Album Umělec / Album Umělec/Rok Album Žánr/Album diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index de9e41e5..11ad6f1f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -130,6 +130,7 @@ Interpret Interpret / Album + Album Interpret / Album Interpret / Jahr Album Genre / Album diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 81bb8bd7..dbcba6c1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -130,6 +130,7 @@ Artista Artista / álbum + álbum Artista / álbum Artista / año Álbum Género / álbum diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 45460ac7..6f856809 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -130,6 +130,7 @@ Artiste Artiste / Album + Album Artiste / Album Artiste / Année Album Genre / Album diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d6a7d32e..cb2bd2db 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -132,6 +132,7 @@ Izvođaču Izvođaču / Albumu + Albumu Izvođaču / Albumu Izvođaču / Godini Albumu Žanru / Albumu diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cf2f5a45..2bb2c80f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -130,6 +130,7 @@ Előadó Előadó / Album + Album Előadó / Album Előadó / Év Album Műfaj / Album diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index db6d2d2b..4f6a570c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -128,6 +128,7 @@ アーティスト アーティスト / アルバム + アルバム アーティスト / アルバム アーティスト / 年 アルバム ジャンル / アルバム diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index e6b8c984..885ac2f0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -132,6 +132,7 @@ Atlikėją Atlikėją / Albumą + Albumą Atlikėją / Albumą Atlikėją / Metus Albumą Žanrą / Albumą diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml index b200e85c..da3a3186 100644 --- a/app/src/main/res/values-ms-rMY/strings.xml +++ b/app/src/main/res/values-ms-rMY/strings.xml @@ -115,6 +115,7 @@ Artis Artis / Album + Album Artis / Album Artis / Tahun Album Genre / Album diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e6ab74ff..36dd8a60 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -130,6 +130,7 @@ Artiest Artiest / Album + Album Artiest / Album Artiest / Jaar Album Genre / Album diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index be0568eb..fdcd8b45 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -134,6 +134,7 @@ Artysta Artysta / Album + Album Artysta / Album Artysta / Rok Album Gatunek / Album diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 21a76cc5..b420a605 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -130,6 +130,7 @@ Artista Artista/Álbum + Álbum Artista / Álbum Artista/Ano Álbum Género/Álbum diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4dcad72d..326f476a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -134,6 +134,7 @@ Исполнитель Исполнитель / Альбом + Альбом Исполнитель / Альбом Исполнитель / Гол Альбом Жанр / Альбом diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 17125e29..2d838d5b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -132,6 +132,7 @@ Interpret Interpret / Album + Album Interpret / Album Interpret / Rok Album Žáner / Album diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 4743eacf..0b21f846 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -132,6 +132,7 @@ извођачу извођачу/албуму + албуму извођачу / албуму извођачу/години албуму жанру/албуму diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5d6115bb..0d23cbe5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -130,6 +130,7 @@ Artist Artist / Album + Album Artist / Album Artist / Årtal Album Genre / Album diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 042f6376..410dcbb3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -128,6 +128,7 @@ Sanatçı Sanatçı / Albüm + Albüm Sanatçı / Albüm Sanatçı / Yıl Albüm Tarz / Albüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c8ea88d0..468ddbc7 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -132,6 +132,7 @@ Виконавець Виконавець / Альбом + Альбом Виконавець / Альбом Виконавець / Рік Альбом Жанр / Альбом diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index a7bde7a4..d0ad2000 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -71,6 +71,7 @@ artist artist-album + albumartist-album artist-year album genre-album diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55a8985c..a1ea3627 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,7 +156,8 @@ Artist Artist / Album - Artist / Year + Album Artist / Album + Artist / Any Album Genre / Album Genre / Artist / Album From 6fa9b15887ff85cb51e671aa85669020446f0c0a Mon Sep 17 00:00:00 2001 From: PhysK Date: Thu, 12 Apr 2018 14:58:10 +0100 Subject: [PATCH 2/4] Fixed error in /res/values/strings.xml --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1ea3627..1ed9dfd0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,7 +157,7 @@ Artist Artist / Album Album Artist / Album - Artist / Any + Artist / Year Album Genre / Album Genre / Artist / Album From 7d62c38c1bdaa71650b84de1759718d64d13ad24 Mon Sep 17 00:00:00 2001 From: PhysK Date: Thu, 12 Apr 2018 20:23:41 +0100 Subject: [PATCH 3/4] Removed Translations for the next Transifex translation pull Added Improvement to CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b1902ec7..7a2fdbd1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ [UNRELEASED] + Improvements: + - Added "Album Artist / Album" to Library Grouping Bugfixes: - Make connection to Clementine more robust - Fix crash when mSocket.getInetAddress() is null From 9d87140d9a54450b3fee62a4bccd06915f4a3ad9 Mon Sep 17 00:00:00 2001 From: PhysK Date: Thu, 12 Apr 2018 20:29:28 +0100 Subject: [PATCH 4/4] Removed Translations for the next Transifex translation pull --- app/src/main/res/values-ca/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-fr/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-ms-rMY/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/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-sr/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 - 19 files changed, 19 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 909efd8c..074fdeb9 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -130,7 +130,6 @@ Artista Artista / Àlbum - Àlbum Artista / Àlbum Artista / Any Àlbum Estil / Àlbum diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 30a30d44..4aa916f7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -134,7 +134,6 @@ Pokud máte díky mé práci skutečně dobrou náladu, malý dar od vás by byl Umělec Umělec/Album - Album Umělec / Album Umělec/Rok Album Žánr/Album diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 11ad6f1f..de9e41e5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -130,7 +130,6 @@ Interpret Interpret / Album - Album Interpret / Album Interpret / Jahr Album Genre / Album diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index dbcba6c1..81bb8bd7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -130,7 +130,6 @@ Artista Artista / álbum - álbum Artista / álbum Artista / año Álbum Género / álbum diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6f856809..45460ac7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -130,7 +130,6 @@ Artiste Artiste / Album - Album Artiste / Album Artiste / Année Album Genre / Album diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index cb2bd2db..d6a7d32e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -132,7 +132,6 @@ Izvođaču Izvođaču / Albumu - Albumu Izvođaču / Albumu Izvođaču / Godini Albumu Žanru / Albumu diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2bb2c80f..cf2f5a45 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -130,7 +130,6 @@ Előadó Előadó / Album - Album Előadó / Album Előadó / Év Album Műfaj / Album diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4f6a570c..db6d2d2b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -128,7 +128,6 @@ アーティスト アーティスト / アルバム - アルバム アーティスト / アルバム アーティスト / 年 アルバム ジャンル / アルバム diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 885ac2f0..e6b8c984 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -132,7 +132,6 @@ Atlikėją Atlikėją / Albumą - Albumą Atlikėją / Albumą Atlikėją / Metus Albumą Žanrą / Albumą diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml index da3a3186..b200e85c 100644 --- a/app/src/main/res/values-ms-rMY/strings.xml +++ b/app/src/main/res/values-ms-rMY/strings.xml @@ -115,7 +115,6 @@ Artis Artis / Album - Album Artis / Album Artis / Tahun Album Genre / Album diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 36dd8a60..e6ab74ff 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -130,7 +130,6 @@ Artiest Artiest / Album - Album Artiest / Album Artiest / Jaar Album Genre / Album diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fdcd8b45..be0568eb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -134,7 +134,6 @@ Artysta Artysta / Album - Album Artysta / Album Artysta / Rok Album Gatunek / Album diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b420a605..21a76cc5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -130,7 +130,6 @@ Artista Artista/Álbum - Álbum Artista / Álbum Artista/Ano Álbum Género/Álbum diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 326f476a..4dcad72d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -134,7 +134,6 @@ Исполнитель Исполнитель / Альбом - Альбом Исполнитель / Альбом Исполнитель / Гол Альбом Жанр / Альбом diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2d838d5b..17125e29 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -132,7 +132,6 @@ Interpret Interpret / Album - Album Interpret / Album Interpret / Rok Album Žáner / Album diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 0b21f846..4743eacf 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -132,7 +132,6 @@ извођачу извођачу/албуму - албуму извођачу / албуму извођачу/години албуму жанру/албуму diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0d23cbe5..5d6115bb 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -130,7 +130,6 @@ Artist Artist / Album - Album Artist / Album Artist / Årtal Album Genre / Album diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 410dcbb3..042f6376 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -128,7 +128,6 @@ Sanatçı Sanatçı / Albüm - Albüm Sanatçı / Albüm Sanatçı / Yıl Albüm Tarz / Albüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 468ddbc7..c8ea88d0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -132,7 +132,6 @@ Виконавець Виконавець / Альбом - Альбом Виконавець / Альбом Виконавець / Рік Альбом Жанр / Альбом