subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1787173 [2/2] - /subversion/trunk/subversion/po/ja.po
Date Thu, 16 Mar 2017 12:52:22 GMT

Modified: subversion/trunk/subversion/po/ja.po
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/ja.po?rev=1787173&r1=1787172&r2=1787173&view=diff
==============================================================================
--- subversion/trunk/subversion/po/ja.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/ja.po [UTF-8] Thu Mar 16 12:52:21 2017
@@ -197,7 +197,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2010-11-12 08:49-0600\n"
+"POT-Creation-Date: 2017-03-16 13:48+0100\n"
 "PO-Revision-Date: 2007-10-28 01:23+0900\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Japanese <dev@subversion.tigris.org>\n"
@@ -205,12879 +205,21229 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\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
+#: ../include/private/svn_fs_util.h:86
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "ファイルが見つかりません: トランザクション %s, パス '%s'"
 
-#: ../include/private/svn_fs_util.h:73
+#: ../include/private/svn_fs_util.h:91
 #, 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
+#: ../include/private/svn_fs_util.h:102
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "ファイルが既に存在します: ファイルシステム '%s', トランザクション %s, パス '%s'"
 
-#: ../include/private/svn_fs_util.h:89
+#: ../include/private/svn_fs_util.h:107
 #, c-format
 msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
 msgstr "ファイルが既に存在します: ファイルシステム '%s', リビジョン %ld, パス '%s'"
 
 # ? root object
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:97
+#: ../include/private/svn_fs_util.h:115
 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
+#: ../include/private/svn_fs_util.h:122
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:129
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:136
 #, 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
+#. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:144
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:151
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:158
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:165
 #, 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
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:174
 #, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
 msgstr "ユーザ '%s' が、'%s' の所有するロック (ファイルシステム '%s') を使用しようとしています"
 
-#: ../include/svn_error_codes.h:160
+#: ../include/svn_error_codes.h:166
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "svn_make_pool() に渡された親メモリプールが不正です"
 
-#: ../include/svn_error_codes.h:164
+#: ../include/svn_error_codes.h:170
 msgid "Bogus filename"
 msgstr "ファイル名が不正です"
 
-#: ../include/svn_error_codes.h:168
+#: ../include/svn_error_codes.h:174
 msgid "Bogus URL"
 msgstr "URL が不正です"
 
-#: ../include/svn_error_codes.h:172
+#: ../include/svn_error_codes.h:178
 msgid "Bogus date"
 msgstr "日時が不正です"
 
-#: ../include/svn_error_codes.h:176
+#: ../include/svn_error_codes.h:182
 msgid "Bogus mime-type"
 msgstr "MIME タイプが不正です"
 
-#: ../include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:192
 msgid "Wrong or unexpected property value"
 msgstr "属性値が不正か、あるいは予想外の値です"
 
-#: ../include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:196
 msgid "Version file format not correct"
 msgstr "バージョンファイル形式が不正です"
 
-#: ../include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:200
 msgid "Path is not an immediate child of the specified directory"
 msgstr "パスが、指定されたディレクトリの直接の子ノードではありません"
 
-#: ../include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:204
 msgid "Bogus UUID"
 msgstr "UUID が不正です"
 
-#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1036
 msgid "Invalid configuration value"
 msgstr "設定値が不正です"
 
-#: ../include/svn_error_codes.h:207
+#: ../include/svn_error_codes.h:213
 msgid "Bogus server specification"
 msgstr "サーバの指定が不正です"
 
-#: ../include/svn_error_codes.h:211
+#: ../include/svn_error_codes.h:217
 #, fuzzy
 msgid "Unsupported checksum type"
 msgstr "サポートされていないリポジトリのバージョンです"
 
-#: ../include/svn_error_codes.h:215
+#: ../include/svn_error_codes.h:221
 #, fuzzy
 msgid "Invalid character in hex checksum"
 msgstr "リビジョン範囲リストに不正な文字 '%c'が見つかりました"
 
-#: ../include/svn_error_codes.h:220
+#: ../include/svn_error_codes.h:226
 #, fuzzy
 msgid "Unknown string value of token"
 msgstr "lock コマンドに関するステータスが未知です"
 
-#: ../include/svn_error_codes.h:226
+#: ../include/svn_error_codes.h:231
+#, fuzzy
+msgid "Invalid changelist name"
+msgstr "変更形式が不正です"
+
+#: ../include/svn_error_codes.h:236
+#, fuzzy
+msgid "Invalid atomic"
+msgstr "ロックが不正です"
+
+#: ../include/svn_error_codes.h:241
+#, fuzzy
+msgid "Invalid compression method"
+msgstr "リビジョン番号が不正です"
+
+#: ../include/svn_error_codes.h:247
 msgid "No such XML tag attribute"
 msgstr "そのような XML タグ属性は存在しません"
 
-#: ../include/svn_error_codes.h:230
+#: ../include/svn_error_codes.h:251
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> には系統情報がありません"
 
-#: ../include/svn_error_codes.h:234
+#: ../include/svn_error_codes.h:255
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "認識できないバイナリデータエンコーディングです。デコードできません"
 
-#: ../include/svn_error_codes.h:238
+#: ../include/svn_error_codes.h:259
 msgid "XML data was not well-formed"
 msgstr "整形済みの XML データではありません"
 
-#: ../include/svn_error_codes.h:242
+#: ../include/svn_error_codes.h:263
 msgid "Data cannot be safely XML-escaped"
 msgstr "データは安全に XML エスケープされていません"
 
-#: ../include/svn_error_codes.h:248
+#: ../include/svn_error_codes.h:268
+#, fuzzy
+msgid "Unexpected XML element found"
+msgstr "予想外のノード種別が見つかりました"
+
+#: ../include/svn_error_codes.h:274
 msgid "Inconsistent line ending style"
 msgstr "改行文字形式が一貫していません"
 
-#: ../include/svn_error_codes.h:252
+#: ../include/svn_error_codes.h:278
 msgid "Unrecognized line ending style"
 msgstr "改行文字形式を認識できません"
 
-#: ../include/svn_error_codes.h:257
+#: ../include/svn_error_codes.h:283
 msgid "Line endings other than expected"
 msgstr "改行文字が期待されるものと異なります"
 
-#: ../include/svn_error_codes.h:261
+#: ../include/svn_error_codes.h:287
 msgid "Ran out of unique names"
 msgstr "固有の名称を使い果たしました"
 
-#: ../include/svn_error_codes.h:266
+#: ../include/svn_error_codes.h:292
 msgid "Framing error in pipe protocol"
 msgstr "パイププロトコルのフレーミングエラーです"
 
-#: ../include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:297
 msgid "Read error in pipe"
 msgstr "パイプの読み込みエラーです"
 
-#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
-#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
+#. is errno on POSIX
+#: ../include/svn_error_codes.h:301 ../libsvn_subr/cmdline.c:418
+#: ../libsvn_subr/cmdline.c:449 ../libsvn_subr/cmdline.c:472 ../svn/util.c:571
+#: ../svnlook/svnlook.c:2000
 #, c-format
 msgid "Write error"
 msgstr "書き込みエラーです"
 
-#: ../include/svn_error_codes.h:281
+#: ../include/svn_error_codes.h:306
+#, fuzzy
+msgid "Write error in pipe"
+msgstr "パイプの読み込みエラーです"
+
+#: ../include/svn_error_codes.h:312
 msgid "Unexpected EOF on stream"
 msgstr "予想外の EOF がストリーム中にあります"
 
-#: ../include/svn_error_codes.h:285
+#: ../include/svn_error_codes.h:316
 msgid "Malformed stream data"
 msgstr "異常なストリームデータです"
 
-#: ../include/svn_error_codes.h:289
+#: ../include/svn_error_codes.h:320
 msgid "Unrecognized stream data"
 msgstr "認識できないストリームデータです"
 
 # TRANSLATION-FIXME: Translation for "edit pipelining" must be checked.
-#: ../include/svn_error_codes.h:294
+#: ../include/svn_error_codes.h:325
 #, fuzzy
 msgid "Stream doesn't support seeking"
 msgstr "編集のパイプライン化がサーバでサポートされていません"
 
-#: ../include/svn_error_codes.h:300
+# TRANSLATION-FIXME: Translation for "edit pipelining" must be checked.
+#: ../include/svn_error_codes.h:330
+#, fuzzy
+msgid "Stream doesn't support this capability"
+msgstr "編集のパイプライン化がサーバでサポートされていません"
+
+#: ../include/svn_error_codes.h:336
 msgid "Unknown svn_node_kind"
 msgstr "未知の svn_node_kind です"
 
-#: ../include/svn_error_codes.h:304
+#: ../include/svn_error_codes.h:340
 msgid "Unexpected node kind found"
 msgstr "予想外のノード種別が見つかりました"
 
-#: ../include/svn_error_codes.h:310
+#: ../include/svn_error_codes.h:346
 msgid "Can't find an entry"
 msgstr "エントリが見つかりません"
 
-#: ../include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:352
 msgid "Entry already exists"
 msgstr "エントリが既に存在します"
 
-#: ../include/svn_error_codes.h:320
+#: ../include/svn_error_codes.h:356
 msgid "Entry has no revision"
 msgstr "エントリにリビジョンがありません"
 
-#: ../include/svn_error_codes.h:324
+#: ../include/svn_error_codes.h:360
 msgid "Entry has no URL"
 msgstr "エントリに URL がありません"
 
-#: ../include/svn_error_codes.h:328
+#: ../include/svn_error_codes.h:364
 msgid "Entry has an invalid attribute"
 msgstr "エントリが不正な属性をもっています"
 
