merge with latest changes

diff --git a/po/enigma2_rel25.pot b/po/enigma2_rel25.pot
index 7a4e672709c6ecb231b9343da7ba2b50a7fa1403..add8189d961fd3c7990b2a174fb9c7ab930b19a1 100644 (file)
--- a/po/enigma2_rel25.pot
+++ b/po/enigma2_rel25.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-15 23:27+0100\n"
+"POT-Creation-Date: 2009-02-16 09:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py:202
+msgid ""
+"\n"
+"Enigma2 will restart after the restore"
+msgstr ""
+
 #: ../lib/python/Components/NimManager.py:951
 #: ../lib/python/Components/NimManager.py:953
 #: ../lib/python/Components/NimManager.py:1026
@@ -3843,6 +3849,16 @@ msgstr ""
 msgid "West"
 msgstr ""
 
+#: ../lib/python/Screens/FactoryReset.py:5
+msgid ""
+"When you do a factory reset, you will lose ALL your configuration data\n"
+"(including bouquets, services, satellite data ...)\n"
+"After completion of factory reset, your receiver will restart "
+"automatically!\n"
+"\n"
+"Really do a factory reset?"
+msgstr ""
+
 #: ../lib/python/Screens/LocationBox.py:516
 msgid "Where to save temporary timeshift recordings?"
 msgstr ""