subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1787174 [2/2] - /subversion/trunk/subversion/po/ko.po
Date Thu, 16 Mar 2017 13:06:10 GMT

Modified: subversion/trunk/subversion/po/ko.po
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/ko.po?rev=1787174&r1=1787173&r2=1787174&view=diff
==============================================================================
--- subversion/trunk/subversion/po/ko.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/ko.po [UTF-8] Thu Mar 16 13:06:10 2017
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2011-03-07 00:53+0900\n"
+"POT-Creation-Date: 2017-03-16 13:59+0100\n"
 "PO-Revision-Date: 2011-03-03 18:16+0900\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Korean <dev@subversion.tigris.org>\n"
@@ -29,8205 +29,14049 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\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 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
 #, 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 에 잘못된 parent 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-type"
 
-#: ../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:892
+#: ../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
 msgid "Unsupported checksum type"
 msgstr "지원되지 않는 체크섬 형식"
 
-#: ../include/svn_error_codes.h:215
+#: ../include/svn_error_codes.h:221
 msgid "Invalid character in hex checksum"
 msgstr "16진 체크섬에 잘못된 문자가 있습니다"
 
-#: ../include/svn_error_codes.h:220
+#: ../include/svn_error_codes.h:226
 msgid "Unknown string value of token"
 msgstr "토큰의 알 수 없는 문자열 값"
 
-#: ../include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:231
 msgid "Invalid changelist name"
 msgstr "변경 목록 이름이 잘못됨"
 
-#: ../include/svn_error_codes.h:231
+#: ../include/svn_error_codes.h:236
+#, fuzzy
+msgid "Invalid atomic"
+msgstr "잘못된 잠금"
+
+#: ../include/svn_error_codes.h:241
+#, fuzzy
+msgid "Invalid compression method"
+msgstr "잘못된 끝 리비전 %ld"
+
+#: ../include/svn_error_codes.h:247
 msgid "No such XML tag attribute"
 msgstr "그러한 XML 태그 값이 없습니다"
 
-#: ../include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:251
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> 는 누락된 계보(ancestry)입니다"
 
-#: ../include/svn_error_codes.h:239
+#: ../include/svn_error_codes.h:255
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "알 수 없는 바이너리 데이터 인코딩: 디코드 불가능"
 
-#: ../include/svn_error_codes.h:243
+#: ../include/svn_error_codes.h:259
 msgid "XML data was not well-formed"
 msgstr "XML 데이터는 제대로 된 형식(well-formed)이 아닙니다"
 
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:263
 msgid "Data cannot be safely XML-escaped"
 msgstr "데이터를 XML 문서로 표현할 수 없습니다"
 
-#: ../include/svn_error_codes.h:253
+#: ../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:257
+#: ../include/svn_error_codes.h:278
 msgid "Unrecognized line ending style"
 msgstr "개행 형식이 알 수 없는 값입니다"
 
-#: ../include/svn_error_codes.h:262
+#: ../include/svn_error_codes.h:283
 msgid "Line endings other than expected"
 msgstr "다른 것이 있어야할 자리에 개행이 되었습니다"
 
-#: ../include/svn_error_codes.h:266
+#: ../include/svn_error_codes.h:287
 msgid "Ran out of unique names"
 msgstr "고유 파일명 생성 실패"
 
-#: ../include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:292
 msgid "Framing error in pipe protocol"
 msgstr "파이프 프로토콜에서 프레임 오류 발생"
 
-#: ../include/svn_error_codes.h:276
+#: ../include/svn_error_codes.h:297
 msgid "Read error in pipe"
 msgstr "파이프에서 읽기 오류 발생"
 
-#: ../include/svn_error_codes.h:280 ../libsvn_subr/cmdline.c:341
-#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:928 ../svnlook/main.c:1807
+#. 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:286
+#: ../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 "스트림의 비정상 종료"
 
-#: ../include/svn_error_codes.h:290
+#: ../include/svn_error_codes.h:316
 msgid "Malformed stream data"
 msgstr "비정상 스트림 데이터"
 
-#: ../include/svn_error_codes.h:294
+#: ../include/svn_error_codes.h:320
 msgid "Unrecognized stream data"
 msgstr "알 수 없는 스트림 데이터"
 
-#: ../include/svn_error_codes.h:299
+#: ../include/svn_error_codes.h:325
 msgid "Stream doesn't support seeking"
 msgstr "스트림은 seeking을 지원하지 않습니다"
 
-#: ../include/svn_error_codes.h:305
+#: ../include/svn_error_codes.h:330
+#, fuzzy
+msgid "Stream doesn't support this capability"
+msgstr "스트림은 seeking을 지원하지 않습니다"
+
+#: ../include/svn_error_codes.h:336
 msgid "Unknown svn_node_kind"
 msgstr "알 수 없는 노드 종류"
 
-#: ../include/svn_error_codes.h:309
+#: ../include/svn_error_codes.h:340
 msgid "Unexpected node kind found"
 msgstr "기대하지 않은 노드 종류가 발견되었습니다"
 
-#: ../include/svn_error_codes.h:315
+#: ../include/svn_error_codes.h:346
 msgid "Can't find an entry"
 msgstr "항목을 찾을 수 없습니다"
 
-#: ../include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:352
 msgid "Entry already exists"
 msgstr "이미 존재하는 항목입니다"
 
-#: ../include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:356
 msgid "Entry has no revision"
 msgstr "리비전이 없는 항목입니다"
 
-#: ../include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:360
 msgid "Entry has no URL"
 msgstr "URL 이 없는 항목입니다"
 
-#: ../include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:364
 msgid "Entry has an invalid attribute"
 msgstr "잘못된 속성을 지닌 항목입니다"
 
-#: ../include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:368
 msgid "Can't create an entry for a forbidden name"
 msgstr "금지된 이름으로 항목을 생성할 수 없습니다"
 
-#: ../include/svn_error_codes.h:343
+#: ../include/svn_error_codes.h:374
 msgid "Obstructed update"
 msgstr "업데이트 중단됨"
 
-#: ../include/svn_error_codes.h:348
+#: ../include/svn_error_codes.h:379
 msgid "Mismatch popping the WC unwind stack"
 msgstr "작업사본의 탈출 스택(unwind stack) 제거가 일치하지 않습니다"
 
-#: ../include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:384
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "비어 있는 작업사본의 탈출 스택을 제거하려했습니다"
 
-#: ../include/svn_error_codes.h:358
+#: ../include/svn_error_codes.h:389
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "비어있지 않은 탈출 스택(unwind stack)을 잠금 해제하려했습니다"
 
-#: ../include/svn_error_codes.h:362
+#: ../include/svn_error_codes.h:393
 msgid "Attempted to lock an already-locked dir"
 msgstr "이미 잠긴 디렉토리를 다시 잠그려함"
 
-#: ../include/svn_error_codes.h:366
+#: ../include/svn_error_codes.h:397
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "작업 사본을 잠글 수 없습니다. 버그라 추정되며, 보고해주십시오"
 
-#: ../include/svn_error_codes.h:371
+#: ../include/svn_error_codes.h:402
 msgid "Invalid lock"
 msgstr "잘못된 잠금"
 
-#: ../include/svn_error_codes.h:378
+#: ../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:386
+#: ../include/svn_error_codes.h:418
 msgid "Path is not a working copy file"
 msgstr "경로는 작업사본 파일이 아닙니다"
 
-#: ../include/svn_error_codes.h:390
+#: ../include/svn_error_codes.h:422
 msgid "Problem running log"
 msgstr "로그실행 중 오류"
 
-#: ../include/svn_error_codes.h:394
+#: ../include/svn_error_codes.h:426
 msgid "Can't find a working copy path"
 msgstr "작업사본의 경로를 찾을 수 없음"
 
