summaryrefslogtreecommitdiff
path: root/vdrmanager/res/values
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2011-10-20 14:39:34 +0200
committerlado <herrlado@gmail.com>2011-10-20 14:39:34 +0200
commit3b452963b56e2d50fc03a3a66cabd973b4789665 (patch)
tree5975193a555765152601f1d1a6c3760fe2f002f4 /vdrmanager/res/values
parent437f9d29198fd7160ef7ed23eb782a5bc4a54da0 (diff)
parent0342f25d24a2a2534c26e7588aac6eba00d0950a (diff)
downloadvdr-manager-3b452963b56e2d50fc03a3a66cabd973b4789665.tar.gz
vdr-manager-3b452963b56e2d50fc03a3a66cabd973b4789665.tar.bz2
Merge branch 'master' of ssh://projects.vdr-developer.org/vdr-manager
Diffstat (limited to 'vdrmanager/res/values')
-rw-r--r--vdrmanager/res/values/common.xml1
-rw-r--r--vdrmanager/res/values/epg_list_menu.xml3
-rw-r--r--vdrmanager/res/values/progress.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/vdrmanager/res/values/common.xml b/vdrmanager/res/values/common.xml
index 8fbde34..340b42b 100644
--- a/vdrmanager/res/values/common.xml
+++ b/vdrmanager/res/values/common.xml
@@ -6,4 +6,5 @@
<string name="no_connection">No connection</string>
<string name="no_connection_retry">Retry</string>
<string name="refresh">Refresh</string>
+ <string name="done">Done</string>
</resources>
diff --git a/vdrmanager/res/values/epg_list_menu.xml b/vdrmanager/res/values/epg_list_menu.xml
index 7176f28..29a9efb 100644
--- a/vdrmanager/res/values/epg_list_menu.xml
+++ b/vdrmanager/res/values/epg_list_menu.xml
@@ -9,6 +9,7 @@
<string name="epg_item_menu_timer_modify">Modify timer</string>
<string name="epg_item_menu_timer_enable">Enable timer</string>
<string name="epg_item_menu_timer_disable">Disable timer</string>
- <string name="epg_no_items">Nothing there…</string>
+ <string name="epg_no_items">Nothing found…</string>
+ <string name="epg_client_errors">An error occurred, check logs…</string>
</resources>
diff --git a/vdrmanager/res/values/progress.xml b/vdrmanager/res/values/progress.xml
index 7c25559..8007725 100644
--- a/vdrmanager/res/values/progress.xml
+++ b/vdrmanager/res/values/progress.xml
@@ -17,6 +17,7 @@
<string name="progress_timer_save">Saving timer …</string>
<string name="progress_timer_delete">Deleting timer …</string>
<string name="progress_timer_enable">Enabling timer …</string>
+ <string name="progress_timer_modify">Updating timer …</string>
<string name="progress_timer_disable">Disabling timer …</string>
<string name="progress_connect_finished_abnormal">Connection finished abnormal …</string>
<string name="progress_connect_finished_abnormal_arg">Connection finished abnormal: %1$s</string>