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, 18 insertions, 12 deletions

diff --git a/po/it.po b/po/it.po
index 3122b129..f2a7e5a3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.7.2\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-05-15 13:09+0200\n"
 "Last-Translator: Andrea Scarpino <bash.lnx@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -41,7 +41,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Impossibile convertire il percorso utf8 \"%s\""
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -75,19 +75,19 @@ msgstr "Esci"
 msgid "Are you sure you want to log out?"
 msgstr "Sei sicuro di voler uscire?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Finestra senza nome"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "Termino..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "Non Risponde"
 
-#: 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 "
@@ -96,11 +96,11 @@ msgstr ""
 "La finestra \"%s\" sembra non rispondere. Vuoi terminarne l'esecuzione "
 "inviando un segnale %s?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Termina Processo"
 
-#: 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 "
@@ -109,7 +109,7 @@ msgstr ""
 "La finestra \"%s\" non sembra rispondere.  Vuoi terminarne l'esecuzione dal "
 "server X?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Disconnesso"
 
@@ -425,9 +425,15 @@ msgstr "Il WM sullo schermo %d non è terminato"
 #: 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 è configurato per %d desktop, ma la sessione attuale ne ha %d.  "
+"Ignoro la configurazione di Openbox."
+msgstr[1] ""
 "Openbox è configurato per %d desktop, ma la sessione attuale ne ha %d.  "
 "Ignoro la configurazione di Openbox."
 
@@ -446,12 +452,12 @@ msgstr "Impossibile creare la directory \"%s\": %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Impossibile salvare la sessione in \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Errore durante il salvataggio della sessione in \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "Non sei connesso al gestore di sessioni"