-#: ../include/svn_error_codes.h:332
+#: ../include/svn_error_codes.h:368
 msgid "Can't create an entry for a forbidden name"
 msgstr ""
 
-#: ../include/svn_error_codes.h:338
+#: ../include/svn_error_codes.h:374
 msgid "Obstructed update"
 msgstr "更新が妨害されました"
 
-#: ../include/svn_error_codes.h:343
+#: ../include/svn_error_codes.h:379
 msgid "Mismatch popping the WC unwind stack"
 msgstr "作業コピーアンワインドスタックに対してポップする際に不一致があります"
 
-#: ../include/svn_error_codes.h:348
+#: ../include/svn_error_codes.h:384
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "空の作業コピーアンワインドスタックに対してポップしようとしています"
 
-#: ../include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:389
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "空でないアンワインドスタックのロックを解除しようとしています"
 
-#: ../include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:393
 msgid "Attempted to lock an already-locked dir"
 msgstr "既にロックされたディレクトリをロックしようとしました"
 
-#: ../include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:397
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "作業コピーがロックされていません。これはおそらくバグなので、報告してください"
 
-#: ../include/svn_error_codes.h:366
+#: ../include/svn_error_codes.h:402
 msgid "Invalid lock"
 msgstr "ロックが不正です"
 
-#: ../include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:408 ../include/svn_error_codes.h:414
 msgid "Path is not a working copy directory"
 msgstr "パスは作業コピーのディレクトリではありません"
 
-#: ../include/svn_error_codes.h:381
+#: ../include/svn_error_codes.h:418
 msgid "Path is not a working copy file"
 msgstr "パスが作業コピーのファイルでありません"
 
-#: ../include/svn_error_codes.h:385
+#: ../include/svn_error_codes.h:422
 msgid "Problem running log"
 msgstr "ログの実行中に問題が起きました"
 
-#: ../include/svn_error_codes.h:389
+#: ../include/svn_error_codes.h:426
 msgid "Can't find a working copy path"
 msgstr "作業コピーパスが見つかりません"
 
-#: ../include/svn_error_codes.h:393
+#: ../include/svn_error_codes.h:430
 msgid "Working copy is not up-to-date"
 msgstr "作業コピーが最新ではありません"
 
-#: ../include/svn_error_codes.h:397
+#: ../include/svn_error_codes.h:434
 msgid "Left locally modified or unversioned files"
 msgstr "ローカルで修正されたファイルやバージョン管理下にないファイルを残しました"
 
-#: ../include/svn_error_codes.h:401
+#: ../include/svn_error_codes.h:438
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "エントリに対してマージできない準備をするよう要求されました"
 
-#: ../include/svn_error_codes.h:405
+#: ../include/svn_error_codes.h:442
 msgid "Found a working copy path"
 msgstr "作業コピーのパスが見つかりました"
 
-#: ../include/svn_error_codes.h:409
+#: ../include/svn_error_codes.h:446
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "作業ディレクトリ内に競合があり、実行中の操作が妨害されました"
 
-#: ../include/svn_error_codes.h:413
+#: ../include/svn_error_codes.h:450
 msgid "Working copy is corrupt"
 msgstr "作業コピーが壊れています"
 
-#: ../include/svn_error_codes.h:417
+#: ../include/svn_error_codes.h:454
 msgid "Working copy text base is corrupt"
 msgstr "作業コピーのテキストベースが壊れています"
 
-#: ../include/svn_error_codes.h:421
+#: ../include/svn_error_codes.h:458
 msgid "Cannot change node kind"
 msgstr "ノード種別を変更できません"
 
-#: ../include/svn_error_codes.h:425
+#: ../include/svn_error_codes.h:462
 msgid "Invalid operation on the current working directory"
 msgstr "現在の作業ディレクトリに対する操作が不正です"
 
-#: ../include/svn_error_codes.h:429
+#: ../include/svn_error_codes.h:466
 msgid "Problem on first log entry in a working copy"
 msgstr "作業コピー中の最初のログエントリに問題があります"
 
-#: ../include/svn_error_codes.h:433
+#: ../include/svn_error_codes.h:470
 msgid "Unsupported working copy format"
 msgstr "サポートされていない作業コピー形式です"
 
 # ? in this context
-#: ../include/svn_error_codes.h:437
+#: ../include/svn_error_codes.h:474
 msgid "Path syntax not supported in this context"
 msgstr "この操作ではパスの構文はサポートされていません"
 
-#: ../include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:479
 msgid "Invalid schedule"
 msgstr "準備内容が不正です"
 
-#: ../include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:484
 msgid "Invalid relocation"
 msgstr "参照リポジトリの変更が不正です"
 
-#: ../include/svn_error_codes.h:452
+#: ../include/svn_error_codes.h:489
 msgid "Invalid switch"
 msgstr "スイッチが不正です"
 
-#: ../include/svn_error_codes.h:457
+#: ../include/svn_error_codes.h:494
 msgid "Changelist doesn't match"
 msgstr "変更リストが一致しません"
 
-#: ../include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:499
 msgid "Conflict resolution failed"
 msgstr "競合を解決できませんでした"
 
-#: ../include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:503
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "作業コピー内に 'copyfrom' パスが見つかりませんでした"
 
-#: ../include/svn_error_codes.h:473
+#: ../include/svn_error_codes.h:511
 msgid "Moving a path from one changelist to another"
 msgstr "パスを他の変更リストに移動中です"
 
-#: ../include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:516
 #, fuzzy
 msgid "Cannot delete a file external"
 msgstr "ファイル名を取得できません"
 
-#: ../include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:521
 #, fuzzy
 msgid "Cannot move a file external"
 msgstr "パス '%s' はそれ自体には移動できません"
 
-#: ../include/svn_error_codes.h:488
+#: ../include/svn_error_codes.h:526
 msgid "Something's amiss with the wc sqlite database"
 msgstr ""
 
-#: ../include/svn_error_codes.h:493
+#: ../include/svn_error_codes.h:531
 #, fuzzy
 msgid "The working copy is missing"
 msgstr "作業コピー '%s' がないか、ロックされていません"
 
-#: ../include/svn_error_codes.h:498
+#: ../include/svn_error_codes.h:536
 #, fuzzy
 msgid "The specified node is not a symlink"
 msgstr "指定されたトランザクションは変更できません"
 
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:541
 #, fuzzy
 msgid "The specified path has an unexpected status"
 msgstr "指定された差分表示 (diff) オプションはサポートされていません"
 
-#: ../include/svn_error_codes.h:508
+#: ../include/svn_error_codes.h:546
 msgid "The working copy needs to be upgraded"
 msgstr ""
 
-#: ../include/svn_error_codes.h:513
+#: ../include/svn_error_codes.h:551
 #, fuzzy
-msgid "Previous operation was interrupted; run 'svn cleanup'"
+msgid "Previous operation has not finished; run 'cleanup' if it was interrupted"
 msgstr "操作が中断されました"
 
-#: ../include/svn_error_codes.h:518
-msgid "This operation can not be performed with just this depth."
+#: ../include/svn_error_codes.h:557
+msgid "The operation cannot be performed with the specified depth"
+msgstr ""
+
+#: ../include/svn_error_codes.h:562
+msgid "Couldn't open a working copy file because access was denied"
+msgstr ""
+
+#: ../include/svn_error_codes.h:567
+msgid "Mixed-revision working copy was found but not expected"
 msgstr ""
 
-#: ../include/svn_error_codes.h:524
+#: ../include/svn_error_codes.h:572
+#, fuzzy
+msgid "Duplicate targets in svn:externals property"
+msgstr "属性 svn:externals の形式が不正です"
+
+#: ../include/svn_error_codes.h:578
 msgid "General filesystem error"
 msgstr "一般的なファイルシステムエラーです"
 
-#: ../include/svn_error_codes.h:528
+#: ../include/svn_error_codes.h:582
 msgid "Error closing filesystem"
 msgstr "ファイルシステムを閉じる際にエラーが発生しました"
 
-#: ../include/svn_error_codes.h:532
+#: ../include/svn_error_codes.h:586
 msgid "Filesystem is already open"
 msgstr "ファイルシステムが既に開いています"
 
-#: ../include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:590
 msgid "Filesystem is not open"
 msgstr "ファイルシステムが開いていません"
 
-#: ../include/svn_error_codes.h:540
+#: ../include/svn_error_codes.h:594
 msgid "Filesystem is corrupt"
 msgstr "ファイルシステムが壊れています"
 
-#: ../include/svn_error_codes.h:544
+#: ../include/svn_error_codes.h:598
 msgid "Invalid filesystem path syntax"
 msgstr "ファイルシステムのパスの構文が不正です。"
 
-#: ../include/svn_error_codes.h:548
+#: ../include/svn_error_codes.h:602
 msgid "Invalid filesystem revision number"
 msgstr "ファイルシステムのリビジョン番号が不正です。"
 
-#: ../include/svn_error_codes.h:552
+#: ../include/svn_error_codes.h:606
 msgid "Invalid filesystem transaction name"
 msgstr "ファイルシステムのトランザクション名が不正です。"
 
-#: ../include/svn_error_codes.h:556
+#: ../include/svn_error_codes.h:610
 msgid "Filesystem directory has no such entry"
 msgstr "ファイルシステムのディレクトリにはそのようなエントリはありません"
 
-#: ../include/svn_error_codes.h:560
+#: ../include/svn_error_codes.h:614
 msgid "Filesystem has no such representation"
 msgstr "そのような表現はファイルシステムにありません"
 