-#: ../include/svn_error_codes.h:398
+#: ../include/svn_error_codes.h:430
 msgid "Working copy is not up-to-date"
 msgstr "작업 사본이 최신이 아닙니다"
 
-#: ../include/svn_error_codes.h:402
+#: ../include/svn_error_codes.h:434
 msgid "Left locally modified or unversioned files"
 msgstr "수정된체 남겨졌거나 버전관리 대상이 아닌 파일"
 
-#: ../include/svn_error_codes.h:406
+#: ../include/svn_error_codes.h:438
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "항목에 대하여 병합될 수 없는 스케쥴이 요청되었습니다"
 
-#: ../include/svn_error_codes.h:410
+#: ../include/svn_error_codes.h:442
 msgid "Found a working copy path"
 msgstr "작업 사본의 경로가 발견되었습니다"
 
-#: ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:446
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "작업사본내에 충돌이 발견되어 명령 수행을 중단합니다"
 
-#: ../include/svn_error_codes.h:418
+#: ../include/svn_error_codes.h:450
 msgid "Working copy is corrupt"
 msgstr "작업사본이 손상되었습니다"
 
-#: ../include/svn_error_codes.h:422
+#: ../include/svn_error_codes.h:454
 msgid "Working copy text base is corrupt"
 msgstr "작업사본의 베이스파일이 손상되었습니다"
 
-#: ../include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:458
 msgid "Cannot change node kind"
 msgstr "노드의 종류를 바꿀 수 없습니다"
 
-#: ../include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:462
 msgid "Invalid operation on the current working directory"
 msgstr "현재 작업사본에 대한 잘못된 명령입니다"
 
-#: ../include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:466
 msgid "Problem on first log entry in a working copy"
 msgstr "작업 사본에 첫번째 로그 엔트리 오류"
 
-#: ../include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:470
 msgid "Unsupported working copy format"
 msgstr "지원하지 않은 작업사본 포맷"
 
-#: ../include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:474
 msgid "Path syntax not supported in this context"
 msgstr "본 문맥에서는 지원되지 않는 경로 형식입니다"
 
-#: ../include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:479
 msgid "Invalid schedule"
 msgstr "예약이 잘못됨"
 
-#: ../include/svn_error_codes.h:452
+#: ../include/svn_error_codes.h:484
 msgid "Invalid relocation"
 msgstr "잘못된 URL 전환"
 
-#: ../include/svn_error_codes.h:457
+#: ../include/svn_error_codes.h:489
 msgid "Invalid switch"
 msgstr "잘못된 전환(switch)"
 
-#: ../include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:494
 msgid "Changelist doesn't match"
 msgstr "변경 목록이 일치하지 않습니다"
 
-#: ../include/svn_error_codes.h:467
+#: ../include/svn_error_codes.h:499
 msgid "Conflict resolution failed"
 msgstr "충돌상황 해제에 실패하였습니다"
 
-#: ../include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:503
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "작업사본에서 'copyfrom' 경로를 찾을 수 없습니다"
 
-#: ../include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:511
 msgid "Moving a path from one changelist to another"
 msgstr "변경목록에서 경로하나를 다른 곳으로 옮김"
 
-#: ../include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:516
 msgid "Cannot delete a file external"
 msgstr "외부 파일은 지울 수 없습니다"
 
-#: ../include/svn_error_codes.h:488
+#: ../include/svn_error_codes.h:521
 msgid "Cannot move a file external"
 msgstr "외부 파일은 옮길 수 없습니다"
 
-#: ../include/svn_error_codes.h:493
+#: ../include/svn_error_codes.h:526
 msgid "Something's amiss with the wc sqlite database"
 msgstr "작업사본의 sqlite 데이터베이스 어딘가에 오류가 있습니다"
 
-#: ../include/svn_error_codes.h:498
+#: ../include/svn_error_codes.h:531
 msgid "The working copy is missing"
 msgstr "작업사본이 없습니다"
 
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:536
 msgid "The specified node is not a symlink"
 msgstr "지정한 노드는 심볼릭 링크가 아닙니다"
 
-#: ../include/svn_error_codes.h:508
+#: ../include/svn_error_codes.h:541
 msgid "The specified path has an unexpected status"
 msgstr "지정한 경로는 예상치 못한 상태를 포함하고 있습니다"
 
-#: ../include/svn_error_codes.h:513
+#: ../include/svn_error_codes.h:546
 msgid "The working copy needs to be upgraded"
 msgstr "작업 사본을 업그레이드 하세요"
 
-#: ../include/svn_error_codes.h:518
-msgid "Previous operation was interrupted; run 'svn cleanup'"
+#: ../include/svn_error_codes.h:551
+#, fuzzy
+msgid "Previous operation has not finished; run 'cleanup' if it was interrupted"
 msgstr "이전 명령 수행이 중간에 멈추었습니다; 'svn cleanup'을 실행하세요"
 
-#: ../include/svn_error_codes.h:523
-msgid "This operation can not be performed with just this depth."
+#: ../include/svn_error_codes.h:557
+#, fuzzy
+msgid "The operation cannot be performed with the specified depth"
 msgstr "이 명령은 본 깊이에서는 수행할 수 없습니다"
 
-#: ../include/svn_error_codes.h:529
+#: ../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: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:533
+#: ../include/svn_error_codes.h:582
 msgid "Error closing filesystem"
 msgstr "파일 시스템 닫기 오류"
 
-#: ../include/svn_error_codes.h:537
+#: ../include/svn_error_codes.h:586
 msgid "Filesystem is already open"
 msgstr "파일 시스템이 이미 열려있습니다"
 
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:590
 msgid "Filesystem is not open"
 msgstr "파일 시스템이 열린 상태가 아닙니다"
 
-#: ../include/svn_error_codes.h:545
+#: ../include/svn_error_codes.h:594
 msgid "Filesystem is corrupt"
 msgstr "파일 시스템이 손상되었습니다"
 
-#: ../include/svn_error_codes.h:549
+#: ../include/svn_error_codes.h:598
 msgid "Invalid filesystem path syntax"
 msgstr "유효하지 않은 파일시스템 경로 형식입니다"
 
-#: ../include/svn_error_codes.h:553
+#: ../include/svn_error_codes.h:602
 msgid "Invalid filesystem revision number"
 msgstr "파일 시스템의 리비전 번호가 잘못되었습니다"
 
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:606
 msgid "Invalid filesystem transaction name"
 msgstr "파일 시스템의 트랜잭션 이름이 잘못되었습니다"
 
-#: ../include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:610
 msgid "Filesystem directory has no such entry"
 msgstr "파일 시스템 디렉토리에 그런 항목이 없습니다"
 
-#: ../include/svn_error_codes.h:565
+#: ../include/svn_error_codes.h:614
 msgid "Filesystem has no such representation"
 msgstr "파일시스템은 그런 표현개체가 없습니다"
 
-#: ../include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:618
 msgid "Filesystem has no such string"
 msgstr "파일 시스템에 그런 문자열이 없습니다"
 
-#: ../include/svn_error_codes.h:573
+#: ../include/svn_error_codes.h:622
 msgid "Filesystem has no such copy"
 msgstr "파일 시스템에 그런 사본이 없습니다"
 
-#: ../include/svn_error_codes.h:577
+#: ../include/svn_error_codes.h:626
 msgid "The specified transaction is not mutable"
 msgstr "본 명령이 수행되면 다시 되돌릴 수 없습니다"
 
-#: ../include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:630
 msgid "Filesystem has no item"
 msgstr "파일 시스템에 그런 아이템이 없습니다"
 
-#: ../include/svn_error_codes.h:585
+#: ../include/svn_error_codes.h:634
 msgid "Filesystem has no such node-rev-id"
 msgstr "파일 시스템에 그런 node-rev-id 가 없습니다"
 
