Use ngettext for %d desktop(s).

This poses a small problem. We currently let translators reorder this
string, but ngettext only takes one numeric argument. This means that you
can either get correct pluralization or the order you want, but not both.

I fixed up the languages I understand at a very basic level, but the
rest will need translator assistance.

1 files changed, 20 insertions, 14 deletions

diff --git a/po/no.po b/po/no.po
index 54b40c9f..5fe220d7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,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-13 13:37+0100\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@gmail.com>\n"
 "Language-Team: None\n"
@@ -38,7 +38,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Feil ved konvertering av \"%s\" fra utf8 "
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -72,19 +72,19 @@ msgstr "Logg Ut"
 msgid "Are you sure you want to log out?"
 msgstr "Er du sikker på at du vil logge ut?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Ukjent Vindu"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "Dreper..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "Svarer Ikke"
 
-#: 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 "
@@ -93,11 +93,11 @@ msgstr ""
 "Vinduet \"%s\" svarer ikke. Vil du utføre tvunget avslutning ved å sende "
 "signalet %s?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Avslutt Prosess"
 
-#: 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 "
@@ -106,7 +106,7 @@ msgstr ""
 "Vinduet \"%s\" svarer ikke. Vil du fjerne tilknytning av vinduet til X-"
 "serveren?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Fjern tilknytning"
 
@@ -413,12 +413,18 @@ msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 #. second one. For example,
 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
 #: openbox/screen.c:412
-#, c-format
+#, fuzzy, 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 ""
-"Aktiv sesjon har %2$d desktoper, mens Openbox er konfigurert til %1$d.  "
+msgstr[0] ""
+"Aktiv sesjon har %2$d skrivebord, mens Openbox er konfigurert til %1$d.  "
+"Benytter innstillingene for den aktive sesjonen."
+msgstr[1] ""
+"Aktiv sesjon har %2$d skrivebord, mens Openbox er konfigurert til %1$d.  "
 "Benytter innstillingene for den aktive sesjonen."
 
 #: openbox/screen.c:1180
@@ -436,12 +442,12 @@ msgstr "Kan ikke lage katalog \"%s\": %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Kan ikke lagre sesjon til \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Feil ved lagring av sesjon til \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "Ikke tilknyttet en sesjonsbehandler"