diff options
| author | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
|---|---|---|
| committer | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
| commit | b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3 (patch) | |
| tree | 327374119c2b40b64de192534b8b6e4f242778be /res/values | |
| parent | 5b58466fd21c8bc97fe00698369228ea96566c33 (diff) | |
| parent | 2db89cb807ae06b0f59039307e20c32cd9052b57 (diff) | |
| download | AntennaPod-b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3.zip | |
Merge branch 'playback-speed' into speed
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/service/PlaybackService.java
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 9881ae2bd..63c2e1db3 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -20,7 +20,6 @@ <item>12</item> <item>24</item> </string-array> - <string-array name="episode_cache_size_entries"> <item>@string/pref_episode_cache_unlimited</item> <item>10</item> @@ -30,7 +29,6 @@ <item>80</item> <item>100</item> </string-array> - <string-array name="episode_cache_size_values"> <item>-1</item> <item>10</item> @@ -40,7 +38,6 @@ <item>80</item> <item>100</item> </string-array> - <string-array name="playback_speed_values"> <item>1.0</item> <item>1.10</item> @@ -58,16 +55,13 @@ <string-array name="autodl_select_networks_default_entries"> <item>N/A</item> </string-array> - <string-array name="autodl_select_networks_default_values"> <item>0</item> </string-array> - <string-array name="theme_options"> <item>@string/pref_theme_title_light</item> <item>@string/pref_theme_title_dark</item> </string-array> - <string-array name="theme_values"> <item>0</item> <item>1</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 21ddf829b..207c5a371 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -190,8 +190,12 @@ <string name="pref_theme_title_light">Light</string> <string name="pref_theme_title_dark">Dark</string> <string name="pref_episode_cache_unlimited">Unlimited</string> + <string name="pref_update_interval_hours_plural">hours</string> + <string name="pref_update_interval_hours_singular">hour</string> + <string name="pref_update_interval_hours_manual">Manual</string> <string name="pref_playback_speed_title">Playback Speed</string> <string name="pref_playback_speed_sum">Change the speed of audio playback using a 3rd party control</string> + <!-- Search --> <string name="search_hint">Search for Feeds or Episodes</string> |