-#: ../include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:638
 msgid "String does not represent a node or node-rev-id"
 msgstr "문자열이 노드 혹은 node-rev-id를 뜻하지 않습니다"
 
-#: ../include/svn_error_codes.h:593
+#: ../include/svn_error_codes.h:642
 msgid "Name does not refer to a filesystem directory"
 msgstr "이름이 파일시스템 디렉토리를 참조하지 않습니다"
 
-#: ../include/svn_error_codes.h:597
+#: ../include/svn_error_codes.h:646
 msgid "Name does not refer to a filesystem file"
 msgstr "이름이 파일시스템 파일을 참조하지 않습니다"
 
-#: ../include/svn_error_codes.h:601
+#: ../include/svn_error_codes.h:650
 msgid "Name is not a single path component"
 msgstr "이름이 파일시스템 단일 경로 요소가 아닙니다"
 
-#: ../include/svn_error_codes.h:605
+#: ../include/svn_error_codes.h:654
 msgid "Attempt to change immutable filesystem node"
 msgstr "변경 불가능한 파일 시스템 노드에 변경을 시도합니다"
 
-#: ../include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:658
 msgid "Item already exists in filesystem"
 msgstr "아이템이 이미 파일 시스템에 있습니다"
 
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:662
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "파일 시스템의 루트에 대하여 제거 혹은 재생성을 시도합니다"
 
-#: ../include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:666
 msgid "Object is not a transaction root"
 msgstr "개체가 트랜잭션의 루트가 아닙니다"
 
-#: ../include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:670
 msgid "Object is not a revision root"
 msgstr "개체가 리비전의 루트가 아닙니다"
 
-#: ../include/svn_error_codes.h:625
+#: ../include/svn_error_codes.h:674
 msgid "Merge conflict during commit"
 msgstr "커밋도중 병합이 충돌하였습니다"
 
-#: ../include/svn_error_codes.h:629
+#: ../include/svn_error_codes.h:678
 msgid "A representation vanished or changed between reads"
 msgstr "읽는 도중 표현개체가 삭제되거나 변경되었습니다"
 
-#: ../include/svn_error_codes.h:633
+#: ../include/svn_error_codes.h:682
 msgid "Tried to change an immutable representation"
 msgstr "변경할 수 없는 표현개체에 대해 변경 시도합니다"
 
-#: ../include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:686
 msgid "Malformed skeleton data"
 msgstr "잘못된 형식의 스케레톤 데이터"
 
-#: ../include/svn_error_codes.h:641
+#: ../include/svn_error_codes.h:690
 msgid "Transaction is out of date"
 msgstr "트랜잭션이 기한 만료됨"
 
-#: ../include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:694
 msgid "Berkeley DB error"
 msgstr "버클리 DB 오류"
 
-#: ../include/svn_error_codes.h:649
+#: ../include/svn_error_codes.h:698
 msgid "Berkeley DB deadlock error"
 msgstr "버클리 DB 데드락 오류"
 
-#: ../include/svn_error_codes.h:653
+#: ../include/svn_error_codes.h:702
 msgid "Transaction is dead"
 msgstr "트랜잭션 종료됨"
 
-#: ../include/svn_error_codes.h:657
+#: ../include/svn_error_codes.h:706
 msgid "Transaction is not dead"
 msgstr "트랜잭션 종료되지 않음"
 
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:711
 msgid "Unknown FS type"
 msgstr "알 수 없는 파일 시스템 종류"
 
-#: ../include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:716
 msgid "No user associated with filesystem"
 msgstr "파일 시스템과 연관된 사용자가 없습니다"
 
-#: ../include/svn_error_codes.h:672
+#: ../include/svn_error_codes.h:721
 msgid "Path is already locked"
 msgstr "경로는 이미 잠겨 있습니다"
 
-#: ../include/svn_error_codes.h:677 ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:973
 msgid "Path is not locked"
 msgstr "경로는 잠기지 않았습니다"
 
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:731
 msgid "Lock token is incorrect"
 msgstr "잠금 토큰이 잘못되었습니다"
 
-#: ../include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:736
 msgid "No lock token provided"
 msgstr "잠금 토큰이 제공되지 않았습니다"
 
-#: ../include/svn_error_codes.h:692
+#: ../include/svn_error_codes.h:741
 msgid "Username does not match lock owner"
 msgstr "Username이 잠금 소유자와 일치하지 않습니다"
 
-#: ../include/svn_error_codes.h:697
+#: ../include/svn_error_codes.h:746
 msgid "Filesystem has no such lock"
 msgstr "파일 시스템에 그런 잠금이 없습니다"
 
-#: ../include/svn_error_codes.h:702
+#: ../include/svn_error_codes.h:751
 msgid "Lock has expired"
 msgstr "잠금이 만료되었습니다"
 
-#: ../include/svn_error_codes.h:707 ../include/svn_error_codes.h:826
+#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:960
 msgid "Item is out of date"
 msgstr "아이템이 오래되었습니다"
 
-#: ../include/svn_error_codes.h:719
+#: ../include/svn_error_codes.h:768
 msgid "Unsupported FS format"
 msgstr "지원하지 않은 FS 포맷"
 
-#: ../include/svn_error_codes.h:724
+#: ../include/svn_error_codes.h:773
 msgid "Representation is being written"
 msgstr "표현식을 출력중입니다"
 
-#: ../include/svn_error_codes.h:729
+#: ../include/svn_error_codes.h:778
 msgid "The generated transaction name is too long"
 msgstr "생성된 트랜잭션이름이 너무 깁니다"
 
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:783
 msgid "Filesystem has no such node origin record"
 msgstr "파일 시스템에 노드의 원본 레코드가 없습니다"
 
-#: ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:788
 msgid "Filesystem upgrade is not supported"
 msgstr "파일 시스템 업그레이드가 지원되지 않습니다"
 
-#: ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:793
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "파일 시스템에 체크섬-표현개체 인덱스 레코드가 없습니다"
 
-#: ../include/svn_error_codes.h:749
+#: ../include/svn_error_codes.h:798
 msgid "Property value in filesystem differs from the provided base value"
 msgstr "파일 시스템의 속성값이 베이스에서 제공된 값과 다릅니다"
 
-#: ../include/svn_error_codes.h:756
+#: ../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 "SQLite의 공유 캐시를 초기화 할 수 없습니다"
+
+#: ../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 "'current' 파일 손상됨"
+
+#: ../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 "지원하지 않은 FS 포맷"
+
+#: ../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 "필요한 노드 리비전 ID가 누락되었습니다"
+
+#: ../include/svn_error_codes.h:869
+#, fuzzy
+msgid "Invalid generation number data."
+msgstr "잘못된 리비전 번호 %ld(이)가 지정되었습니다"
+
+#: ../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:760
+#: ../include/svn_error_codes.h:894
 msgid "A repository hook failed"
 msgstr "저장소 훅(repository hook) 실패"
 
-#: ../include/svn_error_codes.h:764
+#: ../include/svn_error_codes.h:898
 msgid "Incorrect arguments supplied"
 msgstr "잘못된 인자가 넘겨졌습니다"
 
-#: ../include/svn_error_codes.h:768
+#: ../include/svn_error_codes.h:902
 msgid "A report cannot be generated because no data was supplied"
 msgstr "데이터가 없어서 보고서를 생성할 수 없습니다"
 
-#: ../include/svn_error_codes.h:772
+#: ../include/svn_error_codes.h:906
 msgid "Bogus revision report"
 msgstr "이상한 리비전 보고"
 
-#: ../include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:915
 msgid "Unsupported repository version"
 msgstr "지원되지 않는 저장소 버전"
 
-#: ../include/svn_error_codes.h:785
+#: ../include/svn_error_codes.h:919
 msgid "Disabled repository feature"
 msgstr "제한된 저장소 기능"
 