-#: ../include/svn_error_codes.h:564
+#: ../include/svn_error_codes.h:618
 msgid "Filesystem has no such string"
 msgstr "そのような文字列はファイルシステムにありません"
 
-#: ../include/svn_error_codes.h:568
+#: ../include/svn_error_codes.h:622
 msgid "Filesystem has no such copy"
 msgstr "そのようなコピーはファイルシステムにありません"
 
-#: ../include/svn_error_codes.h:572
+#: ../include/svn_error_codes.h:626
 msgid "The specified transaction is not mutable"
 msgstr "指定されたトランザクションは変更できません"
 
-#: ../include/svn_error_codes.h:576
+#: ../include/svn_error_codes.h:630
 msgid "Filesystem has no item"
 msgstr "ファイルシステムに項目がありません"
 
-#: ../include/svn_error_codes.h:580
+#: ../include/svn_error_codes.h:634
 msgid "Filesystem has no such node-rev-id"
 msgstr "ファイルシステムにそのようなノードリビジョン識別番号はありません"
 
-#: ../include/svn_error_codes.h:584
+#: ../include/svn_error_codes.h:638
 msgid "String does not represent a node or node-rev-id"
 msgstr "文字列がノードやノードリビジョン識別番号を表していません"
 
-#: ../include/svn_error_codes.h:588
+#: ../include/svn_error_codes.h:642
 msgid "Name does not refer to a filesystem directory"
 msgstr "名前がファイルシステムのディレクトリを参照していません"
 
-#: ../include/svn_error_codes.h:592
+#: ../include/svn_error_codes.h:646
 msgid "Name does not refer to a filesystem file"
 msgstr "名前がファイルシステムのファイルを参照していません"
 
 # ? single path component
-#: ../include/svn_error_codes.h:596
+#: ../include/svn_error_codes.h:650
 msgid "Name is not a single path component"
 msgstr "名前は一階層のパス成分ではありません"
 
-#: ../include/svn_error_codes.h:600
+#: ../include/svn_error_codes.h:654
 msgid "Attempt to change immutable filesystem node"
 msgstr "ファイルシステムの変更不可ノードを変更しようとしました"
 
-#: ../include/svn_error_codes.h:604
+#: ../include/svn_error_codes.h:658
 msgid "Item already exists in filesystem"
 msgstr "項目は既にファイルシステムに存在しています"
 
-#: ../include/svn_error_codes.h:608
+#: ../include/svn_error_codes.h:662
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "ファイルシステムのルートディレクトリを削除または再作成しようとしています"
 
-#: ../include/svn_error_codes.h:612
+#: ../include/svn_error_codes.h:666
 msgid "Object is not a transaction root"
 msgstr "オブジェクトがトランザクションルートではありません"
 
-#: ../include/svn_error_codes.h:616
+#: ../include/svn_error_codes.h:670
 msgid "Object is not a revision root"
 msgstr "オブジェクトがリビジョンルートではありません"
 
-#: ../include/svn_error_codes.h:620
+#: ../include/svn_error_codes.h:674
 msgid "Merge conflict during commit"
 msgstr "コミット中にマージの競合がありました"
 
-#: ../include/svn_error_codes.h:624
+#: ../include/svn_error_codes.h:678
 msgid "A representation vanished or changed between reads"
 msgstr "読んでいる際に表現が消えたか変更されたかしています"
 
-#: ../include/svn_error_codes.h:628
+#: ../include/svn_error_codes.h:682
 msgid "Tried to change an immutable representation"
 msgstr "変更不可な表現を変更しようとしました"
 
-#: ../include/svn_error_codes.h:632
+#: ../include/svn_error_codes.h:686
 msgid "Malformed skeleton data"
 msgstr "スケルトンデータが不正です"
 
-#: ../include/svn_error_codes.h:636
+#: ../include/svn_error_codes.h:690
 msgid "Transaction is out of date"
 msgstr "トランザクションはリポジトリ側と比べて古くなっています"
 
-#: ../include/svn_error_codes.h:640
+#: ../include/svn_error_codes.h:694
 msgid "Berkeley DB error"
 msgstr "Berkeley DB のエラーです"
 
-#: ../include/svn_error_codes.h:644
+#: ../include/svn_error_codes.h:698
 msgid "Berkeley DB deadlock error"
 msgstr "Berkeley DB のデッドロックエラーです"
 
-#: ../include/svn_error_codes.h:648
+#: ../include/svn_error_codes.h:702
 msgid "Transaction is dead"
 msgstr "トランザクションが死んでいます"
 
-#: ../include/svn_error_codes.h:652
+#: ../include/svn_error_codes.h:706
 msgid "Transaction is not dead"
 msgstr "トランザクションは死んでいません"
 
-#: ../include/svn_error_codes.h:657
+#: ../include/svn_error_codes.h:711
 msgid "Unknown FS type"
 msgstr "未知のファイルシステム形式です"
 
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:716
 msgid "No user associated with filesystem"
 msgstr "どのユーザもファイルシステムと関係ありません"
 
-#: ../include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:721
 msgid "Path is already locked"
 msgstr "パスは既にロックされています"
 
-#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:973
 msgid "Path is not locked"
 msgstr "パスはロックされていません"
 
-#: ../include/svn_error_codes.h:677
+#: ../include/svn_error_codes.h:731
 msgid "Lock token is incorrect"
 msgstr "ロックトークンが不正です"
 
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:736
 msgid "No lock token provided"
 msgstr "ロックトークンが指定されていません"
 
-#: ../include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:741
 msgid "Username does not match lock owner"
 msgstr "ユーザ名がロック所有者と一致しません"
 
-#: ../include/svn_error_codes.h:692
+#: ../include/svn_error_codes.h:746
 msgid "Filesystem has no such lock"
 msgstr "そのようなロックはファイルシステムにありません"
 
-#: ../include/svn_error_codes.h:697
+#: ../include/svn_error_codes.h:751
 msgid "Lock has expired"
 msgstr "ロックは有効期限が切れました"
 
-#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
+#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:960
 msgid "Item is out of date"
 msgstr "項目はリポジトリ側と比べて古くなっています"
 
-#: ../include/svn_error_codes.h:714
+#: ../include/svn_error_codes.h:768
 msgid "Unsupported FS format"
 msgstr "サポートされていないファイルシステム形式です"
 
-#: ../include/svn_error_codes.h:719
+#: ../include/svn_error_codes.h:773
 msgid "Representation is being written"
 msgstr "表現は書き込み中です"
 
-#: ../include/svn_error_codes.h:724
+#: ../include/svn_error_codes.h:778
 msgid "The generated transaction name is too long"
 msgstr "生成されたトランザクション名は長すぎます"
 
-#: ../include/svn_error_codes.h:729
+#: ../include/svn_error_codes.h:783
 msgid "Filesystem has no such node origin record"
 msgstr "ファイルシステムにそのような基点ノードレコードはありません"
 
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:788
 msgid "Filesystem upgrade is not supported"
 msgstr "ファイルシステムのアップグレードはサポートされていません"
 
-#: ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:793
 #, fuzzy
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "そのような表現はファイルシステムにありません"
 
-#: ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:798
 msgid "Property value in filesystem differs from the provided base value"
 msgstr ""
 
-#: ../include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:804
+msgid "The filesystem editor completion process was not followed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:809
+#, fuzzy
+msgid "A packed revprop could not be read"
+msgstr "[エラー出力を読み込めませんでした。]"
+
+#: ../include/svn_error_codes.h:814
+#, fuzzy
+msgid "Could not initialize the revprop caching infrastructure."
+msgstr "SASL ライブラリを初期化できませんでした"
+
+#: ../include/svn_error_codes.h:819
+#, fuzzy
+msgid "Malformed transaction ID string."
+msgstr "表現ヘッダが不正です"
+
+#: ../include/svn_error_codes.h:824
+#, fuzzy
+msgid "Corrupt index file."
+msgstr "現在のファイルは壊れています"
+
+#: ../include/svn_error_codes.h:829
+msgid "Revision not covered by index."
+msgstr ""
+
+#: ../include/svn_error_codes.h:834
+msgid "Item index too large for this revision."
+msgstr ""
+
+#: ../include/svn_error_codes.h:839
+msgid "Container index out of range."
+msgstr ""
+
+#: ../include/svn_error_codes.h:844
+msgid "Index files are inconsistent."
+msgstr ""
+
+#: ../include/svn_error_codes.h:849
+#, fuzzy
+msgid "Lock operation failed"
+msgstr "ロックのリクエストが失敗しました"
+
+#: ../include/svn_error_codes.h:854
+#, fuzzy
+msgid "Unsupported FS type"
+msgstr "サポートされていないファイルシステム形式です"
+
+#: ../include/svn_error_codes.h:859
+msgid "Container capacity exceeded."
+msgstr ""
+
+#: ../include/svn_error_codes.h:864
+#, fuzzy
+msgid "Malformed node revision ID string."
+msgstr "必要なノードリビジョン識別番号がありません"
+
+#: ../include/svn_error_codes.h:869
+#, fuzzy
+msgid "Invalid generation number data."
+msgstr "リビジョン番号が不正です"
+
+#: ../include/svn_error_codes.h:874
+msgid "Revprop manifest corrupt."
+msgstr ""
+
+#: ../include/svn_error_codes.h:879
+#, fuzzy
+msgid "Property list is corrupt."
+msgstr "ファイルシステムが壊れています"
+
+#: ../include/svn_error_codes.h:884
+msgid "Content checksums supposedly match but content does not."
+msgstr ""
+
+#: ../include/svn_error_codes.h:890
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "リポジトリはロックされています。おそらく DB の復旧中です"
 
