You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by fu...@apache.org on 2022/08/20 05:51:17 UTC
svn commit: r1903585 [2/2] - /subversion/trunk/subversion/po/ja.po
Modified: subversion/trunk/subversion/po/ja.po
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/ja.po?rev=1903585&r1=1903584&r2=1903585&view=diff
==============================================================================
--- subversion/trunk/subversion/po/ja.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/ja.po [UTF-8] Sat Aug 20 05:51:17 2022
@@ -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: 2017-03-16 13:48+0100\n"
+"POT-Creation-Date: 2022-08-20 14:44+0900\n"
"PO-Revision-Date: 2007-10-28 01:23+0900\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: Japanese <de...@subversion.tigris.org>\n"
@@ -325,7 +325,7 @@ msgstr "パスが、指定されたデ�
msgid "Bogus UUID"
msgstr "UUID が不正です"
-#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1036
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1056
msgid "Invalid configuration value"
msgstr "設定値が不正です"
@@ -363,1340 +363,1380 @@ msgstr "ロックが不正です"
msgid "Invalid compression method"
msgstr "リビジョン番号が不正です"
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:246
+#, fuzzy
+msgid "Unexpected line ending in the property value"
+msgstr "予想外または未知の属性種別です"
+
+#: ../include/svn_error_codes.h:252
msgid "No such XML tag attribute"
msgstr "そのような XML タグ属性は存在しません"
-#: ../include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:256
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> には系統情報がありません"
-#: ../include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:260
msgid "Unrecognized binary data encoding; can't decode"
msgstr "認識できないバイナリデータエンコーディングです。デコードできません"
-#: ../include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:264
msgid "XML data was not well-formed"
msgstr "整形済みの XML データではありません"
-#: ../include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:268
msgid "Data cannot be safely XML-escaped"
msgstr "データは安全に XML エスケープされていません"
-#: ../include/svn_error_codes.h:268
+#: ../include/svn_error_codes.h:273
#, fuzzy
msgid "Unexpected XML element found"
msgstr "予想外のノード種別が見つかりました"
-#: ../include/svn_error_codes.h:274
+#: ../include/svn_error_codes.h:279
msgid "Inconsistent line ending style"
msgstr "改行文字形式が一貫していません"
-#: ../include/svn_error_codes.h:278
+#: ../include/svn_error_codes.h:283
msgid "Unrecognized line ending style"
msgstr "改行文字形式を認識できません"
-#: ../include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:288
msgid "Line endings other than expected"
msgstr "改行文字が期待されるものと異なります"
-#: ../include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:292
msgid "Ran out of unique names"
msgstr "固有の名称を使い果たしました"
-#: ../include/svn_error_codes.h:292
+#: ../include/svn_error_codes.h:297
msgid "Framing error in pipe protocol"
msgstr "パイププロトコルのフレーミングエラーです"
-#: ../include/svn_error_codes.h:297
+#: ../include/svn_error_codes.h:302
msgid "Read error in pipe"
msgstr "パイプの読み込みエラーです"
#. 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
+#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:442
+#: ../libsvn_subr/cmdline.c:473 ../libsvn_subr/cmdline.c:496 ../svn/util.c:573
+#: ../svnlook/svnlook.c:2034
#, c-format
msgid "Write error"
msgstr "書き込みエラーです"
-#: ../include/svn_error_codes.h:306
+#: ../include/svn_error_codes.h:311
#, fuzzy
msgid "Write error in pipe"
msgstr "パイプの読み込みエラーです"
-#: ../include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:317
msgid "Unexpected EOF on stream"
msgstr "予想外の EOF がストリーム中にあります"
-#: ../include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:321
msgid "Malformed stream data"
msgstr "異常なストリームデータです"
-#: ../include/svn_error_codes.h:320
+#: ../include/svn_error_codes.h:325
msgid "Unrecognized stream data"
msgstr "認識できないストリームデータです"
# TRANSLATION-FIXME: Translation for "edit pipelining" must be checked.
-#: ../include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:330
#, fuzzy
msgid "Stream doesn't support seeking"
msgstr "編集のパイプライン化がサーバでサポートされていません"
# TRANSLATION-FIXME: Translation for "edit pipelining" must be checked.
-#: ../include/svn_error_codes.h:330
+#: ../include/svn_error_codes.h:335
#, fuzzy
msgid "Stream doesn't support this capability"
msgstr "編集のパイプライン化がサーバでサポートされていません"
-#: ../include/svn_error_codes.h:336
+#: ../include/svn_error_codes.h:341
msgid "Unknown svn_node_kind"
msgstr "未知の svn_node_kind です"
-#: ../include/svn_error_codes.h:340
+#: ../include/svn_error_codes.h:345
msgid "Unexpected node kind found"
msgstr "予想外のノード種別が見つかりました"
-#: ../include/svn_error_codes.h:346
+#: ../include/svn_error_codes.h:351
msgid "Can't find an entry"
msgstr "エントリが見つかりません"
-#: ../include/svn_error_codes.h:352
+#: ../include/svn_error_codes.h:357
msgid "Entry already exists"
msgstr "エントリが既に存在します"
-#: ../include/svn_error_codes.h:356
+#: ../include/svn_error_codes.h:361
msgid "Entry has no revision"
msgstr "エントリにリビジョンがありません"
-#: ../include/svn_error_codes.h:360
+#: ../include/svn_error_codes.h:365
msgid "Entry has no URL"
msgstr "エントリに URL がありません"
-#: ../include/svn_error_codes.h:364
+#: ../include/svn_error_codes.h:369
msgid "Entry has an invalid attribute"
msgstr "エントリが不正な属性をもっています"
-#: ../include/svn_error_codes.h:368
+#: ../include/svn_error_codes.h:373
msgid "Can't create an entry for a forbidden name"
msgstr ""
-#: ../include/svn_error_codes.h:374
+#: ../include/svn_error_codes.h:379
msgid "Obstructed update"
msgstr "更新が妨害されました"
-#: ../include/svn_error_codes.h:379
+#: ../include/svn_error_codes.h:384
msgid "Mismatch popping the WC unwind stack"
msgstr "作業コピーアンワインドスタックに対してポップする際に不一致があります"
-#: ../include/svn_error_codes.h:384
+#: ../include/svn_error_codes.h:389
msgid "Attempt to pop empty WC unwind stack"
msgstr "空の作業コピーアンワインドスタックに対してポップしようとしています"
-#: ../include/svn_error_codes.h:389
+#: ../include/svn_error_codes.h:394
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "空でないアンワインドスタックのロックを解除しようとしています"
-#: ../include/svn_error_codes.h:393
+#: ../include/svn_error_codes.h:398
msgid "Attempted to lock an already-locked dir"
msgstr "既にロックされたディレクトリをロックしようとしました"
-#: ../include/svn_error_codes.h:397
+#: ../include/svn_error_codes.h:402
msgid "Working copy not locked; this is probably a bug, please report"
msgstr "作業コピーがロックされていません。これはおそらくバグなので、報告してください"
-#: ../include/svn_error_codes.h:402
+#: ../include/svn_error_codes.h:407
msgid "Invalid lock"
msgstr "ロックが不正です"
-#: ../include/svn_error_codes.h:408 ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:413 ../include/svn_error_codes.h:419
msgid "Path is not a working copy directory"
msgstr "パスは作業コピーのディレクトリではありません"
-#: ../include/svn_error_codes.h:418
+#: ../include/svn_error_codes.h:423
msgid "Path is not a working copy file"
msgstr "パスが作業コピーのファイルでありません"
-#: ../include/svn_error_codes.h:422
+#: ../include/svn_error_codes.h:427
msgid "Problem running log"
msgstr "ログの実行中に問題が起きました"
-#: ../include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:431
msgid "Can't find a working copy path"
msgstr "作業コピーパスが見つかりません"
-#: ../include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:435
msgid "Working copy is not up-to-date"
msgstr "作業コピーが最新ではありません"
-#: ../include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:439
msgid "Left locally modified or unversioned files"
msgstr "ローカルで修正されたファイルやバージョン管理下にないファイルを残しました"
-#: ../include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:443
msgid "Unmergeable scheduling requested on an entry"
msgstr "エントリに対してマージできない準備をするよう要求されました"
-#: ../include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:447
msgid "Found a working copy path"
msgstr "作業コピーのパスが見つかりました"
-#: ../include/svn_error_codes.h:446
+#: ../include/svn_error_codes.h:451
msgid "A conflict in the working copy obstructs the current operation"
msgstr "作業ディレクトリ内に競合があり、実行中の操作が妨害されました"
-#: ../include/svn_error_codes.h:450
+#: ../include/svn_error_codes.h:455
msgid "Working copy is corrupt"
msgstr "作業コピーが壊れています"
-#: ../include/svn_error_codes.h:454
+#: ../include/svn_error_codes.h:459
msgid "Working copy text base is corrupt"
msgstr "作業コピーのテキストベースが壊れています"
-#: ../include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:463
msgid "Cannot change node kind"
msgstr "ノード種別を変更できません"
-#: ../include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:467
msgid "Invalid operation on the current working directory"
msgstr "現在の作業ディレクトリに対する操作が不正です"
-#: ../include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:471
msgid "Problem on first log entry in a working copy"
msgstr "作業コピー中の最初のログエントリに問題があります"
-#: ../include/svn_error_codes.h:470
+#: ../include/svn_error_codes.h:475
msgid "Unsupported working copy format"
msgstr "サポートされていない作業コピー形式です"
# ? in this context
-#: ../include/svn_error_codes.h:474
+#: ../include/svn_error_codes.h:479
msgid "Path syntax not supported in this context"
msgstr "この操作ではパスの構文はサポートされていません"
-#: ../include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:484
msgid "Invalid schedule"
msgstr "準備内容が不正です"
-#: ../include/svn_error_codes.h:484
+#: ../include/svn_error_codes.h:489
msgid "Invalid relocation"
msgstr "参照リポジトリの変更が不正です"
-#: ../include/svn_error_codes.h:489
+#: ../include/svn_error_codes.h:494
msgid "Invalid switch"
msgstr "スイッチが不正です"
-#: ../include/svn_error_codes.h:494
+#: ../include/svn_error_codes.h:499
msgid "Changelist doesn't match"
msgstr "変更リストが一致しません"
-#: ../include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:504
msgid "Conflict resolution failed"
msgstr "競合を解決できませんでした"
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:508
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "作業コピー内に 'copyfrom' パスが見つかりませんでした"
-#: ../include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:516
msgid "Moving a path from one changelist to another"
msgstr "パスを他の変更リストに移動中です"
-#: ../include/svn_error_codes.h:516
+#: ../include/svn_error_codes.h:521
#, fuzzy
msgid "Cannot delete a file external"
msgstr "ファイル名を取得できません"
-#: ../include/svn_error_codes.h:521
+#: ../include/svn_error_codes.h:526
#, fuzzy
msgid "Cannot move a file external"
msgstr "パス '%s' はそれ自体には移動できません"
-#: ../include/svn_error_codes.h:526
+#: ../include/svn_error_codes.h:531
msgid "Something's amiss with the wc sqlite database"
msgstr ""
-#: ../include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:536
#, fuzzy
msgid "The working copy is missing"
msgstr "作業コピー '%s' がないか、ロックされていません"
-#: ../include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:541
#, fuzzy
msgid "The specified node is not a symlink"
msgstr "指定されたトランザクションは変更できません"
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:546
#, fuzzy
msgid "The specified path has an unexpected status"
msgstr "指定された差分表示 (diff) オプションはサポートされていません"
-#: ../include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:551
msgid "The working copy needs to be upgraded"
msgstr ""
-#: ../include/svn_error_codes.h:551
+#: ../include/svn_error_codes.h:556
#, fuzzy
msgid "Previous operation has not finished; run 'cleanup' if it was interrupted"
msgstr "操作が中断されました"
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:562
msgid "The operation cannot be performed with the specified depth"
msgstr ""
-#: ../include/svn_error_codes.h:562
+#: ../include/svn_error_codes.h:567
msgid "Couldn't open a working copy file because access was denied"
msgstr ""
-#: ../include/svn_error_codes.h:567
+#: ../include/svn_error_codes.h:572
msgid "Mixed-revision working copy was found but not expected"
msgstr ""
-#: ../include/svn_error_codes.h:572
+#: ../include/svn_error_codes.h:577
#, fuzzy
msgid "Duplicate targets in svn:externals property"
msgstr "属性 svn:externals の形式が不正です"
-#: ../include/svn_error_codes.h:578
+#: ../include/svn_error_codes.h:583
msgid "General filesystem error"
msgstr "一般的なファイルシステムエラーです"
-#: ../include/svn_error_codes.h:582
+#: ../include/svn_error_codes.h:587
msgid "Error closing filesystem"
msgstr "ファイルシステムを閉じる際にエラーが発生しました"
-#: ../include/svn_error_codes.h:586
+#: ../include/svn_error_codes.h:591
msgid "Filesystem is already open"
msgstr "ファイルシステムが既に開いています"
-#: ../include/svn_error_codes.h:590
+#: ../include/svn_error_codes.h:595
msgid "Filesystem is not open"
msgstr "ファイルシステムが開いていません"
-#: ../include/svn_error_codes.h:594
+#: ../include/svn_error_codes.h:599
msgid "Filesystem is corrupt"
msgstr "ファイルシステムが壊れています"
-#: ../include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:603
msgid "Invalid filesystem path syntax"
msgstr "ファイルシステムのパスの構文が不正です。"
-#: ../include/svn_error_codes.h:602
+#: ../include/svn_error_codes.h:607
msgid "Invalid filesystem revision number"
msgstr "ファイルシステムのリビジョン番号が不正です。"
-#: ../include/svn_error_codes.h:606
+#: ../include/svn_error_codes.h:611
msgid "Invalid filesystem transaction name"
msgstr "ファイルシステムのトランザクション名が不正です。"
-#: ../include/svn_error_codes.h:610
+#: ../include/svn_error_codes.h:615
msgid "Filesystem directory has no such entry"
msgstr "ファイルシステムのディレクトリにはそのようなエントリはありません"
-#: ../include/svn_error_codes.h:614
+#: ../include/svn_error_codes.h:619
msgid "Filesystem has no such representation"
msgstr "そのような表現はファイルシステムにありません"
-#: ../include/svn_error_codes.h:618
+#: ../include/svn_error_codes.h:623
msgid "Filesystem has no such string"
msgstr "そのような文字列はファイルシステムにありません"
-#: ../include/svn_error_codes.h:622
+#: ../include/svn_error_codes.h:627
msgid "Filesystem has no such copy"
msgstr "そのようなコピーはファイルシステムにありません"
-#: ../include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:631
msgid "The specified transaction is not mutable"
msgstr "指定されたトランザクションは変更できません"
-#: ../include/svn_error_codes.h:630
+#: ../include/svn_error_codes.h:635
msgid "Filesystem has no item"
msgstr "ファイルシステムに項目がありません"
-#: ../include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:639
msgid "Filesystem has no such node-rev-id"
msgstr "ファイルシステムにそのようなノードリビジョン識別番号はありません"
-#: ../include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:643
msgid "String does not represent a node or node-rev-id"
msgstr "文字列がノードやノードリビジョン識別番号を表していません"
-#: ../include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:647
msgid "Name does not refer to a filesystem directory"
msgstr "名前がファイルシステムのディレクトリを参照していません"
-#: ../include/svn_error_codes.h:646
+#: ../include/svn_error_codes.h:651
msgid "Name does not refer to a filesystem file"
msgstr "名前がファイルシステムのファイルを参照していません"
# ? single path component
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:655
msgid "Name is not a single path component"
msgstr "名前は一階層のパス成分ではありません"
-#: ../include/svn_error_codes.h:654
+#: ../include/svn_error_codes.h:659
msgid "Attempt to change immutable filesystem node"
msgstr "ファイルシステムの変更不可ノードを変更しようとしました"
-#: ../include/svn_error_codes.h:658
+#: ../include/svn_error_codes.h:663
msgid "Item already exists in filesystem"
msgstr "項目は既にファイルシステムに存在しています"
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
msgid "Attempt to remove or recreate fs root dir"
msgstr "ファイルシステムのルートディレクトリを削除または再作成しようとしています"
-#: ../include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:671
msgid "Object is not a transaction root"
msgstr "オブジェクトがトランザクションルートではありません"
-#: ../include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:675
msgid "Object is not a revision root"
msgstr "オブジェクトがリビジョンルートではありません"
-#: ../include/svn_error_codes.h:674
+#: ../include/svn_error_codes.h:679
msgid "Merge conflict during commit"
msgstr "コミット中にマージの競合がありました"
-#: ../include/svn_error_codes.h:678
+#: ../include/svn_error_codes.h:683
msgid "A representation vanished or changed between reads"
msgstr "読んでいる際に表現が消えたか変更されたかしています"
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:687
msgid "Tried to change an immutable representation"
msgstr "変更不可な表現を変更しようとしました"
-#: ../include/svn_error_codes.h:686
+#: ../include/svn_error_codes.h:691
msgid "Malformed skeleton data"
msgstr "スケルトンデータが不正です"
-#: ../include/svn_error_codes.h:690
+#: ../include/svn_error_codes.h:695
msgid "Transaction is out of date"
msgstr "トランザクションはリポジトリ側と比べて古くなっています"
-#: ../include/svn_error_codes.h:694
+#: ../include/svn_error_codes.h:699
msgid "Berkeley DB error"
msgstr "Berkeley DB のエラーです"
-#: ../include/svn_error_codes.h:698
+#: ../include/svn_error_codes.h:703
msgid "Berkeley DB deadlock error"
msgstr "Berkeley DB のデッドロックエラーです"
-#: ../include/svn_error_codes.h:702
+#: ../include/svn_error_codes.h:707
msgid "Transaction is dead"
msgstr "トランザクションが死んでいます"
-#: ../include/svn_error_codes.h:706
+#: ../include/svn_error_codes.h:711
msgid "Transaction is not dead"
msgstr "トランザクションは死んでいません"
-#: ../include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:716
msgid "Unknown FS type"
msgstr "未知のファイルシステム形式です"
-#: ../include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:721
msgid "No user associated with filesystem"
msgstr "どのユーザもファイルシステムと関係ありません"
-#: ../include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:726
msgid "Path is already locked"
msgstr "パスは既にロックされています"
-#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:973
+#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:993
msgid "Path is not locked"
msgstr "パスはロックされていません"
-#: ../include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:736
msgid "Lock token is incorrect"
msgstr "ロックトークンが不正です"
-#: ../include/svn_error_codes.h:736
+#: ../include/svn_error_codes.h:741
msgid "No lock token provided"
msgstr "ロックトークンが指定されていません"
-#: ../include/svn_error_codes.h:741
+#: ../include/svn_error_codes.h:746
msgid "Username does not match lock owner"
msgstr "ユーザ名がロック所有者と一致しません"
-#: ../include/svn_error_codes.h:746
+#: ../include/svn_error_codes.h:751
msgid "Filesystem has no such lock"
msgstr "そのようなロックはファイルシステムにありません"
-#: ../include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:756
msgid "Lock has expired"
msgstr "ロックは有効期限が切れました"
-#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:960
+#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:980
msgid "Item is out of date"
msgstr "項目はリポジトリ側と比べて古くなっています"
-#: ../include/svn_error_codes.h:768
+#: ../include/svn_error_codes.h:773
msgid "Unsupported FS format"
msgstr "サポートされていないファイルシステム形式です"
-#: ../include/svn_error_codes.h:773
+#: ../include/svn_error_codes.h:778
msgid "Representation is being written"
msgstr "表現は書き込み中です"
-#: ../include/svn_error_codes.h:778
+#: ../include/svn_error_codes.h:783
msgid "The generated transaction name is too long"
msgstr "生成されたトランザクション名は長すぎます"
-#: ../include/svn_error_codes.h:783
+#: ../include/svn_error_codes.h:788
msgid "Filesystem has no such node origin record"
msgstr "ファイルシステムにそのような基点ノードレコードはありません"
-#: ../include/svn_error_codes.h:788
+#: ../include/svn_error_codes.h:793
msgid "Filesystem upgrade is not supported"
msgstr "ファイルシステムのアップグレードはサポートされていません"
-#: ../include/svn_error_codes.h:793
+#: ../include/svn_error_codes.h:798
#, fuzzy
msgid "Filesystem has no such checksum-representation index record"
msgstr "そのような表現はファイルシステムにありません"
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:803
msgid "Property value in filesystem differs from the provided base value"
msgstr ""
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:809
msgid "The filesystem editor completion process was not followed"
msgstr ""
-#: ../include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:814
#, fuzzy
msgid "A packed revprop could not be read"
msgstr "[エラー出力を読み込めませんでした。]"
-#: ../include/svn_error_codes.h:814
+#: ../include/svn_error_codes.h:819
#, fuzzy
msgid "Could not initialize the revprop caching infrastructure."
msgstr "SASL ライブラリを初期化できませんでした"
-#: ../include/svn_error_codes.h:819
+#: ../include/svn_error_codes.h:824
#, fuzzy
msgid "Malformed transaction ID string."
msgstr "表現ヘッダが不正です"
-#: ../include/svn_error_codes.h:824
+#: ../include/svn_error_codes.h:829
#, fuzzy
msgid "Corrupt index file."
msgstr "現在のファイルは壊れています"
-#: ../include/svn_error_codes.h:829
+#: ../include/svn_error_codes.h:834
msgid "Revision not covered by index."
msgstr ""
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:839
msgid "Item index too large for this revision."
msgstr ""
-#: ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:844
msgid "Container index out of range."
msgstr ""
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:849
msgid "Index files are inconsistent."
msgstr ""
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:854
#, fuzzy
msgid "Lock operation failed"
msgstr "ロックのリクエストが失敗しました"
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:859
#, fuzzy
msgid "Unsupported FS type"
msgstr "サポートされていないファイルシステム形式です"
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:864
msgid "Container capacity exceeded."
msgstr ""
-#: ../include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:869
#, fuzzy
msgid "Malformed node revision ID string."
msgstr "必要なノードリビジョン識別番号がありません"
-#: ../include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:874
#, fuzzy
msgid "Invalid generation number data."
msgstr "リビジョン番号が不正です"
-#: ../include/svn_error_codes.h:874
+#: ../include/svn_error_codes.h:879
msgid "Revprop manifest corrupt."
msgstr ""
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:884
#, fuzzy
msgid "Property list is corrupt."
msgstr "ファイルシステムが壊れています"
-#: ../include/svn_error_codes.h:884
+#: ../include/svn_error_codes.h:889
msgid "Content checksums supposedly match but content does not."
msgstr ""
-#: ../include/svn_error_codes.h:890
+#: ../include/svn_error_codes.h:894
+#, fuzzy
+msgid "Unrecognized filesystem I/O control code"
+msgstr "ノード種別 '%s' を認識できません"
+
+#: ../include/svn_error_codes.h:899
+#, fuzzy
+msgid "Rep-sharing is not allowed."
+msgstr "リビジョン範囲は適用できません"
+
+#: ../include/svn_error_codes.h:904
+#, fuzzy
+msgid "Rep-sharing is not supported."
+msgstr "リポジトリのアップグレードはサポートされていません"
+
+#: ../include/svn_error_codes.h:910
msgid "The repository is locked, perhaps for db recovery"
msgstr "リポジトリはロックされています。おそらく DB の復旧中です"
-#: ../include/svn_error_codes.h:894
+#: ../include/svn_error_codes.h:914
msgid "A repository hook failed"
msgstr "リポジトリフックの実行が失敗しました"
-#: ../include/svn_error_codes.h:898
+#: ../include/svn_error_codes.h:918
msgid "Incorrect arguments supplied"
msgstr "不正な引数が与えられました"
-#: ../include/svn_error_codes.h:902
+#: ../include/svn_error_codes.h:922
msgid "A report cannot be generated because no data was supplied"
msgstr "データが入力されなかったので報告を作成できませんでした"
-#: ../include/svn_error_codes.h:906
+#: ../include/svn_error_codes.h:926
msgid "Bogus revision report"
msgstr "リビジョン報告が不正です"
-#: ../include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:935
msgid "Unsupported repository version"
msgstr "サポートされていないリポジトリのバージョンです"
-#: ../include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:939
msgid "Disabled repository feature"
msgstr "このリポジトリ機能は無効になりました"
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:943
msgid "Error running post-commit hook"
msgstr "post-commit フックの実行中にエラーが発生しました"
-#: ../include/svn_error_codes.h:928
+#: ../include/svn_error_codes.h:948
msgid "Error running post-lock hook"
msgstr "post-lock フックの実行中にエラーが発生しました"
-#: ../include/svn_error_codes.h:933
+#: ../include/svn_error_codes.h:953
msgid "Error running post-unlock hook"
msgstr "post-unlock フックの実行中にエラーが発生しました"
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:958
msgid "Repository upgrade is not supported"
msgstr "リポジトリのアップグレードはサポートされていません"
-#: ../include/svn_error_codes.h:944
+#: ../include/svn_error_codes.h:964
msgid "Bad URL passed to RA layer"
msgstr "不正な URL が RA 層に渡されました"
-#: ../include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:968
msgid "Authorization failed"
msgstr "認証に失敗しました"
-#: ../include/svn_error_codes.h:952
+#: ../include/svn_error_codes.h:972
msgid "Unknown authorization method"
msgstr "未知の認証方法です"
-#: ../include/svn_error_codes.h:956
+#: ../include/svn_error_codes.h:976
msgid "Repository access method not implemented"
msgstr "リポジトリアクセス方法が実装されていません"
-#: ../include/svn_error_codes.h:964
+#: ../include/svn_error_codes.h:984
msgid "Repository has no UUID"
msgstr "リポジトリに UUID がありません"
-#: ../include/svn_error_codes.h:968
+#: ../include/svn_error_codes.h:988
msgid "Unsupported RA plugin ABI version"
msgstr "RA プラグイン ABI バージョンはサポートされていません"
-#: ../include/svn_error_codes.h:978
+#: ../include/svn_error_codes.h:998
msgid "Server can only replay from the root of a repository"
msgstr "サーバが再生 (replay) できるのはリポジトリルートからだけです"
-#: ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:1003
msgid "Repository UUID does not match expected UUID"
msgstr "リポジトリの UUID が期待される UUID と一致しません"
-#: ../include/svn_error_codes.h:988
+#: ../include/svn_error_codes.h:1008
#, fuzzy
msgid "Repository root URL does not match expected root URL"
msgstr "リポジトリの UUID が期待される UUID と一致しません"
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:1013
#, fuzzy
msgid "Session URL does not match expected session URL"
msgstr "リポジトリの UUID が期待される UUID と一致しません"
-#: ../include/svn_error_codes.h:998 ../libsvn_ra_svn/client.c:505
+#: ../include/svn_error_codes.h:1018 ../libsvn_ra_svn/client.c:506
#, c-format
msgid "Can't create tunnel"
msgstr "トンネルを作成できません"
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1023
#, fuzzy
msgid "Can't create session"
msgstr "ソケットを作成できません"
-#: ../include/svn_error_codes.h:1009
+#: ../include/svn_error_codes.h:1029
msgid "RA layer failed to init socket layer"
msgstr "RA 層はソケット層を開始できませんでした"
-#: ../include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1033
msgid "RA layer failed to create HTTP request"
msgstr "RA 層は HTTP リクエストの作成できませんでした"
-#: ../include/svn_error_codes.h:1017
+#: ../include/svn_error_codes.h:1037
msgid "RA layer request failed"
msgstr "RA 層のリクエストが失敗しました"
-#: ../include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1041
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 層は、リクエストした OPTIONS 情報を受け取ることができませんでした"
-#: ../include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1045
msgid "RA layer failed to fetch properties"
msgstr "RA 層は属性を取得できませんでした"
-#: ../include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1049
msgid "RA layer file already exists"
msgstr "RA 層のファイルは既にあります"
-#: ../include/svn_error_codes.h:1043
+#: ../include/svn_error_codes.h:1063
msgid "HTTP Path Not Found"
msgstr "HTTP パスが見つかりません"
-#: ../include/svn_error_codes.h:1047
+#: ../include/svn_error_codes.h:1067
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "WebDAV PROPPATCH を実行できませんでした"
#. 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
+#: ../include/svn_error_codes.h:1072 ../include/svn_error_codes.h:1580
+#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716
+#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:2997
msgid "Malformed network data"
msgstr "ネットワークデータが不正です"
-#: ../include/svn_error_codes.h:1057
+#: ../include/svn_error_codes.h:1077
msgid "Unable to extract data from response header"
msgstr "レスポンスヘッダからデータを抽出できません"
-#: ../include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1082
msgid "Repository has been moved"
msgstr "リポジトリは移動しました"
-#: ../include/svn_error_codes.h:1067 ../libsvn_ra_serf/util.c:937
+#: ../include/svn_error_codes.h:1087 ../libsvn_ra_serf/util.c:940
#, fuzzy
msgid "Connection timed out"
msgstr "タイムアウト時間を設定できません"
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1092
msgid "URL access forbidden for unknown reason"
msgstr ""
-#: ../include/svn_error_codes.h:1077
+#: ../include/svn_error_codes.h:1097
msgid "The server state conflicts with the requested preconditions"
msgstr ""
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1102
msgid "The URL doesn't allow the requested method"
msgstr ""
-#: ../include/svn_error_codes.h:1088 ../include/svn_error_codes.h:1549
+#: ../include/svn_error_codes.h:1108 ../include/svn_error_codes.h:1584
msgid "Couldn't find a repository"
msgstr "リポジトリが見つかりません"
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1112
msgid "Couldn't open a repository"
msgstr "リポジトリを開けません"
-#: ../include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1118
msgid "Svndiff data has invalid header"
msgstr "svndiff データに不正なヘッダがあります"
# ? corrupt window
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1122
msgid "Svndiff data contains corrupt window"
msgstr "svndiff データに壊れた window が含まれています"
-#: ../include/svn_error_codes.h:1106
+#: ../include/svn_error_codes.h:1126
msgid "Svndiff data contains backward-sliding source view"
msgstr "svndiff データに、逆方向にスライドするソースビューが含まれています"
-#: ../include/svn_error_codes.h:1110
+#: ../include/svn_error_codes.h:1130
msgid "Svndiff data contains invalid instruction"
msgstr "svndiff データに不正な命令が含まれています"
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1134
msgid "Svndiff data ends unexpectedly"
msgstr "svndiff データが突然途切れました"
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1138
msgid "Svndiff compressed data is invalid"
msgstr "svndiff 圧縮データが不正です"
-#: ../include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1144
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache に SVN ファイルシステムへのパスがありません"
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1148
msgid "Apache got a malformed URI"
msgstr "Apache が不正な URI を受け取りました"
-#: ../include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1152
msgid "Activity not found"
msgstr "作業が見つかりません"
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1156
msgid "Baseline incorrect"
msgstr "ベースラインが不正です"
-#: ../include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1160
msgid "Input/output error"
msgstr "入出力エラーです"
-#: ../include/svn_error_codes.h:1146
+#: ../include/svn_error_codes.h:1166
msgid "A path under version control is needed for this operation"
msgstr "この操作ではバージョン管理下にあるパスが必要です"
-#: ../include/svn_error_codes.h:1150
+#: ../include/svn_error_codes.h:1170
msgid "Repository access is needed for this operation"
msgstr "この操作ではリポジトリへのアクセスが必要です。"
-#: ../include/svn_error_codes.h:1154
+#: ../include/svn_error_codes.h:1174
msgid "Bogus revision information given"
msgstr "不正なリビジョン情報を指定されました"
-#: ../include/svn_error_codes.h:1158
+#: ../include/svn_error_codes.h:1178
msgid "Attempting to commit to a URL more than once"
msgstr "URL に複数回コミットしようとしています"
-#: ../include/svn_error_codes.h:1162
+#: ../include/svn_error_codes.h:1182
msgid "Operation does not apply to binary file"
msgstr "バイナリファイルには適用できない操作です"
-#: ../include/svn_error_codes.h:1168
+#: ../include/svn_error_codes.h:1188
msgid "Format of an svn:externals property was invalid"
msgstr "属性 svn:externals の形式が不正です"
-#: ../include/svn_error_codes.h:1172
+#: ../include/svn_error_codes.h:1192
msgid "Attempting restricted operation for modified resource"
msgstr "修正されているリソースに対し、制限のある操作をしようとしています"
-#: ../include/svn_error_codes.h:1176
+#: ../include/svn_error_codes.h:1196
msgid "Operation does not apply to directory"
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../include/svn_error_codes.h:1180 ../svnadmin/svnadmin.c:1602
+#: ../include/svn_error_codes.h:1200 ../svnadmin/svnadmin.c:1842
#, c-format
msgid "Revision range is not allowed"
msgstr "リビジョン範囲は適用できません"
-#: ../include/svn_error_codes.h:1184
+#: ../include/svn_error_codes.h:1204
msgid "Inter-repository relocation not allowed"
msgstr "参照リポジトリの変更は、異なるリポジトリの間ではできません"
-#: ../include/svn_error_codes.h:1188
+#: ../include/svn_error_codes.h:1208
msgid "Author name cannot contain a newline"
msgstr "変更者の名前に改行文字を入れてはいけません"
-#: ../include/svn_error_codes.h:1192
+#: ../include/svn_error_codes.h:1212
msgid "Bad property name"
msgstr "属性名が不正です"
-#: ../include/svn_error_codes.h:1197
+#: ../include/svn_error_codes.h:1217
msgid "Two versioned resources are unrelated"
msgstr "バージョン管理下にある 2 つのリソースは関係がありません"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1222
msgid "Path has no lock token"
msgstr "パスにロックトークンがありません"
-#: ../include/svn_error_codes.h:1207
+#: ../include/svn_error_codes.h:1227
msgid "Operation does not support multiple sources"
msgstr "複数のコピー元 (または移動元) が操作でサポートされていません"
-#: ../include/svn_error_codes.h:1212
+#: ../include/svn_error_codes.h:1232
msgid "No versioned parent directories"
msgstr "バージョン管理された親ディレクトリがありません"
-#: ../include/svn_error_codes.h:1217 ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1237 ../include/svn_error_codes.h:1257
msgid "Working copy and merge source not ready for reintegration"
msgstr "作業コピーやマージ元に再統合するための仕組みがありません"
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1242
msgid "A file external cannot overwrite an existing versioned item"
msgstr ""
-#: ../include/svn_error_codes.h:1227
+#: ../include/svn_error_codes.h:1247
#, fuzzy
msgid "Invalid path component strip count specified"
msgstr "リビジョン識別子が不正です"
-#: ../include/svn_error_codes.h:1232
+#: ../include/svn_error_codes.h:1252
msgid "Detected a cycle while processing the operation"
msgstr ""
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1262
msgid "Invalid mergeinfo detected in merge target"
msgstr ""
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1267
msgid "Can't perform this operation without a valid lock token"
msgstr ""
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1272
#, fuzzy
msgid "The operation is forbidden by the server"
msgstr "操作が中断されました"
-#: ../include/svn_error_codes.h:1257
+#: ../include/svn_error_codes.h:1277
#, fuzzy
msgid "The conflict resolution option is not applicable"
msgstr "競合を解決できませんでした"
-#: ../include/svn_error_codes.h:1263
+#: ../include/svn_error_codes.h:1283
msgid "A problem occurred; see other errors for details"
msgstr "問題が発生しました。詳しくは他のエラーを参照してください"
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1287
msgid "Failure loading plugin"
msgstr "プラグインをロードできませんでした"
-#: ../include/svn_error_codes.h:1271
+#: ../include/svn_error_codes.h:1291
msgid "Malformed file"
msgstr "ファイルが不正です"
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1295
msgid "Incomplete data"
msgstr "不完全なデータです"
-#: ../include/svn_error_codes.h:1279
+#: ../include/svn_error_codes.h:1299
msgid "Incorrect parameters given"
msgstr "不正なパラメータが指定されました"
-#: ../include/svn_error_codes.h:1283
+#: ../include/svn_error_codes.h:1303
msgid "Tried a versioning operation on an unversioned resource"
msgstr "バージョン管理下にないリソースにバージョン管理操作を実行しようとしました"
-#: ../include/svn_error_codes.h:1287
+#: ../include/svn_error_codes.h:1307
msgid "Test failed"
msgstr "テストが失敗しました"
-#: ../include/svn_error_codes.h:1291
+#: ../include/svn_error_codes.h:1311
msgid "Trying to use an unsupported feature"
msgstr "サポートされていない機能を使おうとしています"
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1315
msgid "Unexpected or unknown property kind"
msgstr "予想外または未知の属性種別です"
-#: ../include/svn_error_codes.h:1299
+#: ../include/svn_error_codes.h:1319
msgid "Illegal target for the requested operation"
msgstr "要求された操作の対象が不正です"
-#: ../include/svn_error_codes.h:1303
+#: ../include/svn_error_codes.h:1323
msgid "MD5 checksum is missing"
msgstr "MD5 チェックサムがありません"
-#: ../include/svn_error_codes.h:1307
+#: ../include/svn_error_codes.h:1327
msgid "Directory needs to be empty but is not"
msgstr "ディレクトリは空でなければなりませんが、そうではありません"
-#: ../include/svn_error_codes.h:1311
+#: ../include/svn_error_codes.h:1331
msgid "Error calling external program"
msgstr "外部プログラムの呼び出し中にエラーが発生しました"
-#: ../include/svn_error_codes.h:1315
+#: ../include/svn_error_codes.h:1335
msgid "Python exception has been set with the error"
msgstr "エラーに対して Python の例外が設定されました"
-#: ../include/svn_error_codes.h:1319
+#: ../include/svn_error_codes.h:1339
msgid "A checksum mismatch occurred"
msgstr "チェックサムの不一致が生じました"
-#: ../include/svn_error_codes.h:1323
+#: ../include/svn_error_codes.h:1343
msgid "The operation was interrupted"
msgstr "操作が中断されました"
-#: ../include/svn_error_codes.h:1327
+#: ../include/svn_error_codes.h:1347
msgid "The specified diff option is not supported"
msgstr "指定された差分表示 (diff) オプションはサポートされていません"
-#: ../include/svn_error_codes.h:1331
+#: ../include/svn_error_codes.h:1351
msgid "Property not found"
msgstr "属性が見つかりません"
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1355
msgid "No auth file path available"
msgstr "利用できる認証ファイルパスがありません"
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1360
msgid "Incompatible library version"
msgstr "ライブラリのバージョンは互換性がありません"
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1365
msgid "Mergeinfo parse error"
msgstr "マージ情報のパースエラーです"
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1370
msgid "Cease invocation of this API"
msgstr "この API の呼び出しを中止します"
-#: ../include/svn_error_codes.h:1355
+#: ../include/svn_error_codes.h:1375
msgid "Error parsing revision number"
msgstr "リビジョン番号をパースする際にエラーが生じました"
-#: ../include/svn_error_codes.h:1360
+#: ../include/svn_error_codes.h:1380
msgid "Iteration terminated before completion"
msgstr "繰り返しをすべて実行し終える前に途中で終了してしまいました"
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1385
msgid "Unknown changelist"
msgstr "そのような変更リストはありません"
-#: ../include/svn_error_codes.h:1370
+#: ../include/svn_error_codes.h:1390
msgid "Reserved directory name in command line arguments"
msgstr "コマンドライン引数に予約されたディレクトリ名が含まれています"
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1395
msgid "Inquiry about unknown capability"
msgstr "未知の機能に関する問い合わせです"
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1400
msgid "Test skipped"
msgstr "テストを飛ばしました"
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1405
#, fuzzy
msgid "APR memcache library not available"
msgstr "APR の memcache ライブラリが利用不能です"
-#: ../include/svn_error_codes.h:1390
+#: ../include/svn_error_codes.h:1410
msgid "Couldn't perform atomic initialization"
msgstr ""
-#: ../include/svn_error_codes.h:1395
+#: ../include/svn_error_codes.h:1415
msgid "SQLite error"
msgstr "SQLite のエラーです"
-#: ../include/svn_error_codes.h:1400
+#: ../include/svn_error_codes.h:1420
#, fuzzy
msgid "Attempted to write to readonly SQLite db"
msgstr "トランザクションでないものに書き込もうとしました"
-#: ../include/svn_error_codes.h:1407
+#: ../include/svn_error_codes.h:1427
msgid "Unsupported schema found in SQLite db"
msgstr ""
-#: ../include/svn_error_codes.h:1412
+#: ../include/svn_error_codes.h:1432
msgid "The SQLite db is busy"
msgstr ""
-#: ../include/svn_error_codes.h:1417
+#: ../include/svn_error_codes.h:1437
msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
msgstr ""
-#: ../include/svn_error_codes.h:1423
+#: ../include/svn_error_codes.h:1443
msgid "Constraint error in SQLite db"
msgstr ""
-#: ../include/svn_error_codes.h:1428
+#: ../include/svn_error_codes.h:1448
msgid "Too many memcached servers configured"
msgstr ""
-#: ../include/svn_error_codes.h:1433
+#: ../include/svn_error_codes.h:1453
#, fuzzy
msgid "Failed to parse version number string"
msgstr "新しい文字列キーを取得できませんでした"
-#: ../include/svn_error_codes.h:1438
+#: ../include/svn_error_codes.h:1458
#, fuzzy
msgid "Atomic data storage is corrupt"
msgstr "作業コピーのテキストベースが壊れています"
-#: ../include/svn_error_codes.h:1443
+#: ../include/svn_error_codes.h:1463
msgid "utf8proc library error"
msgstr ""
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1468
msgid "Bad arguments to SQL operators GLOB or LIKE"
msgstr ""
-#: ../include/svn_error_codes.h:1453
+#: ../include/svn_error_codes.h:1473
#, fuzzy
msgid "Packed data stream is corrupt"
msgstr "ファイルシステムが壊れています"
-#: ../include/svn_error_codes.h:1458
+#: ../include/svn_error_codes.h:1478
msgid "Additional errors:"
msgstr ""
-#: ../include/svn_error_codes.h:1463
+#: ../include/svn_error_codes.h:1483
msgid "Parser error: invalid input"
msgstr ""
-#: ../include/svn_error_codes.h:1468
+#: ../include/svn_error_codes.h:1488
#, fuzzy
msgid "SQLite transaction rollback failed"
msgstr "トランザクションの掃除が失敗しました"
-#: ../include/svn_error_codes.h:1474
+#: ../include/svn_error_codes.h:1493
+#, fuzzy
+msgid "LZ4 compression failed"
+msgstr "ロックのリクエストが失敗しました"
+
+#: ../include/svn_error_codes.h:1498
+#, fuzzy
+msgid "LZ4 decompression failed"
+msgstr "ロックのリクエストが失敗しました"
+
+#: ../include/svn_error_codes.h:1503
+#, fuzzy
+msgid "Could not canonicalize path or URI"
+msgstr "SASL ライブラリを初期化できませんでした"
+
+#: ../include/svn_error_codes.h:1509
msgid "Error parsing arguments"
msgstr "引数をパースする際にエラーが生じました"
-#: ../include/svn_error_codes.h:1478
+#: ../include/svn_error_codes.h:1513
msgid "Not enough arguments provided"
msgstr "十分な引数が与えられていません"
-#: ../include/svn_error_codes.h:1482
+#: ../include/svn_error_codes.h:1517
msgid "Mutually exclusive arguments specified"
msgstr "互いに排他的な引数が指定されています"
-#: ../include/svn_error_codes.h:1486
+#: ../include/svn_error_codes.h:1521
msgid "Attempted command in administrative dir"
msgstr "管理用ディレクトリでコマンドを実行しようとしました"
-#: ../include/svn_error_codes.h:1490
+#: ../include/svn_error_codes.h:1525
msgid "The log message file is under version control"
msgstr "ログメッセージファイルはバージョン管理下にあります"
-#: ../include/svn_error_codes.h:1494
+#: ../include/svn_error_codes.h:1529
msgid "The log message is a pathname"
msgstr "ログメッセージはパス名です"
-#: ../include/svn_error_codes.h:1498
+#: ../include/svn_error_codes.h:1533
msgid "Committing in directory scheduled for addition"
msgstr "追加準備状態にあるディレクトリにコミットしています"
-#: ../include/svn_error_codes.h:1502
+#: ../include/svn_error_codes.h:1537
msgid "No external editor available"
msgstr "利用できる外部エディタがありません"
-#: ../include/svn_error_codes.h:1506
+#: ../include/svn_error_codes.h:1541
msgid "Something is wrong with the log message's contents"
msgstr "ログメッセージの内容に不正な箇所があります"
-#: ../include/svn_error_codes.h:1510
+#: ../include/svn_error_codes.h:1545
msgid "A log message was given where none was necessary"
msgstr "必要ないのにログメッセージが指定されました"
-#: ../include/svn_error_codes.h:1514
+#: ../include/svn_error_codes.h:1549
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:1518
+#: ../include/svn_error_codes.h:1553
#, fuzzy
msgid "Failed processing one or more externals definitions"
msgstr "外部定義を無視します"
-#: ../include/svn_error_codes.h:1523
+#: ../include/svn_error_codes.h:1558
#, fuzzy
msgid "Repository verification failed"
msgstr "リポジトリの作成に失敗しました"
-#: ../include/svn_error_codes.h:1529
+#: ../include/svn_error_codes.h:1564
msgid "Special code for wrapping server errors to report to client"
msgstr "クライアントに報告するサーバのエラーを包み込むための特殊なコードです"
-#: ../include/svn_error_codes.h:1533
+#: ../include/svn_error_codes.h:1568
msgid "Unknown svn protocol command"
msgstr "未知の svn プロトコルコマンドです"
-#: ../include/svn_error_codes.h:1537
+#: ../include/svn_error_codes.h:1572
msgid "Network connection closed unexpectedly"
msgstr "ネットワーク接続が突然切られました"
-#: ../include/svn_error_codes.h:1541
+#: ../include/svn_error_codes.h:1576
msgid "Network read/write error"
msgstr "ネットワークの読み込み / 書き込みエラーです"
-#: ../include/svn_error_codes.h:1553
+#: ../include/svn_error_codes.h:1588
msgid "Client/server version mismatch"
msgstr "クライアントとサーバーのバージョンが一致しません"
-#: ../include/svn_error_codes.h:1558
+#: ../include/svn_error_codes.h:1593
msgid "Cannot negotiate authentication mechanism"
msgstr "認証機構と交渉できません"
-#: ../include/svn_error_codes.h:1563
+#: ../include/svn_error_codes.h:1598
msgid "Editor drive was aborted"
msgstr ""
-#: ../include/svn_error_codes.h:1568
+#: ../include/svn_error_codes.h:1603
msgid "Client request too long"
msgstr ""
-#: ../include/svn_error_codes.h:1573
+#: ../include/svn_error_codes.h:1608
msgid "Server response too long"
msgstr ""
-#: ../include/svn_error_codes.h:1581
+#: ../include/svn_error_codes.h:1616
msgid "Credential data unavailable"
msgstr "利用できるクレデンシャがありません"
-#: ../include/svn_error_codes.h:1585
+#: ../include/svn_error_codes.h:1620
msgid "No authentication provider available"
msgstr "利用できる認証供給者がありません"
-#: ../include/svn_error_codes.h:1589
+#: ../include/svn_error_codes.h:1624
msgid "All authentication providers exhausted"
msgstr "認証供給者はすべて使い果たされています"
-#: ../include/svn_error_codes.h:1593
+#: ../include/svn_error_codes.h:1628
msgid "Credentials not saved"
msgstr "クレデンシャルが保存されていません"
-#: ../include/svn_error_codes.h:1598 ../libsvn_subr/gpg_agent.c:455
+#: ../include/svn_error_codes.h:1633 ../libsvn_subr/gpg_agent.c:512
msgid "Authentication failed"
msgstr "認証に失敗しました"
-#: ../include/svn_error_codes.h:1604
+#: ../include/svn_error_codes.h:1639
msgid "Read access denied for root of edit"
msgstr "編集用ルートパスへの読み込みアクセスが拒否されました"
-#: ../include/svn_error_codes.h:1609
+#: ../include/svn_error_codes.h:1644
msgid "Item is not readable"
msgstr "項目が読み込み可能でありません"
-#: ../include/svn_error_codes.h:1614
+#: ../include/svn_error_codes.h:1649
msgid "Item is partially readable"
msgstr "項目の一部だけが読み込み可能です"
-#: ../include/svn_error_codes.h:1618
+#: ../include/svn_error_codes.h:1653
msgid "Invalid authz configuration"
msgstr "認証設定が不正です"
-#: ../include/svn_error_codes.h:1623
+#: ../include/svn_error_codes.h:1658
msgid "Item is not writable"
msgstr "項目が書き込み可能でありません"
-#: ../include/svn_error_codes.h:1630
+#: ../include/svn_error_codes.h:1665
msgid "Diff data source modified unexpectedly"
msgstr "diff データのソースが突然変更されました"
-#: ../include/svn_error_codes.h:1635
+#: ../include/svn_error_codes.h:1670
#, fuzzy
msgid "Diff data unexpected"
msgstr "svndiff データが突然途切れました"
-#: ../include/svn_error_codes.h:1642
+#: ../include/svn_error_codes.h:1677
msgid "Initialization of SSPI library failed"
msgstr "SSPI ライブラリの初期化に失敗しました"
-#: ../include/svn_error_codes.h:1648
+#: ../include/svn_error_codes.h:1683
msgid "Server SSL certificate untrusted"
msgstr "サーバの SSL 証明書が信頼できません"
-#: ../include/svn_error_codes.h:1653
+#: ../include/svn_error_codes.h:1688
#, fuzzy
msgid "Initialization of the GSSAPI context failed"
msgstr "SSPI ライブラリの初期化に失敗しました"
-#: ../include/svn_error_codes.h:1658
+#: ../include/svn_error_codes.h:1693
msgid "While handling serf response:"
msgstr ""
-#: ../include/svn_error_codes.h:1664
+#: ../include/svn_error_codes.h:1698
+#, fuzzy
+msgid "Can't read from stream"
+msgstr "ストリームを読めません"
+
+#: ../include/svn_error_codes.h:1704
#, fuzzy
msgid "Assertion failure"
msgstr "認証に失敗しました"
-#: ../include/svn_error_codes.h:1668
+#: ../include/svn_error_codes.h:1708
msgid "No non-tracing links found in the error chain"
msgstr ""
-#: ../include/svn_error_codes.h:1676
+#: ../include/svn_error_codes.h:1716
#, fuzzy
msgid "Unexpected end of ASN1 data"
msgstr "エントリが突然途切れました"
-#: ../include/svn_error_codes.h:1680
+#: ../include/svn_error_codes.h:1720
#, fuzzy
msgid "Unexpected ASN1 tag"
msgstr "予想外の EOF がストリーム中にあります"
-#: ../include/svn_error_codes.h:1684
+#: ../include/svn_error_codes.h:1724
#, fuzzy
msgid "Invalid ASN1 length"
msgstr "スイッチが不正です"
-#: ../include/svn_error_codes.h:1688
+#: ../include/svn_error_codes.h:1728
msgid "ASN1 length mismatch"
msgstr ""
-#: ../include/svn_error_codes.h:1692
+#: ../include/svn_error_codes.h:1732
#, fuzzy
msgid "Invalid ASN1 data"
msgstr "(不正な日時)"
-#: ../include/svn_error_codes.h:1696
+#: ../include/svn_error_codes.h:1736
msgid "Unavailable X509 feature"
msgstr ""
-#: ../include/svn_error_codes.h:1700
+#: ../include/svn_error_codes.h:1740
msgid "Invalid PEM certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1704
+#: ../include/svn_error_codes.h:1744
#, fuzzy
msgid "Invalid certificate format"
msgstr "エントリ終端文字が不正です"
-#: ../include/svn_error_codes.h:1708
+#: ../include/svn_error_codes.h:1748
#, fuzzy
msgid "Invalid certificate version"
msgstr "参照リポジトリの変更が不正です"
-#: ../include/svn_error_codes.h:1712
+#: ../include/svn_error_codes.h:1752
#, fuzzy
msgid "Invalid certificate serial number"
msgstr "リビジョン番号が不正です"
-#: ../include/svn_error_codes.h:1716
+#: ../include/svn_error_codes.h:1756
msgid "Found invalid algorithm in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1720
+#: ../include/svn_error_codes.h:1760
msgid "Found invalid name in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1724
+#: ../include/svn_error_codes.h:1764
msgid "Found invalid date in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1728
+#: ../include/svn_error_codes.h:1768
msgid "Found invalid public key in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1732
+#: ../include/svn_error_codes.h:1772
msgid "Found invalid signature in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1736
+#: ../include/svn_error_codes.h:1776
msgid "Found invalid extensions in certificate"
msgstr ""
-#: ../include/svn_error_codes.h:1740
+#: ../include/svn_error_codes.h:1780
msgid "Unknown certificate version"
msgstr ""
-#: ../include/svn_error_codes.h:1744
+#: ../include/svn_error_codes.h:1784
msgid "Certificate uses unknown public key algorithm"
msgstr ""
-#: ../include/svn_error_codes.h:1748
+#: ../include/svn_error_codes.h:1788
msgid "Certificate signature mismatch"
msgstr ""
-#: ../include/svn_error_codes.h:1752
+#: ../include/svn_error_codes.h:1792
#, fuzzy
msgid "Certificate verification failed"
msgstr "競合を解決できませんでした"
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296
msgid "GNOME Keyring is locked and we are non-interactive"
msgstr ""
#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
-#: ../libsvn_subr/opt.c:941
+#: ../libsvn_subr/opt.c:970
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "'%s' は末尾に予約されたパス名がついています"
@@ -1712,7 +1752,7 @@ msgid "'%s' is an existing item in confl
msgstr ""
#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400
-#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968
+#: ../libsvn_wc/workqueue.c:902 ../libsvn_wc/workqueue.c:996
#, c-format
msgid "'%s' not found"
msgstr "'%s' が見つかりません"
@@ -1724,29 +1764,30 @@ msgid "Unsupported node kind for path '%
msgstr "パス '%s' のノード種別はサポートされていません"
#: ../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
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3270
+#: ../libsvn_client/export.c:1388 ../libsvn_client/import.c:861
+#: ../libsvn_client/patch.c:3750 ../libsvn_client/relocate.c:155
+#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:140
+#: ../libsvn_client/shelf2.c:1128 ../libsvn_client/status.c:445
+#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749
+#: ../libsvn_client/upgrade.c:116 ../svn/shelf-cmd.c:1030
+#: ../svn/shelf2-cmd.c:1030 ../svn/util.c:992 ../svnbench/util.c:76
#, fuzzy, c-format
msgid "'%s' is not a local path"
msgstr "'%s' はファイルではありません"
-#: ../libsvn_client/add.c:949 ../libsvn_client/copy_foreign.c:491
-#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:786
+#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:479
+#: ../libsvn_wc/copy.c:786
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' は既にバージョン管理下におかれています"
-#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109
+#: ../libsvn_client/add.c:1083 ../libsvn_client/add.c:1110
#, fuzzy, c-format
msgid "There is no valid URI above '%s'"
msgstr "既にバージョン管理下にある項目 '%s' があります"
-#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:764
+#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:769
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "バイナリファイル '%s' に対しては blame で各行の最終変更者を計算できません"
@@ -1756,7 +1797,7 @@ msgstr "バイナリファイル '%s' �
#: ../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
+#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1167
#: ../svnbench/notify.c:968
#, c-format
msgid "'%s' is not under version control"
@@ -1772,7 +1813,7 @@ msgstr "'%s' はディレクトリを指
msgid "'%s' has no pristine version until it is committed"
msgstr "'%s' はバージョン管理下におかれていないか、または存在しません"
-#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:383
msgid "(local)"
msgstr "(ローカル)"
@@ -1786,23 +1827,28 @@ msgstr "URL '%s' はディレクトリ�
msgid "Target changelist name must not be empty"
msgstr "変更リストが一致しません"
-#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1447
+#: ../libsvn_client/checkout.c:146 ../libsvn_client/export.c:1445
#: ../svnbench/null-export-cmd.c:293
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s' は存在しません"
-#: ../libsvn_client/checkout.c:137
+#: ../libsvn_client/checkout.c:150
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' が参照しているのはファイルです。ディレクトリではありません"
-#: ../libsvn_client/checkout.c:175
+#: ../libsvn_client/checkout.c:188
#, fuzzy, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' は既に、異なる URL にあるリポジトリ用の作業コピーとなっています"
-#: ../libsvn_client/checkout.c:183
+#: ../libsvn_client/checkout.c:195
+#, fuzzy, c-format
+msgid "'%s' is already a working copy for the same URL but its format is %d instead of the expected %d"
+msgstr "'%s' は既に、異なる URL にあるリポジトリ用の作業コピーとなっています"
+
+#: ../libsvn_client/checkout.c:204
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' は既に存在します。そしてディレクトリではありません"
@@ -1821,7 +1867,7 @@ msgstr ""
msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
msgstr ""
-#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303
+#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2294
msgid "Commit failed (details follow):"
msgstr "コミットに失敗しました (詳しい理由は以下のとおりです):"
@@ -1837,24 +1883,24 @@ msgstr "ディレクトリのロック�
msgid "Error bumping revisions post-commit (details follow):"
msgstr "コミット後にリビジョンを上げる際にエラーが発生しました (詳しくは以下のとおりです):"
-#: ../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
+#: ../libsvn_client/commit.c:544
#, fuzzy
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:722
+#: ../libsvn_client/commit.c:677
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "'%s' は URL です。しかし URL はコミットの対象ではありません"
+
+#: ../libsvn_client/commit.c:817
#, 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:777
+#: ../libsvn_client/commit.c:872
#, c-format
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 ""
@@ -1914,69 +1960,69 @@ msgstr "'%s' は追加準備状態とな
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:1421
+#: ../libsvn_client/commit_util.c:1444
#, 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:1576
+#: ../libsvn_client/commit_util.c:1598
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "コミット対象の項目 '%s' にはコピーフラグがついていますが、コピー元の URL がありません"
-#: ../libsvn_client/commit_util.c:1581
+#: ../libsvn_client/commit_util.c:1603
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "コミット対象の項目 '%s' にはコピーフラグがついていますが、リビジョンが不正です"
-#: ../libsvn_client/commit_util.c:2056
+#: ../libsvn_client/commit_util.c:2076
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "標準の属性については、リビジョン属性の明示的な設定はできません"
-#: ../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
+#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1100
+#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4996
+#: ../libsvn_client/conflicts.c:5370 ../libsvn_client/conflicts.c:5392
+#: ../libsvn_client/conflicts.c:5444 ../libsvn_client/conflicts.c:5917
#, fuzzy
msgid "unknown author"
msgstr "(変更者の情報がありません)"
-#: ../libsvn_client/conflicts.c:904
+#: ../libsvn_client/conflicts.c:1131
msgid "A file containing uncommitted changes was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:907
+#: ../libsvn_client/conflicts.c:1134
msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:912
+#: ../libsvn_client/conflicts.c:1139
msgid "A file which already occupies this path was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:916
+#: ../libsvn_client/conflicts.c:1143
#, fuzzy
msgid "An unversioned file was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
-#: ../libsvn_client/conflicts.c:920
+#: ../libsvn_client/conflicts.c:1147
#, fuzzy
msgid "A deleted file was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
-#: ../libsvn_client/conflicts.c:925
+#: ../libsvn_client/conflicts.c:1152
#, fuzzy
msgid "No such file was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:929
+#: ../libsvn_client/conflicts.c:1156
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 ""
#. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:939
+#: ../libsvn_client/conflicts.c:1166
msgid "A file scheduled to be added to the repository in the next commit was found in the working copy."
msgstr ""
@@ -1985,11 +2031,11 @@ msgstr ""
#. * 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
+#: ../libsvn_client/conflicts.c:1197 ../libsvn_client/conflicts.c:1229
msgid "The file in the working copy had been moved away at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:985 ../libsvn_client/conflicts.c:1018
+#: ../libsvn_client/conflicts.c:1212 ../libsvn_client/conflicts.c:1245
#, c-format
msgid ""
"The file in the working copy was moved away to\n"
@@ -2001,61 +2047,61 @@ msgstr ""
#. * 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
+#: ../libsvn_client/conflicts.c:1271 ../libsvn_client/conflicts.c:1303
msgid "A file had been moved here in the working copy at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:1059 ../libsvn_client/conflicts.c:1092
+#: ../libsvn_client/conflicts.c:1286 ../libsvn_client/conflicts.c:1319
#, c-format
msgid ""
"A file was moved here in the working copy from\n"
"'%s'."
msgstr ""
-#: ../libsvn_client/conflicts.c:1128
+#: ../libsvn_client/conflicts.c:1355
msgid "A directory containing uncommitted changes was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:1131
+#: ../libsvn_client/conflicts.c:1358
msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:1136
+#: ../libsvn_client/conflicts.c:1363
msgid "A directory which already occupies this path was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:1140
+#: ../libsvn_client/conflicts.c:1367
msgid "An unversioned directory was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:1144
+#: ../libsvn_client/conflicts.c:1371
#, fuzzy
msgid "A deleted directory was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
-#: ../libsvn_client/conflicts.c:1150
+#: ../libsvn_client/conflicts.c:1377
#, fuzzy
msgid "No such directory was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:1154
+#: ../libsvn_client/conflicts.c:1381
msgid ""
"No such directory was found in the merge target working copy.\n"
"Perhaps the directory has been deleted or moved away in the repository's history?"
msgstr ""
#. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:1164
+#: ../libsvn_client/conflicts.c:1391
msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy."
msgstr ""
#. The move no longer exists.
-#: ../libsvn_client/conflicts.c:1196
+#: ../libsvn_client/conflicts.c:1423
msgid "The directory in the working copy had been moved away at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:1211
+#: ../libsvn_client/conflicts.c:1438
#, c-format
msgid ""
"The directory in the working copy was moved away to\n"
@@ -2066,11 +2112,11 @@ msgstr ""
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1228
+#: ../libsvn_client/conflicts.c:1455
msgid "The directory had been moved away at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:1244
+#: ../libsvn_client/conflicts.c:1471
#, c-format
msgid ""
"The directory was moved away to\n"
@@ -2082,263 +2128,291 @@ msgstr ""
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1270 ../libsvn_client/conflicts.c:1302
+#: ../libsvn_client/conflicts.c:1497 ../libsvn_client/conflicts.c:1529
msgid "A directory had been moved here at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:1285
+#: ../libsvn_client/conflicts.c:1512
#, c-format
msgid ""
"A directory was moved here from\n"
"'%s'."
msgstr ""
-#: ../libsvn_client/conflicts.c:1318
+#: ../libsvn_client/conflicts.c:1545
#, c-format
msgid ""
"A directory was moved here in the working copy from\n"
"'%s'."
msgstr ""
-#: ../libsvn_client/conflicts.c:2162
+#: ../libsvn_client/conflicts.c:3130
msgid "An item containing uncommitted changes was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:2166
+#: ../libsvn_client/conflicts.c:3134
msgid "An item which already occupies this path was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:2170
+#: ../libsvn_client/conflicts.c:3138
#, fuzzy
msgid "A deleted item was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
-#: ../libsvn_client/conflicts.c:2175
+#: ../libsvn_client/conflicts.c:3143
msgid "No such file or directory was found in the working copy."
msgstr ""
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:2180
+#: ../libsvn_client/conflicts.c:3148
msgid ""
"No such file or directory was found in the merge target working copy.\n"
"The item may have been deleted or moved away in the repository's history."
msgstr ""
-#: ../libsvn_client/conflicts.c:2187
+#: ../libsvn_client/conflicts.c:3155
#, fuzzy
msgid "An unversioned item was found in the working copy."
msgstr "パス '%s' は作業コピーにはありません"
-#: ../libsvn_client/conflicts.c:2192
+#: ../libsvn_client/conflicts.c:3160
msgid "An item scheduled to be added to the repository in the next commit was found in the working copy."
msgstr ""
-#: ../libsvn_client/conflicts.c:2197
+#: ../libsvn_client/conflicts.c:3165
msgid "The item in the working copy had been moved away at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:2201
+#: ../libsvn_client/conflicts.c:3169
msgid "An item had been moved here in the working copy at the time this conflict was recorded."
msgstr ""
-#: ../libsvn_client/conflicts.c:2229
+#: ../libsvn_client/conflicts.c:3197
#, c-format
msgid ""
"%s\n"
"And then moved away to '^/%s' by %s in r%ld."
msgstr ""
-#: ../libsvn_client/conflicts.c:2297
+#: ../libsvn_client/conflicts.c:3262
+#, fuzzy
+msgid "No such file or directory was found in the merge target working copy.\n"
+msgstr "パス '%s' は作業コピーにはありません"
+
+#: ../libsvn_client/conflicts.c:3271
+#, fuzzy, c-format
+msgid "%sThe file was moved to '^/%s' in r%ld by %s."
+msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
+
+#: ../libsvn_client/conflicts.c:3277
+#, fuzzy, c-format
+msgid "%sThe directory was moved to '^/%s' in r%ld by %s."
+msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
+
+#: ../libsvn_client/conflicts.c:3284
+#, fuzzy, c-format
+msgid "%sThe item was moved to '^/%s' in r%ld by %s."
+msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
+
+#: ../libsvn_client/conflicts.c:3300
+#, fuzzy, c-format
+msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s."
+msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
+
+#: ../libsvn_client/conflicts.c:3308
+#, fuzzy, c-format
+msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s."
+msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
+
+#: ../libsvn_client/conflicts.c:3316
#, c-format
-msgid ""
-"No such file or directory was found in the merge target working copy.\n"
-"The item was moved away to '^/%s' in r%ld by %s."
+msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr ""
-#: ../libsvn_client/conflicts.c:2310
+#: ../libsvn_client/conflicts.c:3330
#, c-format
msgid ""
"No such file or directory was found in the merge target working copy.\n"
"'^/%s' was deleted in r%ld by %s."
msgstr ""
-#: ../libsvn_client/conflicts.c:2334
+#: ../libsvn_client/conflicts.c:3354
msgid "An update operation tried to edit a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2336
+#: ../libsvn_client/conflicts.c:3356
msgid "An update operation tried to add a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2338
+#: ../libsvn_client/conflicts.c:3358
msgid "An update operation tried to delete or move a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2341
+#: ../libsvn_client/conflicts.c:3361
msgid "An update operation tried to replace a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2349
+#: ../libsvn_client/conflicts.c:3369
msgid "A switch operation tried to edit a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2351
+#: ../libsvn_client/conflicts.c:3371
msgid "A switch operation tried to add a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2353
+#: ../libsvn_client/conflicts.c:3373
msgid "A switch operation tried to delete or move a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2356
+#: ../libsvn_client/conflicts.c:3376
msgid "A switch operation tried to replace a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2364
+#: ../libsvn_client/conflicts.c:3384
msgid "A merge operation tried to edit a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2366
+#: ../libsvn_client/conflicts.c:3386
msgid "A merge operation tried to add a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2368
+#: ../libsvn_client/conflicts.c:3388
msgid "A merge operation tried to delete or move a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2371
+#: ../libsvn_client/conflicts.c:3391
msgid "A merge operation tried to replace a file."
msgstr ""
-#: ../libsvn_client/conflicts.c:2381
+#: ../libsvn_client/conflicts.c:3401
#, fuzzy
msgid "An update operation tried to change a directory."
msgstr "現在の作業ディレクトリに対する操作が不正です"
-#: ../libsvn_client/conflicts.c:2383
+#: ../libsvn_client/conflicts.c:3403
#, fuzzy
msgid "An update operation tried to add a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2385
+#: ../libsvn_client/conflicts.c:3405
msgid "An update operation tried to delete or move a directory."
msgstr ""
-#: ../libsvn_client/conflicts.c:2388
+#: ../libsvn_client/conflicts.c:3408
#, fuzzy
msgid "An update operation tried to replace a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2396
+#: ../libsvn_client/conflicts.c:3416
#, fuzzy
msgid "A switch operation tried to edit a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2398
+#: ../libsvn_client/conflicts.c:3418
#, fuzzy
msgid "A switch operation tried to add a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2400
+#: ../libsvn_client/conflicts.c:3420
msgid "A switch operation tried to delete or move a directory."
msgstr ""
-#: ../libsvn_client/conflicts.c:2403
+#: ../libsvn_client/conflicts.c:3423
#, fuzzy
msgid "A switch operation tried to replace a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2411
+#: ../libsvn_client/conflicts.c:3431
#, fuzzy
msgid "A merge operation tried to edit a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2413
+#: ../libsvn_client/conflicts.c:3433
#, fuzzy
msgid "A merge operation tried to add a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2415
+#: ../libsvn_client/conflicts.c:3435
msgid "A merge operation tried to delete or move a directory."
msgstr ""
-#: ../libsvn_client/conflicts.c:2418
+#: ../libsvn_client/conflicts.c:3438
#, fuzzy
msgid "A merge operation tried to replace a directory."
msgstr "ディレクトリに対しては操作を適用できません"
-#: ../libsvn_client/conflicts.c:2429
+#: ../libsvn_client/conflicts.c:3449
msgid "An update operation tried to edit an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2431
+#: ../libsvn_client/conflicts.c:3451
msgid "An update operation tried to add an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2433
+#: ../libsvn_client/conflicts.c:3453
msgid "An update operation tried to delete or move an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2436
+#: ../libsvn_client/conflicts.c:3456
msgid "An update operation tried to replace an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2444
+#: ../libsvn_client/conflicts.c:3464
msgid "A switch operation tried to edit an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2446
+#: ../libsvn_client/conflicts.c:3466
msgid "A switch operation tried to add an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2448
+#: ../libsvn_client/conflicts.c:3468
msgid "A switch operation tried to delete or move an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2451
+#: ../libsvn_client/conflicts.c:3471
msgid "A switch operation tried to replace an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2459
+#: ../libsvn_client/conflicts.c:3479
msgid "A merge operation tried to edit an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2461
+#: ../libsvn_client/conflicts.c:3481
msgid "A merge operation tried to add an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2463
+#: ../libsvn_client/conflicts.c:3483
msgid "A merge operation tried to delete or move an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2466
+#: ../libsvn_client/conflicts.c:3486
msgid "A merge operation tried to replace an item."
msgstr ""
-#: ../libsvn_client/conflicts.c:2482 ../svn/cl-conflicts.c:212
+#: ../libsvn_client/conflicts.c:3502 ../svn/cl-conflicts.c:212
#, fuzzy
msgid "upon update"
msgstr "日時が不正です"
-#: ../libsvn_client/conflicts.c:2483 ../svn/cl-conflicts.c:213
+#: ../libsvn_client/conflicts.c:3503 ../svn/cl-conflicts.c:213
#, fuzzy
msgid "upon switch"
msgstr "スイッチが不正です"
-#: ../libsvn_client/conflicts.c:2484 ../svn/cl-conflicts.c:214
+#: ../libsvn_client/conflicts.c:3504 ../svn/cl-conflicts.c:214
msgid "upon merge"
msgstr ""
-#: ../libsvn_client/conflicts.c:2485 ../svn/cl-conflicts.c:215
+#: ../libsvn_client/conflicts.c:3505 ../svn/cl-conflicts.c:215
msgid "upon none"
msgstr ""
-#: ../libsvn_client/conflicts.c:2504 ../svn/cl-conflicts.c:127
+#: ../libsvn_client/conflicts.c:3524 ../svn/cl-conflicts.c:127
#: ../svn/cl-conflicts.c:234
msgid "local edit"
msgstr ""
-#: ../libsvn_client/conflicts.c:2507 ../svn/cl-conflicts.c:140
+#: ../libsvn_client/conflicts.c:3527 ../svn/cl-conflicts.c:140
#: ../svn/cl-conflicts.c:237
#, fuzzy
msgid "local add"
@@ -2346,186 +2420,186 @@ msgstr "(ローカル)"
# * This message replaces 'Index' in the header of each diff in the output from
# 'svnlook diff'.
-#: ../libsvn_client/conflicts.c:2510 ../svn/cl-conflicts.c:131
+#: ../libsvn_client/conflicts.c:3530 ../svn/cl-conflicts.c:131
#: ../svn/cl-conflicts.c:240
#, fuzzy
msgid "local delete"
msgstr "削除"
-#: ../libsvn_client/conflicts.c:2513 ../svn/cl-conflicts.c:129
+#: ../libsvn_client/conflicts.c:3533 ../svn/cl-conflicts.c:129
#: ../svn/cl-conflicts.c:243
#, fuzzy
msgid "local obstruction"
msgstr "そのようなトランザクションはありません"
-#: ../libsvn_client/conflicts.c:2517 ../svn/cl-conflicts.c:247
+#: ../libsvn_client/conflicts.c:3537 ../svn/cl-conflicts.c:247
#, fuzzy, c-format
msgid "local %s"
msgstr "(ローカル)"
-#: ../libsvn_client/conflicts.c:2526 ../svn/cl-conflicts.c:192
+#: ../libsvn_client/conflicts.c:3546 ../svn/cl-conflicts.c:192
#: ../svn/cl-conflicts.c:256
msgid "incoming edit"
msgstr ""
-#: ../libsvn_client/conflicts.c:2529 ../svn/cl-conflicts.c:194
+#: ../libsvn_client/conflicts.c:3549 ../svn/cl-conflicts.c:194
#: ../svn/cl-conflicts.c:259
msgid "incoming add"
msgstr ""
-#: ../libsvn_client/conflicts.c:2532 ../svn/cl-conflicts.c:262
+#: ../libsvn_client/conflicts.c:3552 ../svn/cl-conflicts.c:262
msgid "incoming delete"
msgstr ""
-#: ../libsvn_client/conflicts.c:2536 ../svn/cl-conflicts.c:266
+#: ../libsvn_client/conflicts.c:3556 ../svn/cl-conflicts.c:266
#, c-format
msgid "incoming %s"
msgstr ""
-#: ../libsvn_client/conflicts.c:2544 ../svn/cl-conflicts.c:273
+#: ../libsvn_client/conflicts.c:3564 ../svn/cl-conflicts.c:273
#: ../svn/cl-conflicts.c:326
#, c-format
msgid "%s, %s %s"
msgstr ""
-#: ../libsvn_client/conflicts.c:2603
+#: ../libsvn_client/conflicts.c:3623
#, c-format
msgid "incoming %s %s"
msgstr ""
-#: ../libsvn_client/conflicts.c:2706
+#: ../libsvn_client/conflicts.c:3726
#, c-format
msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr ""
-#: ../libsvn_client/conflicts.c:2717 ../libsvn_client/conflicts.c:2797
-#: ../libsvn_client/conflicts.c:3051 ../libsvn_client/conflicts.c:3138
-#: ../libsvn_client/conflicts.c:3438 ../libsvn_client/conflicts.c:3506
+#: ../libsvn_client/conflicts.c:3737 ../libsvn_client/conflicts.c:3817
+#: ../libsvn_client/conflicts.c:4071 ../libsvn_client/conflicts.c:4158
+#: ../libsvn_client/conflicts.c:4458 ../libsvn_client/conflicts.c:4526
#, fuzzy, c-format
msgid ""
"%s\n"
"The replaced directory was moved to '^/%s'."
msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
-#: ../libsvn_client/conflicts.c:2732
+#: ../libsvn_client/conflicts.c:3752
#, c-format
msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld."
msgstr ""
-#: ../libsvn_client/conflicts.c:2744 ../libsvn_client/conflicts.c:2823
-#: ../libsvn_client/conflicts.c:3080 ../libsvn_client/conflicts.c:3166
[... 29202 lines stripped ...]