-#: ../include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:923
 msgid "Error running post-commit hook"
 msgstr "post-commit 훅 실행중 오류"
 
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:928
 msgid "Error running post-lock hook"
 msgstr "post-lock 훅 실행중 오류"
 
-#: ../include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:933
 msgid "Error running post-unlock hook"
 msgstr "post-unlock 훅 실행중 오류"
 
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:938
 msgid "Repository upgrade is not supported"
 msgstr "저장소 업그레이드가 지원되지 않습니다"
 
-#: ../include/svn_error_codes.h:810
+#: ../include/svn_error_codes.h:944
 msgid "Bad URL passed to RA layer"
 msgstr "RA 계층에 잘못된 URL이 전달되었습니다"
 
-#: ../include/svn_error_codes.h:814
+#: ../include/svn_error_codes.h:948
 msgid "Authorization failed"
 msgstr "인증 실패"
 
-#: ../include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:952
 msgid "Unknown authorization method"
 msgstr "알 수 없는 인증 방식"
 
-#: ../include/svn_error_codes.h:822
+#: ../include/svn_error_codes.h:956
 msgid "Repository access method not implemented"
 msgstr "저장소 접근 방법이 구현되지 않았습니다"
 
-#: ../include/svn_error_codes.h:830
+#: ../include/svn_error_codes.h:964
 msgid "Repository has no UUID"
 msgstr "저장소에 UUID가 없습니다"
 
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:968
 msgid "Unsupported RA plugin ABI version"
 msgstr "지원하지 않는 RA 플러긴 ABI 버전입니다"
 
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:978
 msgid "Server can only replay from the root of a repository"
 msgstr "서버는 저장소의 루트에서만 재생가능합니다"
 
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:983
 msgid "Repository UUID does not match expected UUID"
 msgstr "저장소의 UUID가 기대하는 UUID와 일치하지 않습니다"
 
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:988
 msgid "Repository root URL does not match expected root URL"
 msgstr "저장소의 루트 URL이 기대하는 루트 URL과 일치하지 않습니다"
 
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:993
 msgid "Session URL does not match expected session URL"
 msgstr "세션 URL이 기대하는 값과 다릅니다"
 
-#: ../include/svn_error_codes.h:865
+#: ../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:869
+#: ../include/svn_error_codes.h:1013
 msgid "RA layer failed to create HTTP request"
 msgstr "RA 계층에서 HTTP 요청을 생성하지 못했습니다"
 
-#: ../include/svn_error_codes.h:873
+#: ../include/svn_error_codes.h:1017
 msgid "RA layer request failed"
 msgstr "RA 계층 요청 실패"
 
-#: ../include/svn_error_codes.h:877
+#: ../include/svn_error_codes.h:1021
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA 계층이 요구된 OPTIONS 정보를 수신하지 않았습니다"
 
-#: ../include/svn_error_codes.h:881
+#: ../include/svn_error_codes.h:1025
 msgid "RA layer failed to fetch properties"
 msgstr "RA 계층이 속성 추출에 실패하였습니다"
 
-#: ../include/svn_error_codes.h:885
+#: ../include/svn_error_codes.h:1029
 msgid "RA layer file already exists"
 msgstr "RA 계층 파일이 이미 존재합니다"
 
-#: ../include/svn_error_codes.h:899
+#: ../include/svn_error_codes.h:1043
 msgid "HTTP Path Not Found"
 msgstr "HTTP 경로 발견되지 않음"
 
-#: ../include/svn_error_codes.h:903
+#: ../include/svn_error_codes.h:1047
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "WebDAV PROPPATCH 실행 실패"
 
-#: ../include/svn_error_codes.h:908 ../include/svn_error_codes.h:959
-#: ../libsvn_ra_svn/marshal.c:732 ../libsvn_ra_svn/marshal.c:850
-#: ../libsvn_ra_svn/marshal.c:877
+#. 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:913
+#: ../include/svn_error_codes.h:1057
 msgid "Unable to extract data from response header"
 msgstr "응답헤더에서 데이터를 추출할 수 없습니다"
 
-#: ../include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:1062
 msgid "Repository has been moved"
 msgstr "저장소가 이동되었습니다"
 
-#: ../include/svn_error_codes.h:923 ../libsvn_ra_serf/replay.c:844
-#: ../libsvn_ra_serf/update.c:2328 ../libsvn_ra_serf/util.c:635
+#: ../include/svn_error_codes.h:1067 ../libsvn_ra_serf/util.c:937
 msgid "Connection timed out"
 msgstr "연결 시간이 초과되었습니다"
 
-#: ../include/svn_error_codes.h:928
+#: ../include/svn_error_codes.h:1072
 msgid "URL access forbidden for unknown reason"
 msgstr "알 수 없는 이유로 URL 접근이 금지되었습니다"
 
-#: ../include/svn_error_codes.h:934 ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:1077
+msgid "The server state conflicts with the requested preconditions"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1082
+msgid "The URL doesn't allow the requested method"
+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:938
+#: ../include/svn_error_codes.h:1092
 msgid "Couldn't open a repository"
 msgstr "저장소를 열 수 없음"
 
-#: ../include/svn_error_codes.h:943
-msgid "Special code for wrapping server errors to report to client"
-msgstr "클라이언트에 보고하기 위한 서버 에러 래핑 특수 코드"
-
-#: ../include/svn_error_codes.h:947
-msgid "Unknown svn protocol command"
-msgstr "알 수 없는 svn 프로토콜 명령"
-
-#: ../include/svn_error_codes.h:951
-msgid "Network connection closed unexpectedly"
-msgstr "네트워크 접속이 예기치 않게 종료되었습니다"
-
-#: ../include/svn_error_codes.h:955
-msgid "Network read/write error"
-msgstr "네트워크 읽기/쓰기 오류"
-
-#: ../include/svn_error_codes.h:967
-msgid "Client/server version mismatch"
-msgstr "클라이언트/서버 버전 불일치"
-
-#: ../include/svn_error_codes.h:972
-msgid "Cannot negotiate authentication mechanism"
-msgstr "인증 방법 협상 불가능"
-
-#: ../include/svn_error_codes.h:977
-msgid "Editor drive was aborted"
-msgstr "편집기 드라이브가 취소되었습니다"
-
-#: ../include/svn_error_codes.h:983
-msgid "Initialization of SSPI library failed"
-msgstr "SSPI 라이브러리 초기화 실패하였습니다"
-
-#: ../include/svn_error_codes.h:987
-msgid "Server SSL certificate untrusted"
-msgstr "서버의 SSL 인증서를 신뢰할 수 없습니다"
-
-#: ../include/svn_error_codes.h:991
-msgid "Initialization of the GSSAPI context failed"
-msgstr "GSSAPI 초기화에 실패하였습니다"
-
-#: ../include/svn_error_codes.h:996
-msgid "While handling serf response:"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1004
-msgid "Credential data unavailable"
-msgstr "인증 정보가 사용불가합니다"
-
-#: ../include/svn_error_codes.h:1008
-msgid "No authentication provider available"
-msgstr "인증 정보를 얻기 위한 장치가 없습니다"
-
-#: ../include/svn_error_codes.h:1012
-msgid "All authentication providers exhausted"
-msgstr "인증 정보를 얻기위한 장치를 모두 사용하였습니다"
-
-#: ../include/svn_error_codes.h:1016
-msgid "Credentials not saved"
-msgstr "인증 정보는 저장되지 않았습니다"
-
-#: ../include/svn_error_codes.h:1021
-msgid "Authentication failed"
-msgstr "인증에 실패하였습니다"
-
-#: ../include/svn_error_codes.h:1027
-msgid "Read access denied for root of edit"
-msgstr "읽기 금지"
-
-#: ../include/svn_error_codes.h:1032
-msgid "Item is not readable"
-msgstr "아이템이 읽기 불가능합니다"
-
-#: ../include/svn_error_codes.h:1037
-msgid "Item is partially readable"
-msgstr "아이템이 부분적으로 읽기 가능합니다"
-
-#: ../include/svn_error_codes.h:1041
-msgid "Invalid authz configuration"
-msgstr "잘못된 authz 설정"
-
-#: ../include/svn_error_codes.h:1046
-msgid "Item is not writable"
-msgstr "아이템이 쓰기가능하지 않습니다"
-
-#: ../include/svn_error_codes.h:1052
+#: ../include/svn_error_codes.h:1098
 msgid "Svndiff data has invalid header"
 msgstr "Svndiff 데이터가 잘못된 헤더를 가지고 있습니다"
 