-#: ../include/svn_error_codes.h:755
+#: ../include/svn_error_codes.h:894
 msgid "A repository hook failed"
 msgstr "リポジトリフックの実行が失敗しました"
 
-#: ../include/svn_error_codes.h:759
+#: ../include/svn_error_codes.h:898
 msgid "Incorrect arguments supplied"
 msgstr "不正な引数が与えられました"
 
-#: ../include/svn_error_codes.h:763
+#: ../include/svn_error_codes.h:902
 msgid "A report cannot be generated because no data was supplied"
 msgstr "データが入力されなかったので報告を作成できませんでした"
 
-#: ../include/svn_error_codes.h:767
+#: ../include/svn_error_codes.h:906
 msgid "Bogus revision report"
 msgstr "リビジョン報告が不正です"
 
-#: ../include/svn_error_codes.h:776
+#: ../include/svn_error_codes.h:915
 msgid "Unsupported repository version"
 msgstr "サポートされていないリポジトリのバージョンです"
 
-#: ../include/svn_error_codes.h:780
+#: ../include/svn_error_codes.h:919
 msgid "Disabled repository feature"
 msgstr "このリポジトリ機能は無効になりました"
 
-#: ../include/svn_error_codes.h:784
+#: ../include/svn_error_codes.h:923
 msgid "Error running post-commit hook"
 msgstr "post-commit フックの実行中にエラーが発生しました"
 
-#: ../include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:928
 msgid "Error running post-lock hook"
 msgstr "post-lock フックの実行中にエラーが発生しました"
 
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:933
 msgid "Error running post-unlock hook"
 msgstr "post-unlock フックの実行中にエラーが発生しました"
 
-#: ../include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:938
 msgid "Repository upgrade is not supported"
 msgstr "リポジトリのアップグレードはサポートされていません"
 
-#: ../include/svn_error_codes.h:805
+#: ../include/svn_error_codes.h:944
 msgid "Bad URL passed to RA layer"
 msgstr "不正な URL が RA 層に渡されました"
 
-#: ../include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:948
 msgid "Authorization failed"
 msgstr "認証に失敗しました"
 
-#: ../include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:952
 msgid "Unknown authorization method"
 msgstr "未知の認証方法です"
 
-#: ../include/svn_error_codes.h:817
+#: ../include/svn_error_codes.h:956
 msgid "Repository access method not implemented"
 msgstr "リポジトリアクセス方法が実装されていません"
 
-#: ../include/svn_error_codes.h:825
+#: ../include/svn_error_codes.h:964
 msgid "Repository has no UUID"
 msgstr "リポジトリに UUID がありません"
 
-#: ../include/svn_error_codes.h:829
+#: ../include/svn_error_codes.h:968
 msgid "Unsupported RA plugin ABI version"
 msgstr "RA プラグイン ABI バージョンはサポートされていません"
 
-#: ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:978
 msgid "Server can only replay from the root of a repository"
 msgstr "サーバが再生 (replay) できるのはリポジトリルートからだけです"
 
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:983
 msgid "Repository UUID does not match expected UUID"
 msgstr "リポジトリの UUID が期待される UUID と一致しません"
 
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:988
 #, fuzzy
 msgid "Repository root URL does not match expected root URL"
 msgstr "リポジトリの UUID が期待される UUID と一致しません"
 
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:993
 #, fuzzy
 msgid "Session URL does not match expected session URL"
 msgstr "リポジトリの UUID が期待される UUID と一致しません"
 
-#: ../include/svn_error_codes.h:860
+#: ../include/svn_error_codes.h:998 ../libsvn_ra_svn/client.c:505
+#, c-format
+msgid "Can't create tunnel"
+msgstr "トンネルを作成できません"
+
+#: ../include/svn_error_codes.h:1003
+#, fuzzy
+msgid "Can't create session"
+msgstr "ソケットを作成できません"
+
+#: ../include/svn_error_codes.h:1009
 msgid "RA layer failed to init socket layer"
 msgstr "RA 層はソケット層を開始できませんでした"
 
-#: ../include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:1013
 msgid "RA layer failed to create HTTP request"
 msgstr "RA 層は HTTP リクエストの作成できませんでした"
 
-#: ../include/svn_error_codes.h:868
+#: ../include/svn_error_codes.h:1017
 msgid "RA layer request failed"
 msgstr "RA 層のリクエストが失敗しました"
 
-#: ../include/svn_error_codes.h:872
+#: ../include/svn_error_codes.h:1021
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA 層は、リクエストした OPTIONS 情報を受け取ることができませんでした"
 
-#: ../include/svn_error_codes.h:876
+#: ../include/svn_error_codes.h:1025
 msgid "RA layer failed to fetch properties"
 msgstr "RA 層は属性を取得できませんでした"
 
-#: ../include/svn_error_codes.h:880
+#: ../include/svn_error_codes.h:1029
 msgid "RA layer file already exists"
 msgstr "RA 層のファイルは既にあります"
 
-#: ../include/svn_error_codes.h:894
+#: ../include/svn_error_codes.h:1043
 msgid "HTTP Path Not Found"
 msgstr "HTTP パスが見つかりません"
 
-#: ../include/svn_error_codes.h:898
+#: ../include/svn_error_codes.h:1047
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "WebDAV PROPPATCH を実行できませんでした"
 
-#: ../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
+#. If condition COND is not met, return a "malformed network data" error.
+#.
+#: ../include/svn_error_codes.h:1052 ../include/svn_error_codes.h:1545
+#: ../libsvn_ra_svn/marshal.c:1434 ../libsvn_ra_svn/marshal.c:1691
+#: ../libsvn_ra_svn/marshal.c:1720 ../libsvn_ra_svn/marshal.c:2975
 msgid "Malformed network data"
 msgstr "ネットワークデータが不正です"
 
-#: ../include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:1057
 msgid "Unable to extract data from response header"
 msgstr "レスポンスヘッダからデータを抽出できません"
 
-#: ../include/svn_error_codes.h:913
+#: ../include/svn_error_codes.h:1062
 msgid "Repository has been moved"
 msgstr "リポジトリは移動しました"
 
-#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
-#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
+#: ../include/svn_error_codes.h:1067 ../libsvn_ra_serf/util.c:937
 #, fuzzy
 msgid "Connection timed out"
 msgstr "タイムアウト時間を設定できません"
 
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:1072
 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:933
-msgid "Couldn't open a repository"
-msgstr "リポジトリを開けません"
-
-#: ../include/svn_error_codes.h:938
-msgid "Special code for wrapping server errors to report to client"
-msgstr "クライアントに報告するサーバのエラーを包み込むための特殊なコードです"
-
-#: ../include/svn_error_codes.h:942
-msgid "Unknown svn protocol command"
-msgstr "未知の svn プロトコルコマンドです"
-
-#: ../include/svn_error_codes.h:946
-msgid "Network connection closed unexpectedly"
-msgstr "ネットワーク接続が突然切られました"
-
-#: ../include/svn_error_codes.h:950
-msgid "Network read/write error"
-msgstr "ネットワークの読み込み / 書き込みエラーです"
-
-#: ../include/svn_error_codes.h:962
-msgid "Client/server version mismatch"
-msgstr "クライアントとサーバーのバージョンが一致しません"
-
-#: ../include/svn_error_codes.h:967
-msgid "Cannot negotiate authentication mechanism"
-msgstr "認証機構と交渉できません"
-
-#: ../include/svn_error_codes.h:972
-msgid "Editor drive was aborted"
+#: ../include/svn_error_codes.h:1077
+msgid "The server state conflicts with the requested preconditions"
 msgstr ""
 
-#: ../include/svn_error_codes.h:978
-msgid "Initialization of SSPI library failed"
-msgstr "SSPI ライブラリの初期化に失敗しました"
-
-#: ../include/svn_error_codes.h:982
-msgid "Server SSL certificate untrusted"
-msgstr "サーバの SSL 証明書が信頼できません"
-
-#: ../include/svn_error_codes.h:986
-#, fuzzy
-msgid "Initialization of the GSSAPI context failed"
-msgstr "SSPI ライブラリの初期化に失敗しました"
-
-#: ../include/svn_error_codes.h:991
-msgid "While handling serf response:"
+#: ../include/svn_error_codes.h:1082
+msgid "The URL doesn't allow the requested method"
 msgstr ""
 
-#: ../include/svn_error_codes.h:999
-msgid "Credential data unavailable"
-msgstr "利用できるクレデンシャがありません"
-
-#: ../include/svn_error_codes.h:1003
-msgid "No authentication provider available"
-msgstr "利用できる認証供給者がありません"
-
-#: ../include/svn_error_codes.h:1007
-msgid "All authentication providers exhausted"
-msgstr "認証供給者はすべて使い果たされています"
-
-#: ../include/svn_error_codes.h:1011
-msgid "Credentials not saved"
-msgstr "クレデンシャルが保存されていません"
-
-#: ../include/svn_error_codes.h:1016
-msgid "Authentication failed"
-msgstr "認証に失敗しました"
-
-#: ../include/svn_error_codes.h:1022
-msgid "Read access denied for root of edit"
-msgstr "編集用ルートパスへの読み込みアクセスが拒否されました"
-
-#: ../include/svn_error_codes.h:1027
-msgid "Item is not readable"
-msgstr "項目が読み込み可能でありません"
-
-#: ../include/svn_error_codes.h:1032
-msgid "Item is partially readable"
-msgstr "項目の一部だけが読み込み可能です"
-
-#: ../include/svn_error_codes.h:1036
-msgid "Invalid authz configuration"
-msgstr "認証設定が不正です"
+#: ../include/svn_error_codes.h:1088 ../include/svn_error_codes.h:1549
+msgid "Couldn't find a repository"
+msgstr "リポジトリが見つかりません"
 
