svn commit: r887818 - /subversion/branches/1.6.x/subversion/po/zh_CN.po

[do...@apache.org]

Author: dongsheng
Date: Mon Dec  7 02:18:56 2009
New Revision: 887818

URL: http://svn.apache.org/viewvc?rev=887818&view=rev
Log:
Simplified Chinese translation update on the '1.6.x' branch:

* subversion/po/zh_CN.po: Backport from trunk.

Modified:
    subversion/branches/1.6.x/subversion/po/zh_CN.po

Modified: subversion/branches/1.6.x/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/po/zh_CN.po?rev=887818&r1=887817&r2=887818&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/1.6.x/subversion/po/zh_CN.po [UTF-8] Mon Dec  7 02:18:56 2009
@@ -37,8 +37,8 @@
 msgstr ""
 "Project-Id-Version: subversion 1.6\n"
 "Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2009-10-16 11:05+0800\n"
-"PO-Revision-Date: 2009-10-16 12:27+0800\n"
+"POT-Creation-Date: 2009-12-07 10:00+0800\n"
+"PO-Revision-Date: 2009-12-07 10:04+0800\n"
 "Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <de...@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
@@ -5159,21 +5159,27 @@
 
 #, c-format
 msgid ""
+"The path '%s' appears to be part of a Subversion 1.7 or greater\n"
+"working copy rooted at '%s'.\n"
+"Please upgrade your Subversion client to use this working copy."
+msgstr ""
+"路径 '%s' 好像是 Subversion 1.7 或更高版本的工作副本，根路径是 '%s'。\n"
+"请升级你的 Subversion 客户端，以使用此工作副本。"
+
+#, c-format
+msgid ""
 "Working copy format of '%s' is too old (%d); please check out your working "
 "copy again"
 msgstr "“%s”的工作副本格式太旧(%d)；请重新取出工作副本"
 
 #, c-format
 msgid ""
-"This client is too old to work with working copy '%s'.  You need\n"
-"to get a newer Subversion client, or to downgrade this working copy.\n"
-"See http://subversion.tigris.org/faq.html#working-copy-format-change\n"
-"for details."
-msgstr ""
-"此客户端对于工作副本 “%s” 太旧。你需要取得更新的 Subversion 客户端，或者降级\n"
-"工作副本。参见 http://subversion.tigris.org/faq.html#working-copy-format-"
-"change\n"
-"以获得更详细的信息。"
+"The path '%s' appears to be part of a Subversion 1.7 or greater\n"
+"working copy.  Please upgrade your Subversion client to use this\n"
+"working copy."
+msgstr ""
+"路径 '%s' 好像是 Subversion 1.7 或更高版本的工作副本。请升级你的 Subversion\n"
+"客户端，以使用此工作副本。"
 
 #, c-format
 msgid ""
@@ -7145,9 +7151,7 @@
 "     are applied to the obstructing path.\n"
 "\n"
 "     Use the --set-depth option to set a new working copy depth on the\n"
-"     targets of this operation.  Currently, the depth of a working copy\n"
-"     directory can only be increased (telescoped more deeply); you cannot\n"
-"     make a directory more shallow.\n"
+"     targets of this operation.\n"
 "\n"
 "  2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
 "     This is used when repository's root URL changes (such as a scheme\n"
@@ -7172,8 +7176,7 @@
 "同，\n"
 "     将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
 "\n"
-"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。目前工作副本的\n"
-"     深度只能增加(嵌入更深)；你不能让目录收缩。\n"
+"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。\n"
 "\n"
 "  2、重写工作副本的 URL 元数据，以反映单纯的 URL 改变。当版本库的根 URL 改\n"
 "     变(比如方案或者主机名称变动)，但是工作副本仍旧对应同一版本库的同一目录\n"
@@ -7227,9 +7230,7 @@
 "  in the first column with code 'E'.\n"
 "\n"
 "  Use the --set-depth option to set a new working copy depth on the\n"
-"  targets of this operation.  Currently, the depth of a working copy\n"
-"  directory can only be increased (telescoped more deeply); you cannot\n"
-"  make a directory more shallow.\n"
+"  targets of this operation.\n"
 msgstr ""
 "将版本库的修改合并到工作副本中。\n"
 "用法: update [PATH...]\n"
@@ -7256,8 +7257,7 @@
 "  不同，将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
 "  用第一列字符 “E” 来报告障碍路径。\n"
 "\n"
-"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。目前工作副本的\n"
-"  深度只能增加(嵌入更深)；你不能让目录收缩。\n"
+"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。\n"
 
 msgid "Caught signal"
 msgstr "捕捉到信号"