Merge branch 'backport' into work

Conflicts:
	openbox/event.c

1 files changed, 18 insertions, 12 deletions

diff --git a/po/nl.po b/po/nl.po
index 48eaf1c9..e2e5efaf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.7\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-05-24 16:33+0200\n"
+"POT-Creation-Date: 2008-11-15 22:28+0100\n"
 "PO-Revision-Date: 2008-03-18 23:30+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -42,7 +42,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Converteren van het pad \"%s\" vanuit UTF-8 is mislukt"
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -76,19 +76,19 @@ msgstr "Uitloggen"
 msgid "Are you sure you want to log out?"
 msgstr "Weet u zeker dat u wilt uitloggen?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Naamloos venster"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "Termineren..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "Reageert niet"
 
-#: openbox/client.c:3447
+#: openbox/client.c:3454
 #, c-format
 msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to force it "
@@ -97,11 +97,11 @@ msgstr ""
 "Het venster \"%s\" reageert niet.  Wilt u het afsluiten forceren door het "
 "signaal %s te sturen?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Beëindig proces"
 
-#: openbox/client.c:3453
+#: openbox/client.c:3460
 #, c-format
 msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
@@ -110,7 +110,7 @@ msgstr ""
 "Het venster \"%s\" reageert niet.  Wilt u de verbinding van het venster met "
 "de X-server verbreken?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Verbreek verbinding"
 
@@ -421,9 +421,15 @@ msgstr "De vensterbeheerder op scherm %d sluit zichzelf niet af"
 #: openbox/screen.c:412
 #, c-format
 msgid ""
+"Openbox is configured for %d desktop, but the current session has %d.  "
+"Overriding the Openbox configuration."
+msgid_plural ""
 "Openbox is configured for %d desktops, but the current session has %d.  "
 "Overriding the Openbox configuration."
-msgstr ""
+msgstr[0] ""
+"Openbox is geconfigureerd voor %d bureaublad, maar de huidige sessie heeft "
+"er %d.  De Openbox-instelling wordt genegeerd."
+msgstr[1] ""
 "Openbox is geconfigureerd voor %d bureaubladen, maar de huidige sessie heeft "
 "er %d.  De Openbox-instelling wordt genegeerd."
 
@@ -442,12 +448,12 @@ msgstr "Kan map \"%s\" niet aanmaken: %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Kan de sessie niet opslaan in \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Fout tijdens het opslaan van de sessie in \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "Niet met een sessiebeheerder verbonden"