Merge branch 'backport' into work

[chaz/openbox] / po / en@quot.po

diff --git a/po/en@quot.po b/po/en@quot.po
index ea40adcfd0e61601f59aaafff9e2b8d15ef80c07..d058812941be96daa7ebfb2adb557d5bfca4058a 100644 (file)
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.999.0\n"
+"Project-Id-Version: openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-17 22:13+0100\n"
+"POT-Creation-Date: 2008-01-25 03:51+0100\n"
+"PO-Revision-Date: 2008-01-25 03:51+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "Invalid action ‘%s’ requested. No such action exists."
 msgid "Failed to convert the path '%s' from utf8"
 msgstr "Failed to convert the path ‘%s’ from utf8"
 
-#: openbox/actions/execute.c:97 openbox/actions/execute.c:115
+#: openbox/actions/execute.c:97 openbox/actions/execute.c:116
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Failed to execute '%s': %s"
@@ -307,7 +307,7 @@ msgstr ""
 "\n"
 "Please report bugs at %s\n"
 
-#: openbox/openbox.c:604
+#: openbox/openbox.c:602
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Invalid command line argument ‘%s’\n"
@@ -327,7 +327,16 @@ msgstr "Could not acquire window manager selection on screen %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:1162
+#: openbox/screen.c:407
+#, c-format
+msgid ""
+"Openbox is configured for %d desktops, but the current session has %d.  "
+"Overriding the Openbox configuration."
+msgstr ""
+"Openbox is configured for %d desktops, but the current session has %d.  "
+"Overriding the Openbox configuration."
+
+#: openbox/screen.c:1168
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -347,7 +356,7 @@ msgstr "Unable to save the session to '%s': %s"
 msgid "Error while saving the session to '%s': %s"
 msgstr "Error while saving the session to '%s': %s"
 
-#: openbox/startupnotify.c:237
+#: openbox/startupnotify.c:241
 #, c-format
 msgid "Running %s\n"
 msgstr "Running %s\n"