diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-04-06 19:35:52 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-04-06 19:35:52 +0200 |
| commit | dc06e81d95ff62e4a4bce71ec67b36eae48e7920 (patch) | |
| tree | 705d07ee2d304260f211540663d91cbf9093dbb5 /res | |
| parent | a4b78501dc2d32664fbdfdbe617a19defb2f213e (diff) | |
| parent | eb756cc65715c2f5b8b382ee9025eb3f2cfc8db4 (diff) | |
| download | AntennaPod-dc06e81d95ff62e4a4bce71ec67b36eae48e7920.zip | |
Merge branch 'backup' of git://github.com/liesen/AntennaPod into liesen-backup
Conflicts:
src/de/danoeh/antennapod/activity/MainActivity.java
Moved calls to BackupManager from PodDBAdapter to DBWriter
Diffstat (limited to 'res')
| -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 376320ad2..6d36a5c07 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -354,6 +354,9 @@ <string name="new_episodes_count_label">Number of new episodes</string> <string name="in_progress_episodes_count_label">Number of episodes you have started listening to</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> |