-#: ../include/svn_error_codes.h:1041
-msgid "Item is not writable"
-msgstr "項目が書き込み可能でありません"
+#: ../include/svn_error_codes.h:1092
+msgid "Couldn't open a repository"
+msgstr "リポジトリを開けません"
 
-#: ../include/svn_error_codes.h:1047
+#: ../include/svn_error_codes.h:1098
 msgid "Svndiff data has invalid header"
 msgstr "svndiff データに不正なヘッダがあります"
 
 # ? corrupt window
-#: ../include/svn_error_codes.h:1051
+#: ../include/svn_error_codes.h:1102
 msgid "Svndiff data contains corrupt window"
 msgstr "svndiff データに壊れた window が含まれています"
 
-#: ../include/svn_error_codes.h:1055
+#: ../include/svn_error_codes.h:1106
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "svndiff データに、逆方向にスライドするソースビューが含まれています"
 
-#: ../include/svn_error_codes.h:1059
+#: ../include/svn_error_codes.h:1110
 msgid "Svndiff data contains invalid instruction"
 msgstr "svndiff データに不正な命令が含まれています"
 
-#: ../include/svn_error_codes.h:1063
+#: ../include/svn_error_codes.h:1114
 msgid "Svndiff data ends unexpectedly"
 msgstr "svndiff データが突然途切れました"
 
-#: ../include/svn_error_codes.h:1067
+#: ../include/svn_error_codes.h:1118
 msgid "Svndiff compressed data is invalid"
 msgstr "svndiff 圧縮データが不正です"
 
-#: ../include/svn_error_codes.h:1073
-msgid "Diff data source modified unexpectedly"
-msgstr "diff データのソースが突然変更されました"
-
-#: ../include/svn_error_codes.h:1079
+#: ../include/svn_error_codes.h:1124
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache に SVN ファイルシステムへのパスがありません"
 
-#: ../include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1128
 msgid "Apache got a malformed URI"
 msgstr "Apache が不正な URI を受け取りました"
 
-#: ../include/svn_error_codes.h:1087
+#: ../include/svn_error_codes.h:1132
 msgid "Activity not found"
 msgstr "作業が見つかりません"
 
-#: ../include/svn_error_codes.h:1091
+#: ../include/svn_error_codes.h:1136
 msgid "Baseline incorrect"
 msgstr "ベースラインが不正です"
 
-#: ../include/svn_error_codes.h:1095
+#: ../include/svn_error_codes.h:1140
 msgid "Input/output error"
 msgstr "入出力エラーです"
 
-#: ../include/svn_error_codes.h:1101
+#: ../include/svn_error_codes.h:1146
 msgid "A path under version control is needed for this operation"
 msgstr "この操作ではバージョン管理下にあるパスが必要です"
 
-#: ../include/svn_error_codes.h:1105
+#: ../include/svn_error_codes.h:1150
 msgid "Repository access is needed for this operation"
 msgstr "この操作ではリポジトリへのアクセスが必要です。"
 
-#: ../include/svn_error_codes.h:1109
+#: ../include/svn_error_codes.h:1154
 msgid "Bogus revision information given"
 msgstr "不正なリビジョン情報を指定されました"
 
-#: ../include/svn_error_codes.h:1113
+#: ../include/svn_error_codes.h:1158
 msgid "Attempting to commit to a URL more than once"
 msgstr "URL に複数回コミットしようとしています"
 
-#: ../include/svn_error_codes.h:1117
+#: ../include/svn_error_codes.h:1162
 msgid "Operation does not apply to binary file"
 msgstr "バイナリファイルには適用できない操作です"
 
-#: ../include/svn_error_codes.h:1123
+#: ../include/svn_error_codes.h:1168
 msgid "Format of an svn:externals property was invalid"
 msgstr "属性 svn:externals の形式が不正です"
 
-#: ../include/svn_error_codes.h:1127
+#: ../include/svn_error_codes.h:1172
 msgid "Attempting restricted operation for modified resource"
 msgstr "修正されているリソースに対し、制限のある操作をしようとしています"
 
-#: ../include/svn_error_codes.h:1131
+#: ../include/svn_error_codes.h:1176
 msgid "Operation does not apply to directory"
 msgstr "ディレクトリに対しては操作を適用できません"
 
-#: ../include/svn_error_codes.h:1135
+#: ../include/svn_error_codes.h:1180 ../svnadmin/svnadmin.c:1602
+#, c-format
 msgid "Revision range is not allowed"
 msgstr "リビジョン範囲は適用できません"
 
-#: ../include/svn_error_codes.h:1139
+#: ../include/svn_error_codes.h:1184
 msgid "Inter-repository relocation not allowed"
 msgstr "参照リポジトリの変更は、異なるリポジトリの間ではできません"
 
-#: ../include/svn_error_codes.h:1143
+#: ../include/svn_error_codes.h:1188
 msgid "Author name cannot contain a newline"
 msgstr "変更者の名前に改行文字を入れてはいけません"
 
-#: ../include/svn_error_codes.h:1147
+#: ../include/svn_error_codes.h:1192
 msgid "Bad property name"
 msgstr "属性名が不正です"
 
-#: ../include/svn_error_codes.h:1152
+#: ../include/svn_error_codes.h:1197
 msgid "Two versioned resources are unrelated"
 msgstr "バージョン管理下にある 2 つのリソースは関係がありません"
 
-#: ../include/svn_error_codes.h:1157
+#: ../include/svn_error_codes.h:1202
 msgid "Path has no lock token"
 msgstr "パスにロックトークンがありません"
 
-#: ../include/svn_error_codes.h:1162
+#: ../include/svn_error_codes.h:1207
 msgid "Operation does not support multiple sources"
 msgstr "複数のコピー元 (または移動元) が操作でサポートされていません"
 
-#: ../include/svn_error_codes.h:1167
+#: ../include/svn_error_codes.h:1212
 msgid "No versioned parent directories"
 msgstr "バージョン管理された親ディレクトリがありません"
 
-#: ../include/svn_error_codes.h:1172
+#: ../include/svn_error_codes.h:1217 ../include/svn_error_codes.h:1237
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "作業コピーやマージ元に再統合するための仕組みがありません"
 
-#: ../include/svn_error_codes.h:1177
+#: ../include/svn_error_codes.h:1222
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1227
 #, fuzzy
 msgid "Invalid path component strip count specified"
 msgstr "リビジョン識別子が不正です"
 
-#: ../include/svn_error_codes.h:1187
+#: ../include/svn_error_codes.h:1232
 msgid "Detected a cycle while processing the operation"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1193
+#: ../include/svn_error_codes.h:1242
+msgid "Invalid mergeinfo detected in merge target"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1247
+msgid "Can't perform this operation without a valid lock token"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1252
+#, fuzzy
+msgid "The operation is forbidden by the server"
+msgstr "操作が中断されました"
+
+#: ../include/svn_error_codes.h:1257
+#, fuzzy
+msgid "The conflict resolution option is not applicable"
+msgstr "競合を解決できませんでした"
+
+#: ../include/svn_error_codes.h:1263
 msgid "A problem occurred; see other errors for details"
 msgstr "問題が発生しました。詳しくは他のエラーを参照してください"
 
-#: ../include/svn_error_codes.h:1197
+#: ../include/svn_error_codes.h:1267
 msgid "Failure loading plugin"
 msgstr "プラグインをロードできませんでした"
 
-#: ../include/svn_error_codes.h:1201
+#: ../include/svn_error_codes.h:1271
 msgid "Malformed file"
 msgstr "ファイルが不正です"
 
-#: ../include/svn_error_codes.h:1205
+#: ../include/svn_error_codes.h:1275
 msgid "Incomplete data"
 msgstr "不完全なデータです"
 
-#: ../include/svn_error_codes.h:1209
+#: ../include/svn_error_codes.h:1279
 msgid "Incorrect parameters given"
 msgstr "不正なパラメータが指定されました"
 
-#: ../include/svn_error_codes.h:1213
+#: ../include/svn_error_codes.h:1283
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "バージョン管理下にないリソースにバージョン管理操作を実行しようとしました"
 
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1287
 msgid "Test failed"
 msgstr "テストが失敗しました"
 
-#: ../include/svn_error_codes.h:1221
+#: ../include/svn_error_codes.h:1291
 msgid "Trying to use an unsupported feature"
 msgstr "サポートされていない機能を使おうとしています"
 
-#: ../include/svn_error_codes.h:1225
+#: ../include/svn_error_codes.h:1295
 msgid "Unexpected or unknown property kind"
 msgstr "予想外または未知の属性種別です"
 
-#: ../include/svn_error_codes.h:1229
+#: ../include/svn_error_codes.h:1299
 msgid "Illegal target for the requested operation"
 msgstr "要求された操作の対象が不正です"
 
-#: ../include/svn_error_codes.h:1233
+#: ../include/svn_error_codes.h:1303
 msgid "MD5 checksum is missing"
 msgstr "MD5 チェックサムがありません"
 
-#: ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1307
 msgid "Directory needs to be empty but is not"
 msgstr "ディレクトリは空でなければなりませんが、そうではありません"
 
-#: ../include/svn_error_codes.h:1241
+#: ../include/svn_error_codes.h:1311
 msgid "Error calling external program"
 msgstr "外部プログラムの呼び出し中にエラーが発生しました"
 
