[Pkg-privacy-commits] [vidalia] 18/160: Hi Simplified Chinese debconf template!

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit cd76d99a781d92172987e1c52ca754e5fae63221
Author: Dererk <dererk at madap.com.ar>
Date:   Thu May 13 21:32:48 2010 -0300

    Hi Simplified Chinese debconf template!
---
 debian/0.2.x/changelog   |  4 ++-
 debian/0.2.x/po/zh_CN.po | 71 ++++++++++++++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/debian/0.2.x/changelog b/debian/0.2.x/changelog
index 1be669b..81214ac 100644
--- a/debian/0.2.x/changelog
+++ b/debian/0.2.x/changelog
@@ -8,11 +8,13 @@ vidalia (0.2.8-2) unstable; urgency=low
     - French, thanks Christian Perrier (Closes: #580612).
     - German, thanks Martin.E.Schauer (Closes: #580903).
     - Spanish, thanks Francisco Javier Cuadrado (Closes: #581492).
+    - Simplified Chinese, thanks Simplified Chinese Team (Closes: #581563).
 
   * New debconf translations:
     - Danish, thanks Joe Hansen (Closes: #580123).
+    - Vietnamese, thanks Clytie Siddall (Closes: #581532).
 
- -- Ulises Vitulli <uvitulli at fi.uba.ar>  Thu, 13 May 2010 05:48:44 -0300
+ -- Ulises Vitulli <uvitulli at fi.uba.ar>  Thu, 13 May 2010 21:27:02 -0300
 
 vidalia (0.2.8-1) unstable; urgency=low
 
diff --git a/debian/0.2.x/po/zh_CN.po b/debian/0.2.x/po/zh_CN.po
index c0e6d53..f8f65fa 100644
--- a/debian/0.2.x/po/zh_CN.po
+++ b/debian/0.2.x/po/zh_CN.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vidalia 0.1.13\n"
 "Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2008-09-18 00:31-0300\n"
+"POT-Creation-Date: 2010-04-30 17:16+0200\n"
 "PO-Revision-Date: 2008-05-21 21:26+0800\n"
 "Last-Translator: Vern Sun <s5unty at gmail.com>\n"
 "Language-Team: Simplified Chinese <debian-chinese-gb at lists.debian.org>\n"
@@ -12,34 +12,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../templates:1001
-msgid ""
-"Do you want to stop the existing Tor process and let Vidalia start Tor?"
-msgstr "您希望停止正在运行的 Tor 进程并且让 Vidalia 启动 Tor 吗？"
+#: ../templates:2001
+msgid "Let Vidalia start Tor after stopping existing Tor process:"
+msgstr ""
+"停止正在运行的 Tor 进程，并让 Vidalia 来启动 Tor:"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"It looks like there is a Tor process already running. If you want to start "
-"Tor using Vidalia, you might have to stop the existing Tor process. "
-"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
-"in the documentation  carried with this package ('/usr/share/doc/vidalia/"
-"README.Debian')."
+#. Type: select
+#. Choices
+#: ../templates:2002
+msgid "No"
 msgstr ""
-"看起来这里已经有一个 Tor 程序正在运行。如果您想用 Vidalia 启动 Tor，您或许要"
-"停止当前正在运行的 Tor 程序。否则您应该像本软件包提供的说明('/usr/share/doc/"
-"vidalia/README.Debian')那样启用 Tor 的 'ControlPort' 选项。"
+"否"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Note that if you choose to let Vidalia start Tor, you will have to manually "
-"disable  Tor starting automatically on every reboot (See 'README.Debian')."
+#. Type: select
+#. Choices
+#: ../templates:2002
+msgid "Yes (just for now)"
+msgstr ""
+"是 (仅限本次)"
+
+#. Type: select
+#. Choices
+#: ../templates:2002
+msgid "Yes (and disable it for every boot)"
 msgstr ""
-"请注意如果您选择让 Vidalia 启动 Tor，那么您应该手工禁止 Tor 在每次计算机重启"
-"时自动运行 (请参考 'README.Debian')。"
+"是 (同时禁用每次重启时的加载)"
+
+#~ msgid ""
+#~ "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+#~ msgstr "您希望停止正在运行的 Tor 进程并且让 Vidalia 启动 Tor 吗？"
+
+#~ msgid ""
+#~ "It looks like there is a Tor process already running. If you want to "
+#~ "start Tor using Vidalia, you might have to stop the existing Tor process. "
+#~ "Otherwise you will have to enable 'ControlPort' option into Tor as "
+#~ "explained in the documentation  carried with this package ('/usr/share/"
+#~ "doc/vidalia/README.Debian')."
+#~ msgstr ""
+#~ "看起来这里已经有一个 Tor 程序正在运行。如果您想用 Vidalia 启动 Tor，您或许"
+#~ "要停止当前正在运行的 Tor 程序。否则您应该像本软件包提供的说明('/usr/share/"
+#~ "doc/vidalia/README.Debian')那样启用 Tor 的 'ControlPort' 选项。"
 
+#~ msgid ""
+#~ "Note that if you choose to let Vidalia start Tor, you will have to "
+#~ "manually disable Tor starting automatically on every reboot (See 'README."
+#~ "Debian')."
+#~ msgstr ""
+#~ "请注意如果您选择让 Vidalia 启动 Tor，那么您应该手工禁止 Tor 在每次计算机重"
+#~ "启时自动运行 (请参考 'README.Debian')。"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git