-#: ../include/svn_error_codes.h:1056
+#: ../include/svn_error_codes.h:1102
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff 데이터가 손상된 윈도우를 포함하고 있습니다"
 
-#: ../include/svn_error_codes.h:1060
+#: ../include/svn_error_codes.h:1106
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "Svndiff 데이터에 뒤로 진행하는 부분이 있습니다"
 
-#: ../include/svn_error_codes.h:1064
+#: ../include/svn_error_codes.h:1110
 msgid "Svndiff data contains invalid instruction"
 msgstr "Svndiff 데이터에 잘못된 명령이 포함되어있습니다"
 
-#: ../include/svn_error_codes.h:1068
+#: ../include/svn_error_codes.h:1114
 msgid "Svndiff data ends unexpectedly"
 msgstr "Svndiff 데이터가 예기치않게 끝났습니다"
 
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1118
 msgid "Svndiff compressed data is invalid"
 msgstr "Svndiff 의 압축된 데이터가 잘못되었습니다"
 
-#: ../include/svn_error_codes.h:1078
-msgid "Diff data source modified unexpectedly"
-msgstr "Diff 데이터가 예기치않은 방식으로 수정되었습니다"
-
-#: ../include/svn_error_codes.h:1084
+#: ../include/svn_error_codes.h:1124
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache에 SVN 파일시스템에 대한 경로가 없습니다"
 
-#: ../include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1128
 msgid "Apache got a malformed URI"
 msgstr "Apache에 잘못된 URI 를 받았습니다"
 
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1132
 msgid "Activity not found"
 msgstr "명령이 발견되지 않았습니다"
 
-#: ../include/svn_error_codes.h:1096
+#: ../include/svn_error_codes.h:1136
 msgid "Baseline incorrect"
 msgstr "기준 리비전 불일치"
 
-#: ../include/svn_error_codes.h:1100
+#: ../include/svn_error_codes.h:1140
 msgid "Input/output error"
 msgstr "입출력 오류"
 
-#: ../include/svn_error_codes.h:1106
+#: ../include/svn_error_codes.h:1146
 msgid "A path under version control is needed for this operation"
 msgstr "버전 관리대상인 경로가 본 명령어에 필요합니다"
 
-#: ../include/svn_error_codes.h:1110
+#: ../include/svn_error_codes.h:1150
 msgid "Repository access is needed for this operation"
 msgstr "본 명령에는 저장소 접근이 필요합니다"
 
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1154
 msgid "Bogus revision information given"
 msgstr "이상한 리비전 정보가 주어졌습니다"
 
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1158
 msgid "Attempting to commit to a URL more than once"
 msgstr "URL에 대한 커밋이 한 번이상 시도됩니다"
 
-#: ../include/svn_error_codes.h:1122
+#: ../include/svn_error_codes.h:1162
 msgid "Operation does not apply to binary file"
 msgstr "명령은 바이너리 파일에 적용되지 않습니다"
 
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1168
 msgid "Format of an svn:externals property was invalid"
 msgstr "svn:externals 에 대한 형식이 올바르지 않습니다"
 
-#: ../include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1172
 msgid "Attempting restricted operation for modified resource"
 msgstr "수정된 자료에 대하여 제한된 명령을 수행합니다"
 
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1176
 msgid "Operation does not apply to directory"
 msgstr "디렉토리에는 적용할 수 없는 명령"
 
-#: ../include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1180 ../svnadmin/svnadmin.c:1602
+#, c-format
 msgid "Revision range is not allowed"
 msgstr "리비전 범위는 사용 불가능합니다"
 
-#: ../include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1184
 msgid "Inter-repository relocation not allowed"
 msgstr "저장소를 넘어서는 'URL 전환'은 불가능합니다"
 
-#: ../include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1188
 msgid "Author name cannot contain a newline"
 msgstr "작성자 이름은 개행 문자를 포함할 수 없습니다"
 
-#: ../include/svn_error_codes.h:1152
+#: ../include/svn_error_codes.h:1192
 msgid "Bad property name"
 msgstr "잘못된 속성 이름"
 
-#: ../include/svn_error_codes.h:1157
+#: ../include/svn_error_codes.h:1197
 msgid "Two versioned resources are unrelated"
 msgstr "두개의 버전관리 대상이 연관성이 없습니다"
 
-#: ../include/svn_error_codes.h:1162
+#: ../include/svn_error_codes.h:1202
 msgid "Path has no lock token"
 msgstr "지정한 경로에 잠금 토큰이 없습니다"
 
-#: ../include/svn_error_codes.h:1167
+#: ../include/svn_error_codes.h:1207
 msgid "Operation does not support multiple sources"
 msgstr "명령은 복수의 원본은 지원하지 않습니다"
 
-#: ../include/svn_error_codes.h:1172
+#: ../include/svn_error_codes.h:1212
 msgid "No versioned parent directories"
 msgstr "버전관리 대상이 아닌 상위 디렉토리입니다"
 
-#: ../include/svn_error_codes.h:1177
+#: ../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:1182
+#: ../include/svn_error_codes.h:1222
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr "외부 파일은 버전관리 대상으로 존재하는 아이템들을 덮어 쓸 수 없습니다"
 
-#: ../include/svn_error_codes.h:1187
+#: ../include/svn_error_codes.h:1227
 msgid "Invalid path component strip count specified"
 msgstr "지정된 경로 요소 제거 카운트가 잘못되었습니다"
 
-#: ../include/svn_error_codes.h:1192
+#: ../include/svn_error_codes.h:1232
 msgid "Detected a cycle while processing the operation"
 msgstr "명령을 수행하는 도중 순환이 발견되었습니다."
 
-#: ../include/svn_error_codes.h:1198
+#: ../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:1202
+#: ../include/svn_error_codes.h:1267
 msgid "Failure loading plugin"
 msgstr "플러긴 로딩 실패"
 
-#: ../include/svn_error_codes.h:1206
+#: ../include/svn_error_codes.h:1271
 msgid "Malformed file"
 msgstr "잘못된 파일"
 
-#: ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1275
 msgid "Incomplete data"
 msgstr "불완전한 데이터"
 
-#: ../include/svn_error_codes.h:1214
+#: ../include/svn_error_codes.h:1279
 msgid "Incorrect parameters given"
 msgstr "잘못된 인자가 넘겨짐"
 
-#: ../include/svn_error_codes.h:1218
+#: ../include/svn_error_codes.h:1283
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "버전관리 대상이 아닌 것에 버전관련 명령을 시도했습니다"
 
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1287
 msgid "Test failed"
 msgstr "테스트 실패"
 
-#: ../include/svn_error_codes.h:1226
+#: ../include/svn_error_codes.h:1291
 msgid "Trying to use an unsupported feature"
 msgstr "지원하지 않는 속성을 사용하는 중"
 
-#: ../include/svn_error_codes.h:1230
+#: ../include/svn_error_codes.h:1295
 msgid "Unexpected or unknown property kind"
 msgstr "예기치 않은 혹은 알려지지 않은 속성 종류"
 
