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/ca.po b/po/ca.po
index f121262a..6baab061 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,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-25 19:23+0200\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
@@ -38,7 +38,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "No s'ha pogut convertir el camí \"%s\" des de utf8"
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -72,19 +72,19 @@ msgstr "Surt"
 msgid "Are you sure you want to log out?"
 msgstr "Esteu segur de voler sortir?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Finestra sense nom"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "S'està finalitzant..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "No està responent"
 
-#: 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 ""
 "Sembla que la finestra \"%s\" no està responent. Voleu forçar-la a "
 "finalitzar enviant el senyal %s?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Finalitza el procés"
 
-#: 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 ""
 "Sembla que la finestra \"%s\" no està responent.  Voleu desconnectar-la del "
 "servidor d'X?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Desconnecta"
 
@@ -429,9 +429,15 @@ msgstr "El gestor de finestres de la pantalla %d no està sortint"
 #: 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] ""
+"El Openbox està configurat per a %d escriptori, però la sessió actual en te "
+"%d.  S'està modificant la configuració del Openbox."
+msgstr[1] ""
 "El Openbox està configurat per a %d escriptoris, però la sessió actual en te "
 "%d.  S'està modificant la configuració del Openbox."
 
@@ -450,12 +456,12 @@ msgstr "No és pot crear el directori \"%s\": %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "No s'ha pogut desar la sessió a \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "S'ha produït un error mentre es desava la sessió a \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "No esteu connectats al gestor de sessions"