-#: ../include/svn_error_codes.h:1245
+#: ../include/svn_error_codes.h:1315
 msgid "Python exception has been set with the error"
 msgstr "エラーに対して Python の例外が設定されました"
 
-#: ../include/svn_error_codes.h:1249
+#: ../include/svn_error_codes.h:1319
 msgid "A checksum mismatch occurred"
 msgstr "チェックサムの不一致が生じました"
 
-#: ../include/svn_error_codes.h:1253
+#: ../include/svn_error_codes.h:1323
 msgid "The operation was interrupted"
 msgstr "操作が中断されました"
 
-#: ../include/svn_error_codes.h:1257
+#: ../include/svn_error_codes.h:1327
 msgid "The specified diff option is not supported"
 msgstr "指定された差分表示 (diff) オプションはサポートされていません"
 
-#: ../include/svn_error_codes.h:1261
+#: ../include/svn_error_codes.h:1331
 msgid "Property not found"
 msgstr "属性が見つかりません"
 
-#: ../include/svn_error_codes.h:1265
+#: ../include/svn_error_codes.h:1335
 msgid "No auth file path available"
 msgstr "利用できる認証ファイルパスがありません"
 
-#: ../include/svn_error_codes.h:1270
+#: ../include/svn_error_codes.h:1340
 msgid "Incompatible library version"
 msgstr "ライブラリのバージョンは互換性がありません"
 
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1345
 msgid "Mergeinfo parse error"
 msgstr "マージ情報のパースエラーです"
 
-#: ../include/svn_error_codes.h:1280
+#: ../include/svn_error_codes.h:1350
 msgid "Cease invocation of this API"
 msgstr "この API の呼び出しを中止します"
 
-#: ../include/svn_error_codes.h:1285
+#: ../include/svn_error_codes.h:1355
 msgid "Error parsing revision number"
 msgstr "リビジョン番号をパースする際にエラーが生じました"
 
-#: ../include/svn_error_codes.h:1290
+#: ../include/svn_error_codes.h:1360
 msgid "Iteration terminated before completion"
 msgstr "繰り返しをすべて実行し終える前に途中で終了してしまいました"
 
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1365
 msgid "Unknown changelist"
 msgstr "そのような変更リストはありません"
 
-#: ../include/svn_error_codes.h:1300
+#: ../include/svn_error_codes.h:1370
 msgid "Reserved directory name in command line arguments"
 msgstr "コマンドライン引数に予約されたディレクトリ名が含まれています"
 
-#: ../include/svn_error_codes.h:1305
+#: ../include/svn_error_codes.h:1375
 msgid "Inquiry about unknown capability"
 msgstr "未知の機能に関する問い合わせです"
 
-#: ../include/svn_error_codes.h:1310
+#: ../include/svn_error_codes.h:1380
 msgid "Test skipped"
 msgstr "テストを飛ばしました"
 
-#: ../include/svn_error_codes.h:1315
-msgid "apr memcache library not available"
+#: ../include/svn_error_codes.h:1385
+#, fuzzy
+msgid "APR memcache library not available"
 msgstr "APR の memcache ライブラリが利用不能です"
 
-#: ../include/svn_error_codes.h:1320
+#: ../include/svn_error_codes.h:1390
 msgid "Couldn't perform atomic initialization"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1325
+#: ../include/svn_error_codes.h:1395
 msgid "SQLite error"
 msgstr "SQLite のエラーです"
 
-#: ../include/svn_error_codes.h:1330
+#: ../include/svn_error_codes.h:1400
 #, fuzzy
 msgid "Attempted to write to readonly SQLite db"
 msgstr "トランザクションでないものに書き込もうとしました"
 
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1407
 msgid "Unsupported schema found in SQLite db"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1412
 msgid "The SQLite db is busy"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1417
 msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1352
-msgid "Error parsing arguments"
-msgstr "引数をパースする際にエラーが生じました"
+#: ../include/svn_error_codes.h:1423
+msgid "Constraint error in SQLite db"
+msgstr ""
 
-#: ../include/svn_error_codes.h:1356
-msgid "Not enough arguments provided"
-msgstr "十分な引数が与えられていません"
+#: ../include/svn_error_codes.h:1428
+msgid "Too many memcached servers configured"
+msgstr ""
 
-#: ../include/svn_error_codes.h:1360
-msgid "Mutually exclusive arguments specified"
-msgstr "互いに排他的な引数が指定されています"
+#: ../include/svn_error_codes.h:1433
+#, fuzzy
+msgid "Failed to parse version number string"
+msgstr "新しい文字列キーを取得できませんでした"
 
-#: ../include/svn_error_codes.h:1364
-msgid "Attempted command in administrative dir"
-msgstr "管理用ディレクトリでコマンドを実行しようとしました"
+#: ../include/svn_error_codes.h:1438
+#, fuzzy
+msgid "Atomic data storage is corrupt"
+msgstr "作業コピーのテキストベースが壊れています"
 
-#: ../include/svn_error_codes.h:1368
-msgid "The log message file is under version control"
-msgstr "ログメッセージファイルはバージョン管理下にあります"
+#: ../include/svn_error_codes.h:1443
+msgid "utf8proc library error"
+msgstr ""
 
-#: ../include/svn_error_codes.h:1372
-msgid "The log message is a pathname"
+#: ../include/svn_error_codes.h:1448
+msgid "Bad arguments to SQL operators GLOB or LIKE"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1453
+#, fuzzy
+msgid "Packed data stream is corrupt"
+msgstr "ファイルシステムが壊れています"
+
+#: ../include/svn_error_codes.h:1458
+msgid "Additional errors:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1463
+msgid "Parser error: invalid input"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1468
+#, fuzzy
+msgid "SQLite transaction rollback failed"
+msgstr "トランザクションの掃除が失敗しました"
+
+#: ../include/svn_error_codes.h:1474
+msgid "Error parsing arguments"
+msgstr "引数をパースする際にエラーが生じました"
+
+#: ../include/svn_error_codes.h:1478
+msgid "Not enough arguments provided"
+msgstr "十分な引数が与えられていません"
+
+#: ../include/svn_error_codes.h:1482
+msgid "Mutually exclusive arguments specified"
+msgstr "互いに排他的な引数が指定されています"
+
+#: ../include/svn_error_codes.h:1486
+msgid "Attempted command in administrative dir"
+msgstr "管理用ディレクトリでコマンドを実行しようとしました"
+
+#: ../include/svn_error_codes.h:1490
+msgid "The log message file is under version control"
+msgstr "ログメッセージファイルはバージョン管理下にあります"
+
+#: ../include/svn_error_codes.h:1494
+msgid "The log message is a pathname"
 msgstr "ログメッセージはパス名です"
 
-#: ../include/svn_error_codes.h:1376
+#: ../include/svn_error_codes.h:1498
 msgid "Committing in directory scheduled for addition"
 msgstr "追加準備状態にあるディレクトリにコミットしています"
 
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1502
 msgid "No external editor available"
 msgstr "利用できる外部エディタがありません"
 
-#: ../include/svn_error_codes.h:1384
+#: ../include/svn_error_codes.h:1506
 msgid "Something is wrong with the log message's contents"
 msgstr "ログメッセージの内容に不正な箇所があります"
 
-#: ../include/svn_error_codes.h:1388
+#: ../include/svn_error_codes.h:1510
 msgid "A log message was given where none was necessary"
 msgstr "必要ないのにログメッセージが指定されました"
 
-#: ../include/svn_error_codes.h:1392
+#: ../include/svn_error_codes.h:1514
 msgid "No external merge tool available"
 msgstr "利用できる外部マージツールがありません"
 
 # * Description for 'svn --ignore-externals'.
 # * 29 half-size characters are displayed on the left.
-#: ../include/svn_error_codes.h:1396
+#: ../include/svn_error_codes.h:1518
 #, fuzzy
 msgid "Failed processing one or more externals definitions"
 msgstr "外部定義を無視します"
 
