summaryrefslogtreecommitdiff
path: root/core/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorRoss Harrison <rtharrison86@gmail.com>2015-02-28 14:45:14 -0600
committerRoss Harrison <rtharrison86@gmail.com>2015-02-28 14:45:14 -0600
commitab34f84e2c837e927e359c978f5d1ea15be80971 (patch)
treea895ba367c59255666c5b4a2d7d99839c66c5177 /core/src/main/res/values/strings.xml
parent46252ce663903b8f4c9ff41b7ab05ad3c94df669 (diff)
parentc9e8af52c24b405c65fc9220a6c5c573574df672 (diff)
downloadAntennaPod-ab34f84e2c837e927e359c978f5d1ea15be80971.zip
Merge branch 'master' of https://github.com/AntennaPod/AntennaPod into AntennaPod-master
core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
Diffstat (limited to 'core/src/main/res/values/strings.xml')
-rw-r--r--core/src/main/res/values/strings.xml12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 86208becb..a40064f67 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -159,6 +159,12 @@
<string name="removed_from_queue">Item removed</string>
<string name="move_to_top_label">Move to top</string>
<string name="move_to_bottom_label">Move to bottom</string>
+ <string name="sort">Sort</string>
+ <string name="alpha">Alphabetically</string>
+ <string name="date">Date</string>
+ <string name="duration">Duration</string>
+ <string name="ascending">Ascending</string>
+ <string name="descending">Descending</string>
<!-- Flattr -->
<string name="flattr_auth_label">Flattr sign-in</string>
@@ -207,6 +213,8 @@
<string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string>
<string name="pref_unpauseOnHeadsetReconnect_sum">Resume playback when the headphones are reconnected</string>
<string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
+ <string name="pref_auto_delete_sum">Delete episode when playback completes</string>
+ <string name="pref_auto_delete_title">Auto Delete</string>
<string name="playback_pref">Playback</string>
<string name="network_pref">Network</string>
<string name="pref_autoUpdateIntervall_title">Update interval</string>
@@ -235,8 +243,8 @@
<string name="pref_automatic_download_sum">Configure the automatic download of episodes.</string>
<string name="pref_autodl_wifi_filter_title">Enable Wi-Fi filter</string>
<string name="pref_autodl_wifi_filter_sum">Allow automatic download only for selected Wi-Fi networks.</string>
- <string name="pref_automatic_download_on_battery_title">Automatic download on battery</string>
- <string name="pref_automatic_download_on_battery_sum">Allow automatic download while on battery</string>
+ <string name="pref_automatic_download_on_battery_title">Download when not charging</string>
+ <string name="pref_automatic_download_on_battery_sum">Allow automatic download when the battery is not charging</string>
<string name="pref_episode_cache_title">Episode cache</string>
<string name="pref_theme_title_light">Light</string>
<string name="pref_theme_title_dark">Dark</string>