-#: ../include/svn_error_codes.h:1234
+#: ../include/svn_error_codes.h:1299
 msgid "Illegal target for the requested operation"
 msgstr "요구된 명령에 대하여 잘못된 대상"
 
-#: ../include/svn_error_codes.h:1238
+#: ../include/svn_error_codes.h:1303
 msgid "MD5 checksum is missing"
 msgstr "MD5 체크섬 누락됨"
 
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1307
 msgid "Directory needs to be empty but is not"
 msgstr "디렉토리가 비어있어야만 합니다"
 
-#: ../include/svn_error_codes.h:1246
+#: ../include/svn_error_codes.h:1311
 msgid "Error calling external program"
 msgstr "외부 프로그램 실행 중 오류"
 
-#: ../include/svn_error_codes.h:1250
+#: ../include/svn_error_codes.h:1315
 msgid "Python exception has been set with the error"
 msgstr "오류에 파이썬 예외가 있습니다"
 
-#: ../include/svn_error_codes.h:1254
+#: ../include/svn_error_codes.h:1319
 msgid "A checksum mismatch occurred"
 msgstr "체크섬 불일치 오류가 발생하였습니다"
 
-#: ../include/svn_error_codes.h:1258
+#: ../include/svn_error_codes.h:1323
 msgid "The operation was interrupted"
 msgstr "명령 수행이 간섭으로 중단됩니다"
 
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1327
 msgid "The specified diff option is not supported"
 msgstr "지정한 diff 옵션은 지원되지 않는 것입니다"
 
-#: ../include/svn_error_codes.h:1266
+#: ../include/svn_error_codes.h:1331
 msgid "Property not found"
 msgstr "속성을 찾을 수 없습니다"
 
-#: ../include/svn_error_codes.h:1270
+#: ../include/svn_error_codes.h:1335
 msgid "No auth file path available"
 msgstr "인증 파일 경로가 유효하지 않습니다"
 
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1340
 msgid "Incompatible library version"
 msgstr "호환되지 않는 라이브러리 버전"
 
-#: ../include/svn_error_codes.h:1280
+#: ../include/svn_error_codes.h:1345
 msgid "Mergeinfo parse error"
 msgstr "병합정보 분석에 실패하였습니다"
 
-#: ../include/svn_error_codes.h:1285
+#: ../include/svn_error_codes.h:1350
 msgid "Cease invocation of this API"
 msgstr "이 API 호출을 중단합니다"
 
-#: ../include/svn_error_codes.h:1290
+#: ../include/svn_error_codes.h:1355
 msgid "Error parsing revision number"
 msgstr "리비전 번호 파싱 오류"
 
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1360
 msgid "Iteration terminated before completion"
 msgstr "반복작업이 완료되기전에 종료하였습니다"
 
-#: ../include/svn_error_codes.h:1300
+#: ../include/svn_error_codes.h:1365
 msgid "Unknown changelist"
 msgstr "알 수 없는 변경목록"
 
-#: ../include/svn_error_codes.h:1305
+#: ../include/svn_error_codes.h:1370
 msgid "Reserved directory name in command line arguments"
 msgstr "명령행 인자에 예약된 디렉토리 이름"
 
-#: ../include/svn_error_codes.h:1310
+#: ../include/svn_error_codes.h:1375
 msgid "Inquiry about unknown capability"
 msgstr "알 수 없는 기능에 대한 질의"
 
-#: ../include/svn_error_codes.h:1315
+#: ../include/svn_error_codes.h:1380
 msgid "Test skipped"
 msgstr "테스트 하지 않음"
 
-#: ../include/svn_error_codes.h:1320
-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:1325
+#: ../include/svn_error_codes.h:1390
 msgid "Couldn't perform atomic initialization"
 msgstr "초기화를 원자적으로 수행할 수 없습니다"
 
-#: ../include/svn_error_codes.h:1330
+#: ../include/svn_error_codes.h:1395
 msgid "SQLite error"
 msgstr "SQLite 오류"
 
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1400
 msgid "Attempted to write to readonly SQLite db"
 msgstr "읽기전용 SQLite db에 쓰기시도를 하였습니다"
 
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1407
 msgid "Unsupported schema found in SQLite db"
 msgstr "SQLite db에 지원하지 않는 스키마가 발견되었습니다"
 
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1412
 msgid "The SQLite db is busy"
 msgstr "SQLite DB가 바쁩니다"
 
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1417
 msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
 msgstr "트랜잭션 롤백시에 SQLite가 분주하여, 롤백이 가능하도록 모든 SQLite statement를 리셋합니다"
 
-#: ../include/svn_error_codes.h:1357
-msgid "Error parsing arguments"
-msgstr "인자를 분석 도중 오류 발생"
+#: ../include/svn_error_codes.h:1423
+#, fuzzy
+msgid "Constraint error in SQLite db"
+msgstr "SQLite db에 지원하지 않는 스키마가 발견되었습니다"
 
-#: ../include/svn_error_codes.h:1361
-msgid "Not enough arguments provided"
-msgstr "인자가 충분히 주어지지 않았습니다"
+#: ../include/svn_error_codes.h:1428
+msgid "Too many memcached servers configured"
+msgstr ""
 
-#: ../include/svn_error_codes.h:1365
-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:1438
+#, fuzzy
+msgid "Atomic data storage is corrupt"
+msgstr "작업사본의 베이스파일이 손상되었습니다"
+
+#: ../include/svn_error_codes.h:1443
+msgid "utf8proc library error"
+msgstr ""
+
+#: ../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 "트랜잭션이 'cleanup' 오류"
+
+#: ../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:1369
+#: ../include/svn_error_codes.h:1486
 msgid "Attempted command in administrative dir"
 msgstr "관리 디렉토리에 명령을 수행중입니다"
 
-#: ../include/svn_error_codes.h:1373
+#: ../include/svn_error_codes.h:1490
 msgid "The log message file is under version control"
 msgstr "로그 메시지 파일은 버전 관리 대상입니다"
 
-#: ../include/svn_error_codes.h:1377
+#: ../include/svn_error_codes.h:1494
 msgid "The log message is a pathname"
 msgstr "로그 메시지는 경로명입니다"
 
-#: ../include/svn_error_codes.h:1381
+#: ../include/svn_error_codes.h:1498
 msgid "Committing in directory scheduled for addition"
 msgstr "추가하기 위한 디렉토리를 커밋 중"
 
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1502
 msgid "No external editor available"
 msgstr "외부 편집기가 없습니다"
 
-#: ../include/svn_error_codes.h:1389
+#: ../include/svn_error_codes.h:1506
 msgid "Something is wrong with the log message's contents"
 msgstr "로그 메시지 내용이 이상합니다"
 
-#: ../include/svn_error_codes.h:1393
+#: ../include/svn_error_codes.h:1510
 msgid "A log message was given where none was necessary"
 msgstr "로그메시지가 필요없는 곳에 지정되었습니다"
 
-#: ../include/svn_error_codes.h:1397
+#: ../include/svn_error_codes.h:1514
 msgid "No external merge tool available"
 msgstr "외부 병합 도구가 없습니다"
 
-#: ../include/svn_error_codes.h:1401
+#: ../include/svn_error_codes.h:1518
 msgid "Failed processing one or more externals definitions"
 msgstr "외부 모듈(svn:externals로 지정된)은 무시합니다"
 
-#: ../include/svn_error_codes.h:1407
+#: ../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 "잘못된 authz 설정"
+
+#: ../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
+msgid "Initialization of the GSSAPI context failed"
+msgstr "GSSAPI 초기화에 실패하였습니다"
+
+#: ../include/svn_error_codes.h:1658
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1664
 msgid "Assertion failure"
 msgstr "확인 실패"
 
