aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-10-02 19:17:22 -0700
committerScott Jackson <daneren2005@gmail.com>2014-10-02 19:17:22 -0700
commit7069ab8ab78a48e60fa4a95ccc325eb7e56fa1be (patch)
tree7b2ec25823373ad6b1473559a2d9d86d253645a8 /res
parente34688b0366f9ac17e8c9c55877d83d4acd7fb0d (diff)
parentad8e2fbbe3a096dbcea0f252ba0fa1bad6baffda (diff)
downloaddsub-7069ab8ab78a48e60fa4a95ccc325eb7e56fa1be.tar.gz
dsub-7069ab8ab78a48e60fa4a95ccc325eb7e56fa1be.tar.bz2
dsub-7069ab8ab78a48e60fa4a95ccc325eb7e56fa1be.zip
Merge branch 'master' into Transition
Diffstat (limited to 'res')
-rw-r--r--res/menu/select_song.xml4
-rw-r--r--res/menu/select_song_offline.xml4
-rw-r--r--res/values-de/strings.xml1
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-fr/strings.xml1
-rw-r--r--res/values-hu/strings.xml1
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values/strings.xml1
8 files changed, 0 insertions, 14 deletions
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index ec4af96a..07fd57a7 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -14,10 +14,6 @@
compat:showAsAction="ifRoom|withText"/>
<item
- android:id="@+id/menu_select"
- android:title="@string/menu.select"/>
-
- <item
android:id="@+id/menu_download"
android:title="@string/common.download"/>
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 6915c873..c45405fb 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -14,10 +14,6 @@
compat:showAsAction="ifRoom|withText"/>
<item
- android:id="@+id/menu_select"
- android:title="@string/menu.select"/>
-
- <item
android:id="@+id/menu_delete"
android:title="@string/menu.delete_cache"/>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ebfe7377..e57d7fb4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -78,7 +78,6 @@
<string name="menu.search">Suche</string>
<string name="menu.shuffle">Zufall</string>
<string name="menu.refresh">Aktualisieren</string>
- <string name="menu.select">Wähle Alle</string>
<string name="menu.play">Abspielen</string>
<string name="menu.play_last">Ans Ende der Wiedergabeliste</string>
<string name="menu.exit">Beenden</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e2350bab..e49d6197 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -75,7 +75,6 @@
<string name="menu.search">Buscar</string>
<string name="menu.shuffle">Aleatorio</string>
<string name="menu.refresh">Actualizar</string>
- <string name="menu.select">Seleccionar todo</string>
<string name="menu.play">Reproducir</string>
<string name="menu.play_last">Reproducir al final</string>
<string name="menu.exit">Salir</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 40d04b42..4adaf141 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -77,7 +77,6 @@
<string name="menu.search">Recherche</string>
<string name="menu.shuffle">Hasard</string>
<string name="menu.refresh">Recharger</string>
- <string name="menu.select">Tout sélectionner</string>
<string name="menu.play">Jouer</string>
<string name="menu.exit">Quitter</string>
<string name="menu.play_last">Jouer dernier</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 98b64e25..e3197bee 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -78,7 +78,6 @@
<string name="menu.search">Keresés</string>
<string name="menu.shuffle">Lejátszás kevert sorrendben</string>
<string name="menu.refresh">Frissítés</string>
- <string name="menu.select">Összes jelölése be/ki</string>
<string name="menu.play">Lejátszás</string>
<string name="menu.play_last">Sorbaállítás utolsónak</string>
<string name="menu.exit">Kilépés</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9e9bc211..5a009228 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -54,7 +54,6 @@
<string name="menu.search">Поиск</string>
<string name="menu.shuffle">Перемешать</string>
<string name="menu.refresh">Обновить</string>
- <string name="menu.select">Выбрать все</string>
<string name="menu.play">Воспроизвести</string>
<string name="menu.play_last">Воспроизвести последним</string>
<string name="menu.exit">Выход</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc2e4980..857ebe71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,7 +78,6 @@
<string name="menu.search">Search</string>
<string name="menu.shuffle">Shuffle</string>
<string name="menu.refresh">Refresh</string>
- <string name="menu.select">Select All</string>
<string name="menu.play">Play</string>
<string name="menu.play_last">Play Last</string>
<string name="menu.exit">Exit</string>