-#: ../include/svn_error_codes.h:1402
+#: ../include/svn_error_codes.h:1523
+#, fuzzy
+msgid "Repository verification failed"
+msgstr "リポジトリの作成に失敗しました"
+
+#: ../include/svn_error_codes.h:1529
+msgid "Special code for wrapping server errors to report to client"
+msgstr "クライアントに報告するサーバのエラーを包み込むための特殊なコードです"
+
+#: ../include/svn_error_codes.h:1533
+msgid "Unknown svn protocol command"
+msgstr "未知の svn プロトコルコマンドです"
+
+#: ../include/svn_error_codes.h:1537
+msgid "Network connection closed unexpectedly"
+msgstr "ネットワーク接続が突然切られました"
+
+#: ../include/svn_error_codes.h:1541
+msgid "Network read/write error"
+msgstr "ネットワークの読み込み / 書き込みエラーです"
+
+#: ../include/svn_error_codes.h:1553
+msgid "Client/server version mismatch"
+msgstr "クライアントとサーバーのバージョンが一致しません"
+
+#: ../include/svn_error_codes.h:1558
+msgid "Cannot negotiate authentication mechanism"
+msgstr "認証機構と交渉できません"
+
+#: ../include/svn_error_codes.h:1563
+msgid "Editor drive was aborted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1568
+msgid "Client request too long"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1573
+msgid "Server response too long"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1581
+msgid "Credential data unavailable"
+msgstr "利用できるクレデンシャがありません"
+
+#: ../include/svn_error_codes.h:1585
+msgid "No authentication provider available"
+msgstr "利用できる認証供給者がありません"
+
+#: ../include/svn_error_codes.h:1589
+msgid "All authentication providers exhausted"
+msgstr "認証供給者はすべて使い果たされています"
+
+#: ../include/svn_error_codes.h:1593
+msgid "Credentials not saved"
+msgstr "クレデンシャルが保存されていません"
+
+#: ../include/svn_error_codes.h:1598 ../libsvn_subr/gpg_agent.c:455
+msgid "Authentication failed"
+msgstr "認証に失敗しました"
+
+#: ../include/svn_error_codes.h:1604
+msgid "Read access denied for root of edit"
+msgstr "編集用ルートパスへの読み込みアクセスが拒否されました"
+
+#: ../include/svn_error_codes.h:1609
+msgid "Item is not readable"
+msgstr "項目が読み込み可能でありません"
+
+#: ../include/svn_error_codes.h:1614
+msgid "Item is partially readable"
+msgstr "項目の一部だけが読み込み可能です"
+
+#: ../include/svn_error_codes.h:1618
+msgid "Invalid authz configuration"
+msgstr "認証設定が不正です"
+
+#: ../include/svn_error_codes.h:1623
+msgid "Item is not writable"
+msgstr "項目が書き込み可能でありません"
+
+#: ../include/svn_error_codes.h:1630
+msgid "Diff data source modified unexpectedly"
+msgstr "diff データのソースが突然変更されました"
+
+#: ../include/svn_error_codes.h:1635
+#, fuzzy
+msgid "Diff data unexpected"
+msgstr "svndiff データが突然途切れました"
+
+#: ../include/svn_error_codes.h:1642
+msgid "Initialization of SSPI library failed"
+msgstr "SSPI ライブラリの初期化に失敗しました"
+
+#: ../include/svn_error_codes.h:1648
+msgid "Server SSL certificate untrusted"
+msgstr "サーバの SSL 証明書が信頼できません"
+
+#: ../include/svn_error_codes.h:1653
+#, fuzzy
+msgid "Initialization of the GSSAPI context failed"
+msgstr "SSPI ライブラリの初期化に失敗しました"
+
+#: ../include/svn_error_codes.h:1658
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1664
 #, 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
+#: ../include/svn_error_codes.h:1668
+msgid "No non-tracing links found in the error chain"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1676
+#, fuzzy
+msgid "Unexpected end of ASN1 data"
+msgstr "エントリが突然途切れました"
+
+#: ../include/svn_error_codes.h:1680
+#, fuzzy
+msgid "Unexpected ASN1 tag"
+msgstr "予想外の EOF がストリーム中にあります"
+
+#: ../include/svn_error_codes.h:1684
+#, fuzzy
+msgid "Invalid ASN1 length"
+msgstr "スイッチが不正です"
+
+#: ../include/svn_error_codes.h:1688
+msgid "ASN1 length mismatch"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1692
+#, fuzzy
+msgid "Invalid ASN1 data"
+msgstr "(不正な日時)"
+
+#: ../include/svn_error_codes.h:1696
+msgid "Unavailable X509 feature"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1700
+msgid "Invalid PEM certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1704
+#, fuzzy
+msgid "Invalid certificate format"
+msgstr "エントリ終端文字が不正です"
+
+#: ../include/svn_error_codes.h:1708
+#, fuzzy
+msgid "Invalid certificate version"
+msgstr "参照リポジトリの変更が不正です"
+
+#: ../include/svn_error_codes.h:1712
+#, fuzzy
+msgid "Invalid certificate serial number"
+msgstr "リビジョン番号が不正です"
+
+#: ../include/svn_error_codes.h:1716
+msgid "Found invalid algorithm in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1720
+msgid "Found invalid name in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1724
+msgid "Found invalid date in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1728
+msgid "Found invalid public key in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1732
+msgid "Found invalid signature in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1736
+msgid "Found invalid extensions in certificate"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1740
+msgid "Unknown certificate version"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1744
+msgid "Certificate uses unknown public key algorithm"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1748
+msgid "Certificate signature mismatch"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1752
+#, fuzzy
+msgid "Certficate verification failed"
+msgstr "競合を解決できませんでした"
+
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
 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
+#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
+#: ../libsvn_subr/opt.c:941
+#, c-format
+msgid "'%s' ends in a reserved name"
+msgstr "'%s' は末尾に予約されたパス名がついています"
+
+#: ../libsvn_client/add.c:822
+#, c-format
+msgid "'%s' prevents creating parent of '%s'"
+msgstr ""
+
+#: ../libsvn_client/add.c:862 ../libsvn_wc/adm_ops.c:445
+#, c-format
+msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here"
+msgstr ""
+
+#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400
+#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968
 #, c-format
 msgid "'%s' not found"
 msgstr "'%s' が見つかりません"
 
-#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
-#: ../libsvn_wc/adm_ops.c:886
+#: ../libsvn_client/add.c:875 ../libsvn_wc/adm_ops.c:405
+#: ../libsvn_wc/delete.c:98
 #, c-format
 msgid "Unsupported node kind for path '%s'"
 msgstr "パス '%s' のノード種別はサポートされていません"
 
-#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
-#: ../libsvn_subr/opt.c:878
-#, c-format
-msgid "'%s' ends in a reserved name"
-msgstr "'%s' は末尾に予約されたパス名がついています"
-
-#: ../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
+#: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3098
+#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831
+#: ../libsvn_client/patch.c:3744 ../libsvn_client/relocate.c:155
+#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:149
+#: ../libsvn_client/status.c:368 ../libsvn_client/switch.c:471
+#: ../libsvn_client/update.c:701 ../libsvn_client/upgrade.c:111
+#: ../svn/util.c:989 ../svnbench/util.c:76
 #, 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
+#: ../libsvn_client/add.c:949 ../libsvn_client/copy_foreign.c:491
+#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:786
 #, c-format
-msgid "Illegal repository URL '%s'"
-msgstr "リポジトリの URL '%s' が不正です"
+msgid "'%s' is already under version control"
+msgstr "'%s' は既にバージョン管理下におかれています"
+
+#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109
+#, fuzzy, c-format
+msgid "There is no valid URI above '%s'"
+msgstr "既にバージョン管理下にある項目 '%s' があります"
 
-#: ../libsvn_client/blame.c:397
+#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:764
 #, c-format
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "バイナリファイル '%s' に対しては blame で各行の最終変更者を計算できません"
 
-#: ../libsvn_client/blame.c:627
-msgid "Start revision must precede end revision"
-msgstr "開始リビジョンは終了リビジョンよりも前でなくてはなりません"
-
-#: ../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
+#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612
+#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817
+#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107
+#: ../libsvn_wc/adm_ops.c:913 ../libsvn_wc/adm_ops.c:967
+#: ../libsvn_wc/copy.c:628 ../libsvn_wc/copy.c:689 ../libsvn_wc/entries.c:1407
+#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1143
+#: ../svnbench/notify.c:968
 #, c-format
 msgid "'%s' is not under version control"
 msgstr "'%s' はバージョン管理下におかれていません"
 
-#: ../libsvn_client/cat.c:79
+#: ../libsvn_client/cat.c:82
 #, 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 ""
+#: ../libsvn_client/cat.c:92
+#, fuzzy, c-format
+msgid "'%s' has no pristine version until it is committed"
+msgstr "'%s' はバージョン管理下におかれていないか、または存在しません"
 
-#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
 msgid "(local)"
 msgstr "(ローカル)"
 
-#: ../libsvn_client/cat.c:236
+#: ../libsvn_client/cat.c:255
 #, c-format
 msgid "URL '%s' refers to a directory"
 msgstr "URL '%s' はディレクトリを指しています"
 
-#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
+#: ../libsvn_client/changelist.c:57
+#, fuzzy
+msgid "Target changelist name must not be empty"
+msgstr "変更リストが一致しません"
+
+#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1447
+#: ../svnbench/null-export-cmd.c:293
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "URL '%s' は存在しません"
 
-#: ../libsvn_client/checkout.c:168
+#: ../libsvn_client/checkout.c:137
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "URL '%s' が参照しているのはファイルです。ディレクトリではありません"
 
-#: ../libsvn_client/checkout.c:204
+#: ../libsvn_client/checkout.c:175
 #, fuzzy, c-format
-msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
+msgid "'%s' is already a working copy for a different URL"
 msgstr "'%s' は既に、異なる URL にあるリポジトリ用の作業コピーとなっています"
 
-#: ../libsvn_client/checkout.c:212
+#: ../libsvn_client/checkout.c:183
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "'%s' は既に存在します。そしてディレクトリではありません"
 
-#: ../libsvn_client/cmdline.c:78
-#, c-format
-msgid "Improper relative URL '%s'"
-msgstr "相対 URL '%s' は不適切です"
-
-#: ../libsvn_client/cmdline.c:149
+#: ../libsvn_client/cmdline.c:104
 #, c-format
 msgid "All non-relative targets must have the same root URL"
 msgstr "非相対的な対象のルート URL はすべて同一でなければなりません"
 
-#: ../libsvn_client/commit.c:433
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "'%s' は未知またはバージョン管理できない種別です"
-
-#: ../libsvn_client/commit.c:538
-msgid "New entry name required when importing a file"
-msgstr "ファイルのインポートをするときは新しいエントリ名が必要です"
-
-#: ../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: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:795 ../libsvn_client/copy.c:482
-#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
-#: ../libsvn_client/copy.c:1860
+#: ../libsvn_client/cmdline.c:207
 #, c-format
-msgid "Path '%s' already exists"
-msgstr "パス '%s' は既に存在しています"
+msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
+msgstr ""
 
