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/zh_CN.po b/po/zh_CN.po
index 1c7ecf1d..89a65854 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,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-11 22:07+0800\n"
 "Last-Translator: zhou sf <sxzzsf@gmail.com>\n"
 "Language-Team: Simplified Chinese\n"
@@ -40,7 +40,7 @@ msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "从 utf8 转换路径 \"%s\" 时失败"
 
 #: openbox/actions/exit.c:52 openbox/actions/session.c:64
-#: openbox/client.c:3458
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "取消"
 
@@ -72,37 +72,37 @@ msgstr "注销"
 msgid "Are you sure you want to log out?"
 msgstr "确认注销吗?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "未命名窗口"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "杀死中..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "无响应"
 
-#: 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 "
 "to exit by sending the %s signal?"
 msgstr "窗口 \"%s\" 似乎失去了响应. 发送信号 %s 以强制退出吗?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "结束进程"
 
-#: 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 "
 "it from the X server?"
 msgstr "窗口 \"%s\" 似乎失去了响应. 断开其与 X 服务器的连接?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "断开连接"
 
@@ -406,11 +406,17 @@ msgstr "屏幕 %d 的窗口管理器没有退出"
 #. 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 "Openbox 配置了 %d 个桌面, 当前会话拥有 %d 桌面. 覆盖 Openbox 的配置."
+msgstr[0] ""
+"Openbox 配置了 %d 个桌面, 当前会话拥有 %d 桌面. 覆盖 Openbox 的配置."
+msgstr[1] ""
+"Openbox 配置了 %d 个桌面, 当前会话拥有 %d 桌面. 覆盖 Openbox 的配置."
 
 #: openbox/screen.c:1180
 #, c-format
@@ -427,12 +433,12 @@ msgstr "无法创建目录 \"%s\": %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "无法保存会话到 \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "在保存会话到 \"%s\" 时出错： %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "未连接到会话管理器"