diff options
author | Wilhelm Fitzpatrick <rafial@cyngn.com> | 2014-10-01 17:24:20 -0700 |
---|---|---|
committer | linus_lee <llee@cyngn.com> | 2014-11-20 12:51:32 -0800 |
commit | 88e69407fb410ec44fba16254bc3b3e7b2827d53 (patch) | |
tree | 14d809d33a377ec906d7a42b71768af6e0106ef9 /res | |
parent | 89aaf79bd0e8a6fbf914c3b40f826b22c4197787 (diff) | |
download | android_packages_apps_Eleven-88e69407fb410ec44fba16254bc3b3e7b2827d53.tar.gz android_packages_apps_Eleven-88e69407fb410ec44fba16254bc3b3e7b2827d53.tar.bz2 android_packages_apps_Eleven-88e69407fb410ec44fba16254bc3b3e7b2827d53.zip |
Eleven: add hidden buttons actions as overflow actions instead
Note: renamed a string resource, so it is renamed in all localized files
Change-Id: Ic81184122674d5e7d63000113f5412030895002a
Diffstat (limited to 'res')
52 files changed, 140 insertions, 96 deletions
diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml index 2f4a060..26b3ad6 100644 --- a/res/layout/activity_album_detail.xml +++ b/res/layout/activity_album_detail.xml @@ -11,16 +11,6 @@ android:layout_alignParentLeft="true" android:background="@color/page_header_background" > - <com.cyngn.eleven.widgets.PopupMenuButton - android:id="@+id/overflow" - android:layout_width="@dimen/overflow_width" - android:layout_height="@dimen/overflow_width" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_marginBottom="40dp" - android:gravity="center" - android:src="@drawable/menu_button" /> - <ImageView android:id="@+id/album_art" android:layout_width="108dp" @@ -35,7 +25,6 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_toRightOf="@id/album_art" - android:layout_toLeftOf="@id/overflow" android:layout_marginTop="21dp" android:singleLine="true" android:fontFamily="sans-serif" diff --git a/res/menu/activity_base.xml b/res/menu/activity_base.xml index d494081..5c645cf 100644 --- a/res/menu/activity_base.xml +++ b/res/menu/activity_base.xml @@ -18,7 +18,7 @@ <item android:id="@+id/menu_settings" - android:orderInCategory="4" + android:orderInCategory="1000" android:showAsAction="never" android:title="@string/menu_settings"/> diff --git a/res/menu/album_song_sort_by.xml b/res/menu/album_song_sort_by.xml deleted file mode 100644 index 842c66e..0000000 --- a/res/menu/album_song_sort_by.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2012 Andrew Neal - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/menu_sort_by" - android:showAsAction="never" - android:title="@string/menu_sort_by"> - <menu> - <item - android:id="@+id/menu_sort_by_az" - android:title="@string/sort_order_entry_az"/> - <item - android:id="@+id/menu_sort_by_za" - android:title="@string/sort_order_entry_za"/> - <item - android:id="@+id/menu_sort_by_duration" - android:title="@string/sort_order_entry_duration"/> - <item - android:id="@+id/menu_sort_by_track_list" - android:title="@string/sort_order_entry_track_list"/> - <item - android:id="@+id/menu_sort_by_filename" - android:title="@string/sort_order_entry_filename"/> - </menu> - </item> - -</menu>
\ No newline at end of file diff --git a/res/menu/album_sort_by.xml b/res/menu/album_sort_by.xml index 034a280..1d9207a 100644 --- a/res/menu/album_sort_by.xml +++ b/res/menu/album_sort_by.xml @@ -19,6 +19,7 @@ <item android:id="@+id/menu_sort_by" android:showAsAction="never" + android:orderInCategory="120" android:title="@string/menu_sort_by"> <menu> <item diff --git a/res/menu/artist_sort_by.xml b/res/menu/artist_sort_by.xml index b2125a2..1350f8d 100644 --- a/res/menu/artist_sort_by.xml +++ b/res/menu/artist_sort_by.xml @@ -19,6 +19,7 @@ <item android:id="@+id/menu_sort_by" android:showAsAction="never" + android:orderInCategory="120" android:title="@string/menu_sort_by"> <menu> <item diff --git a/res/menu/audio_player.xml b/res/menu/audio_player.xml index 4c97557..1a2b86c 100644 --- a/res/menu/audio_player.xml +++ b/res/menu/audio_player.xml @@ -19,18 +19,22 @@ <item android:id="@+id/menu_audio_player_share" android:showAsAction="never" + android:orderInCategory="40" android:title="@string/menu_share"/> <item android:id="@+id/menu_audio_player_equalizer" android:showAsAction="never" + android:orderInCategory="41" android:title="@string/menu_equalizer"/> <item android:id="@+id/menu_audio_player_ringtone" android:showAsAction="never" + android:orderInCategory="42" android:title="@string/context_menu_use_as_ringtone"/> <item android:id="@+id/menu_audio_player_delete" android:showAsAction="never" + android:orderInCategory="43" android:title="@string/context_menu_delete"/> </menu> diff --git a/res/menu/shuffle.xml b/res/menu/clear_list.xml index 525666f..020df38 100644 --- a/res/menu/shuffle.xml +++ b/res/menu/clear_list.xml @@ -17,8 +17,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item - android:id="@+id/menu_shuffle" + android:id="@+id/clear_list" android:showAsAction="never" - android:title="@string/menu_shuffle"/> + android:orderInCategory="110" + android:title="@string/menu_clear_list"/> </menu>
\ No newline at end of file diff --git a/res/menu/new_playlist.xml b/res/menu/new_playlist.xml new file mode 100644 index 0000000..3e5886c --- /dev/null +++ b/res/menu/new_playlist.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 Andrew Neal + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_new_playlist" + android:showAsAction="never" + android:orderInCategory="100" + android:title="@string/new_playlist"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/queue.xml b/res/menu/queue.xml index 31cf641..7e8df03 100644 --- a/res/menu/queue.xml +++ b/res/menu/queue.xml @@ -18,10 +18,12 @@ <item android:id="@+id/menu_save_queue" android:showAsAction="never" + android:orderInCategory="50" android:title="@string/menu_save_queue"/> <item android:id="@+id/menu_clear_queue" android:showAsAction="never" + android:orderInCategory="51" android:title="@string/menu_clear_queue"/> </menu>
\ No newline at end of file diff --git a/res/menu/shuffle_all.xml b/res/menu/shuffle_all.xml new file mode 100644 index 0000000..b372af0 --- /dev/null +++ b/res/menu/shuffle_all.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 Andrew Neal + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_shuffle_all" + android:showAsAction="never" + android:orderInCategory="30" + android:title="@string/menu_shuffle_all"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/shuffle_item.xml b/res/menu/shuffle_item.xml new file mode 100644 index 0000000..a7450c8 --- /dev/null +++ b/res/menu/shuffle_item.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 Andrew Neal + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/menu_shuffle_item" + android:showAsAction="never" + android:orderInCategory="30" + android:title="@string/menu_shuffle_item"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/song_sort_by.xml b/res/menu/song_sort_by.xml index e471139..ea1044c 100644 --- a/res/menu/song_sort_by.xml +++ b/res/menu/song_sort_by.xml @@ -19,6 +19,7 @@ <item android:id="@+id/menu_sort_by" android:showAsAction="never" + android:orderInCategory="120" android:title="@string/menu_sort_by"> <menu> <item diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index c379785..8e23aaa 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genres</string> <string name="menu_settings">Instellings</string> <string name="menu_search">Soek</string> - <string name="menu_shuffle">Skommel almal</string> + <string name="menu_shuffle_all">Skommel almal</string> <string name="menu_play_all">Speel almal</string> <string name="menu_sort_by">Sorteer volgens</string> <string name="menu_shop">Koop temas</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index e59196c..c25c64e 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">أنواع</string> <string name="menu_settings">إعدادات</string> <string name="menu_search">بحث</string> - <string name="menu_shuffle">خلْط الكل</string> + <string name="menu_shuffle_all">خلْط الكل</string> <string name="menu_play_all">تشغيل الكل</string> <string name="menu_sort_by">الترتيب حسب</string> <string name="menu_shop">متجر للمواضيع</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 87742e9..0ecd78f 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Gèneres</string> <string name="menu_settings">Configuració</string> <string name="menu_search">Cerca</string> - <string name="menu_shuffle">Barreja-ho tot</string> + <string name="menu_shuffle_all">Barreja-ho tot</string> <string name="menu_play_all">Reprodueix tot</string> <string name="menu_sort_by">Ordena per</string> <string name="menu_shop">Compra per temes</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a86ff8e..cac687c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Žánry</string> <string name="menu_settings">Nastavení</string> <string name="menu_search">Vyhledávat</string> - <string name="menu_shuffle">Vše náhodně</string> + <string name="menu_shuffle_all">Vše náhodně</string> <string name="menu_play_all">Přehrát vše</string> <string name="menu_sort_by">Řadit podle\u2026</string> <string name="menu_shop">Obchod s motivy</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5609466..ebd5cba 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genrer</string> <string name="menu_settings">Indstillinger</string> <string name="menu_search">Søg</string> - <string name="menu_shuffle">Bland alle</string> + <string name="menu_shuffle_all">Bland alle</string> <string name="menu_play_all">Afspil alle</string> <string name="menu_sort_by">Sortér efter</string> <string name="menu_shop">Hent temaer</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9ce9bd9..d82549b 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genres</string> <string name="menu_settings">Einstellungen</string> <string name="menu_search">Suchen</string> - <string name="menu_shuffle">Alle zufällig anordnen</string> + <string name="menu_shuffle_all">Alle zufällig anordnen</string> <string name="menu_play_all">Alle wiedergeben</string> <string name="menu_sort_by">Sortieren</string> <string name="menu_shop">Designs beziehen</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 32b8338..8a08029 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Είδη</string> <string name="menu_settings">Ρυθμίσεις</string> <string name="menu_search">Αναζήτηση</string> - <string name="menu_shuffle">Τυχαία αναπαραγωγή όλων</string> + <string name="menu_shuffle_all">Τυχαία αναπαραγωγή όλων</string> <string name="menu_play_all">Αναπαραγωγή όλων</string> <string name="menu_sort_by">Ταξινόμηση κατά</string> <string name="menu_shop">Κατάστημα για θέματα</string> diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml index 09ffe9d..2f65c82 100644 --- a/res/values-es-rXA/strings.xml +++ b/res/values-es-rXA/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Xéneros</string> <string name="menu_settings">Axustes</string> <string name="menu_search">Guetar</string> - <string name="menu_shuffle">Reproducción aleatoria</string> + <string name="menu_shuffle_all">Reproducción aleatoria</string> <string name="menu_play_all">Reproducir too</string> <string name="menu_sort_by">Ordenar por</string> <string name="menu_shop">Descargar temes</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index cdc1f64..83e593c 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Géneros</string> <string name="menu_settings">Ajustes</string> <string name="menu_search">Buscar</string> - <string name="menu_shuffle">Reproducción aleatoria</string> + <string name="menu_shuffle_all">Reproducción aleatoria</string> <string name="menu_play_all">Reproducir todo</string> <string name="menu_sort_by">Ordenar por</string> <string name="menu_shop">Descargar temas</string> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index b94975c..e9975ae 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Žanrid</string> <string name="menu_settings">Seaded</string> <string name="menu_search">Otsi</string> - <string name="menu_shuffle">Juhuesita kõik</string> + <string name="menu_shuffle_all">Juhuesita kõik</string> <string name="menu_play_all">Esita kõik</string> <string name="menu_sort_by">Sorteeri</string> <string name="menu_shop">Külasta teemapoodi</string> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 93673e0..ce3fd52 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Generoak</string> <string name="menu_settings">Ezarpenak</string> <string name="menu_search">Bilatu</string> - <string name="menu_shuffle">Ausazko erreprodukzioa</string> + <string name="menu_shuffle_all">Ausazko erreprodukzioa</string> <string name="menu_play_all">Dena erreproduzitu</string> <string name="menu_sort_by">Honela ordenatu</string> <string name="menu_shop">Gaiak deskargatu</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index ee88ee3..f27e0d4 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Tyylilajit</string> <string name="menu_settings">Asetukset</string> <string name="menu_search">Haku</string> - <string name="menu_shuffle">Sekoita kaikki</string> + <string name="menu_shuffle_all">Sekoita kaikki</string> <string name="menu_play_all">Toista kaikki</string> <string name="menu_sort_by">Lajittelujärjestys</string> <string name="menu_shop">Osta teemoja</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index b55e2b2..91203bd 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genres</string> <string name="menu_settings">Paramètres</string> <string name="menu_search">Rechercher</string> - <string name="menu_shuffle">Lecture aléatoire</string> + <string name="menu_shuffle_all">Lecture aléatoire</string> <string name="menu_play_all">Tout lire</string> <string name="menu_sort_by">Trier par</string> <string name="menu_shop">Obtenir des thèmes</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 2980efc..df31158 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Žanrovi</string> <string name="menu_settings">Postavke</string> <string name="menu_search">Pretraga</string> - <string name="menu_shuffle">Miješaj sve</string> + <string name="menu_shuffle_all">Miješaj sve</string> <string name="menu_play_all">Sviraj sve</string> <string name="menu_sort_by">Sortiraj po</string> <string name="menu_shop">Trgovina za teme</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 5668dc7..658e4b4 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Műfajok</string> <string name="menu_settings">Beállítások</string> <string name="menu_search">Keresés</string> - <string name="menu_shuffle">Véletlen sorrend</string> + <string name="menu_shuffle_all">Véletlen sorrend</string> <string name="menu_play_all">Összes lejátszása</string> <string name="menu_sort_by">Rendezés</string> <string name="menu_shop">Témák keresése</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index d4c696c..83bc3a2 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genre</string> <string name="menu_settings">Pengaturan</string> <string name="menu_search">Cari</string> - <string name="menu_shuffle">Acak semua</string> + <string name="menu_shuffle_all">Acak semua</string> <string name="menu_play_all">Putar semua</string> <string name="menu_sort_by">Urut berdasarkan</string> <string name="menu_shop">Beli tema</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b3a296b..62f05ae 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Generi</string> <string name="menu_settings">Impostazioni</string> <string name="menu_search">Cerca</string> - <string name="menu_shuffle">Riproduzione casuale</string> + <string name="menu_shuffle_all">Riproduzione casuale</string> <string name="menu_play_all">Riproduci tutti</string> <string name="menu_sort_by">Ordina per</string> <string name="menu_shop">Negozio temi</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 932288c..2231382 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">ז\'אנרים</string> <string name="menu_settings">העדפות</string> <string name="menu_search">חיפוש</string> - <string name="menu_shuffle">ערבב את כולם</string> + <string name="menu_shuffle_all">ערבב את כולם</string> <string name="menu_play_all">נגן את כולם</string> <string name="menu_sort_by">מיין על פי</string> <string name="menu_shop">קנה ערכות נושא</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ba394eb..49ad0af 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">ジャンル</string> <string name="menu_settings">設定</string> <string name="menu_search">検索</string> - <string name="menu_shuffle">すべてシャッフル</string> + <string name="menu_shuffle_all">すべてシャッフル</string> <string name="menu_play_all">すべて再生</string> <string name="menu_sort_by">並べ替え</string> <string name="menu_shop">テーマショップ</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index cc34508..60163be 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">장르</string> <string name="menu_settings">설정</string> <string name="menu_search">검색</string> - <string name="menu_shuffle">모두 임의 재생</string> + <string name="menu_shuffle_all">모두 임의 재생</string> <string name="menu_play_all">모두 재생</string> <string name="menu_sort_by">정렬</string> <string name="menu_shop">테마 샵</string> diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml index c1edda8..d0ea862 100644 --- a/res/values-ku/strings.xml +++ b/res/values-ku/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">چهشنهکان</string> <string name="menu_settings">ڕێکخستن</string> <string name="menu_search">گهڕان</string> - <string name="menu_shuffle">ههڕهمهکی</string> + <string name="menu_shuffle_all">ههڕهمهکی</string> <string name="menu_play_all">لێدانی ههمووی</string> <string name="menu_sort_by">ڕیزکردن بهپێی</string> <string name="menu_shop">کڕینی باکگراوهند</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index e6b3b82..1b13992 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Žanrai</string> <string name="menu_settings">Nustatymai</string> <string name="menu_search">Paieška</string> - <string name="menu_shuffle">Maišyti viską</string> + <string name="menu_shuffle_all">Maišyti viską</string> <string name="menu_play_all">Groti viską</string> <string name="menu_sort_by">Rūšiuoti pagal</string> <string name="menu_shop">Temų parduotuvė</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 8adffc1..edfdc12 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Sjangrer</string> <string name="menu_settings">Innstillinger</string> <string name="menu_search">Søk</string> - <string name="menu_shuffle">Bland alle</string> + <string name="menu_shuffle_all">Bland alle</string> <string name="menu_play_all">Spill alle</string> <string name="menu_sort_by">Sorter etter</string> <string name="menu_shop">Se etter nye tema</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 0fecd51..6e2dce6 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genres</string> <string name="menu_settings">Instellingen</string> <string name="menu_search">Zoeken</string> - <string name="menu_shuffle">Alles shufflen</string> + <string name="menu_shuffle_all">Alles shufflen</string> <string name="menu_play_all">Alles afspelen</string> <string name="menu_sort_by">Sorteren op</string> <string name="menu_shop">Zoeken naar thema\'s</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a83a5d7..0caf9a6 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Gatunki</string> <string name="menu_settings">Ustawienia</string> <string name="menu_search">Szukaj</string> - <string name="menu_shuffle">Losuj wszystko</string> + <string name="menu_shuffle_all">Losuj wszystko</string> <string name="menu_play_all">Odtwórz wszystko</string> <string name="menu_sort_by">Sortuj wg</string> <string name="menu_shop">Szukaj motywów w sklepie</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index f095647..699b4d5 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Gêneros</string> <string name="menu_settings">Configurações</string> <string name="menu_search">Pesquisa</string> - <string name="menu_shuffle">Todas aleatório</string> + <string name="menu_shuffle_all">Todas aleatório</string> <string name="menu_play_all">Reproduzir todas</string> <string name="menu_sort_by">Ordenar por</string> <string name="menu_shop">Loja de temas</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index d69fafb..b292c2d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Géneros</string> <string name="menu_settings">Definições</string> <string name="menu_search">Pesquisa</string> - <string name="menu_shuffle">Todas em aleatório</string> + <string name="menu_shuffle_all">Todas em aleatório</string> <string name="menu_play_all">Reproduzir todas</string> <string name="menu_sort_by">Ordenar por</string> <string name="menu_shop">Loja de temas</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 4aaf4d1..2d83331 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genuri</string> <string name="menu_settings">Setări</string> <string name="menu_search">Căutare</string> - <string name="menu_shuffle">Amestecă tot</string> + <string name="menu_shuffle_all">Amestecă tot</string> <string name="menu_play_all">Redă tot</string> <string name="menu_sort_by">Sortare după</string> <string name="menu_shop">Magazin pentru teme</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index e250b72..9b63f3a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Жанры</string> <string name="menu_settings">Настройки</string> <string name="menu_search">Поиск</string> - <string name="menu_shuffle">Перемешать все</string> + <string name="menu_shuffle_all">Перемешать все</string> <string name="menu_play_all">Воспроизвести все</string> <string name="menu_sort_by">Сортировать по</string> <string name="menu_shop">Темы в Play Маркете</string> diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index e45ba09..e8714c8 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">ප්රභේද</string> <string name="menu_settings">සැකසීම්</string> <string name="menu_search">සොයන්න</string> - <string name="menu_shuffle">සියල්ල කලවම් කරන්න</string> + <string name="menu_shuffle_all">සියල්ල කලවම් කරන්න</string> <string name="menu_play_all">සියල්ල ධාවනය කරන්න</string> <string name="menu_sort_by">මඟින් සුබෙදන්න</string> <string name="menu_shop">තේමා සඳහා සාප්පු යන්න</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index e28da4a..9a58b9a 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Žánre</string> <string name="menu_settings">Nastavenia</string> <string name="menu_search">Hľadať</string> - <string name="menu_shuffle">Náhodne prehrať všetko</string> + <string name="menu_shuffle_all">Náhodne prehrať všetko</string> <string name="menu_play_all">Prehrať všetko</string> <string name="menu_sort_by">Zoradiť podľa</string> <string name="menu_shop">Obchod s témami</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 95b0d14..b626b1d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Жанрови</string> <string name="menu_settings">Подешавања</string> <string name="menu_search">Претрага</string> - <string name="menu_shuffle">Репродукуј све насумично</string> + <string name="menu_shuffle_all">Репродукуј све насумично</string> <string name="menu_play_all">Пусти све</string> <string name="menu_sort_by">Сортирај по</string> <string name="menu_shop">Купи тему</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 45de15d..08f0455 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Genrer</string> <string name="menu_settings">Inställningar</string> <string name="menu_search">Sök</string> - <string name="menu_shuffle">Blanda alla</string> + <string name="menu_shuffle_all">Blanda alla</string> <string name="menu_play_all">Spela alla</string> <string name="menu_sort_by">Sortera efter</string> <string name="menu_shop">Fler teman</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index bb40a19..9fc570a 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">ประเภท</string> <string name="menu_settings">ตั้งค่า</string> <string name="menu_search">ค้นหา</string> - <string name="menu_shuffle">สลับทั้งหมด</string> + <string name="menu_shuffle_all">สลับทั้งหมด</string> <string name="menu_play_all">เล่นทั้งหมด</string> <string name="menu_sort_by">เรียงโดย</string> <string name="menu_shop">เลือกซื้อธีม</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 56deac4..125d5c0 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Türler</string> <string name="menu_settings">Ayarlar</string> <string name="menu_search">Arama</string> - <string name="menu_shuffle">Hepsini karıştır</string> + <string name="menu_shuffle_all">Hepsini karıştır</string> <string name="menu_play_all">Hepsini oynat</string> <string name="menu_sort_by">Sırala...</string> <string name="menu_shop">Tema satın al</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 3a23786..b7ef8e9 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">Жанри</string> <string name="menu_settings">Налаштування</string> <string name="menu_search">Пошук</string> - <string name="menu_shuffle">Перемішати</string> + <string name="menu_shuffle_all">Перемішати</string> <string name="menu_play_all">Грати все</string> <string name="menu_sort_by">Сортувати по</string> <string name="menu_shop">Теми</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index cc31d1b..f33c235 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">类型</string> <string name="menu_settings">设置</string> <string name="menu_search">搜索</string> - <string name="menu_shuffle">全部随机播放</string> + <string name="menu_shuffle_all">全部随机播放</string> <string name="menu_play_all">全部播放</string> <string name="menu_sort_by">排序方式</string> <string name="menu_shop">购买主题</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 11b87a2..9b1acdc 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">類型</string> <string name="menu_settings">設定</string> <string name="menu_search">搜尋</string> - <string name="menu_shuffle">全部隨機播放</string> + <string name="menu_shuffle_all">全部隨機播放</string> <string name="menu_play_all">全部播放</string> <string name="menu_sort_by">排序依據</string> <string name="menu_shop">購買主題</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index a15b357..7a1667f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -25,7 +25,7 @@ <string name="page_genres">類型</string> <string name="menu_settings">設定</string> <string name="menu_search">搜尋</string> - <string name="menu_shuffle">全部隨機播放</string> + <string name="menu_shuffle_all">全部隨機播放</string> <string name="menu_play_all">全部播放</string> <string name="menu_sort_by">排序</string> <string name="menu_shop">購買主題</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 15bec76..e881c27 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -37,10 +37,18 @@ <!-- Option menu items --> <string name="menu_settings">Settings</string> <string name="menu_search">Search</string> - <string name="menu_shuffle">Shuffle all</string> + <string name="menu_shuffle_item">Shuffle</string> + <string name="menu_shuffle_all">Shuffle all</string> + <string name="menu_shuffle_playlist">Shuffle playlist</string> + <string name="menu_shuffle_album">Shuffle album</string> + <string name="menu_shuffle_artist">Shuffle artist</string> + <string name="menu_shuffle_top_tracks">Shuffle top tracks</string> + <string name="menu_shuffle_recent">Shuffle recently played</string> + <string name="menu_shuffle_last_added">Shuffle last added</string> <string name="menu_play_all">Play all</string> <string name="menu_sort_by">Sort by</string> <string name="menu_shop">Shop for themes</string> + <string name="menu_clear_list">Clear list</string> <string name="menu_clear_recents">Clear recent</string> <string name="menu_clear_queue">Clear queue</string> <string name="menu_save_queue">Save queue</string> @@ -86,9 +94,13 @@ <string name="save">Save</string> <string name="cancel">Cancel</string> <string name="overwrite">Overwrite</string> + <string name="clear">Clear</string> <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string> <string name="create_playlist_prompt">Playlist name</string> <string name="delete_dialog_title">Delete <xliff:g id="item" example="album">%s</xliff:g>?</string> + <string name="clear_top_tracks_title">Clear top tracks?</string> + <string name="clear_recent_title">Clear recently played?</string> + <string name="clear_last_added">Clear last added?</string> <string name="cannot_be_undone">This cannot be undone</string> <string name="delete_warning">This will permanently delete the cached image entries</string> <string name="new_photo">Choose photo from Gallery</string> |