aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-07-31 13:10:17 -0700
committerScott Jackson <daneren2005@gmail.com>2015-07-31 13:10:17 -0700
commit0d5ea40198f1503ae0ad243663d1c6ba2a4dca99 (patch)
tree0e136575fdcb2d0b9b0f355861930acfd48a1d9c /app/src/main/res/values
parent67cd4eb3447794c94b96946e64d8e2720acbc51f (diff)
parent9f597b5135b85b99755cd791e32796b89fbf81dd (diff)
downloaddsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.gz
dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.bz2
dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.zip
Merge branch 'master' into SlideUpPanel2
Conflicts: app/src/main/java/github/daneren2005/dsub/service/DownloadService.java app/src/main/res/values-de/strings.xml
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/arrays.xml13
-rw-r--r--app/src/main/res/values/strings.xml5
2 files changed, 18 insertions, 0 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d876ecdb..a7dd932d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -163,6 +163,19 @@
<item>@string/settings.temp_loss_nothing</item>
</string-array>
+ <string-array name="keepPlayedCountValues">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ </string-array>
+ <string-array name="keepPlayedCountNames">
+ <item>@string/settings.keep_played_count_none</item>
+ <item>@string/settings.keep_played_count_one</item>
+ <item>@string/settings.keep_played_count_two</item>
+ <item>@string/settings.keep_played_count_three</item>
+ </string-array>
+
<string-array name="disconnectPauseValues">
<item>0</item>
<item>3</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec6c45b4..1cb85711 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -371,6 +371,11 @@
<string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>
<string name="settings.temp_loss_lower">Always lower volume</string>
<string name="settings.temp_loss_nothing">Do Nothing</string>
+ <string name="settings.keep_played_count_title">Keep played songs</string>
+ <string name="settings.keep_played_count_none">Remove all played songs</string>
+ <string name="settings.keep_played_count_one">Keep last played songs</string>
+ <string name="settings.keep_played_count_two">Keep 2 played songs</string>
+ <string name="settings.keep_played_count_three">Keep 3 played songs</string>
<string name="settings.disconnect_pause_title">Pause on Disconnect</string>
<string name="settings.disconnect_pause_both">Pause</string>
<string name="settings.disconnect_pause_neither">Do Nothing</string>