-#: ../include/svn_error_codes.h:1411
+#: ../include/svn_error_codes.h:1668
 msgid "No non-tracing links found in the error chain"
 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:1676
+#, fuzzy
+msgid "Unexpected end of ASN1 data"
+msgstr "기대하지 않은 entry의 끝을 만남"
+
+#: ../include/svn_error_codes.h:1680
+#, fuzzy
+msgid "Unexpected ASN1 tag"
+msgstr "스트림의 비정상 종료"
+
+#: ../include/svn_error_codes.h:1684
+#, fuzzy
+msgid "Invalid ASN1 length"
+msgstr "잘못된 전환(switch)"
+
+#: ../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 "잘못된 URL 전환"
+
+#: ../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 "GNOME Keyring이 잠겨있어 비대화식 모드로 전환합니다"
 
-#: ../libsvn_client/add.c:509
+#: ../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 " '%s'(이)가 '%s'의 부모 생성을 막고 있습니다"
 
-#: ../libsvn_client/add.c:535 ../libsvn_wc/adm_ops.c:874
-#: ../libsvn_wc/workqueue.c:1638 ../libsvn_wc/workqueue.c:1720
+#: ../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:540 ../libsvn_wc/adm_ops.c:567
-#: ../libsvn_wc/adm_ops.c:879
+#: ../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:582 ../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:614 ../libsvn_client/changelist.c:118
-#: ../libsvn_client/changelist.c:169 ../libsvn_client/cleanup.c:56
-#: ../libsvn_client/cleanup.c:133 ../libsvn_client/commit.c:702
-#: ../libsvn_client/export.c:1072 ../libsvn_client/patch.c:2747
-#: ../libsvn_client/relocate.c:234 ../libsvn_client/resolved.c:54
-#: ../libsvn_client/revert.c:134 ../libsvn_client/status.c:274
-#: ../libsvn_client/switch.c:337 ../libsvn_client/update.c:407
-#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:80 ../svn/cleanup-cmd.c:68
-#: ../svn/export-cmd.c:93 ../svn/import-cmd.c:105 ../svn/patch-cmd.c:75
-#: ../svn/patch-cmd.c:87 ../svn/relocate-cmd.c:106 ../svn/resolve-cmd.c:105
-#: ../svn/resolved-cmd.c:75 ../svn/revert-cmd.c:76 ../svn/status-cmd.c:259
-#: ../svn/switch-cmd.c:150 ../svn/update-cmd.c:131 ../svn/upgrade-cmd.c:71
+#: ../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
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "'%s'은(는) 로컬 파일이 아닙니다"
 
-#: ../libsvn_client/blame.c:397
+#: ../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 "'%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:457 ../libsvn_client/blame.c:764
 #, c-format
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "'%s' 바이너리 파일에 대하여 '수정한 사람 보기'를 수행할 수 없습니다"
 
-#: ../libsvn_client/blame.c:627
-msgid "Start revision must precede end revision"
-msgstr "시작 버전은 종료버전보다 앞서야 합니다"
-
-#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1043
-#: ../libsvn_client/delete.c:65 ../libsvn_client/prop_commands.c:430
-#: ../libsvn_client/prop_commands.c:945 ../libsvn_client/prop_commands.c:1247
-#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2002
-#: ../libsvn_wc/adm_ops.c:2036 ../libsvn_wc/copy.c:487
-#: ../libsvn_wc/entries.c:1289 ../libsvn_wc/entries.c:2488
-#: ../libsvn_wc/entries.c:2519 ../libsvn_wc/node.c:1270
-#: ../libsvn_wc/update_editor.c:4029
+#: ../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 "URL '%s' 는 디렉토리입니다"
 
-#: ../libsvn_client/cat.c:89
-#, c-format
-msgid "'%s' has no base revision until it is committed"
+#: ../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:286
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
 msgid "(local)"
 msgstr "(로컬)"
 
-#: ../libsvn_client/cat.c:240
+#: ../libsvn_client/cat.c:255
 #, c-format
 msgid "URL '%s' refers to a directory"
 msgstr "URL '%s' 는 디렉토리입니다"
 
-#: ../libsvn_client/changelist.c:110
+#: ../libsvn_client/changelist.c:57
 msgid "Target changelist name must not be empty"
 msgstr "변경 목록 이름은 비어 있을 수 없습니다"
 
-#: ../libsvn_client/checkout.c:161 ../libsvn_client/export.c:1243
+#: ../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:165
+#: ../libsvn_client/checkout.c:137
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "URL('%s')은 파일입니다. 디렉토리를 지정하세요"
 
-#: ../libsvn_client/checkout.c:201
-#, c-format
-msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
+#: ../libsvn_client/checkout.c:175
+#, fuzzy, c-format
+msgid "'%s' is already a working copy for a different URL"
 msgstr "'%s'는 이미 작업 사본에 있으며, 다른 URL 입니다; 'svn update' 를 이용하여 업데이트하세요"
 
-#: ../libsvn_client/checkout.c:209
+#: ../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:434
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "경로 '%s'은 알 수 없거나 버전관리 할 수 없는 것입니다"
-
-#: ../libsvn_client/commit.c:539
-msgid "New entry name required when importing a file"
-msgstr "파일을 임포트할 때 새 항목 이름이 필요합니다"
-
-#: ../libsvn_client/commit.c:574 ../libsvn_client/patch.c:2754
-#: ../libsvn_client/patch.c:2765 ../libsvn_wc/adm_ops.c:562
-#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:63
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s'는 존재하지 않습니다"
-
-#: ../libsvn_client/commit.c:656 ../libsvn_client/copy.c:481
-#: ../libsvn_client/merge.c:9082 ../libsvn_client/merge.c:10339
-#: ../libsvn_client/merge.c:10614 ../svnlook/main.c:1412
-#, c-format
-msgid "Path '%s' does not exist"
-msgstr "경로 '%s'는 존재하지 않습니다"
-
-#: ../libsvn_client/commit.c:794 ../libsvn_client/copy.c:492
-#: ../libsvn_client/copy.c:1022 ../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 "'%s'은(는) 펙리비전입니다. '%s@'로 시도해보시겠습니까?"
 
-#: ../libsvn_client/commit.c:809
-#, 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:847 ../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:855
+#: ../libsvn_client/commit.c:165
 msgid "Commit succeeded, but other errors follow:"
 msgstr "커밋이 성공하였지만, 오류가 있습니다:"
 
-#: ../libsvn_client/commit.c:862
+#: ../libsvn_client/commit.c:172
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "잠긴 디렉토리를 해제하는데 실패함 (아래에 자세히):"
 
-#: ../libsvn_client/commit.c:873
+#: ../libsvn_client/commit.c:183
 msgid "Error bumping revisions post-commit (details follow):"
 msgstr "커밋 후 리비전들을 갱신하는 도중 오류가 발생하였습니다:"
 
-#: ../libsvn_client/commit.c:967
-msgid "Are all targets part of the same working copy?"
+#: ../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 ""
+"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:1006
-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:1056 ../svn/commit-cmd.c:72
+#: ../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:134
+#: ../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:136
+#: ../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:286 ../libsvn_client/commit_util.c:488
-#: ../libsvn_client/commit_util.c:1037
+#: ../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
+#, fuzzy, c-format
+msgid "Changing directory '%s' is forbidden by the server"
+msgstr "서버에 의해 제외된 '%s'를 복사할 수 없습니다"
+
+#: ../libsvn_client/commit_util.c:170
 #, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "커밋 멈춤: '%s' 이(가) 아직 충돌 상태임"
+msgid "Changing file '%s' is forbidden by the server"
+msgstr ""
 
-#: ../libsvn_client/commit_util.c:328
+#: ../libsvn_client/commit_util.c:318
 #, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "커밋 멈춤: '%s' 이(가) 아직 트리-충돌 상태임"
 