-#: ../libsvn_client/commit.c:810
-#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "'%s' は予約されたパス名です。インポートはできません"
+#: ../libsvn_client/cmdline.c:321
+msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
+msgstr ""
 
-#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
+#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303
 msgid "Commit failed (details follow):"
 msgstr "コミットに失敗しました (詳しい理由は以下のとおりです):"
 
-#: ../libsvn_client/commit.c:856
+#: ../libsvn_client/commit.c:165
 msgid "Commit succeeded, but other errors follow:"
 msgstr "コミットには成功しましたが、続けて他のエラーが生じました:"
 
-#: ../libsvn_client/commit.c:863
+#: ../libsvn_client/commit.c:172
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "ディレクトリのロック解除中にエラーが発生しました (詳しい理由は以下のとおりです):"
 
-#: ../libsvn_client/commit.c:874
+#: ../libsvn_client/commit.c:183
 msgid "Error bumping revisions post-commit (details follow):"
 msgstr "コミット後にリビジョンを上げる際にエラーが発生しました (詳しくは以下のとおりです):"
 
-#: ../libsvn_client/commit.c:968
+#: ../libsvn_client/commit.c:554
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "'%s' は URL です。しかし URL はコミットの対象ではありません"
+
+#: ../libsvn_client/commit.c:656
 #, fuzzy
-msgid "Are all targets part of the same working copy?"
+msgid ""
+"Commit can only commit to a single repository at a time.\n"
+"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:722
+#, c-format
+msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together"
+msgstr ""
 
-#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
+#: ../libsvn_client/commit.c:777
 #, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "'%s' は URL です。しかし URL はコミットの対象ではありません"
+msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together"
+msgstr ""
 
-#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:132
+#: ../libsvn_client/commit_util.c:96 ../libsvn_repos/commit.c:169
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "ディレクトリ '%s' はリポジトリ側と比べて古くなっています"
 
-#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:134
+#: ../libsvn_client/commit_util.c:97 ../libsvn_repos/commit.c:171
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "ファイル '%s' はリポジトリ側と比べて古くなっています"
 
-#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
-#: ../libsvn_client/commit_util.c:1032
+#: ../libsvn_client/commit_util.c:133
+#, fuzzy, c-format
+msgid "Directory '%s' is locked in another working copy"
+msgstr "'%s' はこの作業コピーでロックされていません"
+
+#: ../libsvn_client/commit_util.c:134
+#, fuzzy, c-format
+msgid "File '%s' is locked in another working copy"
+msgstr "'%s' はこの作業コピーでロックされていません"
+
+#: ../libsvn_client/commit_util.c:169
 #, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "コミットを中断しています: '%s' がまだ競合しています"
+msgid "Changing directory '%s' is forbidden by the server"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:170
+#, c-format
+msgid "Changing file '%s' is forbidden by the server"
+msgstr ""
 
-#: ../libsvn_client/commit_util.c:330
+#: ../libsvn_client/commit_util.c:318
 #, fuzzy, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "コミットを中断しています: '%s' がまだ競合しています"
 
-#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
+#: ../libsvn_client/commit_util.c:668
 #, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "'%s' のエントリ種別が不明です"
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "コミットを中断しています: '%s' がまだ競合しています"
 
-#: ../libsvn_client/commit_util.c:457
-#, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "エントリ '%s' が特殊なステータスを突然変更しました"
+#: ../libsvn_client/commit_util.c:687
+#, fuzzy, c-format
+msgid "Node '%s' has unexpectedly changed kind"
+msgstr "コピー元 (もしくは移動元) '%s' はディレクトリではありません"
 
-#: ../libsvn_client/commit_util.c:654
+#: ../libsvn_client/commit_util.c:728
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "'%s' は追加準備状態となっていますが、存在しません"
 
-#: ../libsvn_client/commit_util.c:935
-#, 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"
+#: ../libsvn_client/commit_util.c:1279
+#, fuzzy, c-format
+msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit"
 msgstr "'%s' はバージョン管理下になく、コミットされる対象でもありません。しかし、その子ノード '%s' はコミットされる対象となっています"
 
-#: ../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:1069
-#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "'%s' を、バージョン管理下にない親ディレクトリの下に追加準備しようとしました"
-
-#: ../libsvn_client/commit_util.c:1210
+#: ../libsvn_client/commit_util.c:1421
 #, c-format
 msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
 msgstr "同じ URL を参照しているため、'%s' と '%s' を共にコミットできません"
 
-#: ../libsvn_client/commit_util.c:1367
+#: ../libsvn_client/commit_util.c:1576
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr "コミット対象の項目 '%s' にはコピーフラグがついていますが、コピー元の URL がありません"
 
-#: ../libsvn_client/commit_util.c:1372
+#: ../libsvn_client/commit_util.c:1581
 #, c-format
 msgid "Commit item '%s' has copy flag but an invalid revision"
 msgstr "コミット対象の項目 '%s' にはコピーフラグがついていますが、リビジョンが不正です"
 
-#: ../libsvn_client/commit_util.c:2080
+#: ../libsvn_client/commit_util.c:2056
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "標準の属性については、リビジョン属性の明示的な設定はできません"
 
-#: ../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: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
+#: ../libsvn_client/conflicts.c:493 ../libsvn_client/conflicts.c:873
+#: ../libsvn_client/conflicts.c:1490 ../libsvn_client/conflicts.c:3976
+#: ../libsvn_client/conflicts.c:4398 ../libsvn_client/conflicts.c:4420
+#: ../libsvn_client/conflicts.c:4471 ../libsvn_client/conflicts.c:4948
 #, fuzzy
-msgid "Source and destination URLs appear not to all point to the same repository."
-msgstr "コピー元とコピー先 (または移動元と移動先) は同じリポジトリ内にはないようです (元: '%s'; 先: '%s')"
+msgid "unknown author"
+msgstr "(変更者の情報がありません)"
 
-#: ../libsvn_client/copy.c:985
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "URL '%s' はそれ自体には移動できません"
+#: ../libsvn_client/conflicts.c:904
+msgid "A file containing uncommitted changes was found in the working copy."
+msgstr ""
 
-#: ../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/conflicts.c:907
+msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/copy.c:1536
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "コピー元 (もしくは移動元) の URL '%s' は別のリポジトリに由来しています。一緒に扱えない作業コピーのままにしておきます"
+#: ../libsvn_client/conflicts.c:912
+msgid "A file which already occupies this path was found in the working copy."
+msgstr ""
 
-#: ../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/conflicts.c:916
+#, fuzzy
+msgid "An unversioned file was found in the working copy."
+msgstr "パス '%s' は作業コピーにはありません"
 
-#: ../libsvn_client/copy.c:1671
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "'%s' のエントリが存在します (それなのに作業ファイルがありません)"
+#: ../libsvn_client/conflicts.c:920
+#, fuzzy
+msgid "A deleted file was found in the working copy."
+msgstr "パス '%s' は作業コピーにはありません"
 
-#: ../libsvn_client/copy.c:1844
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "パス '%s' がリビジョン %ld に見つかりません"
+#: ../libsvn_client/conflicts.c:925
+#, fuzzy
+msgid "No such file was found in the working copy."
+msgstr "パス '%s' は作業コピーにはありません"
 
-#: ../libsvn_client/copy.c:1849
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "パス '%s' が HEAD リビジョンに見つかりません"
+#. ### display deleted revision
+#: ../libsvn_client/conflicts.c:929
+msgid ""
+"No such file was found in the merge target working copy.\n"
+"Perhaps the file has been deleted or moved away in the repository's history?"
+msgstr ""
 
-#: ../libsvn_client/copy.c:1970
-msgid "Cannot mix repository and working copy sources"
-msgstr "コピー元 (または移動元) にリポジトリと作業コピーは混在できません"
+#. ### show more details about copies or replacements?
+#: ../libsvn_client/conflicts.c:939
+msgid "A file scheduled to be added to the repository in the next commit was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2022
-#, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "パス '%s' はそれ自体の子ノード '%s' にはコピーできません"
+#. The move no longer exists.
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:970 ../libsvn_client/conflicts.c:1002
+msgid "The file in the working copy had been moved away at the time this conflict was recorded."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2054
+#: ../libsvn_client/conflicts.c:985 ../libsvn_client/conflicts.c:1018
 #, c-format
-msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
+msgid ""
+"The file in the working copy was moved away to\n"
+"'%s'."
 msgstr ""
 
-#: ../libsvn_client/copy.c:2069
-msgid "Moves between the working copy and the repository are not supported"
-msgstr "作業コピー・リポジトリ間の移動はサポートされていません"
+#. The move no longer exists.
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:1044 ../libsvn_client/conflicts.c:1076
+msgid "A file had been moved here in the working copy at the time this conflict was recorded."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2083
+#: ../libsvn_client/conflicts.c:1059 ../libsvn_client/conflicts.c:1092
 #, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "パス '%s' はそれ自体には移動できません"
+msgid ""
+"A file was moved here in the working copy from\n"
+"'%s'."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2152
-#, c-format
-msgid "'%s' does not have a URL associated with it"
-msgstr "'%s' に該当する URL は存在しません"
+#: ../libsvn_client/conflicts.c:1128
+msgid "A directory containing uncommitted changes was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/delete.c:59
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "'%s' は、現実にバージョン管理下にあるリソースを妨害しています"
+#: ../libsvn_client/conflicts.c:1131
+msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/delete.c:74
-#, fuzzy, c-format
-msgid "'%s' has local modifications -- commit or revert them first"

[... 29241 lines stripped ...]


Mime
View raw message