summaryrefslogtreecommitdiff
path: root/po/nl.po
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2008-01-31 12:36:06 -0500
committerDana Jansens <danakj@orodu.net>2008-01-31 12:51:38 -0500
commit20b8fcfa33feeade5946bc7f3046705da5d164fe (patch)
tree5199d13a9f18aa90ce51244c3c3eb6685d7673ab /po/nl.po
parentdc94a241c30484611688a8bfb5515577f017529e (diff)
parentd11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff)
Merge branch 'backport' into work
Conflicts: openbox/client.c openbox/config.c openbox/event.c openbox/extensions.c openbox/focus_cycle_indicator.c openbox/focus_cycle_popup.c openbox/menuframe.c openbox/moveresize.c openbox/openbox.c openbox/screen.c openbox/stacking.c openbox/startupnotify.c
Diffstat (limited to 'po/nl.po')
-rw-r--r--po/nl.po17
1 files changed, 12 insertions, 5 deletions
diff --git a/po/nl.po b/po/nl.po
index b9e9c59b..414cddb3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-01-17 22:13+0100\n"
+"POT-Creation-Date: 2008-01-25 03:51+0100\n"
"PO-Revision-Date: 2007-07-12 13:01+0200\n"
"Last-Translator: Jochem Kossen <jkossen@xs4all.nl>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -26,7 +26,7 @@ msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet"
msgid "Failed to convert the path '%s' from utf8"
msgstr "Converteren van het pad '%s' vanuit utf8 mislukt"
-#: 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 "Uitvoeren van '%s' mislukt: %s"
@@ -287,7 +287,7 @@ msgstr ""
"\n"
"Gelieve bugs te melden bij %s\n"
-#: openbox/openbox.c:604
+#: openbox/openbox.c:602
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Onbekende optie '%s'\n"
@@ -307,7 +307,14 @@ msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
msgid "The WM on screen %d is not exiting"
msgstr "De window manager op scherm %d sluit zichzelf niet af"
-#: 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/screen.c:1168
#, c-format
msgid "desktop %i"
msgstr "bureaublad %i"
@@ -327,7 +334,7 @@ msgstr "Kan de sessie niet opslaan naar '%s': %s"
msgid "Error while saving the session to '%s': %s"
msgstr "Fout tijdens het opslaan van de sessie naar '%s': %s"
-#: openbox/startupnotify.c:237
+#: openbox/startupnotify.c:241
#, c-format
msgid "Running %s\n"
msgstr "Starten %s\n"