-#: ../libsvn_client/commit_util.c:423 ../libsvn_client/commit_util.c:439
+#: ../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:467
-#, 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:663
+#: ../libsvn_client/commit_util.c:728
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "'%s'의 추가 스케쥴은 있지만, 존재하지 않습니다"
 
-#: ../libsvn_client/commit_util.c:940
-#, 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:1057 ../libsvn_client/url.c:198
-#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "'%s' 항목은 URL이 없습니다"
-
-#: ../libsvn_client/commit_util.c:1074
-#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "'%s'의 추가 스케쥴은 있지만, 상위는 버전관리 대상이 아닙니다"
-
-#: ../libsvn_client/commit_util.c:1215
+#: ../libsvn_client/commit_util.c:1421
 #, c-format
 msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
 msgstr "'%s', '%s' 는 둘다 같은 URL을 참조하므로 커밋할 수 없습니다"
 
-#: ../libsvn_client/commit_util.c:1372
+#: ../libsvn_client/commit_util.c:1576
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 copyfrom URL이 없습니다"
 
-#: ../libsvn_client/commit_util.c:1377
+#: ../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:2085
+#: ../libsvn_client/commit_util.c:2056
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "표준 속성은 리비전 속성으로 취급할 수 없습니다"
 
-#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:1876
-#, c-format
-msgid "Path '%s' is not a directory"
-msgstr "경로 '%s'은(는) 디렉토리가 아닙니다"
+#: ../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 "unknown author"
+msgstr "(작성자 불명)"
 
-#: ../libsvn_client/copy.c:679 ../libsvn_client/copy.c:720
-#, c-format
-msgid "Path '%s' already exists, but is not a directory"
-msgstr "'%s'은(는) 존재하며, 디렉토리가 아닙니다"
+#: ../libsvn_client/conflicts.c:904
+msgid "A file containing uncommitted changes was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/copy.c:785
-msgid "Source and destination URLs appear not to all point to the same repository."
-msgstr "원본과 대상 URL이 같은 저장소를 가리키지 않습니다."
+#: ../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:1010 ../libsvn_client/prop_commands.c:230
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "경로 '%s'은(는) 리비전 %ld에 없습니다"
+#: ../libsvn_client/conflicts.c:912
+msgid "A file which already occupies this path 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:916
+#, fuzzy
+msgid "An unversioned file was found in the working copy."
+msgstr "경로 '%s' 은 작업 사본이 아닙니다"
 
-#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
-#: ../libsvn_wc/adm_ops.c:934 ../libsvn_wc/copy.c:582
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "'%s'는 이미 버젼 관리 대상입니다"
+#: ../libsvn_client/conflicts.c:920
+#, fuzzy
+msgid "A deleted 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:925
+#, fuzzy
+msgid "No such 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에 없습니다"
+#. ### 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:1849
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "경로 '%s'는 head 리비전에 없습니다"
+#. ### 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:1971
-msgid "Cannot mix repository and working copy sources"
-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: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:2023
+#: ../libsvn_client/conflicts.c:985 ../libsvn_client/conflicts.c:1018
 #, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "경로 '%s' 를 자신의 하부 디렉토리('%s')에 복사할 수 없습니다"
+msgid ""
+"The file in the working copy was moved away to\n"
+"'%s'."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2055
-#, c-format
-msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
-msgstr "'%s'에 있는 외부 파일을 옮길 수 없습니다; propedit를 이용하여 svn:externals에 대한 내용을 수정하세요"
+#. 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:2070
-msgid "Moves between the working copy and the repository are not supported"
-msgstr "작업 사본과 저장소 간 이동은 지원하지 않습니다"
-
-#: ../libsvn_client/copy.c:2085
+#: ../libsvn_client/conflicts.c:1059 ../libsvn_client/conflicts.c:1092
 #, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "URL '%s'을(를) 자기 자신으로 이동할 수 없습니다"
+msgid ""
+"A file was moved here in the working copy from\n"
+"'%s'."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2086
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "경로 '%s'을(를) 자기 자신에게 복사 할 수 없습니다"
+#: ../libsvn_client/conflicts.c:1128
+msgid "A directory containing uncommitted changes was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/copy.c:2157
-#, c-format
-msgid "'%s' does not have a URL associated with it"
-msgstr "'%s'에 관계된 URL이 없습니다"
+#: ../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:60
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "'%s'은(는) 실제적으로 버전관리 대상입니다"
+#: ../libsvn_client/conflicts.c:1136
+msgid "A directory which already occupies this path was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/delete.c:75
-#, c-format
-msgid "'%s' has local modifications -- commit or revert them first"
-msgstr "'%s'은(는) 수정되었습니다 -- 커밋 혹은 되돌리기를 먼저 하십시오"
+#: ../libsvn_client/conflicts.c:1140
+msgid "An unversioned directory was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/delete.c:105
-#, c-format
-msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
-msgstr "외부 모듈인 '%s'은(는) 제거될 수 없습니다; 해당 모듈을 추가시킨 svn:externals 속성값을 수정(propedit) 혹은 삭제(propdel)하십시오"
+#: ../libsvn_client/conflicts.c:1144
+#, fuzzy
+msgid "A deleted directory was found in the working copy."
+msgstr "병합 대상 '%s'은(는) 작업 사본에 존재하지 않습니다"
 
-#: ../libsvn_client/delete.c:230
-#, c-format
-msgid "URL '%s' does not exist"
-msgstr "URL '%s'은(는) 존재하지 않습니다"
+#: ../libsvn_client/conflicts.c:1150
+#, fuzzy
+msgid "No such directory was found in the working copy."
+msgstr "경로 '%s' 은 작업 사본이 아닙니다"
 
-#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "이동 명령은 리비전(HEAD 값은 제외)을 명시할 수 없습니다"
+#. ### display deleted revision
+#: ../libsvn_client/conflicts.c:1154
+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 ""
 
-#: ../libsvn_client/deprecated.c:1331
-msgid "No commits in repository"
-msgstr "저장소에 커밋 없음"
+#. ### show more details about copies or replacements?
+#: ../libsvn_client/conflicts.c:1164
+msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy."
+msgstr ""
 
-#: ../libsvn_client/deprecated.c:2110 ../libsvn_wc/deprecated.c:3370
-msgid "Non-recursive relocation not supported"
-msgstr "하위 폴더 수행하지 않는 'URL 전환'은 지원하지 않습니다"
+#. The move no longer exists.
+#: ../libsvn_client/conflicts.c:1196
+msgid "The directory in the working copy had been moved away at the time this conflict was recorded."
+msgstr ""
 
-#: ../libsvn_client/diff.c:136
+#: ../libsvn_client/conflicts.c:1211
 #, c-format
-msgid "   Reverse-merged %s:r%s%s"
-msgstr "   역병합 %s:r%s%s"
+msgid ""
+"The directory in the working copy was moved away to\n"
+"'%s'."
+msgstr ""
 
-#: ../libsvn_client/diff.c:151
-#, c-format
-msgid "   Merged %s:r%s%s"
-msgstr "   병합 %s:r%s%s"
+#. 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:1228
+msgid "The directory had been moved away at the time this conflict was recorded."
+msgstr ""
 
-#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1784
-#: ../libsvn_diff/diff_file.c:1800
+#: ../libsvn_client/conflicts.c:1244
 #, c-format
-msgid "Path '%s' must be an immediate child of the directory '%s'"
-msgstr "경로 '%s'는 '%s' 디렉토리의 직계 하위에 있어야합니다"
+msgid ""
+"The directory was moved away to\n"
+"'%s'."
+msgstr ""
 
-#: ../libsvn_client/diff.c:359
-#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(리비전 %ld)"
+#. 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:1270 ../libsvn_client/conflicts.c:1302

[... 24609 lines stripped ...]


Mime
View raw message