diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 16:44:43 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-02 16:44:43 -0400 |
commit | a127674238480f180c3a08803d14e64a73e241a6 (patch) | |
tree | fd940bb8d8ed8458186d79c70201510499c8be1d /core/src/main/res/values | |
parent | b8aac4244e20c07078b64be01a95cfcd254c1864 (diff) | |
parent | 6c4afc4711e1c4e7eac9528fa9582b0106456656 (diff) | |
download | AntennaPod-a127674238480f180c3a08803d14e64a73e241a6.zip |
Merge pull request #1051 from TomHennen/fix1050
we can have both strings and plurals with the same name.
Diffstat (limited to 'core/src/main/res/values')
-rw-r--r-- | core/src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 7ec9bd508..8db8f8d78 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -384,6 +384,9 @@ <string name="sleep_timer_label">Sleep timer</string> <string name="time_left_label">Time left:\u0020</string> <string name="time_dialog_invalid_input">Invalid input, time has to be an integer</string> + <string name="time_unit_seconds">seconds</string> + <string name="time_unit_minutes">minutes</string> + <string name="time_unit_hours">hours</string> <plurals name="time_unit_seconds"> <item quantity="one">1 second</item> <item quantity="other">%d seconds</item> |