diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-04-26 23:58:00 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-04-26 23:58:00 +0200 |
| commit | 2e22685c79500567db453358b94a3c5a7afcfa38 (patch) | |
| tree | 57ad8657ec0ee714d9c8de81d224465ad257b3af /res/values/strings.xml | |
| parent | 68494fd022529778a11991a12c249f27b6e9d0c9 (diff) | |
| parent | df55792d27b2753a04c2f545cbfc52a2f72fa9b1 (diff) | |
| download | AntennaPod-2e22685c79500567db453358b94a3c5a7afcfa38.zip | |
Merge branch 'develop' into newgui
Conflicts:
src/de/danoeh/antennapod/activity/MainActivity.java
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 76928bde8..cf3b02148 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -371,6 +371,9 @@ <string name="in_progress_episodes_count_label">Number of episodes you have started listening to</string> <string name="drag_handle_content_description">Drag to change the position of this item</string> + <!-- OPML backup --> + <string name="backup_restored">"Restored feed subscriptions from backup"</string> + <!-- AntennaPodSP --> <string name="sp_apps_importing_feeds_msg">Importing subscriptions from single-purpose apps…</string> |