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, 19 insertions, 13 deletions

diff --git a/po/fi.po b/po/fi.po
index ac1dc46f..fc2d4bec 100644
--- a/po/fi.po
+++ b/po/fi.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-17 21:26+0100\n"
 "Last-Translator: Lauri Hakko <aperculum@gmail.com>\n"
 "Language-Team: None\n"
@@ -41,7 +41,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Polun \"%s\" muuntaminen utf8:sta epäonnistui"
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -75,19 +75,19 @@ msgstr "Kirjaudu ulos"
 msgid "Are you sure you want to log out?"
 msgstr "Haluatko varmasti kirjautua ulos?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Nimetön ikkuna"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "Tapetaan..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "Ei vastaa"
 
-#: 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 ""
 "Ikkuna \"%s\" ei näytä vastaavan.  Haluatko sulkea sen lähettämällä sille "
 "singaalin %s?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Lopeta prosessi"
 
-#: 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 ""
 "Ikkuna \"%s\" ei näytä vastaavan.  Haluatko katkaista sen yhteyden X-"
 "palvelimeen?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
@@ -417,11 +417,17 @@ msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu"
 #. 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 ""
+msgstr[0] ""
+"Openbox on asetettu käyttämään %d työtilaa, mutta nykyisessä istunnossa "
+"työtiloja on %d.  Ohitetaan Openboxin asetus."
+msgstr[1] ""
 "Openbox on asetettu käyttämään %d työtilaa, mutta nykyisessä istunnossa "
 "työtiloja on %d.  Ohitetaan Openboxin asetus."
 
@@ -440,12 +446,12 @@ msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Istuntoa ei voitu tallentaa hakemistoon \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Virhe tallennettaessa istuntoa hakemistoon \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "Ei yhteyttä istunnon hallintaan"