You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/12/11 01:16:08 UTC
svn commit: r1044548 [30/39] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/ contrib/hook-scripts/
contrib/server-side/ notes/api-errata/ notes/api-err...
Modified: subversion/branches/ignore-mergeinfo/subversion/po/zh_TW.po
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/po/zh_TW.po?rev=1044548&r1=1044547&r2=1044548&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/po/zh_TW.po [UTF-8] (original)
+++ subversion/branches/ignore-mergeinfo/subversion/po/zh_TW.po [UTF-8] Sat Dec 11 00:15:55 2010
@@ -17,1321 +17,1840 @@
# specific language governing permissions and limitations
# under the License.
#
-#The original repos for this translation could be found at
+# The original repos for this translation could be found at
# http://svn.ntcu.net/tmprepo/svn.pot. There is a glossary.txt.
#
msgid ""
msgstr ""
"Project-Id-Version: subversion 1.7\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-05-25 20:39+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
+"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: Traditional Chinese <de...@subversion.tigris.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:68
+#, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "檔案找不到: 修訂版 '%s', 路徑 '%s'"
+
+#: ../include/private/svn_fs_util.h:73
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "檔案找不到: 修訂版 %ld, 路徑 '%s'"
+
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:84
+#, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "檔案已存在: 檔案系統 '%s', 修訂版 '%s', 路徑 '%s'"
+
+#: ../include/private/svn_fs_util.h:89
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "檔案已存在: 檔案系統 '%s', 修訂版 %ld, 路徑 '%s'"
+
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:97
+msgid "Root object must be a transaction root"
+msgstr "根物件必須為異動的根"
+
+#. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
+#. outside of a transaction. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:104
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "檔案無法變更: 檔案系統 '%s', 修訂版 %ld, 路徑 '%s'"
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:111
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "'%s' 不是檔案系統 '%s' 的目錄"
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:118
+#, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "'%s' 不是檔案系統 '%s' 裡的檔案"
+
+#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:126
+#, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "路徑 '%s' 已經被使用者 '%s' 鎖定於檔案系統 '%s' 中"
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:133
+#, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "沒有路徑 '%s' 於檔案系統 '%s' 中的鎖定"
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:140
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "鎖定已過時; 鎖定符記 '%s' 於檔案系統 '%s' 中"
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:147
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "目前沒有使用者名稱與檔案系統 '%s' 關聯在一起"
+
+#. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
+#. LOCK_OWNER doesn't match the USERNAME associated with FS.
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:156
+#, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "使用者 '%s' 試著要使用一個被 '%s' 擁有的鎖定於檔案系統 '%s' 中"
+
# as-is
-#: include/svn_error_codes.h:154
+#: ../include/svn_error_codes.h:160
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "Bad parent pool passed to svn_make_pool()"
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:164
msgid "Bogus filename"
msgstr "有問題的檔名"
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:168
msgid "Bogus URL"
msgstr "有問題的 URL"
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:172
msgid "Bogus date"
msgstr "有問題的日期"
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:176
msgid "Bogus mime-type"
msgstr "有問題的 mime-type"
-#: include/svn_error_codes.h:176
+#: ../include/svn_error_codes.h:186
+msgid "Wrong or unexpected property value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:190
msgid "Version file format not correct"
msgstr "版本檔案格式不正確"
-#: include/svn_error_codes.h:182
+#: ../include/svn_error_codes.h:194
+#, fuzzy
+msgid "Path is not an immediate child of the specified directory"
+msgstr "路徑不是工作複本目錄"
+
+#: ../include/svn_error_codes.h:198
+#, fuzzy
+msgid "Bogus UUID"
+msgstr "有問題的 URL"
+
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
+msgid "Invalid configuration value"
+msgstr "無效的配置值"
+
+#: ../include/svn_error_codes.h:207
+#, fuzzy
+msgid "Bogus server specification"
+msgstr "未提供要求的修訂版規格"
+
+#: ../include/svn_error_codes.h:211
+#, fuzzy
+msgid "Unsupported checksum type"
+msgstr "不支援的檔案庫版本"
+
+#: ../include/svn_error_codes.h:215
+#, fuzzy
+msgid "Invalid character in hex checksum"
+msgstr "無效的結束修訂版 %ld"
+
+#: ../include/svn_error_codes.h:220
+#, fuzzy
+msgid "Unknown string value of token"
+msgstr "鎖定命令的未知狀態"
+
+#: ../include/svn_error_codes.h:226
msgid "No such XML tag attribute"
msgstr "沒有這樣的 XML 標籤屬性"
-#: include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:230
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> 沒有演進歷程"
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:234
msgid "Unrecognized binary data encoding; can't decode"
msgstr "無法辨識的二進制資料編碼: 無法解譯"
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:238
msgid "XML data was not well-formed"
msgstr "XML 的資料不合語法"
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:242
msgid "Data cannot be safely XML-escaped"
msgstr "資料無法安全地以 XML 逸出序列處理"
-#: include/svn_error_codes.h:204
+#: ../include/svn_error_codes.h:248
msgid "Inconsistent line ending style"
msgstr "不一致的列尾樣式"
-#: include/svn_error_codes.h:208
+#: ../include/svn_error_codes.h:252
msgid "Unrecognized line ending style"
msgstr "無法辨識的列尾樣式"
-#: include/svn_error_codes.h:213
+#: ../include/svn_error_codes.h:257
msgid "Line endings other than expected"
msgstr "一列以意料之外的方式結束"
-#: include/svn_error_codes.h:217
+#: ../include/svn_error_codes.h:261
msgid "Ran out of unique names"
msgstr "用完不重覆的名稱"
# as-is
-#: include/svn_error_codes.h:222
+#: ../include/svn_error_codes.h:266
msgid "Framing error in pipe protocol"
msgstr "Framing error in pipe protocol"
-#: include/svn_error_codes.h:227
+#: ../include/svn_error_codes.h:271
msgid "Read error in pipe"
msgstr "管道發生讀取錯誤"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316 svn/util.c:758
+#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
+#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
#, c-format
msgid "Write error"
msgstr "寫入錯誤"
-#: include/svn_error_codes.h:237
+#: ../include/svn_error_codes.h:281
msgid "Unexpected EOF on stream"
msgstr "串流中有意料之外的檔尾符號"
-#: include/svn_error_codes.h:241
+#: ../include/svn_error_codes.h:285
msgid "Malformed stream data"
msgstr "有缺陷的串流資料"
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:289
msgid "Unrecognized stream data"
msgstr "無法辨識的串流資料"
-#: include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:294
+#, fuzzy
+msgid "Stream doesn't support seeking"
+msgstr "伺服器不支援 lock 命令"
+
+#: ../include/svn_error_codes.h:300
msgid "Unknown svn_node_kind"
msgstr "未知的 svn_node_kind"
-#: include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:304
msgid "Unexpected node kind found"
msgstr "找到一個意料之外的節點種類"
-#: include/svn_error_codes.h:261
+#: ../include/svn_error_codes.h:310
msgid "Can't find an entry"
msgstr "無法找到一個項目"
-#: include/svn_error_codes.h:267
+#: ../include/svn_error_codes.h:316
msgid "Entry already exists"
msgstr "項目已存在"
-#: include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:320
msgid "Entry has no revision"
msgstr "項目沒有修訂版"
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:324
msgid "Entry has no URL"
msgstr "項目沒有 URL"
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:328
msgid "Entry has an invalid attribute"
msgstr "項目有無效的屬性"
-#: include/svn_error_codes.h:285
+#: ../include/svn_error_codes.h:332
+msgid "Can't create an entry for a forbidden name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:338
msgid "Obstructed update"
msgstr "塞住的更新"
# as-is
-#: include/svn_error_codes.h:290
+#: ../include/svn_error_codes.h:343
msgid "Mismatch popping the WC unwind stack"
msgstr "Mismatch popping the WC unwind stack"
# as-is
-#: include/svn_error_codes.h:295
+#: ../include/svn_error_codes.h:348
msgid "Attempt to pop empty WC unwind stack"
msgstr "Attempt to pop empty WC unwind stack"
# as-is
-#: include/svn_error_codes.h:300
+#: ../include/svn_error_codes.h:353
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Attempt to unlock with non-empty unwind stack"
-#: include/svn_error_codes.h:304
+#: ../include/svn_error_codes.h:357
msgid "Attempted to lock an already-locked dir"
msgstr "企圖要鎖定一個已鎖定的目錄"
-#: include/svn_error_codes.h:308
+#: ../include/svn_error_codes.h:361
msgid "Working copy not locked; this is probably a bug, please report"
msgstr "工作複本未鎖定; 這大概是臭蟲, 請回報"
-#: include/svn_error_codes.h:313
+#: ../include/svn_error_codes.h:366
msgid "Invalid lock"
msgstr "無效的鎖定"
-#: include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:373
msgid "Path is not a working copy directory"
msgstr "路徑不是工作複本目錄"
-#: include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:381
msgid "Path is not a working copy file"
msgstr "路徑不是工作複本檔案"
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:385
msgid "Problem running log"
msgstr "無法執行紀錄"
-#: include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:389
msgid "Can't find a working copy path"
msgstr "找不到工作複本路徑"
-#: include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:393
msgid "Working copy is not up-to-date"
msgstr "工作複本未更新至最新版"
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:397
msgid "Left locally modified or unversioned files"
msgstr "遺留本地修改或是未納入版本管理的檔案"
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:401
msgid "Unmergeable scheduling requested on an entry"
msgstr "該項目有一個無法合併的排程要求"
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:405
msgid "Found a working copy path"
msgstr "找到一個工作複本路徑"
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:409
msgid "A conflict in the working copy obstructs the current operation"
msgstr "工作複本中的衝突阻礙了目前的動作"
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:413
msgid "Working copy is corrupt"
msgstr "工作複本已損毀"
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:417
msgid "Working copy text base is corrupt"
msgstr "工作複本的文件參考基礎已損毀"
-#: include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:421
msgid "Cannot change node kind"
msgstr "無法更改節點種類"
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:425
msgid "Invalid operation on the current working directory"
msgstr "這個動作對目前的工作複本目錄無效"
-#: include/svn_error_codes.h:369
+#: ../include/svn_error_codes.h:429
msgid "Problem on first log entry in a working copy"
msgstr "作業於工作複本的第一個紀錄項目時發生問題"
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:433
msgid "Unsupported working copy format"
msgstr "不支援的工作複本格式"
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:437
msgid "Path syntax not supported in this context"
msgstr "路徑語法在此文脈中並不支援"
-#: include/svn_error_codes.h:382
+#: ../include/svn_error_codes.h:442
msgid "Invalid schedule"
msgstr "無效的排程"
-#: include/svn_error_codes.h:387
+#: ../include/svn_error_codes.h:447
msgid "Invalid relocation"
msgstr "無效的重新安置"
-#: include/svn_error_codes.h:392
+#: ../include/svn_error_codes.h:452
msgid "Invalid switch"
msgstr "無效的切換"
-#: include/svn_error_codes.h:397
+#: ../include/svn_error_codes.h:457
#, fuzzy
msgid "Changelist doesn't match"
msgstr "總和檢查值: %s\n"
-#: include/svn_error_codes.h:403
+#: ../include/svn_error_codes.h:462
+#, fuzzy
+msgid "Conflict resolution failed"
+msgstr "檔案庫建立失敗"
+
+#: ../include/svn_error_codes.h:466
+#, fuzzy
+msgid "Failed to locate 'copyfrom' path in working copy"
+msgstr "路徑不是工作複本檔案"
+
+#: ../include/svn_error_codes.h:473
+msgid "Moving a path from one changelist to another"
+msgstr ""
+
+#: ../include/svn_error_codes.h:478
+#, fuzzy
+msgid "Cannot delete a file external"
+msgstr "無法取得檔案名稱"
+
+#: ../include/svn_error_codes.h:483
+#, fuzzy
+msgid "Cannot move a file external"
+msgstr "無法移動路徑 '%s' 至其本身"
+
+#: ../include/svn_error_codes.h:488
+msgid "Something's amiss with the wc sqlite database"
+msgstr ""
+
+#: ../include/svn_error_codes.h:493
+#, fuzzy
+msgid "The working copy is missing"
+msgstr "工作複本 '%s' 不存在或未鎖定"
+
+#: ../include/svn_error_codes.h:498
+#, fuzzy
+msgid "The specified node is not a symlink"
+msgstr "指定的異動不可更動"
+
+#: ../include/svn_error_codes.h:503
+#, fuzzy
+msgid "The specified path has an unexpected status"
+msgstr "指定的 diff 選項不支援"
+
+#: ../include/svn_error_codes.h:508
+msgid "The working copy needs to be upgraded"
+msgstr ""
+
+#: ../include/svn_error_codes.h:513
+#, fuzzy
+msgid "Previous operation was interrupted; run 'svn cleanup'"
+msgstr "動作被中斷"
+
+#: ../include/svn_error_codes.h:518
+msgid "This operation can not be performed with just this depth."
+msgstr ""
+
+#: ../include/svn_error_codes.h:524
msgid "General filesystem error"
msgstr "一般性檔案系統錯誤"
-#: include/svn_error_codes.h:407
+#: ../include/svn_error_codes.h:528
msgid "Error closing filesystem"
msgstr "關閉檔案系統發生錯誤"
-#: include/svn_error_codes.h:411
+#: ../include/svn_error_codes.h:532
msgid "Filesystem is already open"
msgstr "檔案系統已開啟"
-#: include/svn_error_codes.h:415
+#: ../include/svn_error_codes.h:536
msgid "Filesystem is not open"
msgstr "檔案系檔未開啟"
-#: include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:540
msgid "Filesystem is corrupt"
msgstr "檔案系統損毀"
-#: include/svn_error_codes.h:423
+#: ../include/svn_error_codes.h:544
msgid "Invalid filesystem path syntax"
msgstr "無效的檔案系統路徑語法"
-#: include/svn_error_codes.h:427
+#: ../include/svn_error_codes.h:548
msgid "Invalid filesystem revision number"
msgstr "無效的檔案系統修訂版號碼"
-#: include/svn_error_codes.h:431
+#: ../include/svn_error_codes.h:552
msgid "Invalid filesystem transaction name"
msgstr "無效的檔案系統異動名稱"
-#: include/svn_error_codes.h:435
+#: ../include/svn_error_codes.h:556
msgid "Filesystem directory has no such entry"
msgstr "檔案系統目錄沒有這樣的項目"
-#: include/svn_error_codes.h:439
+#: ../include/svn_error_codes.h:560
msgid "Filesystem has no such representation"
msgstr "檔案系統沒有這樣的表現 (representation)"
-#: include/svn_error_codes.h:443
+#: ../include/svn_error_codes.h:564
msgid "Filesystem has no such string"
msgstr "檔案系統沒有這樣的字串"
-#: include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:568
msgid "Filesystem has no such copy"
msgstr "檔案系統沒有這樣的複本"
-#: include/svn_error_codes.h:451
+#: ../include/svn_error_codes.h:572
msgid "The specified transaction is not mutable"
msgstr "指定的異動不可更動"
-#: include/svn_error_codes.h:455
+#: ../include/svn_error_codes.h:576
msgid "Filesystem has no item"
msgstr "檔案系統沒有項目"
-#: include/svn_error_codes.h:459
+#: ../include/svn_error_codes.h:580
msgid "Filesystem has no such node-rev-id"
msgstr "檔案系統沒有這樣的 node-rev-id"
-#: include/svn_error_codes.h:463
+#: ../include/svn_error_codes.h:584
msgid "String does not represent a node or node-rev-id"
msgstr "字串並未表示一個節點或 node-rev-id"
-#: include/svn_error_codes.h:467
+#: ../include/svn_error_codes.h:588
msgid "Name does not refer to a filesystem directory"
msgstr "名稱沒有指向檔案系統目錄"
-#: include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:592
msgid "Name does not refer to a filesystem file"
msgstr "名稱沒有指向檔案系統檔案"
-#: include/svn_error_codes.h:475
+#: ../include/svn_error_codes.h:596
msgid "Name is not a single path component"
msgstr "名稱不是一個單一路徑元件"
-#: include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:600
msgid "Attempt to change immutable filesystem node"
msgstr "企圖要修改不可更動的檔案系統節點"
-#: include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:604
msgid "Item already exists in filesystem"
msgstr "該項目已存在於檔案系統中"
-#: include/svn_error_codes.h:487
+#: ../include/svn_error_codes.h:608
msgid "Attempt to remove or recreate fs root dir"
msgstr "企圖要移除或再次建立檔案系統的根目錄"
-#: include/svn_error_codes.h:491
+#: ../include/svn_error_codes.h:612
msgid "Object is not a transaction root"
msgstr "物件不是一個異動的根物件"
-#: include/svn_error_codes.h:495
+#: ../include/svn_error_codes.h:616
msgid "Object is not a revision root"
msgstr "物件不是一個修訂版的根物件"
-#: include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:620
msgid "Merge conflict during commit"
msgstr "送交時發生合併衝突"
# as-is
-#: include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:624
msgid "A representation vanished or changed between reads"
msgstr "A representation vanished or changed between reads"
-#: include/svn_error_codes.h:507
+#: ../include/svn_error_codes.h:628
msgid "Tried to change an immutable representation"
msgstr "嘗試變更一個不可更動的表現 (representation)"
-#: include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:632
msgid "Malformed skeleton data"
msgstr "有缺陷的骨架資料"
-#: include/svn_error_codes.h:515
+#: ../include/svn_error_codes.h:636
msgid "Transaction is out of date"
msgstr "異動已過時"
-#: include/svn_error_codes.h:519
+#: ../include/svn_error_codes.h:640
msgid "Berkeley DB error"
msgstr "Berkeley DB 錯誤"
-#: include/svn_error_codes.h:523
+#: ../include/svn_error_codes.h:644
msgid "Berkeley DB deadlock error"
msgstr "Berkeley DB 發生死結錯誤"
-#: include/svn_error_codes.h:527
+#: ../include/svn_error_codes.h:648
msgid "Transaction is dead"
msgstr "異動掛點"
-#: include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:652
msgid "Transaction is not dead"
msgstr "異動未結束"
-#: include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:657
msgid "Unknown FS type"
msgstr "未知的 FS 類別"
# as-is
-#: include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:662
msgid "No user associated with filesystem"
msgstr "No user associated with filesystem"
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:667
msgid "Path is already locked"
msgstr "路徑已被鎖定"
-#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
+#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
msgid "Path is not locked"
msgstr "路徑未被鎖定"
-#: include/svn_error_codes.h:556
+#: ../include/svn_error_codes.h:677
msgid "Lock token is incorrect"
msgstr "鎖定符記不正確"
-#: include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:682
msgid "No lock token provided"
msgstr "未提供鎖定符記"
-#: include/svn_error_codes.h:566
+#: ../include/svn_error_codes.h:687
msgid "Username does not match lock owner"
msgstr "使用者名稱不符合鎖定擁有者"
-#: include/svn_error_codes.h:571
+#: ../include/svn_error_codes.h:692
msgid "Filesystem has no such lock"
msgstr "檔案系統沒有這樣的鎖定"
-#: include/svn_error_codes.h:576
+#: ../include/svn_error_codes.h:697
msgid "Lock has expired"
msgstr "鎖定已過期"
-#: include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
msgid "Item is out of date"
msgstr "項目已過時"
-#: include/svn_error_codes.h:586
-#, fuzzy
-msgid "SQLite error"
-msgstr "寫入錯誤"
-
-#: include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:714
msgid "Unsupported FS format"
msgstr "不支援的 FS 格式"
-#: include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:719
#, fuzzy
msgid "Representation is being written"
msgstr "表現不是 'delta' 類別"
-#: include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:724
+#, fuzzy
+msgid "The generated transaction name is too long"
+msgstr "指定的異動不可更動"
+
+#: ../include/svn_error_codes.h:729
+#, fuzzy
+msgid "Filesystem has no such node origin record"
+msgstr "檔案系統沒有這樣的 node-rev-id"
+
+#: ../include/svn_error_codes.h:734
+#, fuzzy
+msgid "Filesystem upgrade is not supported"
+msgstr "檔案系檔未開啟"
+
+#: ../include/svn_error_codes.h:739
+#, fuzzy
+msgid "Filesystem has no such checksum-representation index record"
+msgstr "檔案系統沒有這樣的表現 (representation)"
+
+#: ../include/svn_error_codes.h:744
+msgid "Property value in filesystem differs from the provided base value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:751
msgid "The repository is locked, perhaps for db recovery"
msgstr "檔案庫被鎖定, 也許正在作資料庫修復"
-#: include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:755
msgid "A repository hook failed"
msgstr "檔案庫掛勾錯誤"
-#: include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:759
msgid "Incorrect arguments supplied"
msgstr "使用不正確的引數"
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:763
msgid "A report cannot be generated because no data was supplied"
msgstr "無法產生回報, 因為沒有提供任何資料"
-#: include/svn_error_codes.h:625
+#: ../include/svn_error_codes.h:767
msgid "Bogus revision report"
msgstr "有問題的修訂版回報"
-#: include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:776
msgid "Unsupported repository version"
msgstr "不支援的檔案庫版本"
-#: include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:780
msgid "Disabled repository feature"
msgstr "關閉了的檔案庫功能"
-#: include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:784
msgid "Error running post-commit hook"
msgstr "執行 post-commit 掛勾時發生錯誤"
-#: include/svn_error_codes.h:647
+#: ../include/svn_error_codes.h:789
msgid "Error running post-lock hook"
msgstr "執行 post-lock 掛勾時發生錯誤"
-#: include/svn_error_codes.h:652
+#: ../include/svn_error_codes.h:794
msgid "Error running post-unlock hook"
msgstr "執行 post-unlock 掛勾時發生錯誤"
-#: include/svn_error_codes.h:659
+#: ../include/svn_error_codes.h:799
+#, fuzzy
+msgid "Repository upgrade is not supported"
+msgstr "'%s' 不支援"
+
+#: ../include/svn_error_codes.h:805
msgid "Bad URL passed to RA layer"
msgstr "傳遞至 RA 層的 URL 有問題"
-#: include/svn_error_codes.h:663
+#: ../include/svn_error_codes.h:809
msgid "Authorization failed"
msgstr "授權失敗"
-#: include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:813
msgid "Unknown authorization method"
msgstr "未知的授權方法"
-#: include/svn_error_codes.h:671
+#: ../include/svn_error_codes.h:817
msgid "Repository access method not implemented"
msgstr "該檔案庫存取方法未實作"
-#: include/svn_error_codes.h:675
-msgid "Item is out-of-date"
-msgstr "項目已過時"
-
-#: include/svn_error_codes.h:679
+#: ../include/svn_error_codes.h:825
msgid "Repository has no UUID"
msgstr "檔案庫沒有 UUID"
-#: include/svn_error_codes.h:683
+#: ../include/svn_error_codes.h:829
msgid "Unsupported RA plugin ABI version"
msgstr "不支援的 RA 外掛 ABI 版本"
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:839
+#, fuzzy
+msgid "Server can only replay from the root of a repository"
+msgstr "'%s' 不是檔案庫的根目錄"
+
+#: ../include/svn_error_codes.h:844
+#, fuzzy
+msgid "Repository UUID does not match expected UUID"
+msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
+
+#: ../include/svn_error_codes.h:849
+#, fuzzy
+msgid "Repository root URL does not match expected root URL"
+msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
+
+#: ../include/svn_error_codes.h:854
+msgid "Session URL does not match expected session URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:860
msgid "RA layer failed to init socket layer"
msgstr "RA 層無法起始 socket 層"
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:864
msgid "RA layer failed to create HTTP request"
msgstr "RA 層建立 HTTP 要求失敗"
-#: include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:868
msgid "RA layer request failed"
msgstr "RA 層要求失敗"
-#: include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:872
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 層無法取得要求的 OPTIONS 資訊"
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:876
msgid "RA layer failed to fetch properties"
msgstr "RA 層無法取得性質"
-#: include/svn_error_codes.h:715
+#: ../include/svn_error_codes.h:880
msgid "RA layer file already exists"
msgstr "RA 層檔案已存在"
-#: include/svn_error_codes.h:719
-msgid "Invalid configuration value"
-msgstr "無效的配置值"
-
-#: include/svn_error_codes.h:723
+#: ../include/svn_error_codes.h:894
msgid "HTTP Path Not Found"
msgstr "找不到 HTTP 路徑"
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:898
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "執行 WebDAV PROPPATCH 失敗"
-#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
-#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
-#: libsvn_ra_svn/marshal.c:774
+#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
+#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
+#: ../libsvn_ra_svn/marshal.c:859
msgid "Malformed network data"
msgstr "有缺陷的網路資料"
-#: include/svn_error_codes.h:737
+#: ../include/svn_error_codes.h:908
msgid "Unable to extract data from response header"
msgstr "無法自回應檔頭取得資料"
-#: include/svn_error_codes.h:742
+#: ../include/svn_error_codes.h:913
#, fuzzy
msgid "Repository has been moved"
msgstr "檔案庫沒有 UUID"
-#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
+#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
+#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
+#, fuzzy
+msgid "Connection timed out"
+msgstr "網路連線無預期地關閉"
+
+#: ../include/svn_error_codes.h:923
+msgid "URL access forbidden for unknown reason"
+msgstr ""
+
+#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
msgid "Couldn't find a repository"
msgstr "無法找到檔案庫"
-#: include/svn_error_codes.h:752
+#: ../include/svn_error_codes.h:933
msgid "Couldn't open a repository"
msgstr "無法開啟檔案庫"
# as-is
-#: include/svn_error_codes.h:757
+#: ../include/svn_error_codes.h:938
msgid "Special code for wrapping server errors to report to client"
msgstr "Special code for wrapping server errors to report to client"
-#: include/svn_error_codes.h:761
+#: ../include/svn_error_codes.h:942
msgid "Unknown svn protocol command"
msgstr "未知的 svn 通訊協定命令"
-#: include/svn_error_codes.h:765
+#: ../include/svn_error_codes.h:946
msgid "Network connection closed unexpectedly"
msgstr "網路連線無預期地關閉"
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:950
msgid "Network read/write error"
msgstr "網路讀寫錯誤"
-#: include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:962
msgid "Client/server version mismatch"
msgstr "用戶端/伺服器版本不匹配"
-#: include/svn_error_codes.h:786
+#: ../include/svn_error_codes.h:967
msgid "Cannot negotiate authentication mechanism"
msgstr "無法協商出認識機制"
-#: include/svn_error_codes.h:795
+#: ../include/svn_error_codes.h:972
+msgid "Editor drive was aborted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:978
+msgid "Initialization of SSPI library failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:982
+msgid "Server SSL certificate untrusted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:986
+msgid "Initialization of the GSSAPI context failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:991
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:999
msgid "Credential data unavailable"
msgstr "無法取得憑證資料"
-#: include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:1003
msgid "No authentication provider available"
msgstr "無可用的認證供給者"
-#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
+#: ../include/svn_error_codes.h:1007
msgid "All authentication providers exhausted"
msgstr "所有的認證供給者已耗盡"
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:1011
+#, fuzzy
+msgid "Credentials not saved"
+msgstr "無法取得憑證資料"
+
+#: ../include/svn_error_codes.h:1016
+#, fuzzy
+msgid "Authentication failed"
+msgstr "授權失敗"
+
+#: ../include/svn_error_codes.h:1022
msgid "Read access denied for root of edit"
msgstr "編輯的根目錄讀取拒絕"
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:1027
msgid "Item is not readable"
msgstr "項目無法讀取"
-#: include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:1032
msgid "Item is partially readable"
msgstr "項目只有部份可讀取"
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:1036
msgid "Invalid authz configuration"
msgstr "無效的 authz 設定"
-#: include/svn_error_codes.h:832
+#: ../include/svn_error_codes.h:1041
msgid "Item is not writable"
msgstr "項目無法寫入"
-#: include/svn_error_codes.h:838
+#: ../include/svn_error_codes.h:1047
msgid "Svndiff data has invalid header"
msgstr "svndiff 資料包含了無效的檔頭"
# as-is
-#: include/svn_error_codes.h:842
+#: ../include/svn_error_codes.h:1051
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff data contains corrupt window"
# as-is
-#: include/svn_error_codes.h:846
+#: ../include/svn_error_codes.h:1055
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff data contains backward-sliding source view"
-#: include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:1059
msgid "Svndiff data contains invalid instruction"
msgstr "svndiff 資料包含了無效的指令"
-#: include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:1063
msgid "Svndiff data ends unexpectedly"
msgstr "svndiff 資料無預期地結束"
-#: include/svn_error_codes.h:858
+#: ../include/svn_error_codes.h:1067
msgid "Svndiff compressed data is invalid"
msgstr "無效的 svndiff 壓縮資料"
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:1073
msgid "Diff data source modified unexpectedly"
msgstr "差異的資料來源被無預期地更改"
-#: include/svn_error_codes.h:870
+#: ../include/svn_error_codes.h:1079
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache 沒有指向 SVN 檔案系統的路徑"
-#: include/svn_error_codes.h:874
+#: ../include/svn_error_codes.h:1083
msgid "Apache got a malformed URI"
msgstr "Apache 得到一個有缺陷的 URI"
# as-is
-#: include/svn_error_codes.h:878
+#: ../include/svn_error_codes.h:1087
msgid "Activity not found"
msgstr "Activity not found"
-#: include/svn_error_codes.h:882
+#: ../include/svn_error_codes.h:1091
msgid "Baseline incorrect"
msgstr "基線不正確"
-#: include/svn_error_codes.h:886
+#: ../include/svn_error_codes.h:1095
msgid "Input/output error"
msgstr "輸出入錯誤"
-#: include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:1101
msgid "A path under version control is needed for this operation"
msgstr "本動作僅能作用於納入版本控制的路徑"
-#: include/svn_error_codes.h:896
+#: ../include/svn_error_codes.h:1105
msgid "Repository access is needed for this operation"
msgstr "本動作需要對檔案庫進行存取"
-#: include/svn_error_codes.h:900
+#: ../include/svn_error_codes.h:1109
msgid "Bogus revision information given"
msgstr "使用了有問題的修訂版資訊"
-#: include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:1113
msgid "Attempting to commit to a URL more than once"
msgstr "企圖對 URL 進行一次以上的送交"
-#: include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:1117
msgid "Operation does not apply to binary file"
msgstr "本動作不適用於二進制檔案"
-#: include/svn_error_codes.h:914
+#: ../include/svn_error_codes.h:1123
msgid "Format of an svn:externals property was invalid"
msgstr "svn:externals 性質的格式是無效的"
-#: include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:1127
msgid "Attempting restricted operation for modified resource"
msgstr "企圖對已修改的資源進行受限的作業"
-#: include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:1131
msgid "Operation does not apply to directory"
msgstr "本動作不適用於目錄"
-#: include/svn_error_codes.h:926
+#: ../include/svn_error_codes.h:1135
msgid "Revision range is not allowed"
msgstr "不允許的修訂版範圍"
-#: include/svn_error_codes.h:930
+#: ../include/svn_error_codes.h:1139
msgid "Inter-repository relocation not allowed"
msgstr "不支援不同檔案庫之間的重新安置 (relocation)"
-#: include/svn_error_codes.h:934
+#: ../include/svn_error_codes.h:1143
msgid "Author name cannot contain a newline"
msgstr "作者名稱不可包含換列字元"
-#: include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:1147
msgid "Bad property name"
msgstr "有問題的性質名稱"
-#: include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:1152
msgid "Two versioned resources are unrelated"
msgstr "兩個納入版本控制的資源沒有相關性"
-#: include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:1157
msgid "Path has no lock token"
msgstr "路徑無鎖定符記"
-#: include/svn_error_codes.h:953
+#: ../include/svn_error_codes.h:1162
#, fuzzy
msgid "Operation does not support multiple sources"
msgstr "本動作不適用於目錄"
-#: include/svn_error_codes.h:957
+#: ../include/svn_error_codes.h:1167
msgid "No versioned parent directories"
msgstr ""
-#: include/svn_error_codes.h:963
-msgid "A problem occurred; see later errors for details"
+#: ../include/svn_error_codes.h:1172
+#, fuzzy
+msgid "Working copy and merge source not ready for reintegration"
+msgstr "工作複本的合併來源需特別指定修訂版"
+
+#: ../include/svn_error_codes.h:1177
+msgid "A file external cannot overwrite an existing versioned item"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1182
+#, fuzzy
+msgid "Invalid path component strip count specified"
+msgstr "提供了無效的版本號碼"
+
+#: ../include/svn_error_codes.h:1187
+msgid "Detected a cycle while processing the operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1193
+#, fuzzy
+msgid "A problem occurred; see other errors for details"
msgstr "有問題發生; 請參閱隨附的細節"
-#: include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:1197
msgid "Failure loading plugin"
msgstr "載入外掛失敗"
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:1201
msgid "Malformed file"
msgstr "有缺陷的檔案"
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:1205
msgid "Incomplete data"
msgstr "不完全的資料"
-#: include/svn_error_codes.h:979
+#: ../include/svn_error_codes.h:1209
msgid "Incorrect parameters given"
msgstr "使用不正確的參數"
-#: include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:1213
msgid "Tried a versioning operation on an unversioned resource"
msgstr "試著對未納入版本控制的資源進行版本控制動作"
-#: include/svn_error_codes.h:987
+#: ../include/svn_error_codes.h:1217
msgid "Test failed"
msgstr "測試失敗"
-#: include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1221
msgid "Trying to use an unsupported feature"
msgstr "試著要使用不支援的功能"
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1225
msgid "Unexpected or unknown property kind"
msgstr "不預期或未知的性質種類"
-#: include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1229
msgid "Illegal target for the requested operation"
msgstr "對要求的動作來說是不合法的目標"
-#: include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1233
msgid "MD5 checksum is missing"
msgstr "沒有 MD5 檢查值"
-#: include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1237
msgid "Directory needs to be empty but is not"
msgstr "目錄必須為空的, 但是結果並非如此"
-#: include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1241
msgid "Error calling external program"
msgstr "呼叫外部程式時發生錯誤"
-#: include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1245
msgid "Python exception has been set with the error"
msgstr "Python 例外已被設定為錯誤"
-#: include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1249
msgid "A checksum mismatch occurred"
msgstr "總和檢查值不符"
-#: include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1253
msgid "The operation was interrupted"
msgstr "動作被中斷"
-#: include/svn_error_codes.h:1027
+#: ../include/svn_error_codes.h:1257
msgid "The specified diff option is not supported"
msgstr "指定的 diff 選項不支援"
-#: include/svn_error_codes.h:1031
+#: ../include/svn_error_codes.h:1261
msgid "Property not found"
msgstr "找不到性質"
-#: include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1265
msgid "No auth file path available"
msgstr "未提供 auth 檔案路徑"
-#: include/svn_error_codes.h:1039
-msgid "Merge info parse error"
-msgstr ""
-
-#: include/svn_error_codes.h:1044
+#: ../include/svn_error_codes.h:1270
msgid "Incompatible library version"
msgstr "不相容的程式庫版本"
-#: include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1275
+msgid "Mergeinfo parse error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1280
+msgid "Cease invocation of this API"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1285
+#, fuzzy
+msgid "Error parsing revision number"
+msgstr "剖析修訂版 '%s' 時發生語法錯誤"
+
+#: ../include/svn_error_codes.h:1290
+msgid "Iteration terminated before completion"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1295
+#, fuzzy
+msgid "Unknown changelist"
+msgstr "沒有這樣的項目: '%s'"
+
+#: ../include/svn_error_codes.h:1300
+#, fuzzy
+msgid "Reserved directory name in command line arguments"
+msgstr "無法初始化命令列引數"
+
+#: ../include/svn_error_codes.h:1305
+msgid "Inquiry about unknown capability"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1310
+#, fuzzy
+msgid "Test skipped"
+msgstr "測試失敗"
+
+#: ../include/svn_error_codes.h:1315
+msgid "apr memcache library not available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1320
+msgid "Couldn't perform atomic initialization"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1325
+#, fuzzy
+msgid "SQLite error"
+msgstr "寫入錯誤"
+
+#: ../include/svn_error_codes.h:1330
+#, fuzzy
+msgid "Attempted to write to readonly SQLite db"
+msgstr "企圖寫至非異動"
+
+#: ../include/svn_error_codes.h:1335
+msgid "Unsupported schema found in SQLite db"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1340
+msgid "The SQLite db is busy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1345
+msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1352
#, fuzzy
msgid "Error parsing arguments"
msgstr "用戶端於剖析引數時發生錯誤"
-#: include/svn_error_codes.h:1054
+#: ../include/svn_error_codes.h:1356
#, fuzzy
msgid "Not enough arguments provided"
msgstr "未提供足夠的引數"
-#: include/svn_error_codes.h:1058
+#: ../include/svn_error_codes.h:1360
msgid "Mutually exclusive arguments specified"
msgstr "指定了互斥的引數"
-#: include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1364
msgid "Attempted command in administrative dir"
msgstr "企圖於管理目錄中執行命令"
-#: include/svn_error_codes.h:1066
+#: ../include/svn_error_codes.h:1368
msgid "The log message file is under version control"
msgstr "紀錄訊息檔於版本控制之下"
-#: include/svn_error_codes.h:1070
+#: ../include/svn_error_codes.h:1372
msgid "The log message is a pathname"
msgstr "紀錄訊息是路徑名"
-#: include/svn_error_codes.h:1074
+#: ../include/svn_error_codes.h:1376
msgid "Committing in directory scheduled for addition"
msgstr "於預計新增的目錄中進行送交"
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1380
msgid "No external editor available"
msgstr "無法使用外部編輯器"
-#: include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1384
msgid "Something is wrong with the log message's contents"
msgstr "紀錄訊息的內容有不妥的地方"
-#: include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1388
msgid "A log message was given where none was necessary"
msgstr "給了一個送交訊息, 但是根本不需要"
-#: libsvn_client/add.c:346 libsvn_wc/copy.c:188
+#: ../include/svn_error_codes.h:1392
+#, fuzzy
+msgid "No external merge tool available"
+msgstr "無法使用外部編輯器"
+
+#: ../include/svn_error_codes.h:1396
+#, fuzzy
+msgid "Failed processing one or more externals definitions"
+msgstr "忽略外部定義"
+
+#: ../include/svn_error_codes.h:1402
+#, fuzzy
+msgid "Assertion failure"
+msgstr "授權失敗"
+
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:392
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:447
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:554
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:610
+msgid "GNOME Keyring is locked and we are non-interactive"
+msgstr ""
+
+#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:881
+#: ../libsvn_wc/workqueue.c:1658 ../libsvn_wc/workqueue.c:1740
#, c-format
-msgid "Can't close directory '%s'"
-msgstr "無法關閉目錄 '%s'"
+msgid "'%s' not found"
+msgstr "找不到 '%s'"
+
+#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
+#: ../libsvn_wc/adm_ops.c:886
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr "路徑 '%s' 為不支援的節點種類"
-#: libsvn_client/add.c:354
+#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
+#: ../libsvn_subr/opt.c:878
#, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "進行 '%s' 的遞迴式新增時發生錯誤"
+msgid "'%s' ends in a reserved name"
+msgstr ""
+
+#: ../libsvn_client/add.c:580 ../libsvn_client/changelist.c:116
+#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
+#: ../libsvn_client/export.c:952 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:274
+#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
+#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
+#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
+#: ../svn/upgrade-cmd.c:72
+#, fuzzy, c-format
+msgid "'%s' is not a local path"
+msgstr "'%s' 不是檔案"
+
+#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
+#, fuzzy, c-format
+msgid "Illegal repository URL '%s'"
+msgstr "不合法的 svn 檔案庫 URL '%s'"
-#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
+#: ../libsvn_client/blame.c:397
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "無法為二進制檔案 '%s' 計算譴責資訊"
-#: libsvn_client/blame.c:522
-msgid "blame of the WORKING revision is not supported"
-msgstr "不支援 WORKING 修訂版的 blame 功能"
-
-#: libsvn_client/blame.c:535
+#: ../libsvn_client/blame.c:627
msgid "Start revision must precede end revision"
msgstr "起始修訂版必須大於結束修訂版"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "URL '%s' 指向一個目錄"
-
-#: libsvn_client/blame.c:798
+#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1038
+#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:429
+#: ../libsvn_client/prop_commands.c:947 ../libsvn_client/prop_commands.c:1264
+#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2008
+#: ../libsvn_wc/adm_ops.c:2042 ../libsvn_wc/copy.c:596
+#: ../libsvn_wc/entries.c:1405 ../libsvn_wc/entries.c:2450
+#: ../libsvn_wc/entries.c:2481 ../libsvn_wc/node.c:1247
+#: ../libsvn_wc/update_editor.c:4171
#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "修訂版動作 '%c' 對修訂版 %ld 於 '%s' 缺少前一個修訂版"
+msgid "'%s' is not under version control"
+msgstr "'%s' 尚未納入版本控制"
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:79
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' 指向一個目錄"
+#: ../libsvn_client/cat.c:89
+#, c-format
+msgid "'%s' has no base revision until it is committed"
+msgstr ""
+
# as-is
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
msgid "(local)"
msgstr "(local)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
+#: ../libsvn_client/cat.c:236
#, c-format
-msgid "URL '%s' doesn't exist"
+msgid "URL '%s' refers to a directory"
+msgstr "URL '%s' 指向一個目錄"
+
+#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
+#, c-format
+msgid "URL '%s' doesn't exist"
msgstr "URL '%s' 不存在"
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:168
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' 指向一個檔案, 而非目錄"
-#: libsvn_client/checkout.c:168
-#, c-format
-msgid "'%s' is already a working copy for a different URL"
+#: ../libsvn_client/checkout.c:204
+#, fuzzy, c-format
+msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
msgstr "'%s' 已是不同 URL 的工作複本"
-#: libsvn_client/checkout.c:172
-msgid "; run 'svn update' to complete it"
-msgstr "; 請執行 'svn update' 以完成目前的動作"
-
-#: libsvn_client/checkout.c:182
+#: ../libsvn_client/checkout.c:212
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' 已存在, 但不是目錄"
-#: libsvn_client/commit.c:198
+#: ../libsvn_client/cmdline.c:78
+#, fuzzy, c-format
+msgid "Improper relative URL '%s'"
+msgstr "'%s' 的性質:\n"
+
+#: ../libsvn_client/cmdline.c:149
+#, c-format
+msgid "All non-relative targets must have the same root URL"
+msgstr ""
+
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "路徑 '%s' 為未知或未納入版本控制的種類"
-#: libsvn_client/commit.c:512
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "匯入檔案時, 需要一個新的項目名稱"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1008
-#: libsvn_wc/questions.c:92
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:567
+#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: libsvn_client/commit.c:607 libsvn_client/copy.c:289 svnlook/main.c:1216
+#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
+#: ../libsvn_client/merge.c:8975 ../libsvn_client/merge.c:10231
+#: ../libsvn_client/merge.c:10506 ../svnlook/main.c:1407
#, c-format
msgid "Path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: libsvn_client/commit.c:741 libsvn_client/copy.c:298
-#: libsvn_client/copy.c:789 libsvn_client/copy.c:1118
-#: libsvn_client/copy.c:1550
+#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
+#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
+#: ../libsvn_client/copy.c:1860
#, c-format
msgid "Path '%s' already exists"
msgstr "路徑 '%s' 已存在"
-#: libsvn_client/commit.c:756
+#: ../libsvn_client/commit.c:810
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' 是一個保留的名稱, 無法被匯入"
-#: libsvn_client/commit.c:872 libsvn_client/copy.c:972
+#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
msgid "Commit failed (details follow):"
msgstr "送交失敗 (細節隨附):"
-#: libsvn_client/commit.c:880 libsvn_client/copy.c:980
+#: ../libsvn_client/commit.c:856
msgid "Commit succeeded, but other errors follow:"
msgstr "送交成功, 但是發生了其它的錯誤, 如後:"
-#: libsvn_client/commit.c:887 libsvn_client/copy.c:987
+#: ../libsvn_client/commit.c:863
msgid "Error unlocking locked dirs (details follow):"
msgstr "解除鎖定目錄時發生錯誤 (細節隨附):"
-#: libsvn_client/commit.c:898
+#: ../libsvn_client/commit.c:874
msgid "Error bumping revisions post-commit (details follow):"
msgstr "post-commit 增加修訂版時發生錯誤 (細節隨附):"
-#: libsvn_client/commit.c:909 libsvn_client/copy.c:998
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "post-commit 清除時發生錯誤 (細節隨附):"
+#: ../libsvn_client/commit.c:968
+#, fuzzy
+msgid "Are all targets part of the same working copy?"
+msgstr "是否所有的目標都是同一個工作複本的一部份?"
+
+#: ../libsvn_client/commit.c:1007
+#, fuzzy
+msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
+msgstr "無法以非遞迴式送交目錄刪除"
-#: libsvn_client/commit.c:1193
+#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' 是 URL, 但是 URL 不可為送交的目標"
-#: libsvn_client/commit.c:1392
-msgid "Are all the targets part of the same working copy?"
-msgstr "是否所有的目標都是同一個工作複本的一部份?"
+#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:132
+#, fuzzy, c-format
+msgid "Directory '%s' is out of date"
+msgstr "目錄 '%s' 沒有 URL"
-#: libsvn_client/commit.c:1407
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr "無法以非遞迴式送交目錄刪除"
+#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:134
+#, fuzzy, c-format
+msgid "File '%s' is out of date"
+msgstr "項目已過時"
+
+#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
+#: ../libsvn_client/commit_util.c:1032
+#, c-format
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "中止送交: '%s' 仍處於衝突狀態"
+
+#: ../libsvn_client/commit_util.c:330
+#, fuzzy, c-format
+msgid "Aborting commit: '%s' remains in tree-conflict"
+msgstr "中止送交: '%s' 仍處於衝突狀態"
-#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
+#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "未知的項目類型 '%s'"
-#: libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:457
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "項目 '%s' 不預期地變換特殊狀態"
-#: libsvn_client/commit_util.c:335
-#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "中止送交: '%s' 仍處於衝突狀態"
-
-#: libsvn_client/commit_util.c:401
-#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "並未預期 '%s' 是工作複本的根目錄"
+#: ../libsvn_client/commit_util.c:654
+#, fuzzy, c-format
+msgid "'%s' is scheduled for addition, but is missing"
+msgstr "'%s' 於未納入版本控制的父路徑中被排入新增時程"
-#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
+#: ../libsvn_client/commit_util.c:935
#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "送交項目 '%s' 有複製旗標, 但是沒有 copyfrom URL"
+msgid "'%s' is not under version control and is not part of the commit, yet its child '%s' is part of the commit"
+msgstr "'%s' 尚未納入版本控制, 也不是送交的一部份, 但是它的子路徑 '%s' 是送交的一部份"
-#: libsvn_client/commit_util.c:709
+#: ../libsvn_client/commit_util.c:1052 ../libsvn_client/url.c:198
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "'%s' 的項目沒有 URL"
-#: libsvn_client/commit_util.c:742
+#: ../libsvn_client/commit_util.c:1069
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s' 於未納入版本控制的父路徑中被排入新增時程"
-#: libsvn_client/commit_util.c:762
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"'%s' 項目被標示為 '已複製', 但是本身尚未排入新增時程. 也許你送交的\n"
-"目標是位於未納入版本控制 (或尚未納入) 的目錄中?"
-
-#: libsvn_client/commit_util.c:803
-#, c-format
-msgid ""
-"'%s' is not under version control and is not part of the commit, yet its "
-"child '%s' is part of the commit"
-msgstr ""
-"'%s' 尚未納入版本控制, 也不是送交的一部份, 但是它的子路徑 '%s' 是送交的一部份"
-
-#: libsvn_client/commit_util.c:907
+#: ../libsvn_client/commit_util.c:1210
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "無法送交 '%s' 與 '%s', 因為它們都指向同一個 URL"
-#: libsvn_client/commit_util.c:1057
+#: ../libsvn_client/commit_util.c:1367
+#, c-format
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "送交項目 '%s' 有複製旗標, 但是沒有 copyfrom URL"
+
+#: ../libsvn_client/commit_util.c:1372
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "送交項目 '%s' 有複製旗標, 但是修訂版無效"
-#: libsvn_client/commit_util.c:1822
+#: ../libsvn_client/commit_util.c:2080
msgid "Standard properties can't be set explicitly as revision properties"
msgstr ""
-#: libsvn_client/copy.c:314 libsvn_client/copy.c:1566
-#: libsvn_client/update.c:105
+#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1876
#, c-format
msgid "Path '%s' is not a directory"
msgstr "路徑 '%s' 不是目錄"
-#: libsvn_client/copy.c:655
-#, c-format
-msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
+#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
+#, fuzzy, c-format
+msgid "Path '%s' already exists, but is not a directory"
+msgstr "'%s' 已存在, 但不是目錄"
+
+#: ../libsvn_client/copy.c:775
+#, fuzzy
+msgid "Source and destination URLs appear not to all point to the same repository."
msgstr "來源與目的似乎不在同一個檔案庫中 (來源: '%s'; 目的: '%s')"
-#: libsvn_client/copy.c:770
+#: ../libsvn_client/copy.c:985
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "無法移動 URL '%s' 至本身"
-#: libsvn_client/copy.c:779 libsvn_client/prop_commands.c:229
+#: ../libsvn_client/copy.c:1007 ../libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "路徑 '%s' 不存在於修訂版 %ld"
-#: libsvn_client/copy.c:1391
+#: ../libsvn_client/copy.c:1536
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr "來源 URL '%s' 來自其它的檔案庫; 把它當作是脫離的 WC"
-#: libsvn_client/copy.c:1537
+#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
+#: ../libsvn_wc/adm_ops.c:941 ../libsvn_wc/copy.c:691
+#, c-format
+msgid "'%s' is already under version control"
+msgstr "'%s' 已納入版本控制"
+
+#: ../libsvn_client/copy.c:1671
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "存在 '%s' 的項目 (不過工作檔案已消失)"
+
+#: ../libsvn_client/copy.c:1844
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "路徑 '%s' 於修訂版 %ld 中找不到"
-#: libsvn_client/copy.c:1542
+#: ../libsvn_client/copy.c:1849
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "路徑 '%s' 於 HEAD 修訂版中找不到"
-#: libsvn_client/copy.c:1592
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "存在 '%s' 的項目 (不過工作檔案已消失)"
-
-#: libsvn_client/copy.c:1687 libsvn_client/log.c:302
-msgid "Revision type requires a working copy path, not a URL"
-msgstr "修訂版類別使用工作複本路徑, 而非 URL"
-
-#: libsvn_client/copy.c:1722
+#: ../libsvn_client/copy.c:1970
#, fuzzy
msgid "Cannot mix repository and working copy sources"
msgstr "路徑不是工作複本檔案"
-#: libsvn_client/copy.c:1764
+#: ../libsvn_client/copy.c:2022
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "無法複製路徑 '%s' 至其子目錄 '%s' 中"
-#: libsvn_client/copy.c:1784
+#: ../libsvn_client/copy.c:2054
#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "無法移動路徑 '%s' 至其本身"
+msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
+msgstr ""
-#: libsvn_client/copy.c:1793
+#: ../libsvn_client/copy.c:2069
msgid "Moves between the working copy and the repository are not supported"
msgstr ""
-#: libsvn_client/copy.c:1851
+#: ../libsvn_client/copy.c:2083
#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "'%s' 似乎沒有關聯的 URL"
+msgid "Cannot move path '%s' into itself"
+msgstr "無法移動路徑 '%s' 至其本身"
-#: libsvn_client/copy.c:2197 svn/move-cmd.c:60
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移動動作不可指定修訂版 (HEAD 除外)"
+#: ../libsvn_client/copy.c:2152
+#, fuzzy, c-format
+msgid "'%s' does not have a URL associated with it"
+msgstr "'%s' 似乎沒有關聯的 URL"
-#: libsvn_client/delete.c:62
+#: ../libsvn_client/delete.c:59
#, c-format
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s' 擋了實際納入版本控制資源的路"
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2800 libsvn_wc/entries.c:1256
-#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2970
-#: libsvn_wc/update_editor.c:2178
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' 尚未納入版本控制"
+#: ../libsvn_client/delete.c:74
+#, fuzzy, c-format
+msgid "'%s' has local modifications -- commit or revert them first"
+msgstr "'%s' 已有本地修改"
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:104
#, c-format
-msgid "'%s' has local modifications"
-msgstr "'%s' 已有本地修改"
+msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
+msgstr ""
+
+#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
+#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
+#, fuzzy, c-format
+msgid "Cannot mix repository and working copy targets"
+msgstr "路徑不是工作複本檔案"
+
+#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "移動動作不可指定修訂版 (HEAD 除外)"
-#: libsvn_client/diff.c:135
+#: ../libsvn_client/deprecated.c:1331
+msgid "No commits in repository"
+msgstr "檔案庫中沒有任何送交"
+
+#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
+#, fuzzy
+msgid "Non-recursive relocation not supported"
+msgstr "不支援不同檔案庫之間的重新安置 (relocation)"
+
+#: ../libsvn_client/diff.c:136
#, fuzzy, c-format
-msgid " Reverted %s:r%s%s"
+msgid " Reverse-merged %s:r%s%s"
msgstr "已復原 '%s'\n"
-#: libsvn_client/diff.c:153
+#: ../libsvn_client/diff.c:151
#, c-format
msgid " Merged %s:r%s%s"
msgstr ""
-# as-is
-#: libsvn_client/diff.c:175
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%sProperty changes on: %s%s"
-
-# as-is
-#: libsvn_client/diff.c:203
+#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1226
+#: ../libsvn_diff/diff_file.c:1242
#, c-format
-msgid "Name: %s%s"
-msgstr "Name: %s%s"
+msgid "Path '%s' must be an immediate child of the directory '%s'"
+msgstr ""
# as-is
-#: libsvn_client/diff.c:322
+#: ../libsvn_client/diff.c:359
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revision %ld)"
# as-is
-#: libsvn_client/diff.c:324
+#: ../libsvn_client/diff.c:361
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(working copy)"
-#: libsvn_client/diff.c:467
+# as-is
+#: ../libsvn_client/diff.c:637
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr "%sProperty changes on: %s%s"
+
+#: ../libsvn_client/diff.c:921
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "無法顯示: 檔案標示為二進制類型. %s"
-#. -----------------------------------------------------------------------
-#. ** Utilities. **
-#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:827 libsvn_client/merge.c:66
+#: ../libsvn_client/diff.c:1326
+#, fuzzy, c-format
+msgid "Path '%s' has no URL"
+msgstr "'%s' 沒有 URL"
+
+#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
+#: ../libsvn_client/merge.c:8984
msgid "Not all required revisions are specified"
msgstr "並未提供全部所需的修訂版"
-#: libsvn_client/diff.c:842
+#: ../libsvn_client/diff.c:1410
msgid "At least one revision must be non-local for a pegged diff"
msgstr "對於 peg 差異, 必須至少有一個非本地端的修訂版"
-#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
+#: ../libsvn_client/diff.c:1518 ../libsvn_client/diff.c:1530
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' 於檔案庫的修訂版 %ld 找不到"
-#: libsvn_client/diff.c:1025
+#: ../libsvn_client/diff.c:1588
#, fuzzy
-msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
+msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
msgstr "抱歉, svn_client_diff3 以尚不支援的方式被叫用"
-#: libsvn_client/diff.c:1067
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
+#: ../libsvn_client/diff.c:1630
+msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "目前只支援路徑的文件參考基礎與其工作檔案之間的檔案差異"
-#: libsvn_client/diff.c:1212 libsvn_client/switch.c:111
+#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
#, c-format
msgid "Directory '%s' has no URL"
msgstr "目錄 '%s' 沒有 URL"
# as-is
-#: libsvn_client/diff.c:1421
+#: ../libsvn_client/diff.c:2064
msgid "Summarizing diff can only compare repository to repository"
msgstr "Summarizing diff can only compare repository to repository"
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:92
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' 不是一個有效的 EOL 值"
-#: libsvn_client/export.c:260
+#: ../libsvn_client/export.c:377
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "目的目錄已存在, 除非強迫為之, 否則不會複寫過去"
-#: libsvn_client/export.c:358 libsvn_client/export.c:501
+#: ../libsvn_client/export.c:532 ../libsvn_client/export.c:678
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' 已存在, 但不是目錄"
-#: libsvn_client/export.c:362 libsvn_client/export.c:505
+#: ../libsvn_client/export.c:536 ../libsvn_client/export.c:682
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已存在"
-#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
+#: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"表現 '%s' 的總和檢查值不一致:\n"
+" 預期: %s\n"
+" 實際: %s\n"
+
+#: ../libsvn_client/externals.c:364
#, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "'%s' 的總和檢查值不符合; 預期: '%s', 實際: '%s'"
+msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:401
+#, c-format
+msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:427
+#, c-format
+msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
+msgstr ""
+
+#: ../libsvn_client/externals.c:536
+#, fuzzy, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr "URL '%s' 不存在"
+
+#: ../libsvn_client/externals.c:603
+#, fuzzy, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr "不合法的 svn 檔案庫 URL '%s'"
+
+#: ../libsvn_client/externals.c:639
+#, fuzzy, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr "不合法的 svn 檔案庫 URL '%s'"
+
+#: ../libsvn_client/externals.c:686
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:714
+#, fuzzy, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "無法辨識要求的 '%s' 的修訂版類別"
+
+#: ../libsvn_client/externals.c:806
+#, fuzzy, c-format
+msgid "URL '%s' at revision %ld doesn't exist"
+msgstr "URL '%s' 不存在"
+
+#: ../libsvn_client/externals.c:812
+#, fuzzy, c-format
+msgid "URL '%s' at revision %ld is not a file or a directory"
+msgstr "'%s' 不是檔案或目錄"
+
+#: ../libsvn_client/externals.c:1111
+#, c-format
+msgid "Traversal of '%s' found no ambient depth"
+msgstr ""
+
+#: ../libsvn_client/externals.c:1262
+#, fuzzy, c-format
+msgid "'%s' is not a URL"
+msgstr "路徑 '%s' 不是檔案"
+
+#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5358
+#: ../libsvn_wc/wc_db.c:596 ../libsvn_wc/wc_db.c:2039
+#: ../libsvn_wc/wc_db.c:2132 ../libsvn_wc/wc_db.c:2191
+#: ../libsvn_wc/wc_db.c:2215 ../libsvn_wc/wc_db.c:5456
+#: ../libsvn_wc/wc_db.c:5884 ../libsvn_wc/wc_db.c:6834
+#: ../libsvn_wc/wc_db.c:6952 ../libsvn_wc/wc_db.c:7016
+#: ../libsvn_wc/wc_db.c:7228 ../libsvn_wc/wc_db.c:8277
+#: ../libsvn_wc/wc_db.c:8457 ../libsvn_wc/wc_db.c:8795
+#, fuzzy, c-format
+msgid "The node '%s' was not found."
+msgstr "找不到路徑 '%s'"
+
+#: ../libsvn_client/info.c:565
+#, fuzzy, c-format
+msgid "Server does not support retrieving information about the repository root"
+msgstr "伺服器不支援鎖定功能"
-#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
+#: ../libsvn_client/info.c:572 ../libsvn_client/info.c:587
+#: ../libsvn_client/info.c:597
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s' 並不存在於修訂版 %ld 中"
-#: libsvn_client/list.c:234
+#: ../libsvn_client/list.c:249
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s' 並不存在於該修訂版中"
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:237
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "找不到共同的父路徑, 無法對不相交的引數進行處理"
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2521
-#: libsvn_client/merge.c:2527 libsvn_client/merge.c:2720
-#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#: ../libsvn_client/locking_commands.c:282 ../libsvn_client/merge.c:9006
+#: ../libsvn_client/merge.c:9013 ../libsvn_client/merge.c:10240
+#: ../libsvn_client/merge.c:10515 ../libsvn_client/ra.c:484
+#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' 沒有 URL"
-#: libsvn_client/locking_commands.c:284
+#: ../libsvn_client/locking_commands.c:305
msgid "Unable to lock/unlock across multiple repositories"
msgstr "無法在多個檔案庫之間進行鎖定/解鎖"
-#: libsvn_client/locking_commands.c:325
+#: ../libsvn_client/locking_commands.c:346
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' 未於這個工作複本中鎖定"
-#: libsvn_client/locking_commands.c:373
+#: ../libsvn_client/locking_commands.c:391
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:993
-#: libsvn_ra/ra_loader.c:863
+#: ../libsvn_client/locking_commands.c:425 ../libsvn_fs/fs-loader.c:1269
+#: ../libsvn_ra/ra_loader.c:1056
#, fuzzy
msgid "Lock comment contains illegal characters"
msgstr "鎖定註解含有不合法的字元"
-#: libsvn_client/log.c:289
+#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
msgid "Missing required revision specification"
msgstr "未提供要求的修訂版規格"
-#: libsvn_client/log.c:352 libsvn_client/status.c:286
-#: libsvn_client/update.c:119
+#: ../libsvn_client/log.c:401
+#, fuzzy, c-format
+msgid "'%s' is not a relative path"
+msgstr "'%s' 不是檔案"
+
+#: ../libsvn_client/log.c:422
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "指定工作複本路徑時, 只可提供一個目標"
+
+#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:388
#, c-format
msgid "Entry '%s' has no URL"
msgstr "項目 '%s' 沒有 URL"
-#: libsvn_client/log.c:584
-msgid "No commits in repository"
-msgstr "檔案庫中沒有任何送交"
-
-#: libsvn_client/merge.c:92
+#: ../libsvn_client/merge.c:179
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "URL 中沒有綱要 ('%s' 與 '%s')"
-#: libsvn_client/merge.c:98 libsvn_client/merge.c:104
+#: ../libsvn_client/merge.c:185 ../libsvn_client/merge.c:191
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL 中沒有綱要: '%s'"
-#: libsvn_client/merge.c:111
+#: ../libsvn_client/merge.c:198
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "尚不支援混合的存取綱要 ('%s' 與 '%s')"
@@ -1340,2198 +1859,2763 @@ msgstr "尚不支援混合的存取綱� #. xgettext: the '.working', '.merge-left.r%ld' and
#. '.merge-right.r%ld' strings are used to tag onto a file
#. name in case of a merge conflict
-#: libsvn_client/merge.c:333
+#: ../libsvn_client/merge.c:1482
msgid ".working"
msgstr ".working"
# as-is
-#: libsvn_client/merge.c:335
+#: ../libsvn_client/merge.c:1484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".merge-left.r%ld"
# as-is
-#: libsvn_client/merge.c:338
+#: ../libsvn_client/merge.c:1487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: libsvn_client/merge.c:1066
-#, fuzzy, c-format
-msgid "Path '%s' is missing"
-msgstr "找不到目錄 '%s'"
+#: ../libsvn_client/merge.c:3957
+msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:4661
+#, c-format
+msgid ""
+"One or more conflicts were produced while merging r%ld:%ld into\n"
+"'%s' --\n"
+"resolve all conflicts and rerun the merge to apply the remaining\n"
+"unmerged revisions"
+msgstr ""
-#: libsvn_client/merge.c:1072 libsvn_wc/util.c:282
+#: ../libsvn_client/merge.c:5820
+msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8502
+msgid "Use of two URLs is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8509 ../libsvn_client/merge.c:8793
+msgid "Merge from foreign repository is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
+#: ../libsvn_client/merge.c:10523
#, fuzzy, c-format
-msgid "Cannot find a URL for '%s'"
-msgstr "無法找到 '%s' 的項目"
+msgid "Merge target '%s' does not exist in the working copy"
+msgstr "'%s' 未於這個工作複本中鎖定"
-#: libsvn_client/merge.c:1488
+#: ../libsvn_client/merge.c:8896
+#, fuzzy
+msgid "Cannot merge into a working copy with a switched subtree"
+msgstr "路徑不是工作複本檔案"
+
+#: ../libsvn_client/merge.c:8901
+#, fuzzy
+msgid "Cannot merge into a working copy that has local modifications"
+msgstr "路徑不是工作複本檔案"
+
+#: ../libsvn_client/merge.c:8918
+#, fuzzy
+msgid "Cannot determine revision of working copy"
+msgstr "路徑不是工作複本檔案"
+
+#: ../libsvn_client/merge.c:8924
#, c-format
-msgid ""
-"Path '%s' is in conflict, and must be resolved before the remainder of the "
-"requested merge can be applied"
+msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
+msgid "Merge sources must both be either paths or URLs"
msgstr ""
-#: libsvn_client/merge.c:1852 libsvn_client/merge.c:2209
-msgid "Use of two URLs is not compatible with merge info modification"
+#: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
+#, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
+
+#: ../libsvn_client/merge.c:10057 ../libsvn_client/merge.c:10348
+#, c-format
+msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr ""
-#: libsvn_client/merge.c:2758
+#: ../libsvn_client/merge.c:10258
+#, fuzzy, c-format
+msgid "'%s' must be from the same repository as '%s'"
+msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
+
+#: ../libsvn_client/merge.c:10290
+#, fuzzy, c-format
+msgid "Neither the reintegrate source nor target can be the root of the repository"
+msgstr "'%s' 不是檔案庫的根目錄"
+
+#: ../libsvn_client/merge.c:10376
#, c-format
msgid ""
-"Unable to determine merge source for '%s', please provide an explicit source"
+"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
+"%s"
msgstr ""
-#: libsvn_client/prop_commands.c:73
+#: ../libsvn_client/mergeinfo.c:1721
+msgid "Only depths 'infinity' and 'empty' are currently supported"
+msgstr ""
+
+#: ../libsvn_client/patch.c:243
+#, fuzzy, c-format
+msgid "Cannot strip %u components from '%s'"
+msgstr "無法寫入 '%s' 的性質雜湊"
+
+#: ../libsvn_client/patch.c:2754
+#, fuzzy
+msgid "strip count must be positive"
+msgstr "--limit 的引數必須為正數"
+
+#: ../libsvn_client/prop_commands.c:80
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' 是工作複本性質, 因此無法供用戶端存取"
-#: libsvn_client/prop_commands.c:216
+#: ../libsvn_client/prop_commands.c:216
#, fuzzy, c-format
msgid "Property '%s' is not a regular property"
msgstr "性質 '%s' 是項目性質"
-#: libsvn_client/prop_commands.c:320
+#: ../libsvn_client/prop_commands.c:363
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "修訂版性質 '%s' 在此文脈中並不允許"
-#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
+#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
#, c-format
msgid "Bad property name: '%s'"
msgstr "有問題的性質名稱: '%s'"
-#: libsvn_client/prop_commands.c:339
+#: ../libsvn_client/prop_commands.c:380
#, fuzzy, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "設定非本地目標 '%s' 的性質尚不支援"
-#: libsvn_client/prop_commands.c:345
+#: ../libsvn_client/prop_commands.c:385
#, fuzzy, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "設定非本地目標 '%s' 的性質尚不支援"
-#: libsvn_client/prop_commands.c:439
-msgid "Value will not be set unless forced"
+#: ../libsvn_client/prop_commands.c:400
+#, fuzzy, c-format
+msgid "Setting property '%s' on non-local target '%s' is not supported"
+msgstr "設定非本地目標 '%s' 的性質尚不支援"
+
+#: ../libsvn_client/prop_commands.c:471
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:480
+#, c-format
+msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:488
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:519
+#, fuzzy
+msgid "Author name should not contain a newline; value will not be set unless forced"
msgstr "除非強迫為之, 否則其值不會被設定"
-#: libsvn_client/prop_commands.c:659
+#: ../libsvn_client/prop_commands.c:764
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' 不存在於修訂版 %ld"
-#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:949
+#: ../libsvn_client/prop_commands.c:771 ../libsvn_client/prop_commands.c:1089
+#: ../libsvn_wc/crop.c:183
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "'%s' 為未知的節點類型"
-#: libsvn_client/ra.c:133
+#: ../libsvn_client/ra.c:145
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr "企圖在非送交動作中, 設定工作複本性質 '%s' 於 '%s'"
-#: libsvn_client/ra.c:496
+#: ../libsvn_client/ra.c:378
#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未提供 '%s' 於修訂版 %ld 的 changed-path 資訊"
-
-#: libsvn_client/ra.c:616
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in revision %ld"
-msgstr "路徑 '%s' 不存在於修訂版 %ld 中"
+msgid "Redirect cycle detected for URL '%s'"
+msgstr ""
-#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
+#: ../libsvn_client/ra.c:750 ../libsvn_ra/compat.c:376
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "無法找到 '%s' 的檔案庫位置於修訂版 %ld"
-#: libsvn_client/ra.c:674
-#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "'%s' 於修訂版 %ld 是一個無關的物件"
-
-#: libsvn_client/ra.c:831
+#: ../libsvn_client/ra.c:757
#, c-format
-msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
-msgstr ""
-"'%s' 的位置對應至修訂版 %ld 並不存在於檔案庫之中, 或是指向一個無關的物件"
+msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
+msgstr "'%s' 的位置對應至修訂版 %ld 並不存在於檔案庫之中, 或是指向一個無關的物件"
-#: libsvn_client/relocate.c:101
+#: ../libsvn_client/relocate.c:115
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "'%s' 不是檔案庫的根目錄"
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:122
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "於 '%s' 的檔案庫有 uuid '%s', 但是工作複本的是 '%s'"
-#: libsvn_client/revisions.c:93
+#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:136
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "路徑 '%s' 沒有被送交的修訂版"
-#: libsvn_client/revisions.c:103
+#: ../libsvn_client/revisions.c:162
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "無法辨識要求的 '%s' 的修訂版類別"
-#: libsvn_client/switch.c:135 libsvn_ra_local/ra_plugin.c:108
-#: libsvn_ra_local/ra_plugin.c:597 libsvn_wc/update_editor.c:2617
-#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
+#: ../libsvn_client/revisions.c:185
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
msgstr ""
-"'%s'\n"
-"與\n"
-"'%s'\n"
-"並不在同一個檔案庫中"
-#: libsvn_client/switch.c:150
-#, fuzzy, c-format
-msgid "Destination does not exist: '%s'"
-msgstr "目標 '%s' 已存在"
+#: ../libsvn_client/status.c:302 ../libsvn_client/status.c:331
+#: ../libsvn_client/status.c:340 ../libsvn_client/status.c:533
+#: ../libsvn_wc/lock.c:539 ../libsvn_wc/lock.c:899 ../libsvn_wc/lock.c:1598
+#: ../libsvn_wc/wc_db.c:7808 ../libsvn_wc/wc_db_pdh.c:485
+#, c-format
+msgid "'%s' is not a working copy"
+msgstr "'%s' 不是工作複本"
-#: libsvn_client/update.c:145 libsvn_wc/log.c:2573
+#: ../libsvn_client/switch.c:102
#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s' 並不是工作複本目錄"
+msgid "Cannot both exclude and switch a path"
+msgstr ""
+
+#: ../libsvn_client/switch.c:175 ../libsvn_ra_local/ra_plugin.c:199
+#: ../libsvn_ra_local/ra_plugin.c:275 ../libsvn_wc/update_editor.c:5032
+#, c-format
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"'%s'\n"
+"與\n"
+"'%s'\n"
+"並不在同一個檔案庫中"
-#: libsvn_client/update.c:153
+#: ../libsvn_client/util.c:215
#, fuzzy, c-format
-msgid "'%s' is neither a file nor a directory"
-msgstr "'%s' 不是檔案或目錄名稱"
+msgid "URL '%s' is not a child of repository root URL '%s'"
+msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:165
msgid "Compression of svndiff data failed"
msgstr "svndiff 資料壓縮失敗"
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:432
+#, fuzzy
+msgid "Decompression of svndiff data failed: no size"
+msgstr "svndiff 資料解壓縮失敗"
+
+#: ../libsvn_delta/svndiff.c:435
+#, fuzzy
+msgid "Decompression of svndiff data failed: size too large"
+msgstr "svndiff 資料解壓縮失敗"
+
+#: ../libsvn_delta/svndiff.c:456
msgid "Decompression of svndiff data failed"
msgstr "svndiff 資料解壓縮失敗"
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:463
msgid "Size of uncompressed data does not match stored original length"
msgstr "解壓縮後的資料大小與儲存的原始長度不符"
# as-is
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:538
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Invalid diff stream: insn %d cannot be decoded"
# as-is
-#: libsvn_delta/svndiff.c:488
-#, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
+#: ../libsvn_delta/svndiff.c:542
+#, fuzzy, c-format
+msgid "Invalid diff stream: insn %d has length zero"
msgstr "Invalid diff stream: insn %d has non-positive length"
# as-is
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:546
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Invalid diff stream: insn %d overflows the target view"
# as-is
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:555
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Invalid diff stream: [src] insn %d overflows the source view"
# as-is
-#: libsvn_delta/svndiff.c:507
+#: ../libsvn_delta/svndiff.c:562
#, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
# as-is
-#: libsvn_delta/svndiff.c:514
+#: ../libsvn_delta/svndiff.c:569
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "Invalid diff stream: [new] insn %d overflows the new data section"
# as-is
-#: libsvn_delta/svndiff.c:524
+#: ../libsvn_delta/svndiff.c:579
msgid "Delta does not fill the target window"
msgstr "Delta does not fill the target window"
# as-is
-#: libsvn_delta/svndiff.c:527
+#: ../libsvn_delta/svndiff.c:582
msgid "Delta does not contain enough new data"
msgstr "Delta does not contain enough new data"
-#: libsvn_delta/svndiff.c:633
+#: ../libsvn_delta/svndiff.c:688
msgid "Svndiff has invalid header"
msgstr "Svndiff 資料包含了無效的檔頭"
# as-is
-#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
+#: ../libsvn_delta/svndiff.c:744 ../libsvn_delta/svndiff.c:908
+#, fuzzy
+msgid "Svndiff contains a too-large window"
+msgstr "Svndiff data contains corrupt window"
+
+# as-is
+#: ../libsvn_delta/svndiff.c:751 ../libsvn_delta/svndiff.c:915
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff contains corrupt window header"
# as-is
-#: libsvn_delta/svndiff.c:697
+#: ../libsvn_delta/svndiff.c:760
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff has backwards-sliding source views"
# as-is
-#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
-#: libsvn_delta/svndiff.c:866
+#: ../libsvn_delta/svndiff.c:809 ../libsvn_delta/svndiff.c:856
+#: ../libsvn_delta/svndiff.c:937
msgid "Unexpected end of svndiff input"
msgstr "Unexpected end of svndiff input"
-#: libsvn_diff/diff_file.c:587
+#: ../libsvn_diff/diff_file.c:466
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "檔案 '%s' 在產生差異時發生無預期的變動"
-#: libsvn_diff/diff_file.c:707
-#, c-format
-msgid "Error parsing diff options"
-msgstr "剖析差異選項時發生錯誤"
+#: ../libsvn_diff/diff_file.c:630
+msgid "Error in options to internal diff"
+msgstr ""
-#: libsvn_diff/diff_file.c:730
+#: ../libsvn_diff/diff_file.c:656
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "差異選項中有無效的引數 '%s'"
-#: libsvn_diff/diff_file.c:1011
-#, c-format
-msgid "%s\\ No newline at end of file%s"
+#: ../libsvn_diff/diff_file.c:942
+#, fuzzy
+msgid "No newline at end of file"
msgstr "%s\\ 檔案結尾沒有換列字元%s"
-#: libsvn_diff/diff_file.c:1587
+#. Order of date components can be different in different languages
+#: ../libsvn_diff/diff_file.c:1149
+msgid "%a %b %e %H:%M:%S %Y"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1766
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "無法刪除 mmap '%s'"
-#: libsvn_fs/fs-loader.c:104 libsvn_ra/ra_loader.c:158
-#: libsvn_ra/ra_loader.c:171
[... 15683 lines stripped ...]