diff options
Diffstat (limited to 'subversion/po/subversion.pot')
| -rw-r--r-- | subversion/po/subversion.pot | 8135 |
1 files changed, 5173 insertions, 2962 deletions
diff --git a/subversion/po/subversion.pot b/subversion/po/subversion.pot index b07609b..3051288 100644 --- a/subversion/po/subversion.pot +++ b/subversion/po/subversion.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@subversion.apache.org\n" -"POT-Creation-Date: 2015-03-18 13:33+0000\n" +"POT-Creation-Date: 2017-08-05 16:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,72 +21,72 @@ msgstr "" #. 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:81 +#: ../include/private/svn_fs_util.h:86 #, c-format msgid "File not found: transaction '%s', path '%s'" msgstr "" -#: ../include/private/svn_fs_util.h:86 +#: ../include/private/svn_fs_util.h:91 #, c-format msgid "File not found: revision %ld, path '%s'" msgstr "" #. 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:97 +#: ../include/private/svn_fs_util.h:102 #, c-format msgid "File already exists: filesystem '%s', transaction '%s', path '%s'" msgstr "" -#: ../include/private/svn_fs_util.h:102 +#: ../include/private/svn_fs_util.h:107 #, c-format msgid "File already exists: filesystem '%s', revision %ld, path '%s'" msgstr "" #. ROOT is of type svn_fs_root_t *. -#: ../include/private/svn_fs_util.h:110 +#: ../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:117 +#: ../include/private/svn_fs_util.h:122 #, c-format msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'" msgstr "" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:124 +#: ../include/private/svn_fs_util.h:129 #, c-format msgid "'%s' is not a directory in filesystem '%s'" msgstr "" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:131 +#: ../include/private/svn_fs_util.h:136 #, c-format msgid "'%s' is not a file in filesystem '%s'" msgstr "" #. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *". -#: ../include/private/svn_fs_util.h:139 +#: ../include/private/svn_fs_util.h:144 #, c-format msgid "Path '%s' is already locked by user '%s' in filesystem '%s'" msgstr "" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:146 +#: ../include/private/svn_fs_util.h:151 #, c-format msgid "No lock on path '%s' in filesystem '%s'" msgstr "" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:153 +#: ../include/private/svn_fs_util.h:158 #, c-format msgid "Lock has expired: lock-token '%s' in filesystem '%s'" msgstr "" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:160 +#: ../include/private/svn_fs_util.h:165 #, c-format msgid "No username is currently associated with filesystem '%s'" msgstr "" @@ -94,1221 +94,1392 @@ msgstr "" #. 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:169 +#: ../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 "" -#: ../include/svn_error_codes.h:164 +#: ../include/svn_error_codes.h:166 msgid "Bad parent pool passed to svn_make_pool()" msgstr "" -#: ../include/svn_error_codes.h:168 +#: ../include/svn_error_codes.h:170 msgid "Bogus filename" msgstr "" -#: ../include/svn_error_codes.h:172 +#: ../include/svn_error_codes.h:174 msgid "Bogus URL" msgstr "" -#: ../include/svn_error_codes.h:176 +#: ../include/svn_error_codes.h:178 msgid "Bogus date" msgstr "" -#: ../include/svn_error_codes.h:180 +#: ../include/svn_error_codes.h:182 msgid "Bogus mime-type" msgstr "" -#: ../include/svn_error_codes.h:190 +#: ../include/svn_error_codes.h:192 msgid "Wrong or unexpected property value" msgstr "" -#: ../include/svn_error_codes.h:194 +#: ../include/svn_error_codes.h:196 msgid "Version file format not correct" msgstr "" -#: ../include/svn_error_codes.h:198 +#: ../include/svn_error_codes.h:200 msgid "Path is not an immediate child of the specified directory" msgstr "" -#: ../include/svn_error_codes.h:202 +#: ../include/svn_error_codes.h:204 msgid "Bogus UUID" msgstr "" -#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:944 +#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1021 msgid "Invalid configuration value" msgstr "" -#: ../include/svn_error_codes.h:211 +#: ../include/svn_error_codes.h:213 msgid "Bogus server specification" msgstr "" -#: ../include/svn_error_codes.h:215 +#: ../include/svn_error_codes.h:217 msgid "Unsupported checksum type" msgstr "" -#: ../include/svn_error_codes.h:219 +#: ../include/svn_error_codes.h:221 msgid "Invalid character in hex checksum" msgstr "" -#: ../include/svn_error_codes.h:224 +#: ../include/svn_error_codes.h:226 msgid "Unknown string value of token" msgstr "" -#: ../include/svn_error_codes.h:229 +#: ../include/svn_error_codes.h:231 msgid "Invalid changelist name" msgstr "" -#: ../include/svn_error_codes.h:234 +#: ../include/svn_error_codes.h:236 msgid "Invalid atomic" msgstr "" -#: ../include/svn_error_codes.h:240 +#: ../include/svn_error_codes.h:241 +msgid "Invalid compression method" +msgstr "" + +#: ../include/svn_error_codes.h:247 msgid "No such XML tag attribute" msgstr "" -#: ../include/svn_error_codes.h:244 +#: ../include/svn_error_codes.h:251 msgid "<delta-pkg> is missing ancestry" msgstr "" -#: ../include/svn_error_codes.h:248 +#: ../include/svn_error_codes.h:255 msgid "Unrecognized binary data encoding; can't decode" msgstr "" -#: ../include/svn_error_codes.h:252 +#: ../include/svn_error_codes.h:259 msgid "XML data was not well-formed" msgstr "" -#: ../include/svn_error_codes.h:256 +#: ../include/svn_error_codes.h:263 msgid "Data cannot be safely XML-escaped" msgstr "" -#: ../include/svn_error_codes.h:262 +#: ../include/svn_error_codes.h:268 +msgid "Unexpected XML element found" +msgstr "" + +#: ../include/svn_error_codes.h:274 msgid "Inconsistent line ending style" msgstr "" -#: ../include/svn_error_codes.h:266 +#: ../include/svn_error_codes.h:278 msgid "Unrecognized line ending style" msgstr "" -#: ../include/svn_error_codes.h:271 +#: ../include/svn_error_codes.h:283 msgid "Line endings other than expected" msgstr "" -#: ../include/svn_error_codes.h:275 +#: ../include/svn_error_codes.h:287 msgid "Ran out of unique names" msgstr "" -#: ../include/svn_error_codes.h:280 +#: ../include/svn_error_codes.h:292 msgid "Framing error in pipe protocol" msgstr "" -#: ../include/svn_error_codes.h:285 +#: ../include/svn_error_codes.h:297 msgid "Read error in pipe" msgstr "" -#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362 -#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2009 +#. is errno on POSIX +#: ../include/svn_error_codes.h:301 ../libsvn_subr/cmdline.c:417 +#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:571 +#: ../svnlook/svnlook.c:2010 #, c-format msgid "Write error" msgstr "" -#: ../include/svn_error_codes.h:294 +#: ../include/svn_error_codes.h:306 msgid "Write error in pipe" msgstr "" -#: ../include/svn_error_codes.h:300 +#: ../include/svn_error_codes.h:312 msgid "Unexpected EOF on stream" msgstr "" -#: ../include/svn_error_codes.h:304 +#: ../include/svn_error_codes.h:316 msgid "Malformed stream data" msgstr "" -#: ../include/svn_error_codes.h:308 +#: ../include/svn_error_codes.h:320 msgid "Unrecognized stream data" msgstr "" -#: ../include/svn_error_codes.h:313 +#: ../include/svn_error_codes.h:325 msgid "Stream doesn't support seeking" msgstr "" -#: ../include/svn_error_codes.h:319 +#: ../include/svn_error_codes.h:330 +msgid "Stream doesn't support this capability" +msgstr "" + +#: ../include/svn_error_codes.h:336 msgid "Unknown svn_node_kind" msgstr "" -#: ../include/svn_error_codes.h:323 +#: ../include/svn_error_codes.h:340 msgid "Unexpected node kind found" msgstr "" -#: ../include/svn_error_codes.h:329 +#: ../include/svn_error_codes.h:346 msgid "Can't find an entry" msgstr "" -#: ../include/svn_error_codes.h:335 +#: ../include/svn_error_codes.h:352 msgid "Entry already exists" msgstr "" -#: ../include/svn_error_codes.h:339 +#: ../include/svn_error_codes.h:356 msgid "Entry has no revision" msgstr "" -#: ../include/svn_error_codes.h:343 +#: ../include/svn_error_codes.h:360 msgid "Entry has no URL" msgstr "" -#: ../include/svn_error_codes.h:347 +#: ../include/svn_error_codes.h:364 msgid "Entry has an invalid attribute" msgstr "" -#: ../include/svn_error_codes.h:351 +#: ../include/svn_error_codes.h:368 msgid "Can't create an entry for a forbidden name" msgstr "" -#: ../include/svn_error_codes.h:357 +#: ../include/svn_error_codes.h:374 msgid "Obstructed update" msgstr "" -#: ../include/svn_error_codes.h:362 +#: ../include/svn_error_codes.h:379 msgid "Mismatch popping the WC unwind stack" msgstr "" -#: ../include/svn_error_codes.h:367 +#: ../include/svn_error_codes.h:384 msgid "Attempt to pop empty WC unwind stack" msgstr "" -#: ../include/svn_error_codes.h:372 +#: ../include/svn_error_codes.h:389 msgid "Attempt to unlock with non-empty unwind stack" msgstr "" -#: ../include/svn_error_codes.h:376 +#: ../include/svn_error_codes.h:393 msgid "Attempted to lock an already-locked dir" msgstr "" -#: ../include/svn_error_codes.h:380 +#: ../include/svn_error_codes.h:397 msgid "Working copy not locked; this is probably a bug, please report" msgstr "" -#: ../include/svn_error_codes.h:385 +#: ../include/svn_error_codes.h:402 msgid "Invalid lock" msgstr "" -#: ../include/svn_error_codes.h:391 ../include/svn_error_codes.h:397 +#: ../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:401 +#: ../include/svn_error_codes.h:418 msgid "Path is not a working copy file" msgstr "" -#: ../include/svn_error_codes.h:405 +#: ../include/svn_error_codes.h:422 msgid "Problem running log" msgstr "" -#: ../include/svn_error_codes.h:409 +#: ../include/svn_error_codes.h:426 msgid "Can't find a working copy path" msgstr "" -#: ../include/svn_error_codes.h:413 +#: ../include/svn_error_codes.h:430 msgid "Working copy is not up-to-date" msgstr "" -#: ../include/svn_error_codes.h:417 +#: ../include/svn_error_codes.h:434 msgid "Left locally modified or unversioned files" msgstr "" -#: ../include/svn_error_codes.h:421 +#: ../include/svn_error_codes.h:438 msgid "Unmergeable scheduling requested on an entry" msgstr "" -#: ../include/svn_error_codes.h:425 +#: ../include/svn_error_codes.h:442 msgid "Found a working copy path" msgstr "" -#: ../include/svn_error_codes.h:429 +#: ../include/svn_error_codes.h:446 msgid "A conflict in the working copy obstructs the current operation" msgstr "" -#: ../include/svn_error_codes.h:433 +#: ../include/svn_error_codes.h:450 msgid "Working copy is corrupt" msgstr "" -#: ../include/svn_error_codes.h:437 +#: ../include/svn_error_codes.h:454 msgid "Working copy text base is corrupt" msgstr "" -#: ../include/svn_error_codes.h:441 +#: ../include/svn_error_codes.h:458 msgid "Cannot change node kind" msgstr "" -#: ../include/svn_error_codes.h:445 +#: ../include/svn_error_codes.h:462 msgid "Invalid operation on the current working directory" msgstr "" -#: ../include/svn_error_codes.h:449 +#: ../include/svn_error_codes.h:466 msgid "Problem on first log entry in a working copy" msgstr "" -#: ../include/svn_error_codes.h:453 +#: ../include/svn_error_codes.h:470 msgid "Unsupported working copy format" msgstr "" -#: ../include/svn_error_codes.h:457 +#: ../include/svn_error_codes.h:474 msgid "Path syntax not supported in this context" msgstr "" -#: ../include/svn_error_codes.h:462 +#: ../include/svn_error_codes.h:479 msgid "Invalid schedule" msgstr "" -#: ../include/svn_error_codes.h:467 +#: ../include/svn_error_codes.h:484 msgid "Invalid relocation" msgstr "" -#: ../include/svn_error_codes.h:472 +#: ../include/svn_error_codes.h:489 msgid "Invalid switch" msgstr "" -#: ../include/svn_error_codes.h:477 +#: ../include/svn_error_codes.h:494 msgid "Changelist doesn't match" msgstr "" -#: ../include/svn_error_codes.h:482 +#: ../include/svn_error_codes.h:499 msgid "Conflict resolution failed" msgstr "" -#: ../include/svn_error_codes.h:486 +#: ../include/svn_error_codes.h:503 msgid "Failed to locate 'copyfrom' path in working copy" msgstr "" -#: ../include/svn_error_codes.h:494 +#: ../include/svn_error_codes.h:511 msgid "Moving a path from one changelist to another" msgstr "" -#: ../include/svn_error_codes.h:499 +#: ../include/svn_error_codes.h:516 msgid "Cannot delete a file external" msgstr "" -#: ../include/svn_error_codes.h:504 +#: ../include/svn_error_codes.h:521 msgid "Cannot move a file external" msgstr "" -#: ../include/svn_error_codes.h:509 +#: ../include/svn_error_codes.h:526 msgid "Something's amiss with the wc sqlite database" msgstr "" -#: ../include/svn_error_codes.h:514 +#: ../include/svn_error_codes.h:531 msgid "The working copy is missing" msgstr "" -#: ../include/svn_error_codes.h:519 +#: ../include/svn_error_codes.h:536 msgid "The specified node is not a symlink" msgstr "" -#: ../include/svn_error_codes.h:524 +#: ../include/svn_error_codes.h:541 msgid "The specified path has an unexpected status" msgstr "" -#: ../include/svn_error_codes.h:529 +#: ../include/svn_error_codes.h:546 msgid "The working copy needs to be upgraded" msgstr "" -#: ../include/svn_error_codes.h:534 +#: ../include/svn_error_codes.h:551 msgid "" "Previous operation has not finished; run 'cleanup' if it was interrupted" msgstr "" -#: ../include/svn_error_codes.h:540 +#: ../include/svn_error_codes.h:557 msgid "The operation cannot be performed with the specified depth" msgstr "" -#: ../include/svn_error_codes.h:545 +#: ../include/svn_error_codes.h:562 msgid "Couldn't open a working copy file because access was denied" msgstr "" -#: ../include/svn_error_codes.h:550 +#: ../include/svn_error_codes.h:567 msgid "Mixed-revision working copy was found but not expected" msgstr "" -#: ../include/svn_error_codes.h:555 +#: ../include/svn_error_codes.h:572 msgid "Duplicate targets in svn:externals property" msgstr "" -#: ../include/svn_error_codes.h:561 +#: ../include/svn_error_codes.h:578 msgid "General filesystem error" msgstr "" -#: ../include/svn_error_codes.h:565 +#: ../include/svn_error_codes.h:582 msgid "Error closing filesystem" msgstr "" -#: ../include/svn_error_codes.h:569 +#: ../include/svn_error_codes.h:586 msgid "Filesystem is already open" msgstr "" -#: ../include/svn_error_codes.h:573 +#: ../include/svn_error_codes.h:590 msgid "Filesystem is not open" msgstr "" -#: ../include/svn_error_codes.h:577 +#: ../include/svn_error_codes.h:594 msgid "Filesystem is corrupt" msgstr "" -#: ../include/svn_error_codes.h:581 +#: ../include/svn_error_codes.h:598 msgid "Invalid filesystem path syntax" msgstr "" -#: ../include/svn_error_codes.h:585 +#: ../include/svn_error_codes.h:602 msgid "Invalid filesystem revision number" msgstr "" -#: ../include/svn_error_codes.h:589 +#: ../include/svn_error_codes.h:606 msgid "Invalid filesystem transaction name" msgstr "" -#: ../include/svn_error_codes.h:593 +#: ../include/svn_error_codes.h:610 msgid "Filesystem directory has no such entry" msgstr "" -#: ../include/svn_error_codes.h:597 +#: ../include/svn_error_codes.h:614 msgid "Filesystem has no such representation" msgstr "" -#: ../include/svn_error_codes.h:601 +#: ../include/svn_error_codes.h:618 msgid "Filesystem has no such string" msgstr "" -#: ../include/svn_error_codes.h:605 +#: ../include/svn_error_codes.h:622 msgid "Filesystem has no such copy" msgstr "" -#: ../include/svn_error_codes.h:609 +#: ../include/svn_error_codes.h:626 msgid "The specified transaction is not mutable" msgstr "" -#: ../include/svn_error_codes.h:613 +#: ../include/svn_error_codes.h:630 msgid "Filesystem has no item" msgstr "" -#: ../include/svn_error_codes.h:617 +#: ../include/svn_error_codes.h:634 msgid "Filesystem has no such node-rev-id" msgstr "" -#: ../include/svn_error_codes.h:621 +#: ../include/svn_error_codes.h:638 msgid "String does not represent a node or node-rev-id" msgstr "" -#: ../include/svn_error_codes.h:625 +#: ../include/svn_error_codes.h:642 msgid "Name does not refer to a filesystem directory" msgstr "" -#: ../include/svn_error_codes.h:629 +#: ../include/svn_error_codes.h:646 msgid "Name does not refer to a filesystem file" msgstr "" -#: ../include/svn_error_codes.h:633 +#: ../include/svn_error_codes.h:650 msgid "Name is not a single path component" msgstr "" -#: ../include/svn_error_codes.h:637 +#: ../include/svn_error_codes.h:654 msgid "Attempt to change immutable filesystem node" msgstr "" -#: ../include/svn_error_codes.h:641 +#: ../include/svn_error_codes.h:658 msgid "Item already exists in filesystem" msgstr "" -#: ../include/svn_error_codes.h:645 +#: ../include/svn_error_codes.h:662 msgid "Attempt to remove or recreate fs root dir" msgstr "" -#: ../include/svn_error_codes.h:649 +#: ../include/svn_error_codes.h:666 msgid "Object is not a transaction root" msgstr "" -#: ../include/svn_error_codes.h:653 +#: ../include/svn_error_codes.h:670 msgid "Object is not a revision root" msgstr "" -#: ../include/svn_error_codes.h:657 +#: ../include/svn_error_codes.h:674 msgid "Merge conflict during commit" msgstr "" -#: ../include/svn_error_codes.h:661 +#: ../include/svn_error_codes.h:678 msgid "A representation vanished or changed between reads" msgstr "" -#: ../include/svn_error_codes.h:665 +#: ../include/svn_error_codes.h:682 msgid "Tried to change an immutable representation" msgstr "" -#: ../include/svn_error_codes.h:669 +#: ../include/svn_error_codes.h:686 msgid "Malformed skeleton data" msgstr "" -#: ../include/svn_error_codes.h:673 +#: ../include/svn_error_codes.h:690 msgid "Transaction is out of date" msgstr "" -#: ../include/svn_error_codes.h:677 +#: ../include/svn_error_codes.h:694 msgid "Berkeley DB error" msgstr "" -#: ../include/svn_error_codes.h:681 +#: ../include/svn_error_codes.h:698 msgid "Berkeley DB deadlock error" msgstr "" -#: ../include/svn_error_codes.h:685 +#: ../include/svn_error_codes.h:702 msgid "Transaction is dead" msgstr "" -#: ../include/svn_error_codes.h:689 +#: ../include/svn_error_codes.h:706 msgid "Transaction is not dead" msgstr "" -#: ../include/svn_error_codes.h:694 +#: ../include/svn_error_codes.h:711 msgid "Unknown FS type" msgstr "" -#: ../include/svn_error_codes.h:699 +#: ../include/svn_error_codes.h:716 msgid "No user associated with filesystem" msgstr "" -#: ../include/svn_error_codes.h:704 +#: ../include/svn_error_codes.h:721 msgid "Path is already locked" msgstr "" -#: ../include/svn_error_codes.h:709 ../include/svn_error_codes.h:886 +#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:958 msgid "Path is not locked" msgstr "" -#: ../include/svn_error_codes.h:714 +#: ../include/svn_error_codes.h:731 msgid "Lock token is incorrect" msgstr "" -#: ../include/svn_error_codes.h:719 +#: ../include/svn_error_codes.h:736 msgid "No lock token provided" msgstr "" -#: ../include/svn_error_codes.h:724 +#: ../include/svn_error_codes.h:741 msgid "Username does not match lock owner" msgstr "" -#: ../include/svn_error_codes.h:729 +#: ../include/svn_error_codes.h:746 msgid "Filesystem has no such lock" msgstr "" -#: ../include/svn_error_codes.h:734 +#: ../include/svn_error_codes.h:751 msgid "Lock has expired" msgstr "" -#: ../include/svn_error_codes.h:739 ../include/svn_error_codes.h:873 +#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:945 msgid "Item is out of date" msgstr "" -#: ../include/svn_error_codes.h:751 +#: ../include/svn_error_codes.h:768 msgid "Unsupported FS format" msgstr "" -#: ../include/svn_error_codes.h:756 +#: ../include/svn_error_codes.h:773 msgid "Representation is being written" msgstr "" -#: ../include/svn_error_codes.h:761 +#: ../include/svn_error_codes.h:778 msgid "The generated transaction name is too long" msgstr "" -#: ../include/svn_error_codes.h:766 +#: ../include/svn_error_codes.h:783 msgid "Filesystem has no such node origin record" msgstr "" -#: ../include/svn_error_codes.h:771 +#: ../include/svn_error_codes.h:788 msgid "Filesystem upgrade is not supported" msgstr "" -#: ../include/svn_error_codes.h:776 +#: ../include/svn_error_codes.h:793 msgid "Filesystem has no such checksum-representation index record" msgstr "" -#: ../include/svn_error_codes.h:781 +#: ../include/svn_error_codes.h:798 msgid "Property value in filesystem differs from the provided base value" msgstr "" -#: ../include/svn_error_codes.h:787 +#: ../include/svn_error_codes.h:804 msgid "The filesystem editor completion process was not followed" msgstr "" -#: ../include/svn_error_codes.h:792 +#: ../include/svn_error_codes.h:809 msgid "A packed revprop could not be read" msgstr "" -#: ../include/svn_error_codes.h:797 +#: ../include/svn_error_codes.h:814 msgid "Could not initialize the revprop caching infrastructure." msgstr "" -#: ../include/svn_error_codes.h:803 +#: ../include/svn_error_codes.h:819 +msgid "Malformed transaction ID string." +msgstr "" + +#: ../include/svn_error_codes.h:824 +msgid "Corrupt index file." +msgstr "" + +#: ../include/svn_error_codes.h:829 +msgid "Revision not covered by index." +msgstr "" + +#: ../include/svn_error_codes.h:834 +msgid "Item index too large for this revision." +msgstr "" + +#: ../include/svn_error_codes.h:839 +msgid "Container index out of range." +msgstr "" + +#: ../include/svn_error_codes.h:844 +msgid "Index files are inconsistent." +msgstr "" + +#: ../include/svn_error_codes.h:849 +msgid "Lock operation failed" +msgstr "" + +#: ../include/svn_error_codes.h:854 +msgid "Unsupported FS type" +msgstr "" + +#: ../include/svn_error_codes.h:859 +msgid "Container capacity exceeded." +msgstr "" + +#: ../include/svn_error_codes.h:864 +msgid "Malformed node revision ID string." +msgstr "" + +#: ../include/svn_error_codes.h:869 ../libsvn_fs_x/revprops.c:291 +msgid "Invalid generation number data." +msgstr "" + +#: ../include/svn_error_codes.h:875 msgid "The repository is locked, perhaps for db recovery" msgstr "" -#: ../include/svn_error_codes.h:807 +#: ../include/svn_error_codes.h:879 msgid "A repository hook failed" msgstr "" -#: ../include/svn_error_codes.h:811 +#: ../include/svn_error_codes.h:883 msgid "Incorrect arguments supplied" msgstr "" -#: ../include/svn_error_codes.h:815 +#: ../include/svn_error_codes.h:887 msgid "A report cannot be generated because no data was supplied" msgstr "" -#: ../include/svn_error_codes.h:819 +#: ../include/svn_error_codes.h:891 msgid "Bogus revision report" msgstr "" -#: ../include/svn_error_codes.h:828 +#: ../include/svn_error_codes.h:900 msgid "Unsupported repository version" msgstr "" -#: ../include/svn_error_codes.h:832 +#: ../include/svn_error_codes.h:904 msgid "Disabled repository feature" msgstr "" -#: ../include/svn_error_codes.h:836 +#: ../include/svn_error_codes.h:908 msgid "Error running post-commit hook" msgstr "" -#: ../include/svn_error_codes.h:841 +#: ../include/svn_error_codes.h:913 msgid "Error running post-lock hook" msgstr "" -#: ../include/svn_error_codes.h:846 +#: ../include/svn_error_codes.h:918 msgid "Error running post-unlock hook" msgstr "" -#: ../include/svn_error_codes.h:851 +#: ../include/svn_error_codes.h:923 msgid "Repository upgrade is not supported" msgstr "" -#: ../include/svn_error_codes.h:857 +#: ../include/svn_error_codes.h:929 msgid "Bad URL passed to RA layer" msgstr "" -#: ../include/svn_error_codes.h:861 +#: ../include/svn_error_codes.h:933 msgid "Authorization failed" msgstr "" -#: ../include/svn_error_codes.h:865 +#: ../include/svn_error_codes.h:937 msgid "Unknown authorization method" msgstr "" -#: ../include/svn_error_codes.h:869 +#: ../include/svn_error_codes.h:941 msgid "Repository access method not implemented" msgstr "" -#: ../include/svn_error_codes.h:877 +#: ../include/svn_error_codes.h:949 msgid "Repository has no UUID" msgstr "" -#: ../include/svn_error_codes.h:881 +#: ../include/svn_error_codes.h:953 msgid "Unsupported RA plugin ABI version" msgstr "" -#: ../include/svn_error_codes.h:891 +#: ../include/svn_error_codes.h:963 msgid "Server can only replay from the root of a repository" msgstr "" -#: ../include/svn_error_codes.h:896 +#: ../include/svn_error_codes.h:968 msgid "Repository UUID does not match expected UUID" msgstr "" -#: ../include/svn_error_codes.h:901 +#: ../include/svn_error_codes.h:973 msgid "Repository root URL does not match expected root URL" msgstr "" -#: ../include/svn_error_codes.h:906 +#: ../include/svn_error_codes.h:978 msgid "Session URL does not match expected session URL" msgstr "" -#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:492 +#: ../include/svn_error_codes.h:983 ../libsvn_ra_svn/client.c:504 #, c-format msgid "Can't create tunnel" msgstr "" -#: ../include/svn_error_codes.h:917 +#: ../include/svn_error_codes.h:988 +msgid "Can't create session" +msgstr "" + +#: ../include/svn_error_codes.h:994 msgid "RA layer failed to init socket layer" msgstr "" -#: ../include/svn_error_codes.h:921 +#: ../include/svn_error_codes.h:998 msgid "RA layer failed to create HTTP request" msgstr "" -#: ../include/svn_error_codes.h:925 +#: ../include/svn_error_codes.h:1002 msgid "RA layer request failed" msgstr "" -#: ../include/svn_error_codes.h:929 +#: ../include/svn_error_codes.h:1006 msgid "RA layer didn't receive requested OPTIONS info" msgstr "" -#: ../include/svn_error_codes.h:933 +#: ../include/svn_error_codes.h:1010 msgid "RA layer failed to fetch properties" msgstr "" -#: ../include/svn_error_codes.h:937 +#: ../include/svn_error_codes.h:1014 msgid "RA layer file already exists" msgstr "" -#: ../include/svn_error_codes.h:951 +#: ../include/svn_error_codes.h:1028 msgid "HTTP Path Not Found" msgstr "" -#: ../include/svn_error_codes.h:955 +#: ../include/svn_error_codes.h:1032 msgid "Failed to execute WebDAV PROPPATCH" msgstr "" -#: ../include/svn_error_codes.h:960 ../include/svn_error_codes.h:1403 -#: ../libsvn_ra_svn/marshal.c:1075 ../libsvn_ra_svn/marshal.c:1285 -#: ../libsvn_ra_svn/marshal.c:1315 +#. If condition COND is not met, return a "malformed network data" error. +#. +#: ../include/svn_error_codes.h:1037 ../include/svn_error_codes.h:1520 +#: ../libsvn_ra_svn/marshal.c:1100 ../libsvn_ra_svn/marshal.c:1352 +#: ../libsvn_ra_svn/marshal.c:1382 ../libsvn_ra_svn/marshal.c:2466 msgid "Malformed network data" msgstr "" -#: ../include/svn_error_codes.h:965 +#: ../include/svn_error_codes.h:1042 msgid "Unable to extract data from response header" msgstr "" -#: ../include/svn_error_codes.h:970 +#: ../include/svn_error_codes.h:1047 msgid "Repository has been moved" msgstr "" -#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2863 -#: ../libsvn_ra_serf/util.c:944 +#: ../include/svn_error_codes.h:1052 ../libsvn_ra_serf/util.c:893 msgid "Connection timed out" msgstr "" -#: ../include/svn_error_codes.h:980 +#: ../include/svn_error_codes.h:1057 msgid "URL access forbidden for unknown reason" msgstr "" -#: ../include/svn_error_codes.h:986 ../include/svn_error_codes.h:1407 +#: ../include/svn_error_codes.h:1062 +msgid "The server state conflicts with the requested preconditions" +msgstr "" + +#: ../include/svn_error_codes.h:1067 +msgid "The URL doesn't allow the requested method" +msgstr "" + +#: ../include/svn_error_codes.h:1073 ../include/svn_error_codes.h:1524 msgid "Couldn't find a repository" msgstr "" -#: ../include/svn_error_codes.h:990 +#: ../include/svn_error_codes.h:1077 msgid "Couldn't open a repository" msgstr "" -#: ../include/svn_error_codes.h:996 +#: ../include/svn_error_codes.h:1083 msgid "Svndiff data has invalid header" msgstr "" -#: ../include/svn_error_codes.h:1000 +#: ../include/svn_error_codes.h:1087 msgid "Svndiff data contains corrupt window" msgstr "" -#: ../include/svn_error_codes.h:1004 +#: ../include/svn_error_codes.h:1091 msgid "Svndiff data contains backward-sliding source view" msgstr "" -#: ../include/svn_error_codes.h:1008 +#: ../include/svn_error_codes.h:1095 msgid "Svndiff data contains invalid instruction" msgstr "" -#: ../include/svn_error_codes.h:1012 +#: ../include/svn_error_codes.h:1099 msgid "Svndiff data ends unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1016 +#: ../include/svn_error_codes.h:1103 msgid "Svndiff compressed data is invalid" msgstr "" -#: ../include/svn_error_codes.h:1022 +#: ../include/svn_error_codes.h:1109 msgid "Apache has no path to an SVN filesystem" msgstr "" -#: ../include/svn_error_codes.h:1026 +#: ../include/svn_error_codes.h:1113 msgid "Apache got a malformed URI" msgstr "" -#: ../include/svn_error_codes.h:1030 +#: ../include/svn_error_codes.h:1117 msgid "Activity not found" msgstr "" -#: ../include/svn_error_codes.h:1034 +#: ../include/svn_error_codes.h:1121 msgid "Baseline incorrect" msgstr "" -#: ../include/svn_error_codes.h:1038 +#: ../include/svn_error_codes.h:1125 msgid "Input/output error" msgstr "" -#: ../include/svn_error_codes.h:1044 +#: ../include/svn_error_codes.h:1131 msgid "A path under version control is needed for this operation" msgstr "" -#: ../include/svn_error_codes.h:1048 +#: ../include/svn_error_codes.h:1135 msgid "Repository access is needed for this operation" msgstr "" -#: ../include/svn_error_codes.h:1052 +#: ../include/svn_error_codes.h:1139 msgid "Bogus revision information given" msgstr "" -#: ../include/svn_error_codes.h:1056 +#: ../include/svn_error_codes.h:1143 msgid "Attempting to commit to a URL more than once" msgstr "" -#: ../include/svn_error_codes.h:1060 +#: ../include/svn_error_codes.h:1147 msgid "Operation does not apply to binary file" msgstr "" -#: ../include/svn_error_codes.h:1066 +#: ../include/svn_error_codes.h:1153 msgid "Format of an svn:externals property was invalid" msgstr "" -#: ../include/svn_error_codes.h:1070 +#: ../include/svn_error_codes.h:1157 msgid "Attempting restricted operation for modified resource" msgstr "" -#: ../include/svn_error_codes.h:1074 +#: ../include/svn_error_codes.h:1161 msgid "Operation does not apply to directory" msgstr "" -#: ../include/svn_error_codes.h:1078 +#: ../include/svn_error_codes.h:1165 msgid "Revision range is not allowed" msgstr "" -#: ../include/svn_error_codes.h:1082 +#: ../include/svn_error_codes.h:1169 msgid "Inter-repository relocation not allowed" msgstr "" -#: ../include/svn_error_codes.h:1086 +#: ../include/svn_error_codes.h:1173 msgid "Author name cannot contain a newline" msgstr "" -#: ../include/svn_error_codes.h:1090 +#: ../include/svn_error_codes.h:1177 msgid "Bad property name" msgstr "" -#: ../include/svn_error_codes.h:1095 +#: ../include/svn_error_codes.h:1182 msgid "Two versioned resources are unrelated" msgstr "" -#: ../include/svn_error_codes.h:1100 +#: ../include/svn_error_codes.h:1187 msgid "Path has no lock token" msgstr "" -#: ../include/svn_error_codes.h:1105 +#: ../include/svn_error_codes.h:1192 msgid "Operation does not support multiple sources" msgstr "" -#: ../include/svn_error_codes.h:1110 +#: ../include/svn_error_codes.h:1197 msgid "No versioned parent directories" msgstr "" -#: ../include/svn_error_codes.h:1115 ../include/svn_error_codes.h:1135 +#: ../include/svn_error_codes.h:1202 ../include/svn_error_codes.h:1222 msgid "Working copy and merge source not ready for reintegration" msgstr "" -#: ../include/svn_error_codes.h:1120 +#: ../include/svn_error_codes.h:1207 msgid "A file external cannot overwrite an existing versioned item" msgstr "" -#: ../include/svn_error_codes.h:1125 +#: ../include/svn_error_codes.h:1212 msgid "Invalid path component strip count specified" msgstr "" -#: ../include/svn_error_codes.h:1130 +#: ../include/svn_error_codes.h:1217 msgid "Detected a cycle while processing the operation" msgstr "" -#: ../include/svn_error_codes.h:1140 +#: ../include/svn_error_codes.h:1227 msgid "Invalid mergeinfo detected in merge target" msgstr "" -#: ../include/svn_error_codes.h:1145 +#: ../include/svn_error_codes.h:1232 msgid "Can't perform this operation without a valid lock token" msgstr "" -#: ../include/svn_error_codes.h:1150 +#: ../include/svn_error_codes.h:1237 msgid "The operation is forbidden by the server" msgstr "" -#: ../include/svn_error_codes.h:1156 +#: ../include/svn_error_codes.h:1243 msgid "A problem occurred; see other errors for details" msgstr "" -#: ../include/svn_error_codes.h:1160 +#: ../include/svn_error_codes.h:1247 msgid "Failure loading plugin" msgstr "" -#: ../include/svn_error_codes.h:1164 +#: ../include/svn_error_codes.h:1251 msgid "Malformed file" msgstr "" -#: ../include/svn_error_codes.h:1168 +#: ../include/svn_error_codes.h:1255 msgid "Incomplete data" msgstr "" -#: ../include/svn_error_codes.h:1172 +#: ../include/svn_error_codes.h:1259 msgid "Incorrect parameters given" msgstr "" -#: ../include/svn_error_codes.h:1176 +#: ../include/svn_error_codes.h:1263 msgid "Tried a versioning operation on an unversioned resource" msgstr "" -#: ../include/svn_error_codes.h:1180 +#: ../include/svn_error_codes.h:1267 msgid "Test failed" msgstr "" -#: ../include/svn_error_codes.h:1184 +#: ../include/svn_error_codes.h:1271 msgid "Trying to use an unsupported feature" msgstr "" -#: ../include/svn_error_codes.h:1188 +#: ../include/svn_error_codes.h:1275 msgid "Unexpected or unknown property kind" msgstr "" -#: ../include/svn_error_codes.h:1192 +#: ../include/svn_error_codes.h:1279 msgid "Illegal target for the requested operation" msgstr "" -#: ../include/svn_error_codes.h:1196 +#: ../include/svn_error_codes.h:1283 msgid "MD5 checksum is missing" msgstr "" -#: ../include/svn_error_codes.h:1200 +#: ../include/svn_error_codes.h:1287 msgid "Directory needs to be empty but is not" msgstr "" -#: ../include/svn_error_codes.h:1204 +#: ../include/svn_error_codes.h:1291 msgid "Error calling external program" msgstr "" -#: ../include/svn_error_codes.h:1208 +#: ../include/svn_error_codes.h:1295 msgid "Python exception has been set with the error" msgstr "" -#: ../include/svn_error_codes.h:1212 +#: ../include/svn_error_codes.h:1299 msgid "A checksum mismatch occurred" msgstr "" -#: ../include/svn_error_codes.h:1216 +#: ../include/svn_error_codes.h:1303 msgid "The operation was interrupted" msgstr "" -#: ../include/svn_error_codes.h:1220 +#: ../include/svn_error_codes.h:1307 msgid "The specified diff option is not supported" msgstr "" -#: ../include/svn_error_codes.h:1224 +#: ../include/svn_error_codes.h:1311 msgid "Property not found" msgstr "" -#: ../include/svn_error_codes.h:1228 +#: ../include/svn_error_codes.h:1315 msgid "No auth file path available" msgstr "" -#: ../include/svn_error_codes.h:1233 +#: ../include/svn_error_codes.h:1320 msgid "Incompatible library version" msgstr "" -#: ../include/svn_error_codes.h:1238 +#: ../include/svn_error_codes.h:1325 msgid "Mergeinfo parse error" msgstr "" -#: ../include/svn_error_codes.h:1243 +#: ../include/svn_error_codes.h:1330 msgid "Cease invocation of this API" msgstr "" -#: ../include/svn_error_codes.h:1248 +#: ../include/svn_error_codes.h:1335 msgid "Error parsing revision number" msgstr "" -#: ../include/svn_error_codes.h:1253 +#: ../include/svn_error_codes.h:1340 msgid "Iteration terminated before completion" msgstr "" -#: ../include/svn_error_codes.h:1258 +#: ../include/svn_error_codes.h:1345 msgid "Unknown changelist" msgstr "" -#: ../include/svn_error_codes.h:1263 +#: ../include/svn_error_codes.h:1350 msgid "Reserved directory name in command line arguments" msgstr "" -#: ../include/svn_error_codes.h:1268 +#: ../include/svn_error_codes.h:1355 msgid "Inquiry about unknown capability" msgstr "" -#: ../include/svn_error_codes.h:1273 +#: ../include/svn_error_codes.h:1360 msgid "Test skipped" msgstr "" -#: ../include/svn_error_codes.h:1278 +#: ../include/svn_error_codes.h:1365 msgid "APR memcache library not available" msgstr "" -#: ../include/svn_error_codes.h:1283 +#: ../include/svn_error_codes.h:1370 msgid "Couldn't perform atomic initialization" msgstr "" -#: ../include/svn_error_codes.h:1288 +#: ../include/svn_error_codes.h:1375 msgid "SQLite error" msgstr "" -#: ../include/svn_error_codes.h:1293 +#: ../include/svn_error_codes.h:1380 msgid "Attempted to write to readonly SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1300 +#: ../include/svn_error_codes.h:1387 msgid "Unsupported schema found in SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1305 +#: ../include/svn_error_codes.h:1392 msgid "The SQLite db is busy" msgstr "" -#: ../include/svn_error_codes.h:1310 +#: ../include/svn_error_codes.h:1397 msgid "" "SQLite busy at transaction rollback; resetting all busy SQLite statements to " "allow rollback" msgstr "" -#: ../include/svn_error_codes.h:1316 +#: ../include/svn_error_codes.h:1403 msgid "Constraint error in SQLite db" msgstr "" -#: ../include/svn_error_codes.h:1321 +#: ../include/svn_error_codes.h:1408 msgid "Too many memcached servers configured" msgstr "" -#: ../include/svn_error_codes.h:1326 +#: ../include/svn_error_codes.h:1413 msgid "Failed to parse version number string" msgstr "" -#: ../include/svn_error_codes.h:1331 +#: ../include/svn_error_codes.h:1418 msgid "Atomic data storage is corrupt" msgstr "" -#: ../include/svn_error_codes.h:1337 +#: ../include/svn_error_codes.h:1423 +msgid "utf8proc library error" +msgstr "" + +#: ../include/svn_error_codes.h:1428 +msgid "Bad arguments to SQL operators GLOB or LIKE" +msgstr "" + +#: ../include/svn_error_codes.h:1433 +msgid "Packed data stream is corrupt" +msgstr "" + +#: ../include/svn_error_codes.h:1438 +msgid "Additional errors:" +msgstr "" + +#: ../include/svn_error_codes.h:1443 +msgid "Parser error: invalid input" +msgstr "" + +#: ../include/svn_error_codes.h:1449 msgid "Error parsing arguments" msgstr "" -#: ../include/svn_error_codes.h:1341 +#: ../include/svn_error_codes.h:1453 msgid "Not enough arguments provided" msgstr "" -#: ../include/svn_error_codes.h:1345 +#: ../include/svn_error_codes.h:1457 msgid "Mutually exclusive arguments specified" msgstr "" -#: ../include/svn_error_codes.h:1349 +#: ../include/svn_error_codes.h:1461 msgid "Attempted command in administrative dir" msgstr "" -#: ../include/svn_error_codes.h:1353 +#: ../include/svn_error_codes.h:1465 msgid "The log message file is under version control" msgstr "" -#: ../include/svn_error_codes.h:1357 +#: ../include/svn_error_codes.h:1469 msgid "The log message is a pathname" msgstr "" -#: ../include/svn_error_codes.h:1361 +#: ../include/svn_error_codes.h:1473 msgid "Committing in directory scheduled for addition" msgstr "" -#: ../include/svn_error_codes.h:1365 +#: ../include/svn_error_codes.h:1477 msgid "No external editor available" msgstr "" -#: ../include/svn_error_codes.h:1369 +#: ../include/svn_error_codes.h:1481 msgid "Something is wrong with the log message's contents" msgstr "" -#: ../include/svn_error_codes.h:1373 +#: ../include/svn_error_codes.h:1485 msgid "A log message was given where none was necessary" msgstr "" -#: ../include/svn_error_codes.h:1377 +#: ../include/svn_error_codes.h:1489 msgid "No external merge tool available" msgstr "" -#: ../include/svn_error_codes.h:1381 +#: ../include/svn_error_codes.h:1493 msgid "Failed processing one or more externals definitions" msgstr "" -#: ../include/svn_error_codes.h:1387 +#: ../include/svn_error_codes.h:1498 +msgid "Repository verification failed" +msgstr "" + +#: ../include/svn_error_codes.h:1504 msgid "Special code for wrapping server errors to report to client" msgstr "" -#: ../include/svn_error_codes.h:1391 +#: ../include/svn_error_codes.h:1508 msgid "Unknown svn protocol command" msgstr "" -#: ../include/svn_error_codes.h:1395 +#: ../include/svn_error_codes.h:1512 msgid "Network connection closed unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1399 +#: ../include/svn_error_codes.h:1516 msgid "Network read/write error" msgstr "" -#: ../include/svn_error_codes.h:1411 +#: ../include/svn_error_codes.h:1528 msgid "Client/server version mismatch" msgstr "" -#: ../include/svn_error_codes.h:1416 +#: ../include/svn_error_codes.h:1533 msgid "Cannot negotiate authentication mechanism" msgstr "" -#: ../include/svn_error_codes.h:1421 +#: ../include/svn_error_codes.h:1538 msgid "Editor drive was aborted" msgstr "" -#: ../include/svn_error_codes.h:1429 +#: ../include/svn_error_codes.h:1546 msgid "Credential data unavailable" msgstr "" -#: ../include/svn_error_codes.h:1433 +#: ../include/svn_error_codes.h:1550 msgid "No authentication provider available" msgstr "" -#: ../include/svn_error_codes.h:1437 +#: ../include/svn_error_codes.h:1554 msgid "All authentication providers exhausted" msgstr "" -#: ../include/svn_error_codes.h:1441 +#: ../include/svn_error_codes.h:1558 msgid "Credentials not saved" msgstr "" -#: ../include/svn_error_codes.h:1446 ../libsvn_subr/gpg_agent.c:415 +#: ../include/svn_error_codes.h:1563 ../libsvn_subr/gpg_agent.c:456 msgid "Authentication failed" msgstr "" -#: ../include/svn_error_codes.h:1452 +#: ../include/svn_error_codes.h:1569 msgid "Read access denied for root of edit" msgstr "" -#: ../include/svn_error_codes.h:1457 +#: ../include/svn_error_codes.h:1574 msgid "Item is not readable" msgstr "" -#: ../include/svn_error_codes.h:1462 +#: ../include/svn_error_codes.h:1579 msgid "Item is partially readable" msgstr "" -#: ../include/svn_error_codes.h:1466 +#: ../include/svn_error_codes.h:1583 msgid "Invalid authz configuration" msgstr "" -#: ../include/svn_error_codes.h:1471 +#: ../include/svn_error_codes.h:1588 msgid "Item is not writable" msgstr "" -#: ../include/svn_error_codes.h:1478 +#: ../include/svn_error_codes.h:1595 msgid "Diff data source modified unexpectedly" msgstr "" -#: ../include/svn_error_codes.h:1484 +#: ../include/svn_error_codes.h:1602 msgid "Initialization of SSPI library failed" msgstr "" -#: ../include/svn_error_codes.h:1488 +#: ../include/svn_error_codes.h:1608 msgid "Server SSL certificate untrusted" msgstr "" -#: ../include/svn_error_codes.h:1493 +#: ../include/svn_error_codes.h:1613 msgid "Initialization of the GSSAPI context failed" msgstr "" -#: ../include/svn_error_codes.h:1498 +#: ../include/svn_error_codes.h:1618 msgid "While handling serf response:" msgstr "" -#: ../include/svn_error_codes.h:1504 +#: ../include/svn_error_codes.h:1624 msgid "Assertion failure" msgstr "" -#: ../include/svn_error_codes.h:1508 +#: ../include/svn_error_codes.h:1628 msgid "No non-tracing links found in the error chain" msgstr "" +#: ../include/svn_error_codes.h:1636 +msgid "Unexpected end of ASN1 data" +msgstr "" + +#: ../include/svn_error_codes.h:1640 +msgid "Unexpected ASN1 tag" +msgstr "" + +#: ../include/svn_error_codes.h:1644 +msgid "Invalid ASN1 length" +msgstr "" + +#: ../include/svn_error_codes.h:1648 +msgid "ASN1 length mismatch" +msgstr "" + +#: ../include/svn_error_codes.h:1652 +msgid "Invalid ASN1 data" +msgstr "" + +#: ../include/svn_error_codes.h:1656 +msgid "Unavailable X509 feature" +msgstr "" + +#: ../include/svn_error_codes.h:1660 +msgid "Invalid PEM certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1664 +msgid "Invalid certificate format" +msgstr "" + +#: ../include/svn_error_codes.h:1668 +msgid "Invalid certificate version" +msgstr "" + +#: ../include/svn_error_codes.h:1672 +msgid "Invalid certificate serial number" +msgstr "" + +#: ../include/svn_error_codes.h:1676 +msgid "Found invalid algorithm in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1680 +msgid "Found invalid name in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1684 +msgid "Found invalid date in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1688 +msgid "Found invalid public key in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1692 +msgid "Found invalid signature in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1696 +msgid "Found invalid extensions in certificate" +msgstr "" + +#: ../include/svn_error_codes.h:1700 +msgid "Unknown certificate version" +msgstr "" + +#: ../include/svn_error_codes.h:1704 +msgid "Certificate uses unknown public key algorithm" +msgstr "" + +#: ../include/svn_error_codes.h:1708 +msgid "Certificate signature mismatch" +msgstr "" + +#: ../include/svn_error_codes.h:1712 +msgid "Certficate verification failed" +msgstr "" + #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152 msgid "GNOME Keyring is locked and we are non-interactive" msgstr "" -#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356 +#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 #: ../libsvn_subr/opt.c:932 #, c-format msgid "'%s' ends in a reserved name" msgstr "" -#: ../libsvn_client/add.c:875 +#: ../libsvn_client/add.c:822 #, c-format msgid "'%s' prevents creating parent of '%s'" msgstr "" -#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:732 +#: ../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:921 ../libsvn_wc/adm_ops.c:687 -#: ../libsvn_wc/workqueue.c:905 ../libsvn_wc/workqueue.c:999 +#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400 +#: ../libsvn_wc/workqueue.c:873 ../libsvn_wc/workqueue.c:967 #, c-format msgid "'%s' not found" msgstr "" -#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:692 +#: ../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 "" -#: ../libsvn_client/add.c:960 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:55 -#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:815 -#: ../libsvn_client/patch.c:3063 ../libsvn_client/relocate.c:232 -#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136 -#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:473 -#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:109 -#: ../svn/util.c:984 +#: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3078 +#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831 +#: ../libsvn_client/patch.c:3235 ../libsvn_client/relocate.c:153 +#: ../libsvn_client/resolved.c:119 ../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:986 ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" msgstr "" -#: ../libsvn_client/add.c:1001 ../libsvn_client/copy_foreign.c:489 -#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715 +#: ../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 "" -#: ../libsvn_client/add.c:1134 ../libsvn_client/add.c:1161 +#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109 #, c-format msgid "There is no valid URI above '%s'" msgstr "" -#: ../libsvn_client/blame.c:605 -msgid "Start revision must precede end revision" -msgstr "" - -#: ../libsvn_client/blame.c:633 +#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:764 #, c-format msgid "Cannot calculate blame information for binary file '%s'" msgstr "" -#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610 -#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833 -#: ../libsvn_client/prop_commands.c:1423 ../libsvn_client/revisions.c:104 -#: ../libsvn_wc/adm_ops.c:1198 ../libsvn_wc/adm_ops.c:1248 -#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301 -#: ../libsvn_wc/entries.c:2682 ../libsvn_wc/entries.c:2713 -#: ../svn/notify.c:1095 +#: ../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:105 +#: ../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:1026 +#: ../svnbench/notify.c:968 #, c-format msgid "'%s' is not under version control" msgstr "" @@ -1327,7 +1498,7 @@ msgstr "" msgid "(local)" msgstr "" -#: ../libsvn_client/cat.c:247 +#: ../libsvn_client/cat.c:255 #, c-format msgid "URL '%s' refers to a directory" msgstr "" @@ -1336,22 +1507,23 @@ msgstr "" msgid "Target changelist name must not be empty" msgstr "" -#: ../libsvn_client/checkout.c:109 ../libsvn_client/export.c:1447 +#: ../libsvn_client/checkout.c:131 ../libsvn_client/export.c:1447 +#: ../svnbench/null-export-cmd.c:275 #, c-format msgid "URL '%s' doesn't exist" msgstr "" -#: ../libsvn_client/checkout.c:113 +#: ../libsvn_client/checkout.c:135 #, c-format msgid "URL '%s' refers to a file, not a directory" msgstr "" -#: ../libsvn_client/checkout.c:147 +#: ../libsvn_client/checkout.c:173 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "" -#: ../libsvn_client/checkout.c:155 +#: ../libsvn_client/checkout.c:181 #, c-format msgid "'%s' already exists and is not a directory" msgstr "" @@ -1361,246 +1533,288 @@ msgstr "" msgid "All non-relative targets must have the same root URL" msgstr "" -#: ../libsvn_client/cmdline.c:312 +#: ../libsvn_client/cmdline.c:207 +#, c-format +msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" +msgstr "" + +#: ../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:155 ../libsvn_client/copy.c:1522 +#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2307 msgid "Commit failed (details follow):" msgstr "" -#: ../libsvn_client/commit.c:163 +#: ../libsvn_client/commit.c:165 msgid "Commit succeeded, but other errors follow:" msgstr "" -#: ../libsvn_client/commit.c:170 +#: ../libsvn_client/commit.c:172 msgid "Error unlocking locked dirs (details follow):" msgstr "" -#: ../libsvn_client/commit.c:181 +#: ../libsvn_client/commit.c:183 msgid "Error bumping revisions post-commit (details follow):" msgstr "" -#: ../libsvn_client/commit.c:314 -#, c-format -msgid "" -"Cannot delete the directory '%s' in a non-recursive commit because it has " -"children" -msgstr "" - -#: ../libsvn_client/commit.c:613 +#: ../libsvn_client/commit.c:554 #, c-format msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "" -#: ../libsvn_client/commit.c:735 +#: ../libsvn_client/commit.c:656 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:851 +#: ../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:882 +#: ../libsvn_client/commit.c:777 #, 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 "" -#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:167 +#: ../libsvn_client/commit_util.c:96 ../libsvn_repos/commit.c:167 #, c-format msgid "Directory '%s' is out of date" msgstr "" -#: ../libsvn_client/commit_util.c:95 ../libsvn_repos/commit.c:169 +#: ../libsvn_client/commit_util.c:97 ../libsvn_repos/commit.c:169 #, c-format msgid "File '%s' is out of date" msgstr "" -#: ../libsvn_client/commit_util.c:130 +#: ../libsvn_client/commit_util.c:133 #, c-format msgid "Directory '%s' is locked in another working copy" msgstr "" -#: ../libsvn_client/commit_util.c:131 +#: ../libsvn_client/commit_util.c:134 #, c-format msgid "File '%s' is locked in another working copy" msgstr "" -#: ../libsvn_client/commit_util.c:166 +#: ../libsvn_client/commit_util.c:169 #, c-format msgid "Changing directory '%s' is forbidden by the server" msgstr "" -#: ../libsvn_client/commit_util.c:167 +#: ../libsvn_client/commit_util.c:170 #, c-format msgid "Changing file '%s' is forbidden by the server" msgstr "" -#: ../libsvn_client/commit_util.c:315 +#: ../libsvn_client/commit_util.c:318 #, c-format msgid "Aborting commit: '%s' remains in tree-conflict" msgstr "" -#: ../libsvn_client/commit_util.c:666 +#: ../libsvn_client/commit_util.c:668 #, c-format msgid "Aborting commit: '%s' remains in conflict" msgstr "" -#: ../libsvn_client/commit_util.c:685 +#: ../libsvn_client/commit_util.c:687 #, c-format msgid "Node '%s' has unexpectedly changed kind" msgstr "" -#: ../libsvn_client/commit_util.c:726 +#: ../libsvn_client/commit_util.c:728 #, c-format msgid "'%s' is scheduled for addition, but is missing" msgstr "" -#: ../libsvn_client/commit_util.c:1257 +#: ../libsvn_client/commit_util.c:1279 #, 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 "" -#: ../libsvn_client/commit_util.c:1397 +#: ../libsvn_client/commit_util.c:1421 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "" -#: ../libsvn_client/commit_util.c:1548 +#: ../libsvn_client/commit_util.c:1576 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "" -#: ../libsvn_client/commit_util.c:1553 +#: ../libsvn_client/commit_util.c:1581 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "" -#: ../libsvn_client/commit_util.c:2015 +#: ../libsvn_client/commit_util.c:2056 msgid "Standard properties can't be set explicitly as revision properties" msgstr "" -#: ../libsvn_client/copy.c:439 +#: ../libsvn_client/copy.c:295 +#, c-format +msgid "%s property defined at '%s' is using an unsupported syntax" +msgstr "" + +#: ../libsvn_client/copy.c:460 +#, c-format +msgid "" +"Cannot pin external '%s' defined in %s at '%s' because it is not checked out " +"in the working copy at '%s'" +msgstr "" + +#: ../libsvn_client/copy.c:485 +#, c-format +msgid "" +"Cannot pin external '%s' defined in %s at '%s' because '%s' has switched " +"subtrees (switches cannot be represented in %s)" +msgstr "" + +#: ../libsvn_client/copy.c:504 +#, c-format +msgid "" +"Cannot pin external '%s' defined in %s at '%s' because '%s' has local " +"modifications (local modifications cannot be represented in %s)" +msgstr "" + +#: ../libsvn_client/copy.c:522 +#, c-format +msgid "" +"Cannot pin external '%s' defined in %s at '%s' because '%s' is a mixed-" +"revision working copy (mixed-revisions cannot be represented in %s)" +msgstr "" + +#: ../libsvn_client/copy.c:985 #, c-format msgid "Path '%s' exists, but is excluded" msgstr "" -#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062 -#: ../libsvn_client/copy.c:1321 ../libsvn_client/copy.c:1896 -#: ../libsvn_client/import.c:862 +#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:2094 +#: ../libsvn_client/copy.c:2750 ../libsvn_client/import.c:881 +#: ../libsvn_client/mtcc.c:456 ../libsvn_client/mtcc.c:473 +#: ../libsvn_ra_serf/util.c:1852 #, c-format msgid "Path '%s' already exists" msgstr "" -#: ../libsvn_client/copy.c:500 +#: ../libsvn_client/copy.c:1046 #, c-format msgid "Path '%s' already exists as unversioned node" msgstr "" -#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532 -#: ../libsvn_client/copy.c:1912 +#: ../libsvn_client/copy.c:1071 +#, c-format +msgid "Directory '%s' is not under version control" +msgstr "" + +#: ../libsvn_client/copy.c:1073 ../libsvn_client/copy.c:1082 +#: ../libsvn_client/copy.c:1092 ../libsvn_client/copy.c:2766 #, c-format msgid "Path '%s' is not a directory" msgstr "" -#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10168 -#: ../svnlook/svnlook.c:1425 +#: ../libsvn_client/copy.c:1131 ../libsvn_client/merge.c:10299 +#: ../svnlook/svnlook.c:1422 #, c-format msgid "Path '%s' does not exist" msgstr "" -#: ../libsvn_client/copy.c:741 ../libsvn_client/copy.c:782 +#: ../libsvn_client/copy.c:1315 ../libsvn_client/copy.c:1356 #, c-format msgid "Path '%s' already exists, but is not a directory" msgstr "" -#: ../libsvn_client/copy.c:843 +#: ../libsvn_client/copy.c:1493 msgid "Source and destination URLs appear not to point to the same repository." msgstr "" -#: ../libsvn_client/copy.c:1052 ../libsvn_client/prop_commands.c:167 +#: ../libsvn_client/copy.c:1705 ../libsvn_client/prop_commands.c:167 #, c-format msgid "Path '%s' does not exist in revision %ld" msgstr "" -#: ../libsvn_client/copy.c:1880 +#: ../libsvn_client/copy.c:1719 +#, c-format +msgid "Path '/%s' already exists" +msgstr "" + +#: ../libsvn_client/copy.c:2734 ../libsvn_client/mtcc.c:550 #, c-format msgid "Path '%s' not found in revision %ld" msgstr "" -#: ../libsvn_client/copy.c:1885 +#: ../libsvn_client/copy.c:2739 #, c-format msgid "Path '%s' not found in head revision" msgstr "" -#: ../libsvn_client/copy.c:2013 +#: ../libsvn_client/copy.c:2874 msgid "Cannot mix repository and working copy sources" msgstr "" -#: ../libsvn_client/copy.c:2065 +#: ../libsvn_client/copy.c:2927 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" msgstr "" -#: ../libsvn_client/copy.c:2101 +#: ../libsvn_client/copy.c:2963 #, c-format msgid "" "Cannot move the external at '%s'; please edit the svn:externals property on " "'%s'." msgstr "" -#: ../libsvn_client/copy.c:2116 +#: ../libsvn_client/copy.c:2978 msgid "Moves between the working copy and the repository are not supported" msgstr "" -#: ../libsvn_client/copy.c:2131 +#: ../libsvn_client/copy.c:2993 #, c-format msgid "Cannot move URL '%s' into itself" msgstr "" -#: ../libsvn_client/copy.c:2132 +#: ../libsvn_client/copy.c:2994 #, c-format msgid "Cannot move path '%s' into itself" msgstr "" -#: ../libsvn_client/copy.c:2199 +#: ../libsvn_client/copy.c:3061 #, c-format msgid "'%s' does not have a URL associated with it" msgstr "" -#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282 -#: ../libsvn_client/externals.c:963 ../libsvn_client/externals.c:1173 -#: ../libsvn_wc/update_editor.c:1124 +#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:283 +#: ../libsvn_client/externals.c:1021 ../libsvn_client/externals.c:1232 +#: ../libsvn_wc/update_editor.c:1119 #, c-format msgid "Path '%s' is not in the working copy" msgstr "" -#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:814 -#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051 -#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1984 -#: ../libsvn_wc/diff_editor.c:2070 ../libsvn_wc/externals.c:651 -#: ../libsvn_wc/update_editor.c:4277 +#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 +#: ../libsvn_client/repos_diff.c:1002 ../libsvn_fs_fs/dag.c:1110 +#: ../libsvn_fs_x/dag.c:1074 ../libsvn_ra_svn/client.c:1356 +#: ../libsvn_wc/diff_editor.c:1987 ../libsvn_wc/diff_editor.c:2073 +#: ../libsvn_wc/externals.c:709 ../libsvn_wc/update_editor.c:4228 #, c-format msgid "Checksum mismatch for '%s'" msgstr "" -#: ../libsvn_client/copy_foreign.c:479 +#: ../libsvn_client/copy_foreign.c:481 #, c-format msgid "'%s' is not a valid location inside a repository" msgstr "" -#: ../libsvn_client/copy_foreign.c:510 +#: ../libsvn_client/copy_foreign.c:512 #, c-format msgid "Can't add '%s', because no parent directory is found" msgstr "" @@ -1622,105 +1836,109 @@ msgid "" "property on '%s'" msgstr "" -#: ../libsvn_client/deprecated.c:862 ../svn/move-cmd.c:65 +#: ../libsvn_client/delete.c:358 +#, c-format +msgid "URL '%s' not within a repository" +msgstr "" + +#: ../libsvn_client/delete.c:365 +#, c-format +msgid "URL '%s' does not exist" +msgstr "" + +#: ../libsvn_client/deprecated.c:884 ../svn/move-cmd.c:65 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "" -#: ../libsvn_client/deprecated.c:1624 +#: ../libsvn_client/deprecated.c:1647 msgid "No commits in repository" msgstr "" -#: ../libsvn_client/deprecated.c:2930 ../libsvn_wc/deprecated.c:3953 +#: ../libsvn_client/deprecated.c:3032 ../libsvn_wc/deprecated.c:4172 msgid "Non-recursive relocation not supported" msgstr "" -#. Utilities -#: ../libsvn_client/diff.c:64 +#: ../libsvn_client/diff.c:66 #, c-format msgid "Path '%s' must be an immediate child of the directory '%s'" msgstr "" -#: ../libsvn_client/diff.c:258 +#: ../libsvn_client/diff.c:241 #, c-format msgid "%s\t(revision %ld)" msgstr "" -#: ../libsvn_client/diff.c:260 +#: ../libsvn_client/diff.c:243 +#, c-format +msgid "%s\t(nonexistent)" +msgstr "" + +#. SVN_INVALID_REVNUM +#: ../libsvn_client/diff.c:245 #, c-format msgid "%s\t(working copy)" msgstr "" -#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:795 +#: ../libsvn_client/diff.c:499 ../svnlook/svnlook.c:801 #, c-format msgid "%sProperty changes on: %s%s" msgstr "" -#: ../libsvn_client/diff.c:760 +#: ../libsvn_client/diff.c:754 #, c-format msgid "Cannot display: file marked as a binary type.%s" msgstr "" -#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7217 -#: ../libsvn_client/merge.c:10570 +#: ../libsvn_client/diff.c:1285 ../libsvn_client/merge.c:7349 +#: ../libsvn_client/merge.c:10701 msgid "Not all required revisions are specified" msgstr "" -#: ../libsvn_client/diff.c:1279 +#: ../libsvn_client/diff.c:1299 msgid "" "At least one revision must be something other than BASE or WORKING when " "diffing a URL" msgstr "" -#: ../libsvn_client/diff.c:1316 +#: ../libsvn_client/diff.c:1336 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1321 +#: ../libsvn_client/diff.c:1341 #, c-format msgid "" "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1496 +#: ../libsvn_client/diff.c:1517 #, c-format msgid "" "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1501 +#: ../libsvn_client/diff.c:1522 #, c-format msgid "" "Diff targets '%s' and '%s' were not found in the repository at revisions " "'%ld' and '%ld'" msgstr "" -#: ../libsvn_client/diff.c:1575 +#: ../libsvn_client/diff.c:1621 msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" msgstr "" -#: ../libsvn_client/diff.c:1616 +#: ../libsvn_client/diff.c:1661 msgid "" "Only diffs between a path's text-base and its working files are supported at " "this time" msgstr "" -#: ../libsvn_client/diff.c:2221 -msgid "" -"Summarized diffs are only supported between a path's text-base and its " -"working files at this time" -msgstr "" - -#: ../libsvn_client/diff.c:2582 ../libsvn_client/diff.c:2648 +#: ../libsvn_client/diff.c:2367 ../libsvn_client/diff.c:2453 msgid "Cannot ignore properties and show only properties at the same time" msgstr "" -#: ../libsvn_client/diff_local.c:609 -#, c-format -msgid "'%s' is not the same node kind as '%s'" -msgstr "" - -#: ../libsvn_client/diff_local.c:632 ../libsvn_wc/props.c:1568 +#: ../libsvn_client/diff_local.c:792 ../libsvn_wc/props.c:1675 #, c-format msgid "'%s' is not a file or directory" msgstr "" @@ -1735,22 +1953,22 @@ msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "" #: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527 -#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293 -#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327 -#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227 -#: ../libsvn_wc/status.c:2679 ../libsvn_wc/wc_db.c:2589 -#: ../libsvn_wc/wc_db.c:2787 ../libsvn_wc/wc_db.c:2811 -#: ../libsvn_wc/wc_db.c:2969 ../libsvn_wc/wc_db.c:3967 -#: ../libsvn_wc/wc_db.c:6021 ../libsvn_wc/wc_db.c:6341 -#: ../libsvn_wc/wc_db.c:6502 ../libsvn_wc/wc_db.c:6657 -#: ../libsvn_wc/wc_db.c:7696 ../libsvn_wc/wc_db.c:8660 -#: ../libsvn_wc/wc_db.c:9326 ../libsvn_wc/wc_db.c:9955 -#: ../libsvn_wc/wc_db.c:10102 ../libsvn_wc/wc_db.c:10242 -#: ../libsvn_wc/wc_db.c:10592 ../libsvn_wc/wc_db.c:10926 -#: ../libsvn_wc/wc_db.c:12106 ../libsvn_wc/wc_db.c:12182 -#: ../libsvn_wc/wc_db.c:13716 ../libsvn_wc/wc_db.c:13776 -#: ../libsvn_wc/wc_db.c:13914 ../libsvn_wc/wc_db.c:14072 -#: ../libsvn_wc/wc_db.c:14509 ../libsvn_wc/wc_db.c:15290 +#: ../libsvn_wc/adm_crawler.c:1228 ../libsvn_wc/copy.c:651 +#: ../libsvn_wc/crop.c:234 ../libsvn_wc/crop.c:337 ../libsvn_wc/info.c:377 +#: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2722 +#: ../libsvn_wc/wc_db.c:2066 ../libsvn_wc/wc_db.c:2607 +#: ../libsvn_wc/wc_db.c:2846 ../libsvn_wc/wc_db.c:2879 +#: ../libsvn_wc/wc_db.c:3037 ../libsvn_wc/wc_db.c:4050 +#: ../libsvn_wc/wc_db.c:6373 ../libsvn_wc/wc_db.c:6693 +#: ../libsvn_wc/wc_db.c:6933 ../libsvn_wc/wc_db.c:7073 +#: ../libsvn_wc/wc_db.c:8112 ../libsvn_wc/wc_db.c:9112 +#: ../libsvn_wc/wc_db.c:9844 ../libsvn_wc/wc_db.c:10489 +#: ../libsvn_wc/wc_db.c:10636 ../libsvn_wc/wc_db.c:10776 +#: ../libsvn_wc/wc_db.c:11152 ../libsvn_wc/wc_db.c:11485 +#: ../libsvn_wc/wc_db.c:12725 ../libsvn_wc/wc_db.c:12794 +#: ../libsvn_wc/wc_db.c:14123 ../libsvn_wc/wc_db.c:14172 +#: ../libsvn_wc/wc_db.c:14293 ../libsvn_wc/wc_db.c:14452 +#: ../libsvn_wc/wc_db.c:14893 ../libsvn_wc/wc_db.c:15757 #, c-format msgid "The node '%s' was not found." msgstr "" @@ -1779,139 +1997,145 @@ msgstr "" msgid "'%s' already exists" msgstr "" -#: ../libsvn_client/externals.c:202 +#: ../libsvn_client/externals.c:202 ../libsvn_client/externals.c:259 #, c-format msgid "" "The external '%s' defined in %s at '%s' cannot be checked out because '%s' " "is already a versioned path." msgstr "" -#: ../libsvn_client/externals.c:461 +#: ../libsvn_client/externals.c:500 #, c-format msgid "" "Cannot insert a file external defined on '%s' into the working copy '%s'." msgstr "" -#: ../libsvn_client/externals.c:486 +#: ../libsvn_client/externals.c:525 #, c-format msgid "" "The file external from '%s' cannot overwrite the existing versioned item at " "'%s'" msgstr "" -#: ../libsvn_client/externals.c:499 +#: ../libsvn_client/externals.c:539 #, c-format msgid "The file external '%s' can not be created because the node exists." msgstr "" -#: ../libsvn_client/externals.c:761 +#: ../libsvn_client/externals.c:817 #, c-format msgid "URL '%s' at revision %ld doesn't exist" msgstr "" -#: ../libsvn_client/externals.c:766 +#: ../libsvn_client/externals.c:822 #, c-format msgid "URL '%s' at revision %ld is not a file or a directory" msgstr "" -#: ../libsvn_client/externals.c:845 +#: ../libsvn_client/externals.c:901 #, c-format msgid "" "Unsupported external: URL of file external '%s' is not in repository '%s'" msgstr "" -#: ../libsvn_client/externals.c:1038 +#: ../libsvn_client/externals.c:1097 #, c-format msgid "Traversal of '%s' found no ambient depth" msgstr "" -#: ../libsvn_client/import.c:159 +#: ../libsvn_client/import.c:149 #, c-format msgid "%s property on '%s' contains unrecognized EOL-style '%s'" msgstr "" -#: ../libsvn_client/import.c:489 +#: ../libsvn_client/import.c:479 #, c-format msgid "Unknown or unversionable type for '%s'" msgstr "" -#: ../libsvn_client/import.c:707 +#: ../libsvn_client/import.c:706 msgid "New entry name required when importing a file" msgstr "" -#: ../libsvn_client/import.c:758 ../libsvn_client/patch.c:3070 -#: ../libsvn_client/patch.c:3082 ../libsvn_wc/delete.c:93 -#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77 +#: ../libsvn_client/import.c:757 ../libsvn_client/patch.c:3242 +#: ../libsvn_client/patch.c:3254 ../libsvn_wc/delete.c:93 +#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:78 #, c-format msgid "'%s' does not exist" msgstr "" -#: ../libsvn_client/import.c:891 +#: ../libsvn_client/import.c:909 #, c-format msgid "'%s' is a reserved name and cannot be imported" msgstr "" -#: ../libsvn_client/info.c:310 ../libsvn_client/list.c:376 +#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:272 +#: ../svnbench/null-info-cmd.c:148 #, c-format msgid "URL '%s' non-existent in revision %ld" msgstr "" -#: ../libsvn_client/locking_commands.c:266 -#: ../libsvn_client/locking_commands.c:292 +#: ../libsvn_client/locking_commands.c:273 msgid "No common parent found, unable to operate on disjoint arguments" msgstr "" -#: ../libsvn_client/locking_commands.c:325 +#: ../libsvn_client/locking_commands.c:382 #, c-format msgid "The node '%s' is not a file" msgstr "" -#: ../libsvn_client/locking_commands.c:345 +#: ../libsvn_client/locking_commands.c:402 msgid "Unable to lock/unlock across multiple repositories" msgstr "" -#: ../libsvn_client/locking_commands.c:400 +#: ../libsvn_client/locking_commands.c:442 #, c-format msgid "'%s' is not locked in this working copy" msgstr "" -#: ../libsvn_client/locking_commands.c:450 +#: ../libsvn_client/locking_commands.c:495 #, c-format msgid "'%s' is not locked" msgstr "" -#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1413 -#: ../libsvn_ra/ra_loader.c:1074 +#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1641 +#: ../libsvn_ra/ra_loader.c:1058 msgid "Lock comment contains illegal characters" msgstr "" -#: ../libsvn_client/log.c:309 +#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:532 +#: ../libsvn_client/ra.c:867 +#, c-format +msgid "'%s' has no URL" +msgstr "" + +#: ../libsvn_client/log.c:347 msgid "No valid target found" msgstr "" -#: ../libsvn_client/log.c:340 +#: ../libsvn_client/log.c:378 #, c-format msgid "'%s' is not a relative path" msgstr "" -#: ../libsvn_client/log.c:366 +#: ../libsvn_client/log.c:404 msgid "When specifying working copy paths, only one target may be given" msgstr "" -#: ../libsvn_client/log.c:390 ../libsvn_client/revisions.c:189 +#: ../libsvn_client/log.c:428 ../libsvn_client/revisions.c:190 msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL" msgstr "" -#: ../libsvn_client/log.c:523 ../libsvn_client/log.c:832 +#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:870 msgid "Missing required revision specification" msgstr "" -#: ../libsvn_client/merge.c:443 +#: ../libsvn_client/merge.c:442 #, c-format msgid "URL '%s' of '%s' is not in repository '%s'" msgstr "" -#: ../libsvn_client/merge.c:480 +#: ../libsvn_client/merge.c:479 #, c-format msgid "'%s' must be from the same repository as '%s'" msgstr "" @@ -1919,28 +2143,28 @@ msgstr "" #. xgettext: the '.working', '.merge-left.r%ld' and #. '.merge-right.r%ld' strings are used to tag onto a file #. name in case of a merge conflict -#: ../libsvn_client/merge.c:2052 +#: ../libsvn_client/merge.c:2137 #, c-format msgid ".working%s%s" msgstr "" -#: ../libsvn_client/merge.c:2055 +#: ../libsvn_client/merge.c:2140 #, c-format msgid ".merge-left.r%ld%s%s" msgstr "" -#: ../libsvn_client/merge.c:2059 +#: ../libsvn_client/merge.c:2144 #, c-format msgid ".merge-right.r%ld%s%s" msgstr "" -#: ../libsvn_client/merge.c:4722 +#: ../libsvn_client/merge.c:4846 msgid "" "Cannot reverse-merge a range from a path's own future history; try updating " "first" msgstr "" -#: ../libsvn_client/merge.c:5457 +#: ../libsvn_client/merge.c:5581 #, c-format msgid "" "One or more conflicts were produced while merging r%ld:%ld into\n" @@ -1949,83 +2173,87 @@ msgid "" "unmerged revisions" msgstr "" -#: ../libsvn_client/merge.c:6272 +#: ../libsvn_client/merge.c:6397 #, c-format msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" msgstr "" -#: ../libsvn_client/merge.c:6421 +#: ../libsvn_client/merge.c:6551 msgid "" "Merge tracking not allowed with missing subtrees; try restoring these items " "first:\n" msgstr "" -#: ../libsvn_client/merge.c:7421 +#: ../libsvn_client/merge.c:7553 #, c-format msgid "" "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" msgstr "" -#: ../libsvn_client/merge.c:9740 +#: ../libsvn_client/merge.c:9871 msgid "Use of two URLs is not compatible with mergeinfo modification" msgstr "" -#: ../libsvn_client/merge.c:9747 ../libsvn_client/merge.c:10082 +#: ../libsvn_client/merge.c:9878 ../libsvn_client/merge.c:10213 msgid "" "Merge from foreign repository is not compatible with mergeinfo modification" msgstr "" -#: ../libsvn_client/merge.c:10175 ../libsvn_client/merge.c:10318 +#: ../libsvn_client/merge.c:10306 ../libsvn_client/merge.c:10449 #, c-format msgid "Merge target '%s' does not exist in the working copy" msgstr "" -#: ../libsvn_client/merge.c:10198 +#: ../libsvn_client/merge.c:10329 msgid "Cannot determine revision of working copy" msgstr "" -#: ../libsvn_client/merge.c:10204 +#: ../libsvn_client/merge.c:10335 #, c-format msgid "" "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" msgstr "" -#: ../libsvn_client/merge.c:10219 +#: ../libsvn_client/merge.c:10350 msgid "Cannot merge into a working copy with a switched subtree" msgstr "" -#: ../libsvn_client/merge.c:10235 +#: ../libsvn_client/merge.c:10366 msgid "Cannot merge into a working copy that has local modifications" msgstr "" -#: ../libsvn_client/merge.c:10255 ../svn/merge-cmd.c:60 +#: ../libsvn_client/merge.c:10386 ../svn/merge-cmd.c:56 #, c-format msgid "" "Invalid merge source '%s'; a working copy path can only be used with a " "repository revision (a number, a date, or head)" msgstr "" -#: ../libsvn_client/merge.c:10573 ../svn/merge-cmd.c:127 +#: ../libsvn_client/merge.c:10704 ../svn/merge-cmd.c:123 msgid "Merge sources must both be either paths or URLs" msgstr "" -#: ../libsvn_client/merge.c:11334 ../libsvn_client/merge.c:11496 -#: ../libsvn_client/merge.c:12383 +#: ../libsvn_client/merge.c:11473 ../libsvn_client/merge.c:11635 +#: ../libsvn_client/merge.c:12538 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" msgstr "" -#: ../libsvn_client/merge.c:11446 +#: ../libsvn_client/merge.c:11585 #, c-format msgid "" "Neither the reintegrate source nor target can be the root of the repository" msgstr "" -#: ../libsvn_client/merge.c:11456 +#: ../libsvn_client/merge.c:11595 msgid "Reintegrate merge not possible" msgstr "" -#: ../libsvn_client/merge.c:11529 +#: ../libsvn_client/merge.c:11665 +msgid " Missing ranges: " +msgstr "" + +#: ../libsvn_client/merge.c:11668 #, c-format msgid "" "Reintegrate can only be used if revisions %ld through %ld were previously " @@ -2033,160 +2261,257 @@ msgid "" "%s" msgstr "" -#: ../libsvn_client/merge.c:11591 +#: ../libsvn_client/merge.c:11727 #, c-format msgid "" "Can't reintegrate into '%s' because it is locally added and therefore not " "related to the merge source" msgstr "" -#: ../libsvn_client/merge.c:11859 +#: ../libsvn_client/merge.c:12000 msgid "Cannot merge automatically while ignoring mergeinfo" msgstr "" -#: ../libsvn_client/merge.c:12599 +#: ../libsvn_client/merge.c:12668 +#, c-format +msgid "" +"Can't perform automatic merge into '%s' because it is locally added and " +"therefore not related to the merge source" +msgstr "" + +#: ../libsvn_client/merge.c:12767 msgid "" "The required merge is reintegrate-like, and the record-only option cannot be " "used with this kind of merge" msgstr "" -#: ../libsvn_client/merge.c:12605 +#: ../libsvn_client/merge.c:12773 msgid "" "The required merge is reintegrate-like, and the depth option cannot be used " "with this kind of merge" msgstr "" -#: ../libsvn_client/merge.c:12611 +#: ../libsvn_client/merge.c:12779 msgid "" "The required merge is reintegrate-like, and the force_delete option cannot " "be used with this kind of merge" msgstr "" -#: ../libsvn_client/mergeinfo.c:1718 +#: ../libsvn_client/mergeinfo.c:1715 msgid "Only depths 'infinity' and 'empty' are currently supported" msgstr "" -#: ../libsvn_client/patch.c:279 +#: ../libsvn_client/mtcc.c:166 #, c-format -msgid "Cannot strip %u components from '%s'" +msgid "Can't operate on '%s' because '%s' is not a directory" msgstr "" -#: ../libsvn_client/patch.c:910 -msgid "Invalid link representation" +#: ../libsvn_client/mtcc.c:319 +#, c-format +msgid "No origin found for node at '%s'" msgstr "" -#: ../libsvn_client/patch.c:3059 -msgid "strip count must be positive" +#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:402 +#, c-format +msgid "No such revision %ld (HEAD is %ld)" msgstr "" -#: ../libsvn_client/patch.c:3075 ../libsvn_fs_base/tree.c:3978 -#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:2943 -#: ../libsvn_fs_fs/tree.c:2948 ../libsvn_ra/compat.c:675 -#: ../libsvn_ra_local/ra_plugin.c:1145 +#: ../libsvn_client/mtcc.c:407 #, c-format -msgid "'%s' is not a file" +msgid "'%s' is not an ancestor of '%s'" msgstr "" -#: ../libsvn_client/patch.c:3087 ../libsvn_wc/util.c:59 +#: ../libsvn_client/mtcc.c:506 #, c-format -msgid "'%s' is not a directory" +msgid "Can't add file at '%s'" msgstr "" -#: ../libsvn_client/prop_commands.c:60 +#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:708 +#: ../libsvn_fs_base/lock.c:274 ../libsvn_fs_fs/fs_fs.c:1367 +#: ../libsvn_fs_fs/lock.c:759 ../libsvn_fs_fs/rev_file.c:177 +#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:690 +#: ../libsvn_fs_x/lock.c:799 ../libsvn_fs_x/rev_file.c:190 +#: ../libsvn_repos/log.c:2357 ../libsvn_repos/log.c:2361 #, c-format -msgid "'%s' is a wcprop, thus not accessible to clients" +msgid "No such revision %ld" msgstr "" -#: ../libsvn_client/prop_commands.c:155 +#: ../libsvn_client/mtcc.c:560 #, c-format -msgid "Property '%s' is not a regular property" +msgid "Can't add node at '%s'" msgstr "" -#: ../libsvn_client/prop_commands.c:266 +#: ../libsvn_client/mtcc.c:587 #, c-format -msgid "Revision property '%s' not allowed in this context" +msgid "Can't delete node at '%s' as it does not exist" msgstr "" -#: ../libsvn_client/prop_commands.c:273 ../libsvn_client/prop_commands.c:468 +#: ../libsvn_client/mtcc.c:604 +#, c-format +msgid "Can't delete node at '%s'" +msgstr "" + +#: ../libsvn_client/mtcc.c:641 +#, c-format +msgid "Can't create directory at '%s'" +msgstr "" + +#: ../libsvn_client/mtcc.c:779 ../libsvn_client/prop_commands.c:282 +#: ../libsvn_client/prop_commands.c:477 #, c-format msgid "Bad property name: '%s'" msgstr "" -#: ../libsvn_client/prop_commands.c:301 +#: ../libsvn_client/mtcc.c:783 ../libsvn_client/prop_commands.c:275 +#, c-format +msgid "Revision property '%s' not allowed in this context" +msgstr "" + +#: ../libsvn_client/mtcc.c:788 ../libsvn_client/prop_commands.c:60 +#, c-format +msgid "'%s' is a wcprop, thus not accessible to clients" +msgstr "" + +#: ../libsvn_client/mtcc.c:798 +msgid "Error normalizing property value" +msgstr "" + +#: ../libsvn_client/mtcc.c:833 ../libsvn_client/mtcc.c:856 +#, c-format +msgid "Can't set properties at not existing '%s'" +msgstr "" + +#: ../libsvn_client/mtcc.c:904 +#, c-format +msgid "Can't update '%s' because it is not a file" +msgstr "" + +#: ../libsvn_client/mtcc.c:915 +#, c-format +msgid "Can't update file at '%s'" +msgstr "" + +#: ../libsvn_client/mtcc.c:980 +#, c-format +msgid "Can't perform file operation on '%s' as it is not a file" +msgstr "" + +#: ../libsvn_client/mtcc.c:990 +#, c-format +msgid "Can't perform directory operation on '%s' as it is not a directory" +msgstr "" + +#: ../libsvn_client/mtcc.c:997 +#, c-format +msgid "Can't open '%s' as it does not exist" +msgstr "" + +#: ../libsvn_client/mtcc.c:1389 +#, c-format +msgid "Can't commit to '%s' because it is not a directory" +msgstr "" + +#: ../libsvn_client/patch.c:281 +#, c-format +msgid "Cannot strip %u components from '%s'" +msgstr "" + +#: ../libsvn_client/patch.c:917 +msgid "Invalid link representation" +msgstr "" + +#: ../libsvn_client/patch.c:3231 +msgid "strip count must be positive" +msgstr "" + +#: ../libsvn_client/patch.c:3247 ../libsvn_fs_base/tree.c:4099 +#: ../libsvn_fs_base/tree.c:4104 ../libsvn_fs_fs/tree.c:3198 +#: ../libsvn_fs_fs/tree.c:3203 ../libsvn_fs_x/tree.c:3244 +#: ../libsvn_fs_x/tree.c:3249 ../libsvn_ra/compat.c:677 +#: ../libsvn_ra_local/ra_plugin.c:1266 +#, c-format +msgid "'%s' is not a file" +msgstr "" + +#: ../libsvn_client/patch.c:3259 ../libsvn_wc/util.c:59 +#, c-format +msgid "'%s' is not a directory" +msgstr "" + +#: ../libsvn_client/prop_commands.c:155 +#, c-format +msgid "Property '%s' is not a regular property" +msgstr "" + +#: ../libsvn_client/prop_commands.c:310 msgid "Targets must be working copy paths" msgstr "" -#: ../libsvn_client/prop_commands.c:362 +#: ../libsvn_client/prop_commands.c:371 msgid "Targets must be URLs" msgstr "" -#: ../libsvn_client/prop_commands.c:372 +#: ../libsvn_client/prop_commands.c:381 msgid "Setting property on non-local targets needs a base revision" msgstr "" -#: ../libsvn_client/prop_commands.c:387 +#: ../libsvn_client/prop_commands.c:396 #, c-format msgid "Setting property '%s' on non-local targets is not supported" msgstr "" -#: ../libsvn_client/prop_commands.c:415 +#: ../libsvn_client/prop_commands.c:424 #, c-format msgid "" "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone " "else deleted it?)" msgstr "" -#: ../libsvn_client/prop_commands.c:424 +#: ../libsvn_client/prop_commands.c:433 #, c-format msgid "" "revprop '%s' in r%ld has unexpected value in repository (maybe someone else " "changed it?)" msgstr "" -#: ../libsvn_client/prop_commands.c:432 +#: ../libsvn_client/prop_commands.c:441 #, c-format msgid "" "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone " "else set it?)" msgstr "" -#: ../libsvn_client/prop_commands.c:463 +#: ../libsvn_client/prop_commands.c:472 msgid "" "Author name should not contain a newline; value will not be set unless forced" msgstr "" -#: ../libsvn_client/prop_commands.c:577 +#: ../libsvn_client/prop_commands.c:565 #, c-format msgid "'%s' does not exist in revision %ld" msgstr "" -#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1102 -#: ../libsvn_wc/crop.c:168 +#: ../libsvn_client/prop_commands.c:571 ../libsvn_client/prop_commands.c:1081 #, c-format msgid "Unknown node kind for '%s'" msgstr "" -#: ../libsvn_client/ra.c:161 +#: ../libsvn_client/ra.c:164 #, c-format msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation" msgstr "" -#: ../libsvn_client/ra.c:415 +#: ../libsvn_client/ra.c:446 #, c-format msgid "Redirect cycle detected for URL '%s'" msgstr "" -#: ../libsvn_client/ra.c:501 ../libsvn_client/ra.c:812 -#, c-format -msgid "'%s' has no URL" -msgstr "" - -#: ../libsvn_client/ra.c:679 ../libsvn_ra/compat.c:395 +#: ../libsvn_client/ra.c:734 ../libsvn_ra/compat.c:397 #, c-format msgid "Unable to find repository location for '%s' in revision %ld" msgstr "" -#: ../libsvn_client/ra.c:691 +#: ../libsvn_client/ra.c:746 #, c-format msgid "" "The location for '%s' for revision %ld does not exist in the repository or " @@ -2203,29 +2528,29 @@ msgstr "" msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" msgstr "" -#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:570 +#: ../libsvn_client/repos_diff.c:935 ../libsvn_wc/externals.c:627 #, c-format msgid "Base checksum mismatch for '%s'" msgstr "" -#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:138 +#: ../libsvn_client/revisions.c:114 ../libsvn_client/revisions.c:139 #, c-format msgid "Path '%s' has no committed revision" msgstr "" -#: ../libsvn_client/revisions.c:166 +#: ../libsvn_client/revisions.c:167 #, c-format msgid "Unrecognized revision type requested for '%s'" msgstr "" -#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586 +#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 #: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 -#: ../libsvn_wc/wc_db.c:13328 ../libsvn_wc/wc_db_wcroot.c:680 +#: ../libsvn_wc/wc_db.c:13681 ../libsvn_wc/wc_db_wcroot.c:722 #, c-format msgid "'%s' is not a working copy" msgstr "" -#: ../libsvn_client/status.c:454 +#: ../libsvn_client/status.c:469 #, c-format msgid "Entry '%s' has no URL" msgstr "" @@ -2246,7 +2571,7 @@ msgid "Directory '%s' has no URL" msgstr "" #: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236 -#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4868 +#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4921 #, c-format msgid "" "'%s'\n" @@ -2254,246 +2579,245 @@ msgid "" "'%s'" msgstr "" -#: ../libsvn_client/switch.c:242 +#: ../libsvn_client/switch.c:240 #, c-format msgid "'%s' shares no common ancestry with '%s'" msgstr "" -#: ../libsvn_client/util.c:336 -#, c-format -msgid "Cannot mix repository and working copy targets" -msgstr "" - -#: ../libsvn_delta/svndiff.c:175 -msgid "Compression of svndiff data failed" -msgstr "" - -#: ../libsvn_delta/svndiff.c:538 -msgid "Decompression of svndiff data failed: no size" -msgstr "" - -#: ../libsvn_delta/svndiff.c:541 -msgid "Decompression of svndiff data failed: size too large" -msgstr "" - -#: ../libsvn_delta/svndiff.c:565 -msgid "Decompression of svndiff data failed" +#: ../libsvn_client/update.c:762 +msgid "None of the targets are working copies" msgstr "" -#: ../libsvn_delta/svndiff.c:572 -msgid "Size of uncompressed data does not match stored original length" +#: ../libsvn_client/util.c:342 +#, c-format +msgid "Cannot mix repository and working copy targets" msgstr "" -#: ../libsvn_delta/svndiff.c:648 +#: ../libsvn_delta/svndiff.c:436 #, c-format msgid "Invalid diff stream: insn %d cannot be decoded" msgstr "" -#: ../libsvn_delta/svndiff.c:652 +#: ../libsvn_delta/svndiff.c:440 #, c-format msgid "Invalid diff stream: insn %d has length zero" msgstr "" -#: ../libsvn_delta/svndiff.c:656 +#: ../libsvn_delta/svndiff.c:444 #, c-format msgid "Invalid diff stream: insn %d overflows the target view" msgstr "" -#: ../libsvn_delta/svndiff.c:665 +#: ../libsvn_delta/svndiff.c:453 #, c-format msgid "Invalid diff stream: [src] insn %d overflows the source view" msgstr "" -#: ../libsvn_delta/svndiff.c:672 +#: ../libsvn_delta/svndiff.c:460 #, c-format msgid "" "Invalid diff stream: [tgt] insn %d starts beyond the target view position" msgstr "" -#: ../libsvn_delta/svndiff.c:679 +#: ../libsvn_delta/svndiff.c:467 #, c-format msgid "Invalid diff stream: [new] insn %d overflows the new data section" msgstr "" -#: ../libsvn_delta/svndiff.c:689 +#: ../libsvn_delta/svndiff.c:477 msgid "Delta does not fill the target window" msgstr "" -#: ../libsvn_delta/svndiff.c:692 +#: ../libsvn_delta/svndiff.c:480 msgid "Delta does not contain enough new data" msgstr "" -#: ../libsvn_delta/svndiff.c:801 +#: ../libsvn_delta/svndiff.c:608 msgid "Svndiff has invalid header" msgstr "" -#: ../libsvn_delta/svndiff.c:857 ../libsvn_delta/svndiff.c:1039 +#: ../libsvn_delta/svndiff.c:664 ../libsvn_delta/svndiff.c:861 msgid "Svndiff contains a too-large window" msgstr "" -#: ../libsvn_delta/svndiff.c:864 ../libsvn_delta/svndiff.c:1046 +#: ../libsvn_delta/svndiff.c:671 ../libsvn_delta/svndiff.c:868 msgid "Svndiff contains corrupt window header" msgstr "" -#: ../libsvn_delta/svndiff.c:873 +#: ../libsvn_delta/svndiff.c:680 msgid "Svndiff has backwards-sliding source views" msgstr "" -#: ../libsvn_delta/svndiff.c:930 ../libsvn_delta/svndiff.c:987 -#: ../libsvn_delta/svndiff.c:1068 +#: ../libsvn_delta/svndiff.c:720 +msgid "Svndiff contains a too-large window header" +msgstr "" + +#: ../libsvn_delta/svndiff.c:745 ../libsvn_delta/svndiff.c:802 +#: ../libsvn_delta/svndiff.c:890 msgid "Unexpected end of svndiff input" msgstr "" -#: ../libsvn_diff/diff_file.c:184 +#: ../libsvn_diff/diff_file.c:186 #, c-format msgid "File '%s' is too large to be read in to memory" msgstr "" -#: ../libsvn_diff/diff_file.c:1106 +#: ../libsvn_diff/diff_file.c:1104 #, c-format msgid "The file '%s' changed unexpectedly during diff" msgstr "" -#: ../libsvn_diff/diff_file.c:1276 +#: ../libsvn_diff/diff_file.c:1278 msgid "Error in options to internal diff" msgstr "" -#: ../libsvn_diff/diff_file.c:1302 +#: ../libsvn_diff/diff_file.c:1307 #, c-format msgid "Invalid argument '%s' in diff options" msgstr "" #. Order of date components can be different in different languages -#: ../libsvn_diff/diff_file.c:1799 +#: ../libsvn_diff/diff_file.c:1806 msgid "%a %b %e %H:%M:%S %Y" msgstr "" -#: ../libsvn_diff/diff_file.c:1875 ../libsvn_diff/diff_file.c:1891 +#: ../libsvn_diff/diff_file.c:1887 ../libsvn_diff/diff_file.c:1903 #, c-format msgid "Path '%s' must be inside the directory '%s'" msgstr "" -#: ../libsvn_diff/diff_file.c:2409 +#: ../libsvn_diff/diff_file.c:2449 #, c-format msgid "Failed to delete mmap '%s'" msgstr "" -#: ../libsvn_diff/util.c:464 +#: ../libsvn_diff/util.c:477 #, c-format msgid " Reverse-merged %s:r%s%s" msgstr "" -#: ../libsvn_diff/util.c:481 +#: ../libsvn_diff/util.c:494 #, c-format msgid " Merged %s:r%s%s" msgstr "" -#: ../libsvn_fs/editor.c:219 +#: ../libsvn_fs/editor.c:217 #, c-format msgid "Revision for modifying '%s' is required" msgstr "" -#: ../libsvn_fs/editor.c:228 +#: ../libsvn_fs/editor.c:226 #, c-format msgid "'%s' is out of date; try updating" msgstr "" -#: ../libsvn_fs/editor.c:265 +#: ../libsvn_fs/editor.c:258 #, c-format msgid "'%s' has been modified since the commit began (restart the commit)" msgstr "" -#: ../libsvn_fs/editor.c:323 +#: ../libsvn_fs/editor.c:316 #, c-format msgid "'%s' already exists, so may be out of date; try updating" msgstr "" -#: ../libsvn_fs/editor.c:456 +#: ../libsvn_fs/editor.c:449 msgid "The filesystem does not support 'absent' nodes" msgstr "" -#: ../libsvn_fs/fs-loader.c:121 +#: ../libsvn_fs/fs-loader.c:140 #, c-format msgid "Invalid name for FS type '%s'" msgstr "" -#: ../libsvn_fs/fs-loader.c:138 ../libsvn_ra/ra_loader.c:161 -#: ../libsvn_ra/ra_loader.c:174 +#: ../libsvn_fs/fs-loader.c:157 ../libsvn_ra/ra_loader.c:163 +#: ../libsvn_ra/ra_loader.c:176 #, c-format msgid "'%s' does not define '%s()'" msgstr "" -#: ../libsvn_fs/fs-loader.c:164 +#: ../libsvn_fs/fs-loader.c:190 #, c-format msgid "Failed to load module for FS type '%s'" msgstr "" -#: ../libsvn_fs/fs-loader.c:186 +#: ../libsvn_fs/fs-loader.c:211 #, c-format msgid "" "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" -#: ../libsvn_fs/fs-loader.c:266 +#: ../libsvn_fs/fs-loader.c:301 #, c-format msgid "Unknown FS type '%s'" msgstr "" -#: ../libsvn_fs/fs-loader.c:389 +#: ../libsvn_fs/fs-loader.c:450 #, c-format msgid "Path '%s' is not in UTF-8" msgstr "" -#: ../libsvn_fs/fs-loader.c:397 +#: ../libsvn_fs/fs-loader.c:458 #, c-format msgid "Path '%s' contains '.' or '..' element" msgstr "" -#: ../libsvn_fs/fs-loader.c:554 ../libsvn_repos/repos.c:1982 +#: ../libsvn_fs/fs-loader.c:470 ../libsvn_fs_fs/tree.c:2426 +#: ../libsvn_subr/path.c:1229 +#, c-format +msgid "Invalid control character '0x%02x' in path '%s'" +msgstr "" + +#: ../libsvn_fs/fs-loader.c:655 ../libsvn_repos/repos.c:1981 msgid "Hotcopy source and destination are equal" msgstr "" -#: ../libsvn_fs/fs-loader.c:564 +#: ../libsvn_fs/fs-loader.c:665 #, c-format msgid "'%s' already exists and is a file" msgstr "" -#: ../libsvn_fs/fs-loader.c:569 +#: ../libsvn_fs/fs-loader.c:670 #, c-format msgid "'%s' already exists and has an unknown node kind" msgstr "" -#: ../libsvn_fs/fs-loader.c:587 +#: ../libsvn_fs/fs-loader.c:688 #, c-format msgid "" "The filesystem type of the hotcopy source ('%s') does not match the " "filesystem type of the hotcopy destination ('%s')" msgstr "" -#: ../libsvn_fs/fs-loader.c:1395 +#: ../libsvn_fs/fs-loader.c:959 ../libsvn_fs/fs-loader.c:977 +#, c-format +msgid "Attempt to modify internal transaction property '%s'" +msgstr "" + +#: ../libsvn_fs/fs-loader.c:1616 #, c-format msgid "Malformed UUID '%s'" msgstr "" -#: ../libsvn_fs/fs-loader.c:1423 +#: ../libsvn_fs/fs-loader.c:1645 +msgid "Negative expiration date passed to svn_fs_lock" +msgstr "" + +#: ../libsvn_fs/fs-loader.c:1660 #, c-format msgid "Lock token URI '%s' has bad scheme; expected '%s'" msgstr "" -#: ../libsvn_fs/fs-loader.c:1430 +#: ../libsvn_fs/fs-loader.c:1669 #, c-format -msgid "Lock token '%s' is not ASCII at byte %u" +msgid "Lock token '%s' is not ASCII or is a control character at byte %u" msgstr "" -#: ../libsvn_fs/fs-loader.c:1437 +#: ../libsvn_fs/fs-loader.c:1677 #, c-format msgid "Lock token URI '%s' is not XML-safe" msgstr "" -#: ../libsvn_fs/fs-loader.c:1444 -msgid "Negative expiration date passed to svn_fs_lock" -msgstr "" - #: ../libsvn_fs_base/bdb/bdb-err.c:104 #, c-format msgid "Berkeley DB error for filesystem '%s' while %s:\n" @@ -2507,40 +2831,44 @@ msgstr "" msgid "deleting changes" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5911 +#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:665 +#: ../libsvn_fs_x/transaction.c:941 msgid "Missing required node revision ID" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5921 +#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:675 +#: ../libsvn_fs_x/transaction.c:951 msgid "Invalid change ordering: new node revision ID without delete" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5932 +#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:686 +#: ../libsvn_fs_x/transaction.c:962 msgid "Invalid change ordering: non-add change on deleted path" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5941 +#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:695 +#: ../libsvn_fs_x/transaction.c:971 msgid "Invalid change ordering: add change on preexisting path" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:272 -#: ../libsvn_fs_base/bdb/changes-table.c:395 +#: ../libsvn_fs_base/bdb/changes-table.c:296 +#: ../libsvn_fs_base/bdb/changes-table.c:420 msgid "creating cursor for reading changes" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:297 -#: ../libsvn_fs_base/bdb/changes-table.c:416 +#: ../libsvn_fs_base/bdb/changes-table.c:321 +#: ../libsvn_fs_base/bdb/changes-table.c:441 #, c-format msgid "Error reading changes for key '%s'" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:356 -#: ../libsvn_fs_base/bdb/changes-table.c:439 +#: ../libsvn_fs_base/bdb/changes-table.c:381 +#: ../libsvn_fs_base/bdb/changes-table.c:464 msgid "fetching changes" msgstr "" -#: ../libsvn_fs_base/bdb/changes-table.c:369 -#: ../libsvn_fs_base/bdb/changes-table.c:452 +#: ../libsvn_fs_base/bdb/changes-table.c:394 +#: ../libsvn_fs_base/bdb/changes-table.c:477 msgid "closing changes cursor" msgstr "" @@ -2680,8 +3008,7 @@ msgstr "" msgid "storing node revision" msgstr "" -#: ../libsvn_fs_base/bdb/reps-table.c:98 -#: ../libsvn_fs_base/bdb/reps-table.c:200 +#: ../libsvn_fs_base/bdb/reps-table.c:98 ../libsvn_fs_base/bdb/reps-table.c:200 #, c-format msgid "No such representation '%s'" msgstr "" @@ -2866,17 +3193,19 @@ msgstr "" msgid "Attempted to get entries of a non-directory node" msgstr "" -#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:372 +#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:377 +#: ../libsvn_fs_x/dag.c:448 #, c-format msgid "Attempted to create a node with an illegal name '%s'" msgstr "" -#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:378 +#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:383 +#: ../libsvn_fs_x/dag.c:454 msgid "Attempted to create entry in non-directory parent" msgstr "" #: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737 -#: ../libsvn_fs_fs/dag.c:384 +#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:460 #, c-format msgid "Attempted to clone child of non-mutable node" msgstr "" @@ -2886,11 +3215,13 @@ msgstr "" msgid "Attempted to create entry that already exists" msgstr "" -#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:462 +#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468 +#: ../libsvn_fs_x/dag.c:523 msgid "Attempted to set entry in non-directory node" msgstr "" -#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:468 +#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474 +#: ../libsvn_fs_x/dag.c:529 msgid "Attempted to set entry in immutable node" msgstr "" @@ -2929,57 +3260,57 @@ msgstr "" msgid "Attempted removal of immutable node" msgstr "" -#: ../libsvn_fs_base/dag.c:1088 +#: ../libsvn_fs_base/dag.c:1090 #, c-format msgid "Attempted to get textual contents of a *non*-file node" msgstr "" -#: ../libsvn_fs_base/dag.c:1121 +#: ../libsvn_fs_base/dag.c:1123 #, c-format msgid "Attempted to get length of a *non*-file node" msgstr "" -#: ../libsvn_fs_base/dag.c:1148 +#: ../libsvn_fs_base/dag.c:1150 #, c-format msgid "Attempted to get checksum of a *non*-file node" msgstr "" -#: ../libsvn_fs_base/dag.c:1187 ../libsvn_fs_base/dag.c:1244 +#: ../libsvn_fs_base/dag.c:1189 ../libsvn_fs_base/dag.c:1246 #, c-format msgid "Attempted to set textual contents of a *non*-file node" msgstr "" -#: ../libsvn_fs_base/dag.c:1193 ../libsvn_fs_base/dag.c:1250 +#: ../libsvn_fs_base/dag.c:1195 ../libsvn_fs_base/dag.c:1252 #, c-format msgid "Attempted to set textual contents of an immutable node" msgstr "" -#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:829 +#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:829 #, c-format msgid "Checksum mismatch on representation '%s'" msgstr "" -#: ../libsvn_fs_base/dag.c:1373 +#: ../libsvn_fs_base/dag.c:1375 #, c-format msgid "Attempted to open non-existent child node '%s'" msgstr "" -#: ../libsvn_fs_base/dag.c:1379 +#: ../libsvn_fs_base/dag.c:1381 #, c-format msgid "Attempted to open node with an illegal name '%s'" msgstr "" -#: ../libsvn_fs_base/dag.c:1700 +#: ../libsvn_fs_base/dag.c:1713 #, c-format msgid "Attempted merge tracking info change on immutable node" msgstr "" -#: ../libsvn_fs_base/dag.c:1740 +#: ../libsvn_fs_base/dag.c:1753 #, c-format msgid "Attempted mergeinfo count change on immutable node" msgstr "" -#: ../libsvn_fs_base/dag.c:1752 +#: ../libsvn_fs_base/dag.c:1765 #, c-format msgid "Invalid value (%%%s) for node revision mergeinfo count" msgstr "" @@ -2989,7 +3320,8 @@ msgstr "" msgid "Corrupt filesystem revision %ld in filesystem '%s'" msgstr "" -#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2268 +#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:276 +#: ../libsvn_fs_x/cached_data.c:275 #, c-format msgid "Reference to non-existent node '%s' in filesystem '%s'" msgstr "" @@ -3049,153 +3381,153 @@ msgstr "" msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'" msgstr "" -#: ../libsvn_fs_base/fs.c:89 +#: ../libsvn_fs_base/fs.c:87 #, c-format msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d" msgstr "" -#: ../libsvn_fs_base/fs.c:100 +#: ../libsvn_fs_base/fs.c:98 #, c-format msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d" msgstr "" -#: ../libsvn_fs_base/fs.c:190 +#: ../libsvn_fs_base/fs.c:188 #, c-format msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:553 +#: ../libsvn_fs_base/fs.c:607 #, c-format msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:559 +#: ../libsvn_fs_base/fs.c:613 #, c-format msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" msgstr "" -#: ../libsvn_fs_base/fs.c:574 +#: ../libsvn_fs_base/fs.c:628 msgid "creating 'nodes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:575 +#: ../libsvn_fs_base/fs.c:629 msgid "opening 'nodes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:580 +#: ../libsvn_fs_base/fs.c:634 msgid "creating 'revisions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:581 +#: ../libsvn_fs_base/fs.c:635 msgid "opening 'revisions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:586 +#: ../libsvn_fs_base/fs.c:640 msgid "creating 'transactions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:587 +#: ../libsvn_fs_base/fs.c:641 msgid "opening 'transactions' table" msgstr "" -#: ../libsvn_fs_base/fs.c:592 +#: ../libsvn_fs_base/fs.c:646 msgid "creating 'copies' table" msgstr "" -#: ../libsvn_fs_base/fs.c:593 +#: ../libsvn_fs_base/fs.c:647 msgid "opening 'copies' table" msgstr "" -#: ../libsvn_fs_base/fs.c:598 +#: ../libsvn_fs_base/fs.c:652 msgid "creating 'changes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:599 +#: ../libsvn_fs_base/fs.c:653 msgid "opening 'changes' table" msgstr "" -#: ../libsvn_fs_base/fs.c:604 +#: ../libsvn_fs_base/fs.c:658 msgid "creating 'representations' table" msgstr "" -#: ../libsvn_fs_base/fs.c:605 +#: ../libsvn_fs_base/fs.c:659 msgid "opening 'representations' table" msgstr "" -#: ../libsvn_fs_base/fs.c:610 +#: ../libsvn_fs_base/fs.c:664 msgid "creating 'strings' table" msgstr "" -#: ../libsvn_fs_base/fs.c:611 +#: ../libsvn_fs_base/fs.c:665 msgid "opening 'strings' table" msgstr "" -#: ../libsvn_fs_base/fs.c:616 +#: ../libsvn_fs_base/fs.c:670 msgid "creating 'uuids' table" msgstr "" -#: ../libsvn_fs_base/fs.c:617 +#: ../libsvn_fs_base/fs.c:671 msgid "opening 'uuids' table" msgstr "" -#: ../libsvn_fs_base/fs.c:622 +#: ../libsvn_fs_base/fs.c:676 msgid "creating 'locks' table" msgstr "" -#: ../libsvn_fs_base/fs.c:623 +#: ../libsvn_fs_base/fs.c:677 msgid "opening 'locks' table" msgstr "" -#: ../libsvn_fs_base/fs.c:628 +#: ../libsvn_fs_base/fs.c:682 msgid "creating 'lock-tokens' table" msgstr "" -#: ../libsvn_fs_base/fs.c:629 +#: ../libsvn_fs_base/fs.c:683 msgid "opening 'lock-tokens' table" msgstr "" -#: ../libsvn_fs_base/fs.c:637 +#: ../libsvn_fs_base/fs.c:691 msgid "creating 'node-origins' table" msgstr "" -#: ../libsvn_fs_base/fs.c:638 +#: ../libsvn_fs_base/fs.c:692 msgid "opening 'node-origins' table" msgstr "" -#: ../libsvn_fs_base/fs.c:647 +#: ../libsvn_fs_base/fs.c:701 msgid "creating 'miscellaneous' table" msgstr "" -#: ../libsvn_fs_base/fs.c:648 +#: ../libsvn_fs_base/fs.c:702 msgid "opening 'miscellaneous' table" msgstr "" -#: ../libsvn_fs_base/fs.c:657 +#: ../libsvn_fs_base/fs.c:711 msgid "creating 'checksum-reps' table" msgstr "" -#: ../libsvn_fs_base/fs.c:658 +#: ../libsvn_fs_base/fs.c:712 msgid "opening 'checksum-reps' table" msgstr "" -#: ../libsvn_fs_base/fs.c:730 +#: ../libsvn_fs_base/fs.c:802 #, c-format msgid "" "The '%s' feature requires version %d of the filesystem schema; filesystem " "'%s' uses only version %d" msgstr "" -#: ../libsvn_fs_base/fs.c:749 +#: ../libsvn_fs_base/fs.c:821 #, c-format msgid "Expected FS format '%d'; found format '%d'" msgstr "" -#: ../libsvn_fs_base/fs.c:1215 +#: ../libsvn_fs_base/fs.c:1309 #, c-format msgid "BDB repositories do not support incremental hotcopy" msgstr "" -#: ../libsvn_fs_base/fs.c:1319 +#: ../libsvn_fs_base/fs.c:1413 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" "may be interfering with the hotcopy algorithm. If\n" @@ -3203,7 +3535,7 @@ msgid "" "in DB_CONFIG" msgstr "" -#: ../libsvn_fs_base/fs.c:1338 +#: ../libsvn_fs_base/fs.c:1432 msgid "" "Error running catastrophic recovery on hotcopy; the\n" "DB_LOG_AUTOREMOVE feature may be interfering with the\n" @@ -3211,33 +3543,37 @@ msgid "" "this feature in DB_CONFIG" msgstr "" -#: ../libsvn_fs_base/fs.c:1383 +#: ../libsvn_fs_base/fs.c:1477 msgid "Module for working with a Berkeley DB repository." msgstr "" -#: ../libsvn_fs_base/fs.c:1430 +#: ../libsvn_fs_base/fs.c:1527 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "" -#: ../libsvn_fs_base/lock.c:108 ../libsvn_fs_base/lock.c:113 -#: ../libsvn_fs_fs/lock.c:786 ../libsvn_fs_fs/lock.c:791 -#: ../libsvn_fs_fs/lock.c:813 +#: ../libsvn_fs_base/lock.c:122 ../libsvn_fs_base/lock.c:127 +#: ../libsvn_fs_fs/lock.c:740 ../libsvn_fs_fs/lock.c:745 +#: ../libsvn_fs_fs/lock.c:775 ../libsvn_fs_x/lock.c:780 +#: ../libsvn_fs_x/lock.c:785 ../libsvn_fs_x/lock.c:815 #, c-format msgid "Path '%s' doesn't exist in HEAD revision" msgstr "" -#: ../libsvn_fs_base/lock.c:540 ../libsvn_fs_fs/lock.c:682 +#: ../libsvn_fs_base/lock.c:616 ../libsvn_fs_fs/lock.c:613 +#: ../libsvn_fs_x/lock.c:680 #, c-format msgid "Cannot verify lock on path '%s'; no username available" msgstr "" -#: ../libsvn_fs_base/lock.c:546 ../libsvn_fs_fs/lock.c:688 +#: ../libsvn_fs_base/lock.c:622 ../libsvn_fs_fs/lock.c:619 +#: ../libsvn_fs_x/lock.c:686 #, c-format msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')" msgstr "" -#: ../libsvn_fs_base/lock.c:552 ../libsvn_fs_fs/lock.c:694 +#: ../libsvn_fs_base/lock.c:628 ../libsvn_fs_fs/lock.c:625 +#: ../libsvn_fs_x/lock.c:692 #, c-format msgid "Cannot verify lock on path '%s'; no matching lock-token available" msgstr "" @@ -3293,7 +3629,7 @@ msgstr "" msgid "Null rep, but offset past zero already" msgstr "" -#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1253 +#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1254 #, c-format msgid "Rep '%s' is not mutable" msgstr "" @@ -3303,16 +3639,16 @@ msgstr "" msgid "Rep '%s' both mutable and non-fulltext" msgstr "" -#: ../libsvn_fs_base/reps-strings.c:1372 +#: ../libsvn_fs_base/reps-strings.c:1373 msgid "Failed to get new string key" msgstr "" -#: ../libsvn_fs_base/reps-strings.c:1449 +#: ../libsvn_fs_base/reps-strings.c:1450 #, c-format msgid "Attempt to deltify '%s' against itself" msgstr "" -#: ../libsvn_fs_base/reps-strings.c:1522 +#: ../libsvn_fs_base/reps-strings.c:1523 #, c-format msgid "Failed to calculate MD5 digest for '%s'" msgstr "" @@ -3327,12 +3663,13 @@ msgstr "" msgid "Transaction is dead: '%s'" msgstr "" -#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9775 +#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:2117 +#: ../libsvn_fs_x/fs_x.c:1153 #, c-format msgid "revprop '%s' has unexpected value in filesystem" msgstr "" -#: ../libsvn_fs_base/revs-txns.c:1030 +#: ../libsvn_fs_base/revs-txns.c:1053 msgid "Transaction aborted, but cleanup failed" msgstr "" @@ -3348,724 +3685,1167 @@ msgstr "" msgid "committing Berkeley DB transaction" msgstr "" -#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:949 +#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:1104 +#: ../libsvn_fs_x/tree.c:1090 #, c-format msgid "Failure opening '%s'" msgstr "" -#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1393 +#: ../libsvn_fs_base/tree.c:1460 ../libsvn_fs_fs/tree.c:1643 +#: ../libsvn_fs_x/tree.c:1640 msgid "Cannot compare property value between two different filesystems" msgstr "" -#: ../libsvn_fs_base/tree.c:1849 ../libsvn_fs_base/tree.c:1919 +#: ../libsvn_fs_base/tree.c:1926 ../libsvn_fs_base/tree.c:1996 msgid "Corrupt DB: faulty predecessor count" msgstr "" -#: ../libsvn_fs_base/tree.c:1976 +#: ../libsvn_fs_base/tree.c:2053 #, c-format msgid "Unexpected immutable node at '%s'" msgstr "" -#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1423 -#: ../libsvn_repos/commit.c:1262 +#: ../libsvn_fs_base/tree.c:2074 ../libsvn_fs_fs/tree.c:1673 +#: ../libsvn_fs_x/tree.c:1673 ../libsvn_repos/commit.c:1257 #, c-format msgid "Conflict at '%s'" msgstr "" -#: ../libsvn_fs_base/tree.c:2050 ../libsvn_fs_base/tree.c:2802 -#: ../libsvn_fs_fs/tree.c:1474 ../libsvn_fs_fs/tree.c:2011 +#: ../libsvn_fs_base/tree.c:2127 ../libsvn_fs_base/tree.c:2879 +#: ../libsvn_fs_fs/tree.c:1771 ../libsvn_fs_fs/tree.c:2325 +#: ../libsvn_fs_x/tree.c:1797 ../libsvn_fs_x/tree.c:2340 msgid "Bad merge; ancestor, source, and target not all in same fs" msgstr "" -#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1490 +#: ../libsvn_fs_base/tree.c:2143 ../libsvn_fs_fs/tree.c:1787 +#: ../libsvn_fs_x/tree.c:1813 #, c-format msgid "Bad merge; target '%s' has id '%s', same as ancestor" msgstr "" -#: ../libsvn_fs_base/tree.c:2610 +#: ../libsvn_fs_base/tree.c:2687 #, c-format msgid "Transaction '%s' out-of-date with respect to revision '%s'" msgstr "" -#: ../libsvn_fs_base/tree.c:2886 +#: ../libsvn_fs_base/tree.c:2963 #, c-format msgid "Cannot deltify revisions prior to r%ld" msgstr "" -#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2166 +#: ../libsvn_fs_base/tree.c:3081 ../libsvn_fs_fs/tree.c:2507 +#: ../libsvn_fs_x/tree.c:2527 msgid "The root directory cannot be deleted" msgstr "" -#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2236 +#: ../libsvn_fs_base/tree.c:3295 ../libsvn_fs_fs/tree.c:2577 +#: ../libsvn_fs_x/tree.c:2601 #, c-format msgid "Cannot copy between two different filesystems ('%s' and '%s')" msgstr "" -#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2242 +#: ../libsvn_fs_base/tree.c:3304 ../libsvn_fs_fs/tree.c:2584 +#: ../libsvn_fs_x/tree.c:2608 msgid "Copy from mutable tree not currently supported" msgstr "" -#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2719 +#: ../libsvn_fs_base/tree.c:3814 ../libsvn_fs_fs/tree.c:2979 +#: ../libsvn_fs_x/tree.c:3016 #, c-format msgid "Base checksum mismatch on '%s'" msgstr "" -#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:2934 +#: ../libsvn_fs_base/tree.c:4090 ../libsvn_fs_fs/tree.c:3189 +#: ../libsvn_fs_x/tree.c:3235 msgid "Cannot compare file contents between two different filesystems" msgstr "" -#: ../libsvn_fs_base/tree.c:5013 ../libsvn_fs_base/tree.c:5188 +#: ../libsvn_fs_base/tree.c:5139 ../libsvn_fs_base/tree.c:5314 #, c-format msgid "Node-revision '%s' claims to have mergeinfo but doesn't" msgstr "" -#: ../libsvn_fs_base/tree.c:5049 +#: ../libsvn_fs_base/tree.c:5175 #, c-format msgid "" "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not " "a directory" msgstr "" -#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442 -#: ../libsvn_ra_serf/serf.c:1038 ../libsvn_ra_serf/serf.c:1101 +#: ../libsvn_fs_fs/cached_data.c:709 ../libsvn_fs_x/cached_data.c:582 +msgid "Malformed svndiff data in representation" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:956 ../libsvn_fs_x/cached_data.c:842 +#, c-format +msgid "No representation found at offset %s for item %s in revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:1522 ../libsvn_fs_fs/cached_data.c:1535 +#: ../libsvn_fs_fs/cached_data.c:3071 ../libsvn_fs_x/cached_data.c:1424 +#: ../libsvn_fs_x/cached_data.c:1437 ../libsvn_fs_x/cached_data.c:1713 +msgid "Reading one svndiff window read beyond the end of the representation" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:1664 ../libsvn_fs_x/cached_data.c:1565 +msgid "svndiff window length is corrupt" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:2065 ../libsvn_fs_x/cached_data.c:2143 +msgid "Checksum mismatch while reading representation" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:2506 ../libsvn_fs_fs/cached_data.c:2520 +#: ../libsvn_fs_fs/cached_data.c:2527 ../libsvn_fs_x/cached_data.c:2508 +#: ../libsvn_fs_x/cached_data.c:2522 ../libsvn_fs_x/cached_data.c:2529 +#, c-format +msgid "Directory entry corrupt in '%s'" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:2776 +#, c-format +msgid "malformed property list for node-revision '%s' in '%s'" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:2809 +#, c-format +msgid "malformed property list for node-revision '%s'" +msgstr "" + +#: ../libsvn_fs_fs/cached_data.c:3252 +#, c-format +msgid "" +"Low-level checksum mismatch while reading\n" +"%s bytes of meta data at offset %s for item %s in revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448 ../libsvn_fs_x/dag.c:377 +#: ../libsvn_fs_x/dag.c:504 ../libsvn_ra_serf/stat.c:606 msgid "Can't get entries of non-directory" msgstr "" -#: ../libsvn_fs_fs/dag.c:551 +#: ../libsvn_fs_fs/dag.c:593 ../libsvn_fs_x/dag.c:613 #, c-format msgid "" "Can't increment mergeinfo count on node-revision %%s to negative value %%%s" msgstr "" -#: ../libsvn_fs_fs/dag.c:562 +#: ../libsvn_fs_fs/dag.c:604 ../libsvn_fs_x/dag.c:624 #, c-format msgid "" "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" msgstr "" -#: ../libsvn_fs_fs/dag.c:1134 +#: ../libsvn_fs_fs/dag.c:1193 ../libsvn_fs_x/dag.c:1165 msgid "Empty noderev in cache" msgstr "" -#: ../libsvn_fs_fs/dag.c:1326 +#: ../libsvn_fs_fs/dag.c:1421 ../libsvn_fs_x/dag.c:1357 #, c-format msgid "Attempted to update ancestry of non-mutable node" msgstr "" -#: ../libsvn_fs_fs/fs.c:83 +#: ../libsvn_fs_fs/fs.c:101 #, c-format msgid "Can't fetch FSFS shared data" msgstr "" -#: ../libsvn_fs_fs/fs.c:110 +#: ../libsvn_fs_fs/fs.c:130 #, c-format msgid "Can't store FSFS shared data" msgstr "" -#: ../libsvn_fs_fs/fs.c:404 +#: ../libsvn_fs_fs/fs.c:548 msgid "Module for working with a plain file (FSFS) repository." msgstr "" -#: ../libsvn_fs_fs/fs.c:454 +#: ../libsvn_fs_fs/fs.c:610 #, c-format msgid "Unsupported FS loader version (%d) for fsfs" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:727 +#: ../libsvn_fs_fs/fs_fs.c:444 #, c-format -msgid "Can't unlock unknown transaction '%s'" +msgid "" +"Found format '%d', only created by unreleased dev builds; see http://" +"subversion.apache.org/docs/release-notes/1.7#revprop-packing" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:731 +#: ../libsvn_fs_fs/fs_fs.c:455 ../libsvn_fs_x/fs_x.c:103 #, c-format -msgid "Can't unlock nonlocked transaction '%s'" +msgid "Expected FS format between '1' and '%d'; found format '%d'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:738 +#: ../libsvn_fs_fs/fs_fs.c:507 ../libsvn_fs_x/fs_x.c:128 #, c-format -msgid "Can't unlock prototype revision lockfile for transaction '%s'" +msgid "Can't read first line of format file '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:744 +#: ../libsvn_fs_fs/fs_fs.c:564 ../libsvn_fs_x/fs_x.c:150 #, c-format -msgid "Can't close prototype revision lockfile for transaction '%s'" +msgid "'%s' contains invalid filesystem format option '%s'" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:574 +#, c-format +msgid "'%s' specifies logical addressing for a non-sharded repository" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:656 ../libsvn_fs_x/fs_x.c:209 +#, c-format +msgid "%s is too small for fsfs.conf setting '%s'." msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:806 +#: ../libsvn_fs_fs/fs_fs.c:664 ../libsvn_fs_x/fs_x.c:217 +#, c-format +msgid "%s is too large for fsfs.conf setting '%s'." +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:675 ../libsvn_fs_x/fs_x.c:228 #, c-format msgid "" -"Cannot write to the prototype revision file of transaction '%s' because a " -"previous representation is currently being written by this process" +"%s is invalid for fsfs.conf setting '%s' because it is not a power of 2." msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:842 +#: ../libsvn_fs_fs/fs_fs.c:1187 +#, c-format +msgid "'%s' is not a regular file. Please move it out of the way and try again" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:1352 ../libsvn_fs_x/fs_x.c:675 +#, c-format +msgid "Invalid revision number '%ld'" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:1811 +msgid "FSFS is not compatible with Subversion prior to 1.1" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:1948 +#, c-format +msgid "malformed node origin data in '%s'" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:2016 #, c-format msgid "" -"Cannot write to the prototype revision file of transaction '%s' because a " -"previous representation is currently being written by another process" +"Node origin for '%s' exists with a different value (%s) than what we were " +"about to store (%s)" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2014 +#: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108 +#: ../libsvn_subr/io.c:293 #, c-format -msgid "Can't get exclusive lock on file '%s'" +msgid "Error converting entry in directory '%s' to UTF-8" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:968 +#: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 +#: ../libsvn_subr/io.c:1086 #, c-format -msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" +msgid "Source '%s' is not a directory" +msgstr "" + +#: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 +#: ../libsvn_subr/io.c:1092 +#, c-format +msgid "Destination '%s' is not a directory" +msgstr "" + +#: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 +#: ../libsvn_subr/io.c:1169 ../libsvn_subr/io.c:2855 +#, c-format +msgid "Can't read directory '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:995 +#: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 +#: ../libsvn_subr/io.c:1174 ../libsvn_subr/io.c:2860 ../libsvn_subr/io.c:4579 +#, c-format +msgid "Error closing directory '%s'" +msgstr "" + +#: ../libsvn_fs_fs/hotcopy.c:490 #, c-format msgid "" -"Found format '%d', only created by unreleased dev builds; see http://" -"subversion.apache.org/docs/release-notes/1.7#revprop-packing" +"The FSFS format (%d) of the hotcopy source does not match the FSFS format " +"(%d) of the hotcopy destination; please upgrade both repositories to the " +"same format" +msgstr "" + +#: ../libsvn_fs_fs/hotcopy.c:499 ../libsvn_fs_x/hotcopy.c:495 +msgid "" +"The UUID of the hotcopy source does not match the UUID of the hotcopy " +"destination" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1006 +#: ../libsvn_fs_fs/hotcopy.c:506 ../libsvn_fs_x/hotcopy.c:502 +msgid "" +"The sharding layout configuration of the hotcopy source does not match the " +"sharding layout configuration of the hotcopy destination" +msgstr "" + +#: ../libsvn_fs_fs/hotcopy.c:581 ../libsvn_fs_x/hotcopy.c:575 #, c-format -msgid "Expected FS format between '1' and '%d'; found format '%d'" +msgid "" +"The hotcopy destination already contains more packed revisions (%lu) than " +"the hotcopy source contains (%lu)" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1052 +#: ../libsvn_fs_fs/hotcopy.c:877 #, c-format -msgid "Can't read first line of format file '%s'" +msgid "" +"Failed to create hotcopy at '%s'. The file '%s' is missing from the source " +"repository. Please create this file, for instance by running 'svnadmin " +"upgrade %s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1092 +#: ../libsvn_fs_fs/hotcopy.c:903 ../libsvn_fs_x/hotcopy.c:786 #, c-format -msgid "'%s' contains invalid filesystem format option '%s'" +msgid "" +"The hotcopy destination already contains more revisions (%lu) than the " +"hotcopy source contains (%lu); are source and destination swapped?" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1582 +#: ../libsvn_fs_fs/index.c:288 #, c-format -msgid "'%s' is not a regular file. Please move it out of the way and try again" +msgid "Can't read index file '%s' at offset 0x%s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1753 +#: ../libsvn_fs_fs/index.c:298 #, c-format -msgid "Can't read '%s'" +msgid "Unexpected end of index file %s at offset 0x%s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1816 ../libsvn_fs_fs/fs_fs.c:1835 +#: ../libsvn_fs_fs/index.c:333 ../libsvn_fs_x/index.c:339 #, c-format -msgid "Found malformed header '%s' in revision file" +msgid "Corrupt index: number too large" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1871 +#: ../libsvn_fs_fs/index.c:376 ../libsvn_fs_x/index.c:382 #, c-format -msgid "Invalid revision number '%ld'" +msgid "" +"Index stream header prefix mismatch.\n" +" expected: %s found: %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1886 ../libsvn_fs_fs/fs_fs.c:1941 -#: ../libsvn_fs_fs/fs_fs.c:1952 ../libsvn_repos/log.c:2268 -#: ../libsvn_repos/log.c:2272 +#: ../libsvn_fs_fs/index.c:603 ../libsvn_fs_x/index.c:561 #, c-format -msgid "No such revision %ld" +msgid "UINT32 0x%s too large, max = 0x%s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1986 -msgid "Unexpected EOF" +#: ../libsvn_fs_fs/index.c:635 ../libsvn_fs_x/index.c:593 +#, c-format +msgid "File offset 0x%s too large, max = 0x%s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:1993 +#: ../libsvn_fs_fs/index.c:809 ../libsvn_fs_x/index.c:942 #, c-format -msgid "Number '%s' invalid or too large" +msgid "L2P index page size %s exceeds current limit of 2G entries" +msgstr "" + +#: ../libsvn_fs_fs/index.c:870 ../libsvn_fs_x/index.c:1005 +#, c-format +msgid "Item index %s too large in l2p proto index for revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/index.c:891 ../libsvn_fs_x/index.c:1029 +#, c-format +msgid "L2P index page count %d exceeds current limit of 2G pages" +msgstr "" + +#: ../libsvn_fs_fs/index.c:994 ../libsvn_fs_fs/index.c:2197 +#: ../libsvn_fs_x/index.c:1296 ../libsvn_fs_x/index.c:2542 +msgid "Index rev / pack file revision numbers do not match" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1000 ../libsvn_fs_x/index.c:1309 +msgid "L2P index page size is not a power of two" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1007 ../libsvn_fs_x/index.c:1303 +msgid "Invalid number of revisions in L2P index" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1013 ../libsvn_fs_x/index.c:1315 +msgid "Fewer L2P index pages than revisions" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1016 ../libsvn_fs_x/index.c:1318 +msgid "L2P index page count implausibly large" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1021 ../libsvn_fs_x/index.c:1323 +#, c-format +msgid "Corrupt L2P index for r%ld only covers r%ld:%ld" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1040 ../libsvn_fs_x/index.c:1343 +msgid "Revision with no L2P index pages" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1045 ../libsvn_fs_x/index.c:1348 +msgid "L2P page table exceeded" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1052 ../libsvn_fs_x/index.c:1355 +msgid "Revisions do not cover the full L2P index page table" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1060 ../libsvn_fs_x/index.c:1363 +msgid "Empty L2P index page" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1066 ../libsvn_fs_x/index.c:1369 +msgid "Page exceeds L2P index page size" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1125 ../libsvn_fs_x/index.c:1124 +#, c-format +msgid "Revision %ld not covered by item index" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1151 ../libsvn_fs_x/index.c:1150 +#, c-format +msgid "Item index %s exceeds l2p limit of %s for revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1358 ../libsvn_fs_x/index.c:1527 +msgid "L2P actual page size does not match page table value." +msgstr "" + +#: ../libsvn_fs_fs/index.c:1491 ../libsvn_fs_x/index.c:1571 +#, c-format +msgid "Item index %s too large in revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/index.c:1910 ../libsvn_fs_x/index.c:2148 +#, c-format +msgid "Revision 0x%s too large, max = 0x%s" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2203 ../libsvn_fs_x/index.c:2548 +msgid "Index offset and rev / pack file size do not match" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2209 ../libsvn_fs_x/index.c:2554 +msgid "P2L index page size is not a power of two" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2215 ../libsvn_fs_x/index.c:2560 +msgid "P2L page count does not match rev / pack file size" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2395 ../libsvn_fs_x/index.c:2649 +msgid "Invalid item type in P2L index" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2399 ../libsvn_fs_x/index.c:2702 +msgid "Changed path list must have item number 1" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2413 ../libsvn_fs_x/index.c:2659 +msgid "Invalid FNV1 checksum in P2L index" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2422 +msgid "Empty regions must have item number 0 and checksum 0" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2492 ../libsvn_fs_x/index.c:2768 +msgid "P2L page description overlaps with next page description" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2608 ../libsvn_fs_x/index.c:2883 +#, c-format +msgid "Offset %s too large in revision %ld" +msgstr "" + +#: ../libsvn_fs_fs/index.c:2798 ../libsvn_fs_x/index.c:3086 +#, c-format +msgid "Last P2L index entry extends beyond the last page in revision %ld." +msgstr "" + +#: ../libsvn_fs_fs/lock.c:120 ../libsvn_fs_x/lock.c:121 +#, c-format +msgid "Corrupt lockfile for path '%s' in filesystem '%s'" +msgstr "" + +#: ../libsvn_fs_fs/lock.c:228 ../libsvn_fs_x/lock.c:240 +#, c-format +msgid "Cannot write lock/entries hashfile '%s'" +msgstr "" + +#: ../libsvn_fs_fs/lock.c:279 ../libsvn_fs_x/lock.c:292 +#, c-format +msgid "Can't parse lock/entries hashfile '%s'" +msgstr "" + +#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:824 +#, c-format +msgid "Lock failed: newer version of '%s' exists" +msgstr "" + +#: ../libsvn_fs_fs/lock.c:1164 ../libsvn_fs_x/lock.c:1292 +#, c-format +msgid "Failed to lock '%s'" +msgstr "" + +#: ../libsvn_fs_fs/lock.c:1258 ../libsvn_fs_x/lock.c:1383 +#, c-format +msgid "Failed to unlock '%s'" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:97 ../libsvn_fs_x/low_level.c:100 +msgid "Invalid character in revision number" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2160 ../libsvn_fs_fs/fs_fs.c:2174 -#: ../libsvn_fs_fs/fs_fs.c:2182 ../libsvn_fs_fs/fs_fs.c:2190 -#: ../libsvn_fs_fs/fs_fs.c:2199 ../libsvn_fs_fs/fs_fs.c:2212 -#: ../libsvn_fs_fs/fs_fs.c:2221 +#: ../libsvn_fs_fs/low_level.c:120 +#, c-format +msgid "Revision file (r%ld) lacks trailing newline" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:134 +#, c-format +msgid "Final line in revision file (r%ld) longer than 64 characters" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:149 +#, c-format +msgid "Final line in revision file r%ld missing space" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:208 ../libsvn_fs_fs/low_level.c:217 +#: ../libsvn_fs_fs/low_level.c:226 ../libsvn_fs_fs/low_level.c:235 +#: ../libsvn_fs_x/low_level.c:122 ../libsvn_fs_x/low_level.c:131 +#: ../libsvn_fs_x/low_level.c:140 ../libsvn_fs_x/low_level.c:149 +msgid "Invalid revision footer" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:293 ../libsvn_fs_fs/low_level.c:298 +#: ../libsvn_fs_fs/low_level.c:304 ../libsvn_fs_fs/low_level.c:321 +#: ../libsvn_fs_fs/low_level.c:354 ../libsvn_fs_fs/low_level.c:374 +#: ../libsvn_fs_fs/low_level.c:399 ../libsvn_fs_x/low_level.c:804 +#: ../libsvn_fs_x/low_level.c:812 ../libsvn_fs_x/low_level.c:829 +#: ../libsvn_fs_x/low_level.c:862 ../libsvn_fs_x/low_level.c:882 +#: ../libsvn_fs_x/low_level.c:902 +msgid "Invalid changes line in rev-file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:347 ../libsvn_fs_x/low_level.c:855 +msgid "Invalid change kind in rev file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:367 ../libsvn_fs_x/low_level.c:875 +msgid "Invalid text-mod flag in rev-file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:387 ../libsvn_fs_x/low_level.c:895 +msgid "Invalid prop-mod flag in rev-file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:412 ../libsvn_fs_x/low_level.c:915 +msgid "Invalid mergeinfo-mod flag in rev-file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:419 ../libsvn_fs_x/low_level.c:921 +msgid "Invalid path in changes line" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:439 ../libsvn_fs_x/low_level.c:944 +msgid "Invalid copy-from path in changes line" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:545 ../libsvn_fs_x/low_level.c:1044 +#, c-format +msgid "Invalid change type %d" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:673 ../libsvn_fs_fs/low_level.c:690 +#: ../libsvn_fs_x/low_level.c:204 ../libsvn_fs_x/low_level.c:221 +#, c-format +msgid "Found malformed header '%s' in revision file" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:737 ../libsvn_fs_fs/low_level.c:746 +#: ../libsvn_fs_fs/low_level.c:754 ../libsvn_fs_fs/low_level.c:763 +#: ../libsvn_fs_fs/low_level.c:781 ../libsvn_fs_fs/low_level.c:800 +#: ../libsvn_fs_fs/low_level.c:807 ../libsvn_fs_fs/low_level.c:814 +#: ../libsvn_fs_x/low_level.c:257 ../libsvn_fs_x/low_level.c:272 +#: ../libsvn_fs_x/low_level.c:281 ../libsvn_fs_x/low_level.c:289 +#: ../libsvn_fs_x/low_level.c:298 ../libsvn_fs_x/low_level.c:313 msgid "Malformed text representation offset line in node-rev" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2252 +#: ../libsvn_fs_fs/low_level.c:841 ../libsvn_fs_x/low_level.c:346 #, c-format msgid "While reading representation offsets for node-revision '%s':" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2407 +#: ../libsvn_fs_fs/low_level.c:875 msgid "Missing id field in node-rev" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2421 +#: ../libsvn_fs_fs/low_level.c:890 ../libsvn_fs_x/low_level.c:462 #, c-format msgid "Missing kind field in node-rev '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2456 +#: ../libsvn_fs_fs/low_level.c:925 ../libsvn_fs_x/low_level.c:499 #, c-format msgid "Missing cpath field in node-rev '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2484 ../libsvn_fs_fs/fs_fs.c:2491 +#: ../libsvn_fs_fs/low_level.c:932 ../libsvn_fs_x/low_level.c:506 +#, c-format +msgid "Non-canonical cpath field in node-rev '%s'" +msgstr "" + +#: ../libsvn_fs_fs/low_level.c:957 ../libsvn_fs_x/low_level.c:535 #, c-format msgid "Malformed copyroot line in node-rev '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2508 ../libsvn_fs_fs/fs_fs.c:2515 +#: ../libsvn_fs_fs/low_level.c:975 ../libsvn_fs_x/low_level.c:555 #, c-format msgid "Malformed copyfrom line in node-rev '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:7642 +#: ../libsvn_fs_fs/low_level.c:1180 ../libsvn_fs_x/low_level.c:748 #, c-format -msgid "Attempted to write to non-transaction '%s'" +msgid "Malformed representation header" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2821 +#: ../libsvn_fs_fs/pack.c:1984 #, c-format -msgid "Malformed representation header at %s" +msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." +msgstr "" + +#: ../libsvn_fs_fs/recovery.c:172 +msgid "Recovery encountered a non-directory node" +msgstr "" + +#: ../libsvn_fs_fs/recovery.c:193 +msgid "Recovery encountered a deltified directory representation" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2853 +#: ../libsvn_fs_fs/recovery.c:216 #, c-format -msgid "Missing node-id in node-rev at r%ld (offset %s)" +msgid "malformed representation for node-revision '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2862 +#: ../libsvn_fs_fs/recovery.c:242 ../libsvn_fs_fs/recovery.c:251 +#: ../libsvn_fs_fs/recovery.c:257 +msgid "Directory entry corrupt" +msgstr "" + +#: ../libsvn_fs_fs/recovery.c:403 ../libsvn_fs_x/recovery.c:178 #, c-format -msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)" +msgid "Expected current rev to be <= %ld but found %ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2953 +#: ../libsvn_fs_fs/recovery.c:454 ../libsvn_fs_x/recovery.c:215 #, c-format -msgid "Revision file (r%ld) lacks trailing newline" +msgid "Revision %ld has a revs file but no revprops file" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2967 +#: ../libsvn_fs_fs/recovery.c:461 ../libsvn_fs_x/recovery.c:222 #, c-format -msgid "Final line in revision file (r%ld) longer than 64 characters" +msgid "Revision %ld has a revs file but the revprops file is inaccessible" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:2982 +#: ../libsvn_fs_fs/recovery.c:470 ../libsvn_fs_x/recovery.c:204 #, c-format -msgid "Final line in revision file r%ld missing space" +msgid "Revision %ld has a non-file where its revprops file should be" +msgstr "" + +#: ../libsvn_fs_fs/rep-cache.c:132 +#, c-format +msgid "Couldn't open rep-cache database '%s'" +msgstr "" + +#: ../libsvn_fs_fs/rep-cache.c:282 ../libsvn_fs_fs/rep-cache.c:341 +#: ../libsvn_fs_x/rep-cache.c:256 ../libsvn_fs_x/rep-cache.c:314 +msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3686 +#: ../libsvn_fs_fs/revprops.c:321 ../libsvn_fs_x/revprops.c:800 #, c-format -msgid "Packed revprop manifest for r%ld too small" +msgid "Packed revprop manifest for r%ld not properly terminated" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3743 +#: ../libsvn_fs_fs/revprops.c:363 ../libsvn_fs_x/revprops.c:842 +#, c-format +msgid "Packed revprop manifest for r%ld has too many entries" +msgstr "" + +#: ../libsvn_fs_fs/revprops.c:368 ../libsvn_fs_x/revprops.c:847 +#, c-format +msgid "Packed revprop manifest for r%ld has too few entries" +msgstr "" + +#: ../libsvn_fs_fs/revprops.c:432 ../libsvn_fs_x/revprops.c:911 #, c-format msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3754 +#: ../libsvn_fs_fs/revprops.c:443 ../libsvn_fs_x/revprops.c:922 #, c-format msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3763 +#: ../libsvn_fs_fs/revprops.c:452 ../libsvn_fs_x/revprops.c:931 msgid "Header end not found" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3791 +#: ../libsvn_fs_fs/revprops.c:484 ../libsvn_fs_x/revprops.c:965 msgid "Packed revprop size exceeds pack file size" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3850 +#: ../libsvn_fs_fs/revprops.c:542 ../libsvn_fs_x/revprops.c:1034 #, c-format msgid "No such packed revision %ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3890 +#: ../libsvn_fs_fs/revprops.c:575 ../libsvn_fs_x/revprops.c:1075 #, c-format msgid "Failed to read revprop pack file for r%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3897 +#: ../libsvn_fs_fs/revprops.c:582 ../libsvn_fs_x/revprops.c:1082 #, c-format msgid "Revprop pack file for r%ld is corrupt" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:3970 +#: ../libsvn_fs_fs/revprops.c:639 ../libsvn_fs_x/revprops.c:1158 #, c-format msgid "Could not read revprops for revision %ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:4199 +#: ../libsvn_fs_fs/revprops.c:871 ../libsvn_fs_x/revprops.c:1407 #, c-format msgid "Packed file '%s' misses a tag" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:4537 -msgid "Malformed svndiff data in representation" +#: ../libsvn_fs_fs/transaction.c:258 ../libsvn_fs_x/transaction.c:510 +#, c-format +msgid "Can't unlock unknown transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:4973 ../libsvn_fs_fs/fs_fs.c:4992 -msgid "Reading one svndiff window read beyond the end of the representation" +#: ../libsvn_fs_fs/transaction.c:262 ../libsvn_fs_x/transaction.c:514 +#, c-format +msgid "Can't unlock nonlocked transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:5080 -msgid "svndiff window length is corrupt" +#: ../libsvn_fs_fs/transaction.c:269 ../libsvn_fs_x/transaction.c:521 +#, c-format +msgid "Can't unlock prototype revision lockfile for transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:5248 -msgid "Checksum mismatch while reading representation" +#: ../libsvn_fs_fs/transaction.c:275 ../libsvn_fs_x/transaction.c:527 +#, c-format +msgid "Can't close prototype revision lockfile for transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:5613 ../libsvn_fs_fs/fs_fs.c:5627 -#: ../libsvn_fs_fs/fs_fs.c:5634 +#: ../libsvn_fs_fs/transaction.c:321 ../libsvn_fs_x/transaction.c:575 #, c-format -msgid "Directory entry corrupt in '%s'" +msgid "" +"Cannot write to the prototype revision file of transaction '%s' because a " +"previous representation is currently being written by this process" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6112 ../libsvn_fs_fs/fs_fs.c:6117 -#: ../libsvn_fs_fs/fs_fs.c:6123 ../libsvn_fs_fs/fs_fs.c:6140 -#: ../libsvn_fs_fs/fs_fs.c:6173 ../libsvn_fs_fs/fs_fs.c:6193 -#: ../libsvn_fs_fs/fs_fs.c:6228 ../libsvn_fs_fs/fs_fs.c:6233 -msgid "Invalid changes line in rev-file" +#: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:613 +#, c-format +msgid "" +"Cannot write to the prototype revision file of transaction '%s' because a " +"previous representation is currently being written by another process" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6166 -msgid "Invalid change kind in rev file" +#: ../libsvn_fs_fs/transaction.c:366 ../libsvn_fs_x/transaction.c:621 +#: ../libsvn_subr/io.c:2343 +#, c-format +msgid "Can't get exclusive lock on file '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6186 -msgid "Invalid text-mod flag in rev-file" +#: ../libsvn_fs_fs/transaction.c:414 ../libsvn_fs_x/transaction.c:667 +#, c-format +msgid "p2l proto index offset %s beyond protorev file size %s for TXN %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6206 -msgid "Invalid prop-mod flag in rev-file" +#: ../libsvn_fs_fs/transaction.c:523 ../libsvn_fs_fs/transaction.c:2444 +#: ../libsvn_fs_x/transaction.c:796 ../libsvn_fs_x/transaction.c:2455 +#, c-format +msgid "Attempted to write to non-transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6464 +#: ../libsvn_fs_fs/transaction.c:932 ../libsvn_fs_x/transaction.c:1182 msgid "Copying from transactions not allowed" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6597 +#: ../libsvn_fs_fs/transaction.c:1065 #, c-format msgid "Unable to create transaction directory in '%s' for revision %ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6662 +#: ../libsvn_fs_fs/transaction.c:1136 ../libsvn_fs_x/transaction.c:1338 msgid "Internal error: a null transaction id was passed to get_txn_proplist()" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6821 ../libsvn_fs_fs/fs_fs.c:6828 -msgid "next-id file corrupt" +#: ../libsvn_fs_fs/transaction.c:1149 +#, c-format +msgid "malformed property list in transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:6924 -#, c-format -msgid "Transaction '%s' cleanup failed" +#: ../libsvn_fs_fs/transaction.c:1317 ../libsvn_fs_fs/transaction.c:1323 +#: ../libsvn_fs_x/transaction.c:1603 ../libsvn_fs_x/transaction.c:1609 +msgid "next-id file corrupt" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:7069 +#: ../libsvn_fs_fs/transaction.c:1436 ../libsvn_fs_x/transaction.c:1717 #, c-format -msgid "Invalid change type %d" +msgid "Transaction '%s' cleanup failed" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:7662 +#: ../libsvn_fs_fs/transaction.c:2464 ../libsvn_fs_x/transaction.c:2476 msgid "Can't set text contents of a directory" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:7748 ../libsvn_fs_fs/fs_fs.c:7753 -#: ../libsvn_fs_fs/fs_fs.c:7760 -msgid "Corrupt 'current' file" -msgstr "" - -#: ../libsvn_fs_fs/fs_fs.c:8020 +#: ../libsvn_fs_fs/transaction.c:2882 ../libsvn_fs_x/transaction.c:2802 #, c-format msgid "" "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), " "committing r%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:8155 +#: ../libsvn_fs_fs/transaction.c:3040 msgid "Truncated protorev file detected" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:8555 +#: ../libsvn_fs_fs/transaction.c:3524 ../libsvn_fs_x/transaction.c:3357 msgid "Transaction out of date" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9054 -msgid "Recovery encountered a non-directory node" +#: ../libsvn_fs_fs/transaction.c:3813 ../libsvn_fs_x/transaction.c:3626 +#, c-format +msgid "No such transaction '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9076 -msgid "Recovery encountered a deltified directory representation" +#: ../libsvn_fs_fs/tree.c:2589 ../libsvn_fs_x/tree.c:2613 +msgid "Copy immutable tree not supported" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9114 ../libsvn_fs_fs/fs_fs.c:9123 -#: ../libsvn_fs_fs/fs_fs.c:9129 -msgid "Directory entry corrupt" +#: ../libsvn_fs_fs/tree.c:3908 ../libsvn_fs_x/tree.c:3906 +#, c-format +msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9302 +#: ../libsvn_fs_fs/tree.c:4024 ../libsvn_fs_x/tree.c:4022 #, c-format -msgid "Expected current rev to be <= %ld but found %ld" +msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9359 +#: ../libsvn_fs_fs/tree.c:4224 #, c-format -msgid "Revision %ld has a revs file but no revprops file" +msgid "" +"Querying mergeinfo requires version %d of the FSFS filesystem schema; " +"filesystem '%s' uses only version %d" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9366 +#: ../libsvn_fs_fs/util.c:387 ../libsvn_fs_x/util.c:499 #, c-format -msgid "Revision %ld has a revs file but the revprops file is inaccessible" +msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9375 -#, c-format -msgid "Revision %ld has a non-file where its revprops file should be" +#: ../libsvn_fs_fs/util.c:477 ../libsvn_fs_fs/util.c:482 +#: ../libsvn_fs_fs/util.c:487 ../libsvn_fs_x/util.c:572 +msgid "Corrupt 'current' file" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9553 +#: ../libsvn_fs_fs/util.c:598 ../libsvn_fs_x/util.c:673 #, c-format -msgid "" -"Node origin for '%s' exists with a different value (%s) than what we were " -"about to store (%s)" +msgid "Can't read '%s'" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:9659 -#, c-format -msgid "No such transaction '%s'" +#: ../libsvn_fs_fs/util.c:619 ../libsvn_fs_x/util.c:700 +msgid "Unexpected EOF" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10376 +#: ../libsvn_fs_fs/util.c:626 ../libsvn_fs_x/util.c:707 #, c-format -msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." +msgid "Number '%s' invalid or too large" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10655 ../libsvn_subr/io.c:248 +#: ../libsvn_fs_fs/verify.c:208 ../libsvn_fs_x/verify.c:184 #, c-format -msgid "Error converting entry in directory '%s' to UTF-8" +msgid "%s checksum mismatch in file %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10692 ../libsvn_subr/io.c:1021 +#: ../libsvn_fs_fs/verify.c:303 #, c-format -msgid "Source '%s' is not a directory" +msgid "" +"p2l index entry not found for PHYS %s returned by l2p index for LOG r%ld:i%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10698 ../libsvn_subr/io.c:1027 +#: ../libsvn_fs_fs/verify.c:313 ../libsvn_fs_x/verify.c:292 #, c-format -msgid "Destination '%s' is not a directory" +msgid "p2l index info LOG r%ld:i%ld does not match l2p index for LOG r%ld:i%ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10770 ../libsvn_subr/io.c:1104 -#: ../libsvn_subr/io.c:2492 +#: ../libsvn_fs_fs/verify.c:379 ../libsvn_fs_x/verify.c:361 #, c-format -msgid "Can't read directory '%s'" +msgid "p2l does not cover offset %s for revision %ld" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:10775 ../libsvn_subr/io.c:1109 -#: ../libsvn_subr/io.c:2497 ../libsvn_subr/io.c:4002 +#: ../libsvn_fs_fs/verify.c:404 #, c-format -msgid "Error closing directory '%s'" +msgid "" +"Empty P2L entry for PHYS %s refers to revision %ld outside the rev / pack " +"file (%ld-%ld)" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11067 +#: ../libsvn_fs_fs/verify.c:421 #, c-format msgid "" -"The FSFS format (%d) of the hotcopy source does not match the FSFS format " -"(%d) of the hotcopy destination; please upgrade both repositories to the " -"same format" +"l2p index entry PHYS %sdoes not match p2l index value LOG r%ld:i%ld for PHYS " +"%s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11076 -msgid "" -"The UUID of the hotcopy source does not match the UUID of the hotcopy " -"destination" +#: ../libsvn_fs_fs/verify.c:485 ../libsvn_fs_x/verify.c:462 +#, c-format +msgid "Empty section in file %s contains non-NUL data at offset %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11083 -msgid "" -"The sharding layout configuration of the hotcopy source does not match the " -"sharding layout configuration of the hotcopy destination" +#: ../libsvn_fs_fs/verify.c:526 ../libsvn_fs_x/verify.c:505 +#, c-format +msgid "Checksum mismatch in item at offset %s of length %s bytes in file %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11209 +#: ../libsvn_fs_fs/verify.c:622 ../libsvn_fs_x/verify.c:603 #, c-format -msgid "" -"Failed to create hotcopy at '%s'. The file '%s' is missing from the source " -"repository. Please create this file, for instance by running 'svnadmin " -"upgrade %s'" +msgid "File size of %s for revision r%ld does not match p2l index size of %s" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11235 +#: ../libsvn_fs_fs/verify.c:667 ../libsvn_fs_x/verify.c:651 #, c-format msgid "" -"The hotcopy destination already contains more revisions (%lu) than the " -"hotcopy source contains (%lu); are source and destination swapped?" +"p2l index entry for revision r%ld is non-contiguous between offsets %s and " +"%s" +msgstr "" + +#: ../libsvn_fs_util/fs-util.c:164 +msgid "Filesystem object has not been opened yet" +msgstr "" + +#: ../libsvn_fs_util/fs-util.c:167 +msgid "Filesystem object already open" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11271 +#: ../libsvn_fs_x/cached_data.c:2955 #, c-format msgid "" -"The hotcopy destination already contains more packed revisions (%lu) than " -"the hotcopy source contains (%lu)" +"Low-level checksum mismatch while reading\n" +"%s bytes of meta data at offset %s " msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11386 +#: ../libsvn_fs_x/changes.c:239 #, c-format -msgid "" -"The assumed HEAD revision (%lu) of the hotcopy source has been packed while " -"the hotcopy was in progress; please restart the hotcopy operation" +msgid "Changes list index %%%s exceeds container size %%d" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:11401 +#: ../libsvn_fs_x/changes.c:490 #, c-format -msgid "" -"Revision %lu disappeared from the hotcopy source while hotcopy was in " -"progress" +msgid "Changes list index %u exceeds container size %d" msgstr "" -#: ../libsvn_fs_fs/lock.c:120 +#: ../libsvn_fs_x/fs.c:103 #, c-format -msgid "Corrupt lockfile for path '%s' in filesystem '%s'" +msgid "Can't fetch FSX shared data" msgstr "" -#: ../libsvn_fs_fs/lock.c:228 +#: ../libsvn_fs_x/fs.c:132 #, c-format -msgid "Cannot write lock/entries hashfile '%s'" +msgid "Can't store FSX shared data" +msgstr "" + +#: ../libsvn_fs_x/fs.c:600 +msgid "Module for working with an experimental (FSX) repository." msgstr "" -#: ../libsvn_fs_fs/lock.c:280 +#: ../libsvn_fs_x/fs.c:663 #, c-format -msgid "Can't parse lock/entries hashfile '%s'" +msgid "Unsupported FS loader version (%d) for fsx" +msgstr "" + +#: ../libsvn_fs_x/fs_x.c:1021 +msgid "FSX is not compatible with Subversion prior to 1.9" msgstr "" -#: ../libsvn_fs_fs/lock.c:818 +#: ../libsvn_fs_x/hotcopy.c:486 #, c-format -msgid "Lock failed: newer version of '%s' exists" +msgid "" +"The FSX format (%d) of the hotcopy source does not match the FSX format (%d) " +"of the hotcopy destination; please upgrade both repositories to the same " +"format" msgstr "" -#: ../libsvn_fs_fs/rep-cache.c:138 -msgid "Couldn't open rep-cache database" +#: ../libsvn_fs_x/index.c:294 +msgid "Can't read index file '%s' at offset 0x%" msgstr "" -#: ../libsvn_fs_fs/rep-cache.c:267 ../libsvn_fs_fs/rep-cache.c:312 -msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" +#: ../libsvn_fs_x/index.c:304 +msgid "Unexpected end of index file %s at offset 0x%" +msgstr "" + +#: ../libsvn_fs_x/index.c:2668 +msgid "Unused regions must be empty and have checksum 0" +msgstr "" + +#: ../libsvn_fs_x/index.c:2682 +msgid "Only containers may have more than one sub-item" msgstr "" -#: ../libsvn_fs_fs/rep-cache.c:348 +#: ../libsvn_fs_x/low_level.c:423 #, c-format -msgid "" -"Representation key for checksum '%%s' exists in filesystem '%%s' with a " -"different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld," -"%%%s,%%%s,%%%s)" +msgid "Missing %s field in node-rev" msgstr "" -#: ../libsvn_fs_fs/tree.c:2086 ../libsvn_subr/path.c:1233 +#: ../libsvn_fs_x/noderevs.c:320 #, c-format -msgid "Invalid control character '0x%02x' in path '%s'" +msgid "ID part index %d exceeds container size %d" msgstr "" -#: ../libsvn_fs_fs/tree.c:3685 +#: ../libsvn_fs_x/noderevs.c:348 #, c-format -msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" +msgid "Node revision ID index %d exceeds container size %d" msgstr "" -#: ../libsvn_fs_fs/tree.c:3801 +#: ../libsvn_fs_x/noderevs.c:377 #, c-format -msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" +msgid "Node revision index %%%s exceeds container size %%d" msgstr "" -#: ../libsvn_fs_fs/tree.c:4001 +#: ../libsvn_fs_x/noderevs.c:617 #, c-format -msgid "" -"Querying mergeinfo requires version %d of the FSFS filesystem schema; " -"filesystem '%s' uses only version %d" +msgid "Unexpected MD5 digest size %%%s" msgstr "" -#: ../libsvn_fs_util/fs-util.c:154 -msgid "Filesystem object has not been opened yet" +#: ../libsvn_fs_x/noderevs.c:629 +#, c-format +msgid "Unexpected SHA1 digest size %%%s" msgstr "" -#: ../libsvn_fs_util/fs-util.c:157 -msgid "Filesystem object already open" +#: ../libsvn_fs_x/rep-cache.c:125 +msgid "Couldn't open rep-cache database" msgstr "" -#: ../libsvn_ra/compat.c:182 +#: ../libsvn_fs_x/reps.c:496 +msgid "Text body exceeds star delta container capacity" +msgstr "" + +#: ../libsvn_fs_x/reps.c:501 +msgid "Instruction count exceeds star delta container capacity" +msgstr "" + +#: ../libsvn_fs_x/verify.c:283 +#, c-format +msgid "" +"p2l index entry not found for PHYS o%s:s%ld returned by l2p index for LOG r" +"%ld:i%ld" +msgstr "" + +#: ../libsvn_fs_x/verify.c:392 +#, c-format +msgid "" +"l2p index entry PHYS o%s:s%ld does not match p2l index value LOG r%ld:i%ld " +"for PHYS o%s:s%ld" +msgstr "" + +#: ../libsvn_ra/compat.c:183 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" msgstr "" -#: ../libsvn_ra/compat.c:326 ../libsvn_ra/compat.c:570 +#: ../libsvn_ra/compat.c:328 ../libsvn_ra/compat.c:572 #, c-format msgid "Path '%s' doesn't exist in revision %ld" msgstr "" -#: ../libsvn_ra/compat.c:403 +#: ../libsvn_ra/compat.c:405 #, c-format msgid "'%s' in revision %ld is an unrelated object" msgstr "" -#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1291 +#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1275 #, c-format msgid "Invalid peg revision %ld" msgstr "" -#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1294 -#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329 +#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1278 +#: ../libsvn_repos/rev_hunt.c:212 ../libsvn_repos/rev_hunt.c:327 #, c-format msgid "Invalid end revision %ld" msgstr "" -#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1297 +#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1281 msgid "Peg revision must precede end revision" msgstr "" -#: ../libsvn_ra/ra_loader.c:215 +#: ../libsvn_ra/ra_loader.c:217 #, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" -#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:594 +#: ../libsvn_ra/ra_loader.c:291 #, c-format msgid "Illegal repository URL '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:399 +#: ../libsvn_ra/ra_loader.c:329 #, c-format msgid "Invalid config: unknown HTTP library '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:468 +#: ../libsvn_ra/ra_loader.c:373 #, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:519 +#: ../libsvn_ra/ra_loader.c:397 +#, c-format +msgid "Unable to connect to a repository at URL '%s'" +msgstr "" + +#: ../libsvn_ra/ra_loader.c:425 #, c-format msgid "Repository UUID '%s' doesn't match expected UUID '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:540 +#: ../libsvn_ra/ra_loader.c:486 #, c-format msgid "'%s' isn't in the same repository as '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:564 +#: ../libsvn_ra/ra_loader.c:510 #, c-format msgid "'%s' isn't a child of session URL '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2465 +#: ../libsvn_ra/ra_loader.c:526 ../libsvn_ra_svn/client.c:2624 #, c-format msgid "'%s' isn't a child of repository root URL '%s'" msgstr "" -#: ../libsvn_ra/ra_loader.c:624 +#: ../libsvn_ra/ra_loader.c:570 #, c-format msgid "" "Specifying 'old_value_p' is not allowed when the '%s' capability is not " "advertised, and could indicate a bug in your client" msgstr "" -#: ../libsvn_ra/ra_loader.c:1445 +#: ../libsvn_ra/ra_loader.c:1421 #, c-format msgid " - handles '%s' scheme\n" msgstr "" -#: ../libsvn_ra/ra_loader.c:1538 +#: ../libsvn_ra/ra_loader.c:1514 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "" @@ -4105,32 +4885,28 @@ msgstr "" #. ---------------------------------------------------------------- #. ** The RA vtable routines ** -#: ../libsvn_ra_local/ra_plugin.c:503 +#: ../libsvn_ra_local/ra_plugin.c:509 msgid "Module for accessing a repository on local disk." msgstr "" -#: ../libsvn_ra_local/ra_plugin.c:579 -msgid "Unable to open an ra_local session to URL" -msgstr "" - -#: ../libsvn_ra_local/ra_plugin.c:612 ../libsvn_ra_serf/serf.c:586 +#: ../libsvn_ra_local/ra_plugin.c:685 ../libsvn_ra_serf/serf.c:810 #, c-format msgid "URL '%s' is not a child of the session's repository root URL '%s'" msgstr "" -#: ../libsvn_ra_local/ra_plugin.c:1140 ../libsvn_ra_local/ra_plugin.c:1597 -#: ../libsvn_ra_serf/util.c:2604 +#: ../libsvn_ra_local/ra_plugin.c:1261 ../libsvn_ra_local/ra_plugin.c:1725 +#: ../libsvn_ra_serf/util.c:1796 #, c-format msgid "'%s' path not found" msgstr "" -#: ../libsvn_ra_local/ra_plugin.c:1539 ../libsvn_ra_serf/options.c:678 -#: ../libsvn_ra_svn/client.c:2666 +#: ../libsvn_ra_local/ra_plugin.c:1667 ../libsvn_ra_serf/options.c:732 +#: ../libsvn_ra_svn/client.c:2825 #, c-format msgid "Don't know anything about capability '%s'" msgstr "" -#: ../libsvn_ra_local/ra_plugin.c:1745 +#: ../libsvn_ra_local/ra_plugin.c:1880 #, c-format msgid "Unsupported RA loader version (%d) for ra_local" msgstr "" @@ -4140,236 +4916,181 @@ msgstr "" msgid "Unable to open repository '%s'" msgstr "" -#: ../libsvn_ra_serf/commit.c:215 -#, c-format -msgid "%s of '%s': %d %s" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:315 +#: ../libsvn_ra_serf/commit.c:287 msgid "No Location header received" msgstr "" -#: ../libsvn_ra_serf/commit.c:325 +#: ../libsvn_ra_serf/commit.c:297 msgid "Error parsing Location header value" msgstr "" -#: ../libsvn_ra_serf/commit.c:435 -#, c-format -msgid "Directory '%s' is out of date; try updating" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:523 ../libsvn_repos/commit.c:512 +#: ../libsvn_ra_serf/commit.c:483 ../libsvn_repos/commit.c:520 #, c-format msgid "Path '%s' not present" msgstr "" -#: ../libsvn_ra_serf/commit.c:573 -#, c-format -msgid "File '%s' is out of date; try updating" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:975 -msgid "At least one property change failed; repository is unchanged" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:1233 -#, c-format -msgid "Failed writing updated file" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:1421 ../libsvn_ra_serf/commit.c:1511 -#, c-format -msgid "%s of '%s': %d %s (%s://%s)" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:1431 +#: ../libsvn_ra_serf/commit.c:1298 #, c-format msgid "POST request did not return transaction information" msgstr "" -#: ../libsvn_ra_serf/commit.c:1475 -msgid "" -"The OPTIONS response did not include the requested activity-collection-set " -"value" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:1718 ../libsvn_ra_serf/commit.c:2127 -#: ../libsvn_ra_serf/update.c:2619 +#: ../libsvn_ra_serf/commit.c:1587 ../libsvn_ra_serf/update.c:2271 #, c-format msgid "Unable to parse URL '%s'" msgstr "" -#: ../libsvn_ra_serf/commit.c:1746 ../libsvn_ra_serf/util.c:2600 +#: ../libsvn_ra_serf/commit.c:1835 #, c-format -msgid "Access to '%s' forbidden" -msgstr "" - -#: ../libsvn_ra_serf/commit.c:1750 -#, c-format -msgid "Adding directory failed: %s on %s (%d %s)" +msgid "File '%s' already exists" msgstr "" -#: ../libsvn_ra_serf/commit.c:1979 +#: ../libsvn_ra_serf/get_deleted_rev.c:173 #, c-format -msgid "File '%s' already exists" +msgid "'%s' REPORT not implemented" msgstr "" -#: ../libsvn_ra_serf/commit.c:2251 -#, c-format -msgid "MERGE request failed: returned %d (during commit)" +#: ../libsvn_ra_serf/get_file.c:376 +msgid "Can't get text contents of a directory" msgstr "" -#: ../libsvn_ra_serf/commit.c:2333 +#: ../libsvn_ra_serf/get_lock.c:170 ../libsvn_ra_serf/lock.c:165 #, c-format -msgid "DELETE returned unexpected status: %d" +msgid "Invalid LOCK timeout value '%s'" msgstr "" -#: ../libsvn_ra_serf/commit.c:2527 -msgid "" -"DAV request failed; it's possible that the repository's pre-revprop-change " -"hook either failed or is non-existent" +#: ../libsvn_ra_serf/get_lock.c:323 +msgid "Server does not support locking features" msgstr "" -#: ../libsvn_ra_serf/get_deleted_rev.c:173 -#, c-format -msgid "'%s' REPORT not implemented" +#: ../libsvn_ra_serf/getdate.c:167 +msgid "The REPORT response did not include the requested properties" msgstr "" -#: ../libsvn_ra_serf/inherited_props.c:171 ../libsvn_ra_serf/property.c:279 -#: ../libsvn_ra_serf/update.c:2468 +#: ../libsvn_ra_serf/inherited_props.c:171 ../libsvn_ra_serf/property.c:264 +#: ../libsvn_ra_serf/update.c:1894 #, c-format msgid "Got unrecognized encoding '%s'" msgstr "" -#: ../libsvn_ra_serf/locks.c:171 +#: ../libsvn_ra_serf/lock.c:261 #, c-format -msgid "Invalid LOCK timeout value '%s'" +msgid "No lock on path '%s' (%d %s)" msgstr "" -#: ../libsvn_ra_serf/locks.c:243 +#: ../libsvn_ra_serf/lock.c:270 #, c-format -msgid "Lock request failed: %d %s" +msgid "Unlock of '%s' failed (%d %s)" msgstr "" -#: ../libsvn_ra_serf/locks.c:424 -msgid "Malformed URL for repository" -msgstr "" - -#: ../libsvn_ra_serf/locks.c:430 -msgid "Server does not support locking features" +#: ../libsvn_ra_serf/lock.c:278 +#, c-format +msgid "Path '%s' doesn't exist in HEAD revision (%d %s)" msgstr "" -#: ../libsvn_ra_serf/locks.c:596 +#: ../libsvn_ra_serf/lock.c:287 #, c-format -msgid "'%s' is not locked in the repository" +msgid "Path '%s' already locked (%d %s)" msgstr "" -#: ../libsvn_ra_serf/locks.c:647 ../libsvn_ra_serf/locks.c:653 +#: ../libsvn_ra_serf/lock.c:603 #, c-format -msgid "Unlock request failed: %d %s" +msgid "'%s' is not locked in the repository" msgstr "" -#: ../libsvn_ra_serf/log.c:169 +#: ../libsvn_ra_serf/log.c:172 #, c-format msgid "Unsupported encoding '%s'" msgstr "" -#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1577 +#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1746 msgid "Server does not support custom revprops via log" msgstr "" -#: ../libsvn_ra_serf/merge.c:200 +#: ../libsvn_ra_serf/merge.c:205 #, c-format msgid "A MERGE response for '%s' is not a child of the destination ('%s')" msgstr "" -#: ../libsvn_ra_serf/options.c:661 -#, c-format -msgid "Don't know how to handle '%s' for capability '%s'" +#: ../libsvn_ra_serf/merge.c:448 +msgid "The MERGE response did not include a new revision" msgstr "" -#: ../libsvn_ra_serf/options.c:685 +#: ../libsvn_ra_serf/multistatus.c:226 ../libsvn_ra_serf/multistatus.c:231 #, c-format -msgid "Attempt to fetch capability '%s' resulted in '%s'" +msgid "Malformed DAV:status '%s'" msgstr "" -#: ../libsvn_ra_serf/property.c:700 -msgid "The PROPFIND response did not include the requested properties" +#: ../libsvn_ra_serf/multistatus.c:534 +#, c-format +msgid "Property operation on '%s' failed" msgstr "" -#: ../libsvn_ra_serf/property.c:993 -msgid "" -"The PROPFIND response did not include the requested baseline-collection value" +#: ../libsvn_ra_serf/multistatus.c:553 +msgid "<blank error>" msgstr "" -#: ../libsvn_ra_serf/property.c:1005 -msgid "The PROPFIND response did not include the requested version-name value" +#: ../libsvn_ra_serf/multistatus.c:562 +#, c-format +msgid "While handling the '%s' property on '%s':" msgstr "" -#: ../libsvn_ra_serf/property.c:1043 -msgid "The OPTIONS response did not include the requested checked-in value" +#: ../libsvn_ra_serf/multistatus.c:566 +#, c-format +msgid "While handling the '%s' path:" msgstr "" -#: ../libsvn_ra_serf/property.c:1125 +#: ../libsvn_ra_serf/options.c:446 msgid "The OPTIONS response did not include the youngest revision" msgstr "" -#: ../libsvn_ra_serf/property.c:1218 -msgid "The PROPFIND response did not include the requested resourcetype value" -msgstr "" - -#: ../libsvn_ra_serf/property.c:1253 -msgid "The PROPFIND response did not include the requested 'DAV:' properties" -msgstr "" - -#: ../libsvn_ra_serf/replay.c:222 ../libsvn_ra_serf/update.c:1657 -msgid "Missing revision attr in target-revision element" -msgstr "" - -#: ../libsvn_ra_serf/replay.c:240 -msgid "Missing revision attr in open-root element" +#: ../libsvn_ra_serf/options.c:487 +msgid "" +"The OPTIONS response did not include the requested activity-collection-set " +"value" msgstr "" -#: ../libsvn_ra_serf/replay.c:260 ../libsvn_ra_serf/update.c:1885 -msgid "Missing name attr in delete-entry element" +#: ../libsvn_ra_serf/options.c:529 +msgid "Location header not set on redirect response" msgstr "" -#: ../libsvn_ra_serf/replay.c:266 -msgid "Missing revision attr in delete-entry element" +#: ../libsvn_ra_serf/options.c:559 ../libsvn_ra_serf/util.c:1787 +#, c-format +msgid "Repository moved permanently to '%s'" msgstr "" -#: ../libsvn_ra_serf/replay.c:286 ../libsvn_ra_serf/update.c:1724 -msgid "Missing name attr in open-directory element" +#: ../libsvn_ra_serf/options.c:560 ../libsvn_ra_serf/util.c:1788 +#, c-format +msgid "Repository moved temporarily to '%s'" msgstr "" -#: ../libsvn_ra_serf/replay.c:292 ../libsvn_ra_serf/update.c:1675 -#: ../libsvn_ra_serf/update.c:1715 -msgid "Missing revision attr in open-directory element" +#: ../libsvn_ra_serf/options.c:715 +#, c-format +msgid "Don't know how to handle '%s' for capability '%s'" msgstr "" -#: ../libsvn_ra_serf/replay.c:312 ../libsvn_ra_serf/update.c:1762 -msgid "Missing name attr in add-directory element" +#: ../libsvn_ra_serf/options.c:739 +#, c-format +msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "" -#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1806 -msgid "Missing name attr in open-file element" +#: ../libsvn_ra_serf/property.c:663 +msgid "" +"The PROPFIND response did not include the requested baseline-collection value" msgstr "" -#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1815 -msgid "Missing revision attr in open-file element" +#: ../libsvn_ra_serf/property.c:683 +msgid "The PROPFIND response did not include the requested version-name value" msgstr "" -#: ../libsvn_ra_serf/replay.c:375 ../libsvn_ra_serf/update.c:1840 -msgid "Missing name attr in add-file element" +#: ../libsvn_ra_serf/property.c:719 +msgid "The OPTIONS response did not include the requested checked-in value" msgstr "" -#: ../libsvn_ra_serf/replay.c:443 ../libsvn_ra_serf/update.c:1981 -#: ../libsvn_ra_serf/update.c:2068 -#, c-format -msgid "Missing name attr in %s element" +#: ../libsvn_ra_serf/property.c:891 +msgid "The PROPFIND response did not include the requested 'DAV:' properties" msgstr "" -#: ../libsvn_ra_serf/replay.c:578 +#: ../libsvn_ra_serf/replay.c:465 msgid "Error writing stream: unexpected EOF" msgstr "" @@ -4377,228 +5098,188 @@ msgstr "" msgid "Failed to read the request" msgstr "" -#: ../libsvn_ra_serf/serf.c:62 +#: ../libsvn_ra_serf/serf.c:63 msgid "Module for accessing a repository via WebDAV protocol using serf." msgstr "" -#: ../libsvn_ra_serf/serf.c:65 +#: ../libsvn_ra_serf/serf.c:66 #, c-format msgid "" "Module for accessing a repository via WebDAV protocol using serf.\n" -" - using serf %d.%d.%d" +" - using serf %d.%d.%d (compiled with %d.%d.%d)" msgstr "" -#: ../libsvn_ra_serf/serf.c:129 +#: ../libsvn_ra_serf/serf.c:135 #, c-format msgid "Invalid config: unknown %s '%s'" msgstr "" -#: ../libsvn_ra_serf/serf.c:327 +#: ../libsvn_ra_serf/serf.c:367 msgid "Invalid config: illegal character in timeout value" msgstr "" -#: ../libsvn_ra_serf/serf.c:331 +#: ../libsvn_ra_serf/serf.c:371 msgid "Invalid config: negative timeout value" msgstr "" -#: ../libsvn_ra_serf/serf.c:344 +#: ../libsvn_ra_serf/serf.c:384 msgid "Invalid URL: illegal character in proxy port number" msgstr "" -#: ../libsvn_ra_serf/serf.c:348 +#: ../libsvn_ra_serf/serf.c:388 msgid "Invalid URL: negative proxy port number" msgstr "" -#: ../libsvn_ra_serf/serf.c:351 +#: ../libsvn_ra_serf/serf.c:391 msgid "" "Invalid URL: proxy port number greater than maximum TCP port number 65535" msgstr "" -#: ../libsvn_ra_serf/serf.c:371 +#: ../libsvn_ra_serf/serf.c:411 #, c-format msgid "Could not resolve proxy server '%s'" msgstr "" -#: ../libsvn_ra_serf/serf.c:474 -#, c-format -msgid "Illegal URL '%s'" -msgstr "" - -#: ../libsvn_ra_serf/serf.c:546 +#: ../libsvn_ra_serf/serf.c:602 #, c-format msgid "Connection to '%s' failed" msgstr "" -#: ../libsvn_ra_serf/serf.c:1216 +#: ../libsvn_ra_serf/serf.c:1002 msgid "The UUID property was not found on the resource or any of its parents" msgstr "" -#: ../libsvn_ra_serf/serf.c:1290 +#: ../libsvn_ra_serf/serf.c:1077 #, c-format msgid "Unsupported RA loader version (%d) for ra_serf" msgstr "" -#: ../libsvn_ra_serf/serf.c:1304 +#: ../libsvn_ra_serf/serf.c:1091 #, c-format msgid "" "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d " "library" msgstr "" -#: ../libsvn_ra_serf/update.c:1115 -#, c-format -msgid "GET request returned unexpected delta base: %s" -msgstr "" - -#: ../libsvn_ra_serf/update.c:1133 -#, c-format -msgid "GET request failed: %d %s" -msgstr "" - -#: ../libsvn_ra_serf/update.c:1919 -msgid "Missing name attr in absent-directory element" +#: ../libsvn_ra_serf/stat.c:106 +msgid "The PROPFIND response did not include the requested resourcetype value" msgstr "" -#: ../libsvn_ra_serf/update.c:1944 -msgid "Missing name attr in absent-file element" +#: ../libsvn_ra_serf/stat.c:410 ../libsvn_ra_serf/stat.c:448 +msgid "Can't get properties of non-directory" msgstr "" -#: ../libsvn_ra_serf/update.c:2012 ../libsvn_ra_serf/update.c:2119 +#: ../libsvn_ra_serf/update.c:1137 ../libsvn_ra_serf/update.c:1143 #, c-format -msgid "Unknown tag '%s' while at state %d" -msgstr "" - -#: ../libsvn_ra_serf/update.c:2187 ../libsvn_ra_serf/update.c:2309 -#: ../libsvn_ra_serf/update.c:2346 -msgid "" -"The REPORT or PROPFIND response did not include the requested checked-in " -"value" +msgid "GET request returned unexpected delta base: %s" msgstr "" -#: ../libsvn_ra_serf/update.c:2528 +#: ../libsvn_ra_serf/update.c:1700 ../libsvn_ra_serf/update.c:1750 #, c-format -msgid "Error writing to '%s': unexpected EOF" +msgid "Missing '%s' attribute" msgstr "" -#: ../libsvn_ra_serf/update.c:2884 -msgid "Error retrieving REPORT" +#: ../libsvn_ra_serf/update.c:1964 ../libsvn_ra_serf/update.c:1994 +msgid "The REPORT response did not include the requested checked-in value" msgstr "" -#: ../libsvn_ra_serf/update.c:3093 +#: ../libsvn_ra_serf/update.c:2644 msgid "Missing update-report close tag" msgstr "" -#: ../libsvn_ra_serf/update.c:3562 -msgid "Can't get text contents of a directory" -msgstr "" - -#: ../libsvn_ra_serf/util.c:249 +#: ../libsvn_ra_serf/util.c:195 msgid ": " msgstr "" -#: ../libsvn_ra_serf/util.c:251 +#: ../libsvn_ra_serf/util.c:197 msgid ", " msgstr "" -#: ../libsvn_ra_serf/util.c:462 +#: ../libsvn_ra_serf/util.c:407 msgid "Server SSL certificate verification failed" msgstr "" -#: ../libsvn_ra_serf/util.c:467 +#: ../libsvn_ra_serf/util.c:412 msgid "certificate is not yet valid" msgstr "" -#: ../libsvn_ra_serf/util.c:470 +#: ../libsvn_ra_serf/util.c:415 msgid "certificate has expired" msgstr "" -#: ../libsvn_ra_serf/util.c:474 +#: ../libsvn_ra_serf/util.c:419 msgid "certificate issued for a different hostname" msgstr "" -#: ../libsvn_ra_serf/util.c:478 +#: ../libsvn_ra_serf/util.c:423 msgid "issuer is not trusted" msgstr "" -#: ../libsvn_ra_serf/util.c:481 +#: ../libsvn_ra_serf/util.c:426 msgid "and other reason(s)" msgstr "" -#: ../libsvn_ra_serf/util.c:528 +#: ../libsvn_ra_serf/util.c:473 #, c-format msgid "Invalid config: unable to load certificate file '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:960 ../libsvn_ra_serf/util.c:963 +#: ../libsvn_ra_serf/util.c:911 ../libsvn_ra_serf/util.c:914 msgid "Error running context" msgstr "" -#: ../libsvn_ra_serf/util.c:1297 ../libsvn_ra_serf/util.c:1302 -#, c-format -msgid "Malformed DAV:status CDATA '%s'" -msgstr "" - -#: ../libsvn_ra_serf/util.c:1599 ../libsvn_ra_serf/util.c:1702 -#, c-format -msgid "XML parsing failed" -msgstr "" - -#: ../libsvn_ra_serf/util.c:1602 -#, c-format -msgid "XML parsing failed: (%d %s)" -msgstr "" - -#: ../libsvn_ra_serf/util.c:1889 -msgid "The XML response contains invalid XML" -msgstr "" - -#: ../libsvn_ra_serf/util.c:1954 +#: ../libsvn_ra_serf/util.c:1186 msgid "" "No more credentials or we tried too many times.\n" "Authentication failed" msgstr "" -#: ../libsvn_ra_serf/util.c:1976 +#: ../libsvn_ra_serf/util.c:1208 msgid "Proxy authentication failed" msgstr "" -#: ../libsvn_ra_serf/util.c:2029 +#: ../libsvn_ra_serf/util.c:1263 #, c-format msgid "%s request on '%s' failed" msgstr "" -#: ../libsvn_ra_serf/util.c:2101 +#: ../libsvn_ra_serf/util.c:1335 #, c-format msgid "Premature EOF seen from server (http status=%d)" msgstr "" -#: ../libsvn_ra_serf/util.c:2170 -#, c-format -msgid "%s request on '%s' failed: %d %s" -msgstr "" - -#: ../libsvn_ra_serf/util.c:2492 +#: ../libsvn_ra_serf/util.c:1686 msgid "" "The PROPFIND response did not include the requested version-controlled-" "configuration value" msgstr "" -#: ../libsvn_ra_serf/util.c:2594 +#: ../libsvn_ra_serf/util.c:1792 +#, c-format +msgid "Access to '%s' forbidden" +msgstr "" + +#: ../libsvn_ra_serf/util.c:1799 +#, c-format +msgid "HTTP method is not allowed on '%s'" +msgstr "" + +#: ../libsvn_ra_serf/util.c:1803 #, c-format -msgid "Repository moved permanently to '%s'; please relocate" +msgid "'%s' conflicts" msgstr "" -#: ../libsvn_ra_serf/util.c:2596 +#: ../libsvn_ra_serf/util.c:1806 #, c-format -msgid "Repository moved temporarily to '%s'; please relocate" +msgid "Precondition on '%s' failed" msgstr "" -#: ../libsvn_ra_serf/util.c:2607 +#: ../libsvn_ra_serf/util.c:1809 #, c-format msgid "'%s': no lock token available" msgstr "" -#: ../libsvn_ra_serf/util.c:2611 +#: ../libsvn_ra_serf/util.c:1813 #, c-format msgid "" "DAV request failed: 411 Content length required. The server or an " @@ -4606,250 +5287,299 @@ msgid "" "chunked-requests' to 'auto' or 'no' in your client configuration." msgstr "" -#: ../libsvn_ra_serf/util.c:2617 +#: ../libsvn_ra_serf/util.c:1819 +#, c-format +msgid "Unexpected server error %d '%s' on '%s'" +msgstr "" + +#: ../libsvn_ra_serf/util.c:1823 #, c-format msgid "The requested feature is not supported by '%s'" msgstr "" -#: ../libsvn_ra_serf/util.c:2623 +#: ../libsvn_ra_serf/util.c:1829 +#, c-format +msgid "Unexpected HTTP status %d '%s' on '%s'" +msgstr "" + +#: ../libsvn_ra_serf/util.c:1848 #, c-format -msgid "Unexpected HTTP status %d '%s' on '%s'\n" +msgid "Path '%s' unexpectedly created" msgstr "" -#: ../libsvn_ra_serf/util.c:2767 +#: ../libsvn_ra_serf/util.c:1857 #, c-format -msgid "The %s response contains invalid XML (%d %s)" +msgid "The HTTP method '%s' is not allowed on '%s'" msgstr "" -#: ../libsvn_ra_serf/xml.c:622 +#: ../libsvn_ra_serf/util.c:1862 +#, c-format +msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" +msgstr "" + +#: ../libsvn_ra_serf/util.c:1965 +#, c-format +msgid "Illegal URL '%s'" +msgstr "" + +#: ../libsvn_ra_serf/xml.c:502 +#, c-format +msgid "XML stream truncated: closing '%s' missing" +msgstr "" + +#: ../libsvn_ra_serf/xml.c:530 +msgid "document element not found" +msgstr "" + +#: ../libsvn_ra_serf/xml.c:533 +#, c-format +msgid "XML stream truncated: %s" +msgstr "" + +#: ../libsvn_ra_serf/xml.c:698 #, c-format msgid "XML Parsing failed: Unexpected root element '%s'" msgstr "" -#: ../libsvn_ra_serf/xml.c:682 +#: ../libsvn_ra_serf/xml.c:758 +#, c-format +msgid "Missing XML attribute '%s' on '%s' element" +msgstr "" + +#: ../libsvn_ra_serf/xml.c:916 #, c-format -msgid "Missing XML attribute: '%s'" +msgid "Malformed XML: %s" msgstr "" -#: ../libsvn_ra_serf/xml.c:757 -msgid "The response contains invalid XML" +#: ../libsvn_ra_serf/xml.c:918 +msgid "The XML response contains invalid XML" msgstr "" -#: ../libsvn_ra_svn/client.c:142 +#: ../libsvn_ra_svn/client.c:143 #, c-format msgid "Unknown hostname '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:167 +#: ../libsvn_ra_svn/client.c:168 #, c-format msgid "Can't connect to host '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:205 +#: ../libsvn_ra_svn/client.c:206 msgid "Prop diffs element not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:403 +#: ../libsvn_ra_svn/client.c:405 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:420 +#: ../libsvn_ra_svn/client.c:422 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "" -#: ../libsvn_ra_svn/client.c:431 +#: ../libsvn_ra_svn/client.c:433 #, c-format msgid "Can't tokenize command '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:464 +#: ../libsvn_ra_svn/client.c:476 #, c-format msgid "Error in child process: %s" msgstr "" -#: ../libsvn_ra_svn/client.c:539 +#: ../libsvn_ra_svn/client.c:555 msgid "" "To better debug SSH connection problems, remove the -q option from 'ssh' in " "the [tunnels] section of your Subversion configuration file." msgstr "" -#: ../libsvn_ra_svn/client.c:557 +#: ../libsvn_ra_svn/client.c:573 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:637 +#: ../libsvn_ra_svn/client.c:724 #, c-format msgid "Server requires minimum version %d" msgstr "" -#: ../libsvn_ra_svn/client.c:641 +#: ../libsvn_ra_svn/client.c:728 #, c-format msgid "Server only supports versions up to %d" msgstr "" -#: ../libsvn_ra_svn/client.c:649 +#: ../libsvn_ra_svn/client.c:736 msgid "Server does not support edit pipelining" msgstr "" -#: ../libsvn_ra_svn/client.c:686 +#: ../libsvn_ra_svn/client.c:773 msgid "Impossibly long repository root from server" msgstr "" -#: ../libsvn_ra_svn/client.c:698 +#: ../libsvn_ra_svn/client.c:785 msgid "" "Module for accessing a repository using the svn network protocol.\n" " - with Cyrus SASL authentication" msgstr "" -#: ../libsvn_ra_svn/client.c:702 +#: ../libsvn_ra_svn/client.c:789 msgid "Module for accessing a repository using the svn network protocol." msgstr "" -#: ../libsvn_ra_svn/client.c:912 +#: ../libsvn_ra_svn/client.c:871 +#, c-format +msgid "Invalid host '%s'" +msgstr "" + +#: ../libsvn_ra_svn/client.c:1062 msgid "Server did not send repository root" msgstr "" -#: ../libsvn_ra_svn/client.c:985 +#: ../libsvn_ra_svn/client.c:1138 #, c-format msgid "" "ra_svn does not support not specifying a log message with pre-1.5 servers; " "consider passing an empty one, or upgrading the server" msgstr "" -#: ../libsvn_ra_svn/client.c:1008 +#: ../libsvn_ra_svn/client.c:1161 msgid "" "Server doesn't support setting arbitrary revision properties during commit" msgstr "" -#: ../libsvn_ra_svn/client.c:1111 +#: ../libsvn_ra_svn/client.c:1261 msgid "Inherited proplist element not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1186 +#: ../libsvn_ra_svn/client.c:1334 msgid "Non-string as part of file contents" msgstr "" -#: ../libsvn_ra_svn/client.c:1272 +#: ../libsvn_ra_svn/client.c:1423 msgid "Dirlist element not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1357 +#: ../libsvn_ra_svn/client.c:1432 +#, c-format +msgid "Invalid directory entry name '%s'" +msgstr "" + +#: ../libsvn_ra_svn/client.c:1515 msgid "Mergeinfo element is not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1565 +#: ../libsvn_ra_svn/client.c:1734 msgid "Log entry not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1612 +#: ../libsvn_ra_svn/client.c:1782 msgid "Changed-path entry not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1778 +#: ../libsvn_ra_svn/client.c:1937 msgid "'stat' not implemented" msgstr "" -#: ../libsvn_ra_svn/client.c:1837 +#: ../libsvn_ra_svn/client.c:1996 msgid "'get-locations' not implemented" msgstr "" -#: ../libsvn_ra_svn/client.c:1852 +#: ../libsvn_ra_svn/client.c:2011 msgid "Location entry not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1891 +#: ../libsvn_ra_svn/client.c:2050 msgid "'get-location-segments' not implemented" msgstr "" -#: ../libsvn_ra_svn/client.c:1908 +#: ../libsvn_ra_svn/client.c:2067 msgid "Location segment entry not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:1918 +#: ../libsvn_ra_svn/client.c:2077 msgid "Expected valid revision range" msgstr "" -#: ../libsvn_ra_svn/client.c:1959 +#: ../libsvn_ra_svn/client.c:2118 msgid "'get-file-revs' not implemented" msgstr "" -#: ../libsvn_ra_svn/client.c:1983 +#: ../libsvn_ra_svn/client.c:2142 msgid "Revision entry not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:2000 ../libsvn_ra_svn/client.c:2030 +#: ../libsvn_ra_svn/client.c:2159 ../libsvn_ra_svn/client.c:2189 msgid "Text delta chunk not a string" msgstr "" -#: ../libsvn_ra_svn/client.c:2042 +#: ../libsvn_ra_svn/client.c:2201 msgid "The get-file-revs command didn't return any revisions" msgstr "" -#: ../libsvn_ra_svn/client.c:2089 +#: ../libsvn_ra_svn/client.c:2248 msgid "Server doesn't support the lock command" msgstr "" -#: ../libsvn_ra_svn/client.c:2153 +#: ../libsvn_ra_svn/client.c:2312 msgid "Server doesn't support the unlock command" msgstr "" -#: ../libsvn_ra_svn/client.c:2251 +#: ../libsvn_ra_svn/client.c:2410 msgid "Lock response not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:2265 +#: ../libsvn_ra_svn/client.c:2424 msgid "Unknown status for lock command" msgstr "" -#: ../libsvn_ra_svn/client.c:2289 +#: ../libsvn_ra_svn/client.c:2448 msgid "Didn't receive end marker for lock responses" msgstr "" -#: ../libsvn_ra_svn/client.c:2379 +#: ../libsvn_ra_svn/client.c:2538 msgid "Unlock response not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:2393 +#: ../libsvn_ra_svn/client.c:2552 msgid "Unknown status for unlock command" msgstr "" -#: ../libsvn_ra_svn/client.c:2416 +#: ../libsvn_ra_svn/client.c:2575 msgid "Didn't receive end marker for unlock responses" msgstr "" -#: ../libsvn_ra_svn/client.c:2440 ../libsvn_ra_svn/client.c:2492 +#: ../libsvn_ra_svn/client.c:2599 ../libsvn_ra_svn/client.c:2651 msgid "Server doesn't support the get-lock command" msgstr "" -#: ../libsvn_ra_svn/client.c:2506 +#: ../libsvn_ra_svn/client.c:2665 msgid "Lock element not a list" msgstr "" -#: ../libsvn_ra_svn/client.c:2549 +#: ../libsvn_ra_svn/client.c:2708 msgid "Server doesn't support the replay command" msgstr "" -#: ../libsvn_ra_svn/client.c:2580 +#: ../libsvn_ra_svn/client.c:2739 msgid "Server doesn't support the replay-range command" msgstr "" -#: ../libsvn_ra_svn/client.c:2598 +#: ../libsvn_ra_svn/client.c:2757 #, c-format msgid "Expected 'revprops', found '%s'" msgstr "" -#: ../libsvn_ra_svn/client.c:2615 +#: ../libsvn_ra_svn/client.c:2774 msgid "Error while replaying commit" msgstr "" -#: ../libsvn_ra_svn/client.c:2688 +#: ../libsvn_ra_svn/client.c:2847 msgid "'get-deleted-rev' not implemented" msgstr "" -#: ../libsvn_ra_svn/client.c:2787 +#: ../libsvn_ra_svn/client.c:2958 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "" @@ -4875,38 +5605,38 @@ msgstr "" msgid "Could not create SASL context: %s%s" msgstr "" -#: ../libsvn_ra_svn/cyrus_auth.c:921 ../libsvn_ra_svn/internal_auth.c:63 +#: ../libsvn_ra_svn/cyrus_auth.c:932 ../libsvn_ra_svn/internal_auth.c:63 #: ../libsvn_ra_svn/internal_auth.c:114 #, c-format msgid "Authentication error from server: %s" msgstr "" -#: ../libsvn_ra_svn/cyrus_auth.c:925 +#: ../libsvn_ra_svn/cyrus_auth.c:936 msgid "Can't get username or password" msgstr "" -#: ../libsvn_ra_svn/editorp.c:145 +#: ../libsvn_ra_svn/editorp.c:147 msgid "Successful edit status returned too soon" msgstr "" -#: ../libsvn_ra_svn/editorp.c:487 +#: ../libsvn_ra_svn/editorp.c:495 msgid "Invalid file or dir token during edit" msgstr "" -#: ../libsvn_ra_svn/editorp.c:715 +#: ../libsvn_ra_svn/editorp.c:736 msgid "Apply-textdelta already active" msgstr "" -#: ../libsvn_ra_svn/editorp.c:737 ../libsvn_ra_svn/editorp.c:755 +#: ../libsvn_ra_svn/editorp.c:758 ../libsvn_ra_svn/editorp.c:776 msgid "Apply-textdelta not active" msgstr "" -#: ../libsvn_ra_svn/editorp.c:850 +#: ../libsvn_ra_svn/editorp.c:871 #, c-format msgid "Command 'finish-replay' invalid outside of replays" msgstr "" -#: ../libsvn_ra_svn/editorp.c:954 ../libsvn_ra_svn/marshal.c:1498 +#: ../libsvn_ra_svn/editorp.c:975 ../libsvn_ra_svn/marshal.c:1579 #, c-format msgid "Unknown editor command '%s'" msgstr "" @@ -4915,56 +5645,60 @@ msgstr "" msgid "Can't get password" msgstr "" -#: ../libsvn_ra_svn/marshal.c:151 +#: ../libsvn_ra_svn/marshal.c:147 msgid "Capability entry is not a word" msgstr "" -#: ../libsvn_ra_svn/marshal.c:941 +#: ../libsvn_ra_svn/marshal.c:953 msgid "String length larger than maximum" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1007 -msgid "Too many nested items" +#: ../libsvn_ra_svn/marshal.c:1021 +msgid "Items are nested too deeply" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1027 ../libsvn_ra_svn/marshal.c:1105 +#: ../libsvn_ra_svn/marshal.c:1042 ../libsvn_ra_svn/marshal.c:1130 msgid "Number is larger than maximum" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1133 +#: ../libsvn_ra_svn/marshal.c:1073 +msgid "Word is too long" +msgstr "" + +#: ../libsvn_ra_svn/marshal.c:1158 msgid "Word too long" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1351 +#: ../libsvn_ra_svn/marshal.c:1418 msgid "Proplist element not a list" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1390 +#: ../libsvn_ra_svn/marshal.c:1457 msgid "Empty error list" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1399 ../libsvn_ra_svn/marshal.c:1425 +#: ../libsvn_ra_svn/marshal.c:1466 ../libsvn_ra_svn/marshal.c:1492 msgid "Malformed error list" msgstr "" -#: ../libsvn_ra_svn/marshal.c:1454 +#: ../libsvn_ra_svn/marshal.c:1521 #, c-format msgid "Unknown status '%s' in command response" msgstr "" -#: ../libsvn_ra_svn/streams.c:78 ../libsvn_ra_svn/streams.c:157 +#: ../libsvn_ra_svn/streams.c:110 #, c-format -msgid "Can't read from connection" +msgid "Can't get socket timeout" msgstr "" -#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:170 +#: ../libsvn_ra_svn/streams.c:123 #, c-format -msgid "Can't write to connection" +msgid "Can't read from connection" msgstr "" -#: ../libsvn_ra_svn/streams.c:144 +#: ../libsvn_ra_svn/streams.c:134 #, c-format -msgid "Can't get socket timeout" +msgid "Can't write to connection" msgstr "" #: ../libsvn_repos/commit.c:170 @@ -4972,32 +5706,32 @@ msgstr "" msgid "'%s' is out of date" msgstr "" -#: ../libsvn_repos/commit.c:291 +#: ../libsvn_repos/commit.c:294 #, c-format msgid "Got source path but no source revision for '%s'" msgstr "" -#: ../libsvn_repos/commit.c:324 +#: ../libsvn_repos/commit.c:327 #, c-format msgid "Source url '%s' is from different repository" msgstr "" -#: ../libsvn_repos/commit.c:640 +#: ../libsvn_repos/commit.c:648 #, c-format msgid "" "Checksum mismatch for resulting fulltext\n" "(%s)" msgstr "" -#: ../libsvn_repos/commit.c:685 +#: ../libsvn_repos/commit.c:693 msgid "(no error)" msgstr "" -#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722 +#: ../libsvn_repos/commit.c:724 ../libsvn_repos/commit.c:730 msgid "post-commit hook failed with no error message." msgstr "" -#: ../libsvn_repos/commit.c:725 +#: ../libsvn_repos/commit.c:733 #, c-format msgid "" "post commit FS processing had error:\n" @@ -5005,19 +5739,19 @@ msgid "" "%s" msgstr "" -#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735 +#: ../libsvn_repos/commit.c:734 ../libsvn_repos/commit.c:743 msgid "(no error message)" msgstr "" -#: ../libsvn_repos/commit.c:733 +#: ../libsvn_repos/commit.c:741 #, c-format msgid "" "post commit FS processing had error:\n" "%s" msgstr "" -#: ../libsvn_repos/commit.c:1273 ../libsvn_repos/fs-wrap.c:98 -#: ../libsvn_repos/load-fs-vtable.c:1046 +#: ../libsvn_repos/commit.c:1268 ../libsvn_repos/fs-wrap.c:117 +#: ../libsvn_repos/load-fs-vtable.c:1113 msgid "Commit succeeded, but post-commit hook failed" msgstr "" @@ -5025,31 +5759,31 @@ msgstr "" msgid "Unable to open root of edit" msgstr "" -#: ../libsvn_repos/delta.c:247 +#: ../libsvn_repos/delta.c:236 msgid "Invalid target path" msgstr "" -#: ../libsvn_repos/delta.c:251 +#: ../libsvn_repos/delta.c:240 msgid "Delta depth 'exclude' not supported" msgstr "" -#: ../libsvn_repos/delta.c:277 +#: ../libsvn_repos/delta.c:266 msgid "" "Invalid editor anchoring; at least one of the input paths is not a directory " "and there was no source entry" msgstr "" -#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:780 +#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:942 #, c-format msgid "* Dumped revision %ld.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:786 +#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:948 #, c-format msgid "* Verified revision %ld.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:834 +#: ../libsvn_repos/deprecated.c:661 ../svnadmin/svnadmin.c:996 #, c-format msgid "" "\n" @@ -5057,7 +5791,7 @@ msgid "" "\n" msgstr "" -#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:840 +#: ../libsvn_repos/deprecated.c:667 ../svnadmin/svnadmin.c:1002 #, c-format msgid "" "\n" @@ -5065,126 +5799,189 @@ msgid "" "\n" msgstr "" -#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:853 +#: ../libsvn_repos/deprecated.c:680 ../svnadmin/svnadmin.c:1015 #, c-format msgid " * editing path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:859 +#: ../libsvn_repos/deprecated.c:686 ../svnadmin/svnadmin.c:1021 #, c-format msgid " * deleting path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:865 +#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:1027 #, c-format msgid " * adding path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:871 +#: ../libsvn_repos/deprecated.c:698 ../svnadmin/svnadmin.c:1033 #, c-format msgid " * replacing path : %s ..." msgstr "" -#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:881 +#: ../libsvn_repos/deprecated.c:708 ../svnadmin/svnadmin.c:1042 msgid " done.\n" msgstr "" -#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:891 +#: ../libsvn_repos/deprecated.c:718 ../svnadmin/svnadmin.c:1051 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "" -#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:904 +#: ../libsvn_repos/deprecated.c:725 ../svnadmin/svnadmin.c:1064 #, c-format msgid " removing '\\r' from %s ..." msgstr "" -#: ../libsvn_repos/dump.c:248 +#: ../libsvn_repos/dump.c:794 +#, c-format +msgid "Path '%s' not found in r%ld." +msgstr "" + +#: ../libsvn_repos/dump.c:799 +#, c-format +msgid "Unexpected node kind %d for '%s' at r%ld. Expected kind was %d." +msgstr "" + +#: ../libsvn_repos/dump.c:837 +#, c-format +msgid "Path '%s' exists in r%ld." +msgstr "" + +#: ../libsvn_repos/dump.c:867 #, c-format msgid "" "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r" "%ld). Loading this dump may result in invalid mergeinfo." msgstr "" -#: ../libsvn_repos/dump.c:310 +#: ../libsvn_repos/dump.c:975 +#, c-format +msgid "Duplicate representation of path '%s' in %s property of '%s'" +msgstr "" + +#: ../libsvn_repos/dump.c:1121 #, c-format msgid "E%06d: While validating fspath '%s': %s" msgstr "" -#: ../libsvn_repos/dump.c:432 +#: ../libsvn_repos/dump.c:1160 +#, c-format +msgid "Change invalid path '%s' in r%ld" +msgstr "" + +#: ../libsvn_repos/dump.c:1184 +#, c-format +msgid "Deleting invalid path '%s' in r%ld" +msgstr "" + +#: ../libsvn_repos/dump.c:1203 +#, c-format +msgid "Replacing non-existent path '%s' in r%ld" +msgstr "" + +#: ../libsvn_repos/dump.c:1244 +#, c-format +msgid "Adding already existing path '%s' in r%ld" +msgstr "" + +#: ../libsvn_repos/dump.c:1267 +#, c-format +msgid "Copying from invalid path to '%s' in r%ld" +msgstr "" + +#: ../libsvn_repos/dump.c:1279 #, c-format msgid "" "Referencing data in revision %ld, which is older than the oldest dumped " "revision (r%ld). Loading this dump into an empty repository will fail." msgstr "" -#: ../libsvn_repos/dump.c:1148 ../libsvn_repos/dump.c:1440 +#: ../libsvn_repos/dump.c:1999 ../libsvn_repos/dump.c:2409 #, c-format msgid "Start revision %ld is greater than end revision %ld" msgstr "" -#: ../libsvn_repos/dump.c:1153 ../libsvn_repos/dump.c:1445 +#: ../libsvn_repos/dump.c:2004 ../libsvn_repos/dump.c:2414 #, c-format msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "" -#: ../libsvn_repos/dump.c:1291 +#: ../libsvn_repos/dump.c:2117 msgid "" "The range of revisions dumped contained references to copy sources outside " "that range." msgstr "" -#: ../libsvn_repos/dump.c:1305 +#: ../libsvn_repos/dump.c:2129 msgid "" "The range of revisions dumped contained mergeinfo which reference revisions " "outside that range." msgstr "" -#: ../libsvn_repos/dump.c:1364 +#: ../libsvn_repos/dump.c:2183 +#, c-format +msgid "Node '%s' is not a directory." +msgstr "" + +#: ../libsvn_repos/dump.c:2191 +#, c-format +msgid "Node '%s' is not a file." +msgstr "" + +#: ../libsvn_repos/dump.c:2196 #, c-format msgid "Unexpected node kind %d for '%s'" msgstr "" -#: ../libsvn_repos/fs-wrap.c:194 +#: ../libsvn_repos/dump.c:2243 +#, c-format +msgid "Duplicate representation of path '%s'" +msgstr "" + +#: ../libsvn_repos/fs-wrap.c:213 #, c-format msgid "" "Storage of non-regular property '%s' is disallowed through the repository " "interface, and could indicate a bug in your client" msgstr "" -#: ../libsvn_repos/fs-wrap.c:209 +#: ../libsvn_repos/fs-wrap.c:228 #, c-format msgid "Cannot accept '%s' property because it is not encoded in UTF-8" msgstr "" -#: ../libsvn_repos/fs-wrap.c:219 +#: ../libsvn_repos/fs-wrap.c:238 #, c-format msgid "Cannot accept non-LF line endings in '%s' property" msgstr "" -#: ../libsvn_repos/fs-wrap.c:260 +#: ../libsvn_repos/fs-wrap.c:279 #, c-format msgid "" "Commit rejected because mergeinfo on '%s' contains unexpected string " "terminator" msgstr "" -#: ../libsvn_repos/fs-wrap.c:267 +#: ../libsvn_repos/fs-wrap.c:286 #, c-format msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" msgstr "" -#: ../libsvn_repos/fs-wrap.c:397 +#: ../libsvn_repos/fs-wrap.c:416 #, c-format msgid "Write denied: not authorized to read all of revision %ld" msgstr "" -#: ../libsvn_repos/fs-wrap.c:581 -#, c-format -msgid "Cannot unlock path '%s', no authenticated username available" +#: ../libsvn_repos/fs-wrap.c:629 +msgid "Locking succeeded, but post-lock hook failed" msgstr "" -#: ../libsvn_repos/fs-wrap.c:597 +#: ../libsvn_repos/fs-wrap.c:735 +msgid "Cannot unlock, no authenticated username available" +msgstr "" + +#: ../libsvn_repos/fs-wrap.c:783 msgid "Unlock succeeded, but post-unlock hook failed" msgstr "" @@ -5257,87 +6054,87 @@ msgstr "" msgid "Error closing null file" msgstr "" -#: ../libsvn_repos/hooks.c:446 +#: ../libsvn_repos/hooks.c:454 #, c-format msgid "Failed to run '%s' hook; broken symlink" msgstr "" -#: ../libsvn_repos/hooks.c:664 +#: ../libsvn_repos/hooks.c:679 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:567 ../svnrdump/load_editor.c:810 +#: ../libsvn_repos/load-fs-vtable.c:589 ../svnrdump/load_editor.c:642 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:581 +#: ../libsvn_repos/load-fs-vtable.c:603 #, c-format msgid "" "Copy source checksum mismatch on copy from '%s'@%ld\n" "to '%s' in rev based on r%ld" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:645 +#: ../libsvn_repos/load-fs-vtable.c:667 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:661 +#: ../libsvn_repos/load-fs-vtable.c:683 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:831 +#: ../libsvn_repos/load-fs-vtable.c:852 ../svnrdump/load_editor.c:778 msgid "Invalid svn:mergeinfo value" msgstr "" -#: ../libsvn_repos/load-fs-vtable.c:840 +#: ../libsvn_repos/load-fs-vtable.c:861 msgid "Invalid svn:mergeinfo value; leaving unchanged" msgstr "" -#: ../libsvn_repos/load.c:54 +#: ../libsvn_repos/load.c:46 msgid "Premature end of content data in dumpstream" msgstr "" -#: ../libsvn_repos/load.c:61 +#: ../libsvn_repos/load.c:53 msgid "Dumpstream data appears to be malformed" msgstr "" -#: ../libsvn_repos/load.c:110 +#: ../libsvn_repos/load.c:102 #, c-format msgid "Dump stream contains a malformed header (with no ':') at '%.20s'" msgstr "" -#: ../libsvn_repos/load.c:123 +#: ../libsvn_repos/load.c:115 #, c-format msgid "Dump stream contains a malformed header (with no value) at '%.20s'" msgstr "" -#: ../libsvn_repos/load.c:212 +#: ../libsvn_repos/load.c:204 msgid "Incomplete or unterminated property block" msgstr "" -#: ../libsvn_repos/load.c:360 +#: ../libsvn_repos/load.c:344 msgid "Unexpected EOF writing contents" msgstr "" -#: ../libsvn_repos/load.c:390 +#: ../libsvn_repos/load.c:374 #, c-format msgid "Malformed dumpfile header '%s'" msgstr "" -#: ../libsvn_repos/load.c:397 +#: ../libsvn_repos/load.c:381 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "" -#: ../libsvn_repos/load.c:538 +#: ../libsvn_repos/load.c:522 msgid "Unrecognized record type in stream" msgstr "" -#: ../libsvn_repos/load.c:645 +#: ../libsvn_repos/load.c:629 msgid "Sum of subblock sizes larger than total block content length" msgstr "" @@ -5346,11 +6143,15 @@ msgstr "" msgid "'%s' not found in filesystem" msgstr "" -#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1267 +#: ../libsvn_repos/replay.c:541 ../libsvn_repos/replay.c:1267 #, c-format msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "" +#: ../libsvn_repos/replay.c:556 +msgid "Root directory already exists." +msgstr "" + #: ../libsvn_repos/reporter.c:205 #, c-format msgid "Invalid length (%%%s) when about to read a string" @@ -5361,42 +6162,42 @@ msgstr "" msgid "Invalid depth (%c) for path '%s'" msgstr "" -#: ../libsvn_repos/reporter.c:951 +#: ../libsvn_repos/reporter.c:950 #, c-format msgid "Working copy path '%s' does not exist in repository" msgstr "" -#: ../libsvn_repos/reporter.c:1355 +#: ../libsvn_repos/reporter.c:1376 msgid "Not authorized to open root of edit operation" msgstr "" -#: ../libsvn_repos/reporter.c:1372 +#: ../libsvn_repos/reporter.c:1393 #, c-format msgid "Target path '%s' does not exist" msgstr "" -#: ../libsvn_repos/reporter.c:1380 +#: ../libsvn_repos/reporter.c:1401 msgid "Cannot replace a directory from within" msgstr "" -#: ../libsvn_repos/reporter.c:1420 +#: ../libsvn_repos/reporter.c:1441 msgid "Invalid report for top level of working copy" msgstr "" -#: ../libsvn_repos/reporter.c:1435 +#: ../libsvn_repos/reporter.c:1456 msgid "Two top-level reports with no target" msgstr "" -#: ../libsvn_repos/reporter.c:1497 +#: ../libsvn_repos/reporter.c:1518 #, c-format msgid "Unsupported report depth '%s'" msgstr "" -#: ../libsvn_repos/reporter.c:1527 +#: ../libsvn_repos/reporter.c:1548 msgid "Depth 'exclude' not supported for link" msgstr "" -#: ../libsvn_repos/reporter.c:1584 +#: ../libsvn_repos/reporter.c:1605 msgid "Request depth 'exclude' not supported" msgstr "" @@ -5417,131 +6218,151 @@ msgstr "" msgid "Creating lock dir" msgstr "" -#: ../libsvn_repos/repos.c:291 +#: ../libsvn_repos/repos.c:367 msgid "Creating hook directory" msgstr "" -#: ../libsvn_repos/repos.c:373 +#: ../libsvn_repos/repos.c:420 msgid "Creating start-commit hook" msgstr "" -#: ../libsvn_repos/repos.c:465 +#: ../libsvn_repos/repos.c:483 msgid "Creating pre-commit hook" msgstr "" -#: ../libsvn_repos/repos.c:543 +#: ../libsvn_repos/repos.c:534 msgid "Creating pre-revprop-change hook" msgstr "" -#: ../libsvn_repos/repos.c:783 +#: ../libsvn_repos/repos.c:600 +msgid "Creating pre-lock hook" +msgstr "" + +#: ../libsvn_repos/repos.c:658 +msgid "Creating pre-unlock hook" +msgstr "" + +#: ../libsvn_repos/repos.c:691 msgid "Creating post-commit hook" msgstr "" -#: ../libsvn_repos/repos.c:975 +#: ../libsvn_repos/repos.c:726 +msgid "Creating post-lock hook" +msgstr "" + +#: ../libsvn_repos/repos.c:758 +msgid "Creating post-unlock hook" +msgstr "" + +#: ../libsvn_repos/repos.c:799 msgid "Creating post-revprop-change hook" msgstr "" -#: ../libsvn_repos/repos.c:987 +#: ../libsvn_repos/repos.c:810 msgid "Creating conf directory" msgstr "" -#: ../libsvn_repos/repos.c:1071 +#: ../libsvn_repos/repos.c:899 msgid "Creating svnserve.conf file" msgstr "" -#: ../libsvn_repos/repos.c:1089 +#: ../libsvn_repos/repos.c:917 msgid "Creating passwd file" msgstr "" -#: ../libsvn_repos/repos.c:1131 +#: ../libsvn_repos/repos.c:959 msgid "Creating authz file" msgstr "" -#: ../libsvn_repos/repos.c:1161 +#: ../libsvn_repos/repos.c:989 msgid "Creating hooks-env file" msgstr "" -#: ../libsvn_repos/repos.c:1217 +#: ../libsvn_repos/repos.c:1045 msgid "Could not create top-level directory" msgstr "" -#: ../libsvn_repos/repos.c:1227 +#: ../libsvn_repos/repos.c:1055 msgid "Creating DAV sandbox dir" msgstr "" -#: ../libsvn_repos/repos.c:1296 +#: ../libsvn_repos/repos.c:1124 msgid "Error opening db lockfile" msgstr "" -#: ../libsvn_repos/repos.c:1333 +#: ../libsvn_repos/repos.c:1162 #, c-format msgid "'%s' is an existing repository" msgstr "" -#: ../libsvn_repos/repos.c:1337 +#: ../libsvn_repos/repos.c:1167 #, c-format msgid "'%s' is a subdirectory of an existing repository rooted at '%s'" msgstr "" -#: ../libsvn_repos/repos.c:1345 +#: ../libsvn_repos/repos.c:1177 msgid "Repository creation failed" msgstr "" -#: ../libsvn_repos/repos.c:1430 +#: ../libsvn_repos/repos.c:1267 #, c-format msgid "Expected repository format '%d' or '%d'; found format '%d'" msgstr "" -#: ../libsvn_repos/repos.c:1674 +#: ../libsvn_repos/repos.c:1571 #, c-format msgid "unknown capability '%s'" msgstr "" -#: ../libsvn_repos/rev_hunt.c:71 +#: ../libsvn_repos/rev_hunt.c:73 #, c-format msgid "Failed to find time on revision %ld" msgstr "" -#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325 +#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:323 #, c-format msgid "Invalid start revision %ld" msgstr "" -#: ../libsvn_repos/rev_hunt.c:518 +#: ../libsvn_repos/rev_hunt.c:503 msgid "Unreadable path encountered; access denied" msgstr "" -#: ../libsvn_repos/rev_hunt.c:1156 ../libsvn_repos/rev_hunt.c:1495 +#: ../libsvn_repos/rev_hunt.c:1120 ../libsvn_repos/rev_hunt.c:1478 #, c-format msgid "'%s' is not a file in revision %ld" msgstr "" -#: ../libsvn_subr/auth.c:223 +#: ../libsvn_subr/auth.c:247 +msgid "No authentication providers registered" +msgstr "" + +#: ../libsvn_subr/auth.c:253 #, c-format msgid "No provider registered for '%s' credentials" msgstr "" -#: ../libsvn_subr/cache-membuffer.c:518 +#: ../libsvn_subr/cache-membuffer.c:651 #, c-format msgid "Can't lock cache mutex" msgstr "" -#: ../libsvn_subr/cache-membuffer.c:556 ../libsvn_subr/cache-membuffer.c:580 +#: ../libsvn_subr/cache-membuffer.c:689 ../libsvn_subr/cache-membuffer.c:710 #, c-format msgid "Can't write-lock cache mutex" msgstr "" -#: ../libsvn_subr/cache-membuffer.c:607 +#: ../libsvn_subr/cache-membuffer.c:734 #, c-format msgid "Can't unlock cache mutex" msgstr "" -#: ../libsvn_subr/cache-membuffer.c:1352 +#: ../libsvn_subr/cache-membuffer.c:1840 #, c-format msgid "Can't create cache mutex" msgstr "" -#: ../libsvn_subr/cache-membuffer.c:2089 +#: ../libsvn_subr/cache-membuffer.c:2792 msgid "Can't iterate a membuffer-based cache" msgstr "" @@ -5550,46 +6371,51 @@ msgstr "" msgid "Unknown memcached error while reading" msgstr "" -#: ../libsvn_subr/cache-memcache.c:238 +#: ../libsvn_subr/cache-memcache.c:258 #, c-format msgid "Unknown memcached error while writing" msgstr "" -#: ../libsvn_subr/cache-memcache.c:344 +#: ../libsvn_subr/cache-memcache.c:364 msgid "Can't iterate a memcached cache" msgstr "" -#: ../libsvn_subr/cache-memcache.c:444 +#: ../libsvn_subr/cache-memcache.c:460 #, c-format msgid "Error parsing memcache server '%s'" msgstr "" -#: ../libsvn_subr/cache-memcache.c:452 +#: ../libsvn_subr/cache-memcache.c:468 #, c-format msgid "Scope not allowed in memcache server '%s'" msgstr "" -#: ../libsvn_subr/cache-memcache.c:460 +#: ../libsvn_subr/cache-memcache.c:476 #, c-format msgid "Must specify host and port for memcache server '%s'" msgstr "" -#: ../libsvn_subr/cache-memcache.c:480 +#: ../libsvn_subr/cache-memcache.c:496 #, c-format msgid "Unknown error creating memcache server" msgstr "" -#: ../libsvn_subr/cache-memcache.c:488 +#: ../libsvn_subr/cache-memcache.c:504 #, c-format msgid "Unknown error adding server to memcache" msgstr "" -#: ../libsvn_subr/cache-memcache.c:561 +#: ../libsvn_subr/cache-memcache.c:574 #, c-format msgid "Unknown error creating apr_memcache_t" msgstr "" -#: ../libsvn_subr/checksum.c:470 +#: ../libsvn_subr/checksum.c:352 +#, c-format +msgid "Invalid prefix in checksum '%s'" +msgstr "" + +#: ../libsvn_subr/checksum.c:642 #, c-format msgid "" "%s:\n" @@ -5597,106 +6423,217 @@ msgid "" " actual: %s\n" msgstr "" -#: ../libsvn_subr/cmdline.c:655 +#: ../libsvn_subr/cmdline.c:761 #, c-format msgid "Error initializing command line arguments" msgstr "" -#: ../libsvn_subr/cmdline.c:744 +#: ../libsvn_subr/cmdline.c:874 +#, c-format +msgid "Ignoring unknown value '%s'; did you mean '%s'?" +msgstr "" + +#: ../libsvn_subr/cmdline.c:879 +#, c-format +msgid "Ignoring unknown value '%s'" +msgstr "" + +#: ../libsvn_subr/cmdline.c:974 msgid "Invalid syntax of argument of --config-option" msgstr "" -#: ../libsvn_subr/cmdline.c:771 +#: ../libsvn_subr/cmdline.c:1001 #, c-format msgid "Unrecognized file in argument of %s" msgstr "" -#: ../libsvn_subr/cmdline.c:1017 +#: ../libsvn_subr/cmdline.c:1247 msgid "" "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-" "time configuration option is empty or consists solely of whitespace. " "Expected a shell command." msgstr "" -#: ../libsvn_subr/cmdline.c:1024 +#: ../libsvn_subr/cmdline.c:1254 msgid "" "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and " "no 'editor-cmd' run-time configuration option was found" msgstr "" -#: ../libsvn_subr/cmdline.c:1049 ../libsvn_subr/cmdline.c:1133 +#: ../libsvn_subr/cmdline.c:1279 ../libsvn_subr/cmdline.c:1363 #, c-format msgid "Can't get working directory" msgstr "" -#: ../libsvn_subr/cmdline.c:1060 ../libsvn_subr/cmdline.c:1144 -#: ../libsvn_subr/cmdline.c:1169 +#: ../libsvn_subr/cmdline.c:1290 ../libsvn_subr/cmdline.c:1374 +#: ../libsvn_subr/cmdline.c:1399 #, c-format msgid "Can't change working directory to '%s'" msgstr "" -#: ../libsvn_subr/cmdline.c:1068 ../libsvn_subr/cmdline.c:1316 +#: ../libsvn_subr/cmdline.c:1298 ../libsvn_subr/cmdline.c:1546 #, c-format msgid "Can't restore working directory" msgstr "" -#: ../libsvn_subr/cmdline.c:1075 ../libsvn_subr/cmdline.c:1251 +#: ../libsvn_subr/cmdline.c:1305 ../libsvn_subr/cmdline.c:1481 #, c-format msgid "system('%s') returned %d" msgstr "" -#: ../libsvn_subr/cmdline.c:1196 +#: ../libsvn_subr/cmdline.c:1426 #, c-format msgid "Can't write to '%s'" msgstr "" -#: ../libsvn_subr/cmdline.c:1211 ../libsvn_subr/cmdline.c:1226 -#: ../libsvn_subr/cmdline.c:1260 ../libsvn_subr/io.c:3616 +#: ../libsvn_subr/cmdline.c:1441 ../libsvn_subr/cmdline.c:1456 +#: ../libsvn_subr/cmdline.c:1490 ../libsvn_subr/io.c:4183 #, c-format msgid "Can't stat '%s'" msgstr "" -#: ../libsvn_subr/cmdline.c:1285 +#: ../libsvn_subr/cmdline.c:1515 msgid "Error normalizing edited contents to internal format" msgstr "" -#: ../libsvn_subr/config.c:740 +#: ../libsvn_subr/cmdline.c:1589 +#, c-format +msgid "" +"Unknown value '%s' for %s.\n" +"Supported values: %s" +msgstr "" + +#: ../libsvn_subr/compress.c:158 +msgid "Compression of svndiff data failed" +msgstr "" + +#: ../libsvn_subr/compress.c:194 +msgid "Decompression of zlib compressed data failed: no size" +msgstr "" + +#: ../libsvn_subr/compress.c:197 +msgid "Decompression of zlib compressed data failed: size too large" +msgstr "" + +#: ../libsvn_subr/compress.c:222 +msgid "Decompression of svndiff data failed" +msgstr "" + +#: ../libsvn_subr/compress.c:229 +msgid "Size of uncompressed data does not match stored original length" +msgstr "" + +#: ../libsvn_subr/compress.c:245 +#, c-format +msgid "Unsupported compression method %d" +msgstr "" + +#: ../libsvn_subr/config.c:805 #, c-format msgid "Config error: invalid boolean value '%s' for '[%s] %s'" msgstr "" -#: ../libsvn_subr/config.c:745 +#: ../libsvn_subr/config.c:810 #, c-format msgid "Config error: invalid boolean value '%s' for '%s'" msgstr "" -#: ../libsvn_subr/config.c:1174 +#: ../libsvn_subr/config.c:1239 #, c-format msgid "Config error: invalid integer value '%s'" msgstr "" -#: ../libsvn_subr/config_auth.c:100 +#: ../libsvn_subr/config_auth.c:96 msgid "Unable to open auth file for reading" msgstr "" -#: ../libsvn_subr/config_auth.c:105 +#: ../libsvn_subr/config_auth.c:101 #, c-format msgid "Error parsing '%s'" msgstr "" -#: ../libsvn_subr/config_auth.c:135 +#: ../libsvn_subr/config_auth.c:130 msgid "Unable to locate auth file" msgstr "" -#: ../libsvn_subr/config_auth.c:146 +#: ../libsvn_subr/config_auth.c:142 msgid "Unable to open auth file for writing" msgstr "" -#: ../libsvn_subr/config_auth.c:150 +#: ../libsvn_subr/config_auth.c:144 #, c-format msgid "Error writing hash to '%s'" msgstr "" +#: ../libsvn_subr/config_file.c:353 +#, c-format +msgid "line %d: Option must end with ':' or '='" +msgstr "" + +#: ../libsvn_subr/config_file.c:396 +#, c-format +msgid "line %d: Section header must end with ']'" +msgstr "" + +#: ../libsvn_subr/config_file.c:563 +#, c-format +msgid "Error while parsing config file: %s:" +msgstr "" + +#: ../libsvn_subr/config_file.c:606 +#, c-format +msgid "line %d: Section header must start in the first column" +msgstr "" + +#: ../libsvn_subr/config_file.c:619 +#, c-format +msgid "line %d: Comment must start in the first column" +msgstr "" + +#: ../libsvn_subr/config_file.c:634 +#, c-format +msgid "line %d: Section header expected" +msgstr "" + +#: ../libsvn_subr/config_file.c:638 +#, c-format +msgid "line %d: Option expected" +msgstr "" + +#: ../libsvn_subr/config_win.c:93 +msgid "Can't determine the system config path" +msgstr "" + +#: ../libsvn_subr/config_win.c:94 +msgid "Can't determine the user's config path" +msgstr "" + +#: ../libsvn_subr/config_win.c:137 +msgid "Can't enumerate registry values" +msgstr "" + +#: ../libsvn_subr/config_win.c:154 +msgid "Can't read registry value data" +msgstr "" + +#: ../libsvn_subr/config_win.c:191 +#, c-format +msgid "Unrecognised registry path '%s'" +msgstr "" + +#: ../libsvn_subr/config_win.c:208 +#, c-format +msgid "Can't open registry key '%s'" +msgstr "" + +#: ../libsvn_subr/config_win.c:246 +msgid "Can't enumerate registry keys" +msgstr "" + +#: ../libsvn_subr/config_win.c:256 +msgid "Can't open existing subkey" +msgstr "" + #: ../libsvn_subr/crypto.c:93 #, c-format msgid "Failed to initialize cryptography subsystem" @@ -5789,349 +6726,363 @@ msgstr "" msgid "Can't expand time" msgstr "" -#: ../libsvn_subr/deprecated.c:361 ../libsvn_subr/opt.c:302 +#: ../libsvn_subr/deprecated.c:364 ../libsvn_subr/opt.c:302 msgid "" "\n" "Valid options:\n" msgstr "" -#: ../libsvn_subr/deprecated.c:437 ../libsvn_subr/opt.c:417 +#: ../libsvn_subr/deprecated.c:440 ../libsvn_subr/opt.c:417 #, c-format msgid "" "\"%s\": unknown command.\n" "\n" msgstr "" -#: ../libsvn_subr/deprecated.c:615 ../libsvn_subr/opt.c:1239 -#: ../svnrdump/svnrdump.c:646 +#: ../libsvn_subr/deprecated.c:618 ../libsvn_subr/opt.c:1232 +#: ../svnrdump/svnrdump.c:601 #, c-format msgid "Type '%s help' for usage.\n" msgstr "" -#: ../libsvn_subr/deprecated.c:1023 +#: ../libsvn_subr/deprecated.c:1026 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "" -#: ../libsvn_subr/dirent_uri.c:1605 +#: ../libsvn_subr/dirent_uri.c:1628 #, c-format msgid "Couldn't determine absolute path of '%s'" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2314 +#: ../libsvn_subr/dirent_uri.c:2342 #, c-format msgid "Local URL '%s' does not contain 'file://' prefix" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2393 +#: ../libsvn_subr/dirent_uri.c:2421 #, c-format msgid "Local URL '%s' contains only a hostname, no path" msgstr "" -#: ../libsvn_subr/dirent_uri.c:2407 +#: ../libsvn_subr/dirent_uri.c:2435 #, c-format msgid "Local URL '%s' contains unsupported hostname" msgstr "" -#: ../libsvn_subr/error.c:263 -msgid "Additional errors:" -msgstr "" - -#: ../libsvn_subr/error.c:528 +#: ../libsvn_subr/error.c:553 msgid "Can't recode error string from APR" msgstr "" -#: ../libsvn_subr/error.c:628 +#: ../libsvn_subr/error.c:646 #, c-format msgid "%swarning: W%06d: %s\n" msgstr "" -#: ../libsvn_subr/error.c:710 +#: ../libsvn_subr/error.c:752 #, c-format msgid "In file '%s' line %d: assertion failed (%s)" msgstr "" -#: ../libsvn_subr/error.c:714 +#: ../libsvn_subr/error.c:756 #, c-format msgid "In file '%s' line %d: internal malfunction" msgstr "" -#: ../libsvn_subr/error.c:770 +#: ../libsvn_subr/error.c:818 msgid "stream error" msgstr "" -#: ../libsvn_subr/error.c:775 +#: ../libsvn_subr/error.c:823 msgid "out of memory" msgstr "" -#: ../libsvn_subr/error.c:780 +#: ../libsvn_subr/error.c:828 msgid "buffer error" msgstr "" -#: ../libsvn_subr/error.c:785 +#: ../libsvn_subr/error.c:833 msgid "version error" msgstr "" -#: ../libsvn_subr/error.c:790 +#: ../libsvn_subr/error.c:838 msgid "corrupt data" msgstr "" -#: ../libsvn_subr/error.c:795 +#: ../libsvn_subr/error.c:843 msgid "unknown error" msgstr "" -#: ../libsvn_subr/gpg_agent.c:408 ../libsvn_subr/prompt.c:631 +#: ../libsvn_subr/gpg_agent.c:449 ../libsvn_subr/prompt.c:627 #, c-format msgid "Password for '%s': " msgstr "" -#: ../libsvn_subr/gpg_agent.c:409 +#: ../libsvn_subr/gpg_agent.c:450 #, c-format msgid "Enter your Subversion password for %s" msgstr "" -#: ../libsvn_subr/hash.c:120 +#: ../libsvn_subr/hash.c:126 msgid "Serialized hash missing terminator" msgstr "" -#: ../libsvn_subr/hash.c:129 ../libsvn_subr/hash.c:142 -#: ../libsvn_subr/hash.c:153 ../libsvn_subr/hash.c:165 -#: ../libsvn_subr/hash.c:173 ../libsvn_subr/hash.c:183 -#: ../libsvn_subr/hash.c:196 ../libsvn_subr/hash.c:204 +#: ../libsvn_subr/hash.c:135 ../libsvn_subr/hash.c:186 +msgid "Serialized hash malformed key length" +msgstr "" + +#: ../libsvn_subr/hash.c:148 ../libsvn_subr/hash.c:199 +msgid "Serialized hash malformed key data" +msgstr "" + +#: ../libsvn_subr/hash.c:160 +msgid "Serialized hash malformed value length" +msgstr "" + +#: ../libsvn_subr/hash.c:172 +msgid "Serialized hash malformed value data" +msgstr "" + +#: ../libsvn_subr/hash.c:176 ../libsvn_subr/hash.c:208 msgid "Serialized hash malformed" msgstr "" -#: ../libsvn_subr/hash.c:244 +#: ../libsvn_subr/hash.c:282 msgid "Cannot serialize negative length" msgstr "" -#: ../libsvn_subr/io.c:309 +#: ../libsvn_subr/io.c:354 #, c-format msgid "Can't check path '%s'" msgstr "" -#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4558 +#: ../libsvn_subr/io.c:601 ../libsvn_subr/io.c:5135 #, c-format msgid "Can't open '%s'" msgstr "" -#: ../libsvn_subr/io.c:563 ../libsvn_subr/io.c:649 +#: ../libsvn_subr/io.c:627 ../libsvn_subr/io.c:713 #, c-format msgid "Unable to make name for '%s'" msgstr "" -#: ../libsvn_subr/io.c:636 +#: ../libsvn_subr/io.c:700 #, c-format msgid "Can't create symbolic link '%s'" msgstr "" -#: ../libsvn_subr/io.c:653 ../libsvn_subr/io.c:686 ../libsvn_subr/io.c:714 +#: ../libsvn_subr/io.c:717 ../libsvn_subr/io.c:752 ../libsvn_subr/io.c:780 +#: ../libsvn_subr/io.c:1965 msgid "Symbolic links are not supported on this platform" msgstr "" -#: ../libsvn_subr/io.c:676 +#: ../libsvn_subr/io.c:740 ../libsvn_subr/io.c:1924 ../libsvn_subr/io.c:1944 #, c-format msgid "Can't read contents of link" msgstr "" -#: ../libsvn_subr/io.c:734 +#: ../libsvn_subr/io.c:800 #, c-format msgid "Can't find a temporary directory" msgstr "" -#: ../libsvn_subr/io.c:852 +#: ../libsvn_subr/io.c:918 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:895 ../libsvn_subr/io.c:917 ../libsvn_subr/io.c:963 -#: ../libsvn_subr/io.c:4691 +#: ../libsvn_subr/io.c:961 ../libsvn_subr/io.c:983 ../libsvn_subr/io.c:1029 +#: ../libsvn_subr/io.c:5267 #, c-format msgid "Can't set permissions on '%s'" msgstr "" -#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1984 ../libsvn_subr/io.c:2043 -#: ../libsvn_subr/io.c:4596 +#: ../libsvn_subr/io.c:979 ../libsvn_subr/io.c:2313 ../libsvn_subr/io.c:2372 +#: ../libsvn_subr/io.c:5173 #, c-format msgid "Can't get file name" msgstr "" -#: ../libsvn_subr/io.c:987 +#: ../libsvn_subr/io.c:1052 #, c-format msgid "Can't append '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:1033 +#: ../libsvn_subr/io.c:1098 #, c-format msgid "Destination '%s' already exists" msgstr "" -#: ../libsvn_subr/io.c:1137 +#: ../libsvn_subr/io.c:1207 #, c-format msgid "Can't make directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:1206 +#: ../libsvn_subr/io.c:1311 #, c-format msgid "Can't set access time of '%s'" msgstr "" -#: ../libsvn_subr/io.c:1535 ../libsvn_subr/io.c:1637 +#: ../libsvn_subr/io.c:1641 ../libsvn_subr/io.c:1743 #, c-format msgid "Can't change perms of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:1803 +#: ../libsvn_subr/io.c:1871 #, c-format -msgid "Can't set file '%s' read-only" +msgid "Can't get attributes of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:1835 +#: ../libsvn_subr/io.c:1879 #, c-format -msgid "Can't set file '%s' read-write" +msgid "Can't set attributes of file '%s'" msgstr "" -#: ../libsvn_subr/io.c:1874 ../libsvn_subr/io.c:1908 +#: ../libsvn_subr/io.c:2016 ../libsvn_subr/io.c:2675 #, c-format -msgid "Error getting UID of process" +msgid "Can't remove file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2010 +#: ../libsvn_subr/io.c:2086 ../libsvn_subr/io.c:4218 #, c-format -msgid "Can't get shared lock on file '%s'" +msgid "Can't move '%s' to '%s'" msgstr "" -#: ../libsvn_subr/io.c:2048 +#: ../libsvn_subr/io.c:2132 #, c-format -msgid "Can't unlock file '%s'" +msgid "Can't set file '%s' read-only" msgstr "" -#: ../libsvn_subr/io.c:2103 ../libsvn_subr/io.c:3511 +#: ../libsvn_subr/io.c:2164 #, c-format -msgid "Can't flush file '%s'" +msgid "Can't set file '%s' read-write" msgstr "" -#: ../libsvn_subr/io.c:2104 ../libsvn_subr/io.c:3512 +#: ../libsvn_subr/io.c:2203 ../libsvn_subr/io.c:2237 #, c-format -msgid "Can't flush stream" +msgid "Error getting UID of process" msgstr "" -#: ../libsvn_subr/io.c:2116 ../libsvn_subr/io.c:2133 +#: ../libsvn_subr/io.c:2339 #, c-format -msgid "Can't flush file to disk" +msgid "Can't get shared lock on file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2225 ../libsvn_subr/prompt.c:197 -#: ../svnserve/svnserve.c:822 +#: ../libsvn_subr/io.c:2377 #, c-format -msgid "Can't open stdin" +msgid "Can't unlock file '%s'" msgstr "" -#: ../libsvn_subr/io.c:2245 -msgid "Reading from stdin is disallowed" +#: ../libsvn_subr/io.c:2475 ../libsvn_subr/io.c:2496 +#, c-format +msgid "Can't flush file to disk" msgstr "" -#: ../libsvn_subr/io.c:2312 +#: ../libsvn_subr/io.c:2586 ../libsvn_subr/prompt.c:197 #, c-format -msgid "Can't remove file '%s'" +msgid "Can't open stdin" msgstr "" -#: ../libsvn_subr/io.c:2399 +#: ../libsvn_subr/io.c:2606 +msgid "Reading from stdin is disallowed" +msgstr "" + +#: ../libsvn_subr/io.c:2762 #, c-format msgid "Can't remove '%s'" msgstr "" -#: ../libsvn_subr/io.c:2562 +#: ../libsvn_subr/io.c:2925 #, c-format msgid "Path '%s' not found, case obstructed by '%s'" msgstr "" -#: ../libsvn_subr/io.c:2601 +#: ../libsvn_subr/io.c:2964 #, c-format msgid "Path '%s' not found" msgstr "" -#: ../libsvn_subr/io.c:2675 +#: ../libsvn_subr/io.c:3038 #, c-format msgid "Can't create process '%s' attributes" msgstr "" -#: ../libsvn_subr/io.c:2682 +#: ../libsvn_subr/io.c:3045 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "" -#: ../libsvn_subr/io.c:2694 +#: ../libsvn_subr/io.c:3061 #, c-format msgid "Can't set process '%s' directory" msgstr "" -#: ../libsvn_subr/io.c:2708 +#: ../libsvn_subr/io.c:3075 #, c-format msgid "Can't set process '%s' child input" msgstr "" -#: ../libsvn_subr/io.c:2716 +#: ../libsvn_subr/io.c:3083 #, c-format msgid "Can't set process '%s' child outfile" msgstr "" -#: ../libsvn_subr/io.c:2724 +#: ../libsvn_subr/io.c:3091 #, c-format msgid "Can't set process '%s' child errfile" msgstr "" -#: ../libsvn_subr/io.c:2738 +#: ../libsvn_subr/io.c:3105 #, c-format msgid "Can't set process '%s' stdio pipes" msgstr "" -#: ../libsvn_subr/io.c:2746 +#: ../libsvn_subr/io.c:3113 #, c-format msgid "Can't set process '%s' child errfile for error handler" msgstr "" -#: ../libsvn_subr/io.c:2753 +#: ../libsvn_subr/io.c:3120 #, c-format msgid "Can't set process '%s' error handler" msgstr "" -#: ../libsvn_subr/io.c:2776 +#: ../libsvn_subr/io.c:3143 #, c-format msgid "Can't start process '%s'" msgstr "" -#: ../libsvn_subr/io.c:2800 +#: ../libsvn_subr/io.c:3167 #, c-format msgid "Error waiting for process '%s'" msgstr "" -#: ../libsvn_subr/io.c:2809 +#: ../libsvn_subr/io.c:3176 #, c-format msgid "Process '%s' failed (signal %d, core dumped)" msgstr "" -#: ../libsvn_subr/io.c:2814 +#: ../libsvn_subr/io.c:3181 #, c-format msgid "Process '%s' failed (signal %d)" msgstr "" -#: ../libsvn_subr/io.c:2820 +#: ../libsvn_subr/io.c:3187 #, c-format msgid "Process '%s' failed (exitwhy %d, exitcode %d)" msgstr "" -#: ../libsvn_subr/io.c:2828 +#: ../libsvn_subr/io.c:3195 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "" -#: ../libsvn_subr/io.c:2935 +#: ../libsvn_subr/io.c:3302 #, c-format msgid "'%s' returned %d" msgstr "" -#: ../libsvn_subr/io.c:3055 +#: ../libsvn_subr/io.c:3423 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -6141,204 +7092,222 @@ msgid "" "%s" msgstr "" -#: ../libsvn_subr/io.c:3196 +#: ../libsvn_subr/io.c:3564 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3291 +#: ../libsvn_subr/io.c:3659 #, c-format msgid "Can't open file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3331 +#: ../libsvn_subr/io.c:3699 #, c-format msgid "Can't close file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3332 +#: ../libsvn_subr/io.c:3700 #, c-format msgid "Can't close stream" msgstr "" -#: ../libsvn_subr/io.c:3341 ../libsvn_subr/io.c:3377 ../libsvn_subr/io.c:3402 +#: ../libsvn_subr/io.c:3709 ../libsvn_subr/io.c:3745 ../libsvn_subr/io.c:3770 +#: ../libsvn_subr/io.c:3860 #, c-format msgid "Can't read file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3342 ../libsvn_subr/io.c:3378 ../libsvn_subr/io.c:3403 +#: ../libsvn_subr/io.c:3710 ../libsvn_subr/io.c:3746 ../libsvn_subr/io.c:3771 +#: ../libsvn_subr/io.c:3861 #, c-format msgid "Can't read stream" msgstr "" -#: ../libsvn_subr/io.c:3351 +#: ../libsvn_subr/io.c:3719 #, c-format msgid "Can't write file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3352 +#: ../libsvn_subr/io.c:3720 #, c-format msgid "Can't write stream" msgstr "" -#: ../libsvn_subr/io.c:3366 +#: ../libsvn_subr/io.c:3734 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3367 +#: ../libsvn_subr/io.c:3735 #, c-format msgid "Can't get attribute information from stream" msgstr "" -#: ../libsvn_subr/io.c:3414 +#: ../libsvn_subr/io.c:3782 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3415 +#: ../libsvn_subr/io.c:3783 #, c-format msgid "Can't set position pointer in stream" msgstr "" -#: ../libsvn_subr/io.c:3426 ../libsvn_subr/io.c:3473 +#: ../libsvn_subr/io.c:3870 +#, c-format +msgid "Can't seek in file '%s'" +msgstr "" + +#: ../libsvn_subr/io.c:3871 +#, c-format +msgid "Can't seek in stream" +msgstr "" + +#: ../libsvn_subr/io.c:3888 ../libsvn_subr/io.c:3945 #, c-format msgid "Can't write to file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3427 ../libsvn_subr/io.c:3474 +#: ../libsvn_subr/io.c:3889 ../libsvn_subr/io.c:3946 #, c-format msgid "Can't write to stream" msgstr "" -#: ../libsvn_subr/io.c:3516 +#: ../libsvn_subr/io.c:3899 ../libsvn_subr/io.c:4071 +#, c-format +msgid "Can't flush file '%s'" +msgstr "" + +#: ../libsvn_subr/io.c:3900 ../libsvn_subr/io.c:4072 +#, c-format +msgid "Can't flush stream" +msgstr "" + +#: ../libsvn_subr/io.c:4020 +#, c-format +msgid "Can't write '%s' atomically" +msgstr "" + +#: ../libsvn_subr/io.c:4076 #, c-format msgid "Can't truncate file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3517 +#: ../libsvn_subr/io.c:4077 #, c-format msgid "Can't truncate stream" msgstr "" -#: ../libsvn_subr/io.c:3590 +#: ../libsvn_subr/io.c:4157 #, c-format msgid "Can't read length line in file '%s'" msgstr "" -#: ../libsvn_subr/io.c:3594 +#: ../libsvn_subr/io.c:4161 msgid "Can't read length line in stream" msgstr "" -#: ../libsvn_subr/io.c:3651 -#, c-format -msgid "Can't move '%s' to '%s'" -msgstr "" - -#: ../libsvn_subr/io.c:3732 +#: ../libsvn_subr/io.c:4305 #, c-format msgid "Can't create directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:3755 +#: ../libsvn_subr/io.c:4317 ../libsvn_subr/io.c:4331 #, c-format msgid "Can't hide directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:3815 ../libsvn_subr/io.c:3938 +#: ../libsvn_subr/io.c:4392 ../libsvn_subr/io.c:4515 #, c-format msgid "Can't open directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:3850 +#: ../libsvn_subr/io.c:4427 #, c-format msgid "Can't remove directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:3868 +#: ../libsvn_subr/io.c:4445 #, c-format msgid "Can't read directory" msgstr "" -#: ../libsvn_subr/io.c:3888 +#: ../libsvn_subr/io.c:4465 #, c-format msgid "Error closing directory" msgstr "" -#: ../libsvn_subr/io.c:3957 +#: ../libsvn_subr/io.c:4534 #, c-format msgid "Can't read directory entry in '%s'" msgstr "" -#: ../libsvn_subr/io.c:4083 +#: ../libsvn_subr/io.c:4660 #, c-format msgid "Can't check directory '%s'" msgstr "" -#: ../libsvn_subr/io.c:4145 +#: ../libsvn_subr/io.c:4722 #, c-format msgid "Reading '%s'" msgstr "" -#: ../libsvn_subr/io.c:4164 +#: ../libsvn_subr/io.c:4741 #, c-format msgid "First line of '%s' contains non-digit" msgstr "" -#: ../libsvn_subr/io.c:4479 +#: ../libsvn_subr/io.c:5056 #, c-format msgid "Can't create temporary file from template '%s'" msgstr "" -#: ../libsvn_subr/io.c:4568 +#: ../libsvn_subr/io.c:5145 #, c-format msgid "Can't set aside '%s'" msgstr "" -#: ../libsvn_subr/io.c:4580 +#: ../libsvn_subr/io.c:5157 ../libsvn_subr/stream.c:2083 #, c-format msgid "Unable to make name in '%s'" msgstr "" -#: ../libsvn_subr/mergeinfo.c:100 ../libsvn_subr/mergeinfo.c:714 +#: ../libsvn_subr/mergeinfo.c:101 ../libsvn_subr/mergeinfo.c:714 msgid "Pathname not terminated by ':'" msgstr "" -#: ../libsvn_subr/mergeinfo.c:103 -msgid "No pathname preceding ':'" -msgstr "" - -#: ../libsvn_subr/mergeinfo.c:521 +#: ../libsvn_subr/mergeinfo.c:518 #, c-format msgid "Invalid character '%c' found in revision list" msgstr "" -#: ../libsvn_subr/mergeinfo.c:529 +#: ../libsvn_subr/mergeinfo.c:526 #, c-format msgid "Invalid revision number '0' found in range list" msgstr "" -#: ../libsvn_subr/mergeinfo.c:540 +#: ../libsvn_subr/mergeinfo.c:537 #, c-format msgid "Unable to parse reversed revision range '%ld-%ld'" msgstr "" -#: ../libsvn_subr/mergeinfo.c:545 +#: ../libsvn_subr/mergeinfo.c:542 #, c-format msgid "" "Unable to parse revision range '%ld-%ld' with same start and end revisions" msgstr "" -#: ../libsvn_subr/mergeinfo.c:582 ../libsvn_subr/mergeinfo.c:589 +#: ../libsvn_subr/mergeinfo.c:579 ../libsvn_subr/mergeinfo.c:586 #, c-format msgid "Invalid character '%c' found in range list" msgstr "" -#: ../libsvn_subr/mergeinfo.c:596 +#: ../libsvn_subr/mergeinfo.c:593 msgid "Range list parsing ended before hitting newline" msgstr "" -#: ../libsvn_subr/mergeinfo.c:674 +#: ../libsvn_subr/mergeinfo.c:670 #, c-format msgid "" "Unable to parse overlapping revision ranges '%s' and '%s' with different " @@ -6355,73 +7324,39 @@ msgstr "" msgid "Could not find end of line in range list line in '%s'" msgstr "" -#: ../libsvn_subr/mergeinfo.c:786 +#: ../libsvn_subr/mergeinfo.c:790 #, c-format msgid "Could not parse mergeinfo string '%s'" msgstr "" -#: ../libsvn_subr/mergeinfo.c:2350 +#: ../libsvn_subr/mergeinfo.c:2367 msgid "NULL mergeinfo catalog\n" msgstr "" -#: ../libsvn_subr/mergeinfo.c:2355 +#: ../libsvn_subr/mergeinfo.c:2372 msgid "empty mergeinfo catalog\n" msgstr "" -#: ../libsvn_subr/mutex.c:45 +#: ../libsvn_subr/mutex.c:69 #, c-format msgid "Can't create mutex" msgstr "" -#: ../libsvn_subr/mutex.c:62 +#: ../libsvn_subr/mutex.c:86 #, c-format msgid "Can't lock mutex" msgstr "" -#: ../libsvn_subr/mutex.c:78 +#: ../libsvn_subr/mutex.c:102 #, c-format msgid "Can't unlock mutex" msgstr "" -#: ../libsvn_subr/named_atomic.c:335 -msgid "Not a valid atomic" -msgstr "" - -#: ../libsvn_subr/named_atomic.c:474 +#: ../libsvn_subr/nls.c:69 #, c-format -msgid "MMAP failed for file '%s'" -msgstr "" - -#: ../libsvn_subr/named_atomic.c:486 -msgid "Number of atomics in namespace is too large." -msgstr "" - -#: ../libsvn_subr/named_atomic.c:537 -msgid "Atomic's name is too long." -msgstr "" - -#: ../libsvn_subr/named_atomic.c:543 -msgid "Namespace has not been initialized." -msgstr "" - -#: ../libsvn_subr/named_atomic.c:591 -msgid "Out of slots for named atomic." -msgstr "" - -#: ../libsvn_subr/nls.c:80 -#, c-format -msgid "Can't convert string to UCS-2: '%s'" -msgstr "" - -#: ../libsvn_subr/nls.c:87 msgid "Can't get module file name" msgstr "" -#: ../libsvn_subr/nls.c:102 -#, c-format -msgid "Can't convert module path to UTF-8 from UCS-2: '%s'" -msgstr "" - #: ../libsvn_subr/opt.c:189 msgid " ARG" msgstr "" @@ -6446,28 +7381,23 @@ msgstr "" msgid "Revision property pair is empty" msgstr "" -#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336 +#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:338 #: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" msgstr "" -#: ../libsvn_subr/opt.c:1018 -#, c-format -msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" -msgstr "" - -#: ../libsvn_subr/opt.c:1064 +#: ../libsvn_subr/opt.c:1057 #, c-format msgid "URL '%s' contains a '..' element" msgstr "" -#: ../libsvn_subr/opt.c:1097 +#: ../libsvn_subr/opt.c:1090 #, c-format msgid "Error resolving case of '%s'" msgstr "" -#: ../libsvn_subr/opt.c:1119 +#: ../libsvn_subr/opt.c:1112 #, c-format msgid "" "%s, version %s\n" @@ -6475,36 +7405,44 @@ msgid "" "\n" msgstr "" -#: ../libsvn_subr/opt.c:1136 +#: ../libsvn_subr/opt.c:1129 msgid "" "System information:\n" "\n" msgstr "" -#: ../libsvn_subr/opt.c:1137 +#: ../libsvn_subr/opt.c:1130 #, c-format msgid "* running on %s\n" msgstr "" -#: ../libsvn_subr/opt.c:1141 +#: ../libsvn_subr/opt.c:1134 #, c-format msgid " - %s\n" msgstr "" -#: ../libsvn_subr/opt.c:1151 +#: ../libsvn_subr/opt.c:1144 msgid "* linked dependencies:\n" msgstr "" -#: ../libsvn_subr/opt.c:1176 +#: ../libsvn_subr/opt.c:1169 msgid "* loaded shared libraries:\n" msgstr "" +#: ../libsvn_subr/packed_data.c:736 +msgid "Unexpected end of stream" +msgstr "" + +#: ../libsvn_subr/packed_data.c:742 +msgid "Integer representation too long" +msgstr "" + #: ../libsvn_subr/path.c:1114 #, c-format msgid "Can't determine the native path encoding" msgstr "" -#: ../libsvn_subr/path.c:1303 +#: ../libsvn_subr/path.c:1299 #, c-format msgid "Improper relative URL '%s'" msgstr "" @@ -6518,57 +7456,52 @@ msgstr "" msgid "Can't open stderr" msgstr "" -#: ../libsvn_subr/prompt.c:263 -#, c-format -msgid "Can't write to terminal" -msgstr "" - -#: ../libsvn_subr/prompt.c:385 ../libsvn_subr/prompt.c:472 +#: ../libsvn_subr/prompt.c:381 ../libsvn_subr/prompt.c:468 #, c-format msgid "Can't read from terminal" msgstr "" -#: ../libsvn_subr/prompt.c:540 +#: ../libsvn_subr/prompt.c:536 msgid "End of file while reading from terminal" msgstr "" -#: ../libsvn_subr/prompt.c:602 +#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:312 #, c-format msgid "Authentication realm: %s\n" msgstr "" -#: ../libsvn_subr/prompt.c:629 ../libsvn_subr/prompt.c:652 +#: ../libsvn_subr/prompt.c:625 ../libsvn_subr/prompt.c:648 msgid "Username: " msgstr "" -#: ../libsvn_subr/prompt.c:674 +#: ../libsvn_subr/prompt.c:670 #, c-format msgid "Error validating server certificate for '%s':\n" msgstr "" -#: ../libsvn_subr/prompt.c:680 +#: ../libsvn_subr/prompt.c:676 msgid "" " - The certificate is not issued by a trusted authority. Use the\n" " fingerprint to validate the certificate manually!\n" msgstr "" -#: ../libsvn_subr/prompt.c:687 +#: ../libsvn_subr/prompt.c:683 msgid " - The certificate hostname does not match.\n" msgstr "" -#: ../libsvn_subr/prompt.c:693 +#: ../libsvn_subr/prompt.c:689 msgid " - The certificate is not yet valid.\n" msgstr "" -#: ../libsvn_subr/prompt.c:699 +#: ../libsvn_subr/prompt.c:695 msgid " - The certificate has expired.\n" msgstr "" -#: ../libsvn_subr/prompt.c:705 +#: ../libsvn_subr/prompt.c:701 msgid " - The certificate has an unknown error.\n" msgstr "" -#: ../libsvn_subr/prompt.c:710 +#: ../libsvn_subr/prompt.c:706 #, c-format msgid "" "Certificate information:\n" @@ -6578,48 +7511,48 @@ msgid "" " - Fingerprint: %s\n" msgstr "" -#: ../libsvn_subr/prompt.c:725 +#: ../libsvn_subr/prompt.c:721 msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? " msgstr "" -#: ../libsvn_subr/prompt.c:729 +#: ../libsvn_subr/prompt.c:725 msgid "(R)eject or accept (t)emporarily? " msgstr "" -#: ../libsvn_subr/prompt.c:769 +#: ../libsvn_subr/prompt.c:765 msgid "Client certificate filename: " msgstr "" -#: ../libsvn_subr/prompt.c:793 +#: ../libsvn_subr/prompt.c:789 #, c-format msgid "Passphrase for '%s': " msgstr "" -#: ../libsvn_subr/prompt.c:845 +#: ../libsvn_subr/prompt.c:840 msgid "yes" msgstr "" -#: ../libsvn_subr/prompt.c:846 +#: ../libsvn_subr/prompt.c:841 msgid "y" msgstr "" -#: ../libsvn_subr/prompt.c:851 +#: ../libsvn_subr/prompt.c:846 msgid "no" msgstr "" -#: ../libsvn_subr/prompt.c:852 +#: ../libsvn_subr/prompt.c:847 msgid "n" msgstr "" -#: ../libsvn_subr/prompt.c:858 +#: ../libsvn_subr/prompt.c:853 msgid "Please type 'yes' or 'no': " msgstr "" -#: ../libsvn_subr/prompt.c:872 +#: ../libsvn_subr/prompt.c:867 msgid "Store password unencrypted (yes/no)? " msgstr "" -#: ../libsvn_subr/prompt.c:874 +#: ../libsvn_subr/prompt.c:869 #, c-format msgid "" "\n" @@ -6638,11 +7571,11 @@ msgid "" "-----------------------------------------------------------------------\n" msgstr "" -#: ../libsvn_subr/prompt.c:901 +#: ../libsvn_subr/prompt.c:896 msgid "Store passphrase unencrypted (yes/no)? " msgstr "" -#: ../libsvn_subr/prompt.c:903 +#: ../libsvn_subr/prompt.c:898 #, c-format msgid "" "\n" @@ -6661,81 +7594,99 @@ msgid "" "-----------------------------------------------------------------------\n" msgstr "" -#: ../libsvn_subr/prompt.c:949 +#: ../libsvn_subr/prompt.c:944 #, c-format msgid "Password for '%s' GNOME keyring: " msgstr "" -#: ../libsvn_subr/simple_providers.c:449 -#: ../libsvn_subr/ssl_client_cert_pw_providers.c:296 +#: ../libsvn_subr/simple_providers.c:444 +#: ../libsvn_subr/ssl_client_cert_pw_providers.c:286 #, c-format msgid "Config error: invalid value '%s' for option '%s'" msgstr "" -#: ../libsvn_subr/sqlite.c:176 +#: ../libsvn_subr/sqlite.c:242 #, c-format msgid "sqlite[S%d]: %s, executing statement '%s'" msgstr "" -#: ../libsvn_subr/sqlite.c:265 +#: ../libsvn_subr/sqlite.c:331 msgid "sqlite: Expected database row missing" msgstr "" -#: ../libsvn_subr/sqlite.c:266 +#: ../libsvn_subr/sqlite.c:332 msgid "sqlite: Extra database row found" msgstr "" -#: ../libsvn_subr/sqlite.c:726 +#: ../libsvn_subr/sqlite.c:803 #, c-format msgid "SQLite compiled for %s, but running with %s" msgstr "" -#: ../libsvn_subr/sqlite.c:738 +#: ../libsvn_subr/sqlite.c:815 msgid "SQLite is required to be compiled and run in thread-safe mode" msgstr "" -#: ../libsvn_subr/sqlite.c:747 +#: ../libsvn_subr/sqlite.c:824 #, c-format msgid "Could not configure SQLite [S%d]" msgstr "" -#: ../libsvn_subr/sqlite.c:749 +#: ../libsvn_subr/sqlite.c:826 msgid "Could not initialize SQLite" msgstr "" -#: ../libsvn_subr/sqlite.c:1219 +#: ../libsvn_subr/sqlite.c:1307 +msgid "SQLite transaction rollback failed" +msgstr "" + +#: ../libsvn_subr/sqlite.c:1488 #, c-format msgid "SQLite hotcopy failed for %s" msgstr "" -#: ../libsvn_subr/string.c:943 ../libsvn_subr/string.c:987 +#: ../libsvn_subr/stream.c:969 +#, c-format +msgid "Polling for available data on filestream failed" +msgstr "" + +#: ../libsvn_subr/stream.c:989 +msgid "Windows doesn't support polling on files" +msgstr "" + +#: ../libsvn_subr/string.c:981 ../libsvn_subr/string.c:1025 #, c-format msgid "Could not convert '%s' into a number" msgstr "" -#: ../libsvn_subr/subst.c:1803 ../libsvn_wc/props.c:1660 +#: ../libsvn_subr/subst.c:1820 ../libsvn_wc/props.c:1767 #, c-format msgid "File '%s' has inconsistent newlines" msgstr "" -#: ../libsvn_subr/sysinfo.c:1106 +#: ../libsvn_subr/subst.c:1858 +#, c-format +msgid "Can't read special file: File '%s' not found" +msgstr "" + +#: ../libsvn_subr/sysinfo.c:1228 msgid "Intel" msgstr "" -#: ../libsvn_subr/sysinfo.c:1107 +#: ../libsvn_subr/sysinfo.c:1229 msgid "Intel 64-bit" msgstr "" -#: ../libsvn_subr/sysinfo.c:1108 +#: ../libsvn_subr/sysinfo.c:1230 msgid "PowerPC" msgstr "" -#: ../libsvn_subr/sysinfo.c:1109 +#: ../libsvn_subr/sysinfo.c:1231 msgid "PowerPC 64-bit" msgstr "" #. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000" -#: ../libsvn_subr/time.c:85 +#: ../libsvn_subr/time.c:87 msgid " (%a, %d %b %Y)" msgstr "" @@ -6744,14 +7695,24 @@ msgstr "" msgid "Token '%s' is unrecognized" msgstr "" -#: ../libsvn_subr/types.c:48 +#: ../libsvn_subr/types.c:52 +#, c-format +msgid "Negative revision number found parsing '%s'" +msgstr "" + +#: ../libsvn_subr/types.c:53 #, c-format msgid "Invalid revision number found parsing '%s'" msgstr "" -#: ../libsvn_subr/types.c:60 +#: ../libsvn_subr/types.c:64 #, c-format -msgid "Negative revision number found parsing '%s'" +msgid "Revision number longer than 10 digits '%s'" +msgstr "" + +#: ../libsvn_subr/types.c:70 +#, c-format +msgid "Revision number too large '%s'" msgstr "" #: ../libsvn_subr/utf.c:245 @@ -6769,35 +7730,35 @@ msgstr "" msgid "Can't create a character converter from '%s' to '%s'" msgstr "" -#: ../libsvn_subr/utf.c:601 +#: ../libsvn_subr/utf.c:548 #, c-format msgid "Can't convert string from native encoding to '%s':" msgstr "" -#: ../libsvn_subr/utf.c:605 +#: ../libsvn_subr/utf.c:552 #, c-format msgid "Can't convert string from '%s' to native encoding:" msgstr "" -#: ../libsvn_subr/utf.c:609 +#: ../libsvn_subr/utf.c:556 #, c-format msgid "Can't convert string from '%s' to '%s':" msgstr "" -#: ../libsvn_subr/utf.c:654 +#: ../libsvn_subr/utf.c:601 #, c-format msgid "" "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from " "UTF-8" msgstr "" -#: ../libsvn_subr/utf.c:662 +#: ../libsvn_subr/utf.c:609 #, c-format msgid "" "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" msgstr "" -#: ../libsvn_subr/utf.c:707 +#: ../libsvn_subr/utf.c:654 #, c-format msgid "" "Valid UTF-8 data\n" @@ -6806,6 +7767,58 @@ msgid "" "(hex:%s)" msgstr "" +#: ../libsvn_subr/utf.c:1202 ../libsvn_subr/utf.c:1211 +#, c-format +msgid "Conversion to UTF-16 failed" +msgstr "" + +#: ../libsvn_subr/utf.c:1240 ../libsvn_subr/utf.c:1250 +#, c-format +msgid "Conversion from UTF-16 failed" +msgstr "" + +#: ../libsvn_subr/utf8proc.c:227 +#, c-format +msgid "Invalid Unicode character U+%04lX" +msgstr "" + +#: ../libsvn_subr/utf8proc.c:264 +msgid "Cannot use a custom escape token in glob matching mode" +msgstr "" + +#: ../libsvn_subr/utf8proc.c:295 +msgid "Escape token must be one character" +msgstr "" + +#: ../libsvn_subr/utf8proc.c:298 +#, c-format +msgid "Invalid escape character U+%04lX" +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:117 +msgid "Memory for processing UTF-8 data could not be allocated." +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:119 +msgid "UTF-8 string is too long to be processed." +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:121 +msgid "Invalid UTF-8 string" +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:123 +msgid "Unassigned Unicode code point found in UTF-8 string." +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:125 +msgid "Invalid options for UTF-8 processing chosen." +msgstr "" + +#: ../libsvn_subr/utf8proc/utf8proc.c:127 +msgid "An unknown error occured while processing UTF-8 data." +msgstr "" + #: ../libsvn_subr/validate.c:56 #, c-format msgid "MIME type '%s' has empty media type" @@ -6841,7 +7854,7 @@ msgstr "" #: ../libsvn_subr/version.c:139 msgid "" -"Copyright (C) 2014 The Apache Software Foundation.\n" +"Copyright (C) 2017 The Apache Software Foundation.\n" "This software consists of contributions made by many people;\n" "see the NOTICE file for more information.\n" "Subversion is open source software, see http://subversion.apache.org/\n" @@ -6854,36 +7867,36 @@ msgstr "" msgid "Failed to parse version number string '%s'" msgstr "" -#: ../libsvn_subr/xml.c:416 +#: ../libsvn_subr/xml.c:475 #, c-format msgid "Malformed XML: %s at line %ld" msgstr "" -#: ../libsvn_wc/adm_crawler.c:114 +#: ../libsvn_wc/adm_crawler.c:119 #, c-format msgid "The existing node '%s' can not be restored." msgstr "" -#: ../libsvn_wc/adm_crawler.c:133 +#: ../libsvn_wc/adm_crawler.c:138 #, c-format msgid "The node '%s' can not be restored." msgstr "" -#: ../libsvn_wc/adm_crawler.c:851 +#: ../libsvn_wc/adm_crawler.c:865 msgid "Error aborting report" msgstr "" -#: ../libsvn_wc/adm_crawler.c:963 +#: ../libsvn_wc/adm_crawler.c:978 #, c-format msgid "Pristine checksum for file '%s' is missing" msgstr "" -#: ../libsvn_wc/adm_crawler.c:1128 +#: ../libsvn_wc/adm_crawler.c:1152 #, c-format msgid "Checksum mismatch for text base of '%s'" msgstr "" -#: ../libsvn_wc/adm_crawler.c:1139 +#: ../libsvn_wc/adm_crawler.c:1163 #, c-format msgid "While preparing '%s' for commit" msgstr "" @@ -6916,50 +7929,50 @@ msgstr "" msgid "Node '%s' has no pristine text" msgstr "" -#: ../libsvn_wc/adm_files.c:452 +#: ../libsvn_wc/adm_files.c:420 #, c-format msgid "Revision %ld doesn't match existing revision %ld in '%s'" msgstr "" -#: ../libsvn_wc/adm_files.c:489 +#: ../libsvn_wc/adm_files.c:460 #, c-format msgid "" "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" msgstr "" -#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5279 +#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5334 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" msgstr "" -#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5273 +#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5328 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "" -#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5286 +#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5341 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "" -#: ../libsvn_wc/adm_ops.c:677 +#: ../libsvn_wc/adm_ops.c:390 #, c-format msgid "Can't create an entry with a reserved name while trying to add '%s'" msgstr "" -#: ../libsvn_wc/adm_ops.c:881 +#: ../libsvn_wc/adm_ops.c:594 #, c-format msgid "The URL '%s' has a different repository root than its parent" msgstr "" -#: ../libsvn_wc/adm_ops.c:899 +#: ../libsvn_wc/adm_ops.c:614 #, c-format msgid "" "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' " "for addition under a working copy from repository '%s' with uuid '%s'." msgstr "" -#: ../libsvn_wc/adm_ops.c:913 +#: ../libsvn_wc/adm_ops.c:628 #, c-format msgid "Can't add '%s' with URL '%s', but with the data from '%s'" msgstr "" @@ -6977,241 +7990,273 @@ msgstr "" msgid "Not a conflict skel" msgstr "" -#: ../libsvn_wc/conflicts.c:610 ../libsvn_wc/conflicts.c:707 +#: ../libsvn_wc/conflicts.c:607 ../libsvn_wc/conflicts.c:704 msgid "Not a completed conflict skel" msgstr "" -#: ../libsvn_wc/conflicts.c:788 ../libsvn_wc/conflicts.c:861 -#: ../libsvn_wc/conflicts.c:951 +#: ../libsvn_wc/conflicts.c:785 ../libsvn_wc/conflicts.c:858 +#: ../libsvn_wc/conflicts.c:948 msgid "Conflict not set" msgstr "" -#: ../libsvn_wc/conflicts.c:1438 ../libsvn_wc/conflicts.c:1790 +#: ../libsvn_wc/conflicts.c:1315 ../libsvn_wc/conflicts.c:1990 +#: ../libsvn_wc/conflicts.c:2035 msgid "Conflict callback violated API: returned no results" msgstr "" -#: ../libsvn_wc/conflicts.c:1482 +#: ../libsvn_wc/conflicts.c:1360 msgid "Conflict callback violated API: returned no merged file" msgstr "" -#: ../libsvn_wc/conflicts.c:2468 ../libsvn_wc/conflicts.c:2644 +#: ../libsvn_wc/conflicts.c:1645 +#, c-format +msgid "" +"Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' " +"because a merged version of the file cannot be created." +msgstr "" + +#: ../libsvn_wc/conflicts.c:1690 +#, c-format +msgid "" +"Conflict on '%s' could not be resolved because the chosen version of the " +"file is not available." +msgstr "" + +#: ../libsvn_wc/conflicts.c:2497 msgid "Invalid 'conflict_result' argument" msgstr "" -#: ../libsvn_wc/conflicts.c:2767 ../libsvn_wc/conflicts.c:2807 +#: ../libsvn_wc/conflicts.c:2740 ../libsvn_wc/conflicts.c:2798 #, c-format msgid "" "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; " "'%s' not resolved" msgstr "" -#: ../libsvn_wc/conflicts.c:2822 +#: ../libsvn_wc/conflicts.c:2825 +#, c-format +msgid "" +"Tree conflict can only be resolved to 'working' state; '%s' is no longer " +"moved" +msgstr "" + +#: ../libsvn_wc/conflicts.c:2843 #, c-format msgid "" "Tree conflict can only be resolved to 'working' state; '%s' not resolved" msgstr "" -#: ../libsvn_wc/conflicts.c:2931 +#: ../libsvn_wc/conflicts.c:3020 msgid "No conflict-callback and no pre-defined conflict-choice provided" msgstr "" -#: ../libsvn_wc/copy.c:86 +#: ../libsvn_wc/conflicts.c:3263 +#, c-format +msgid "Unable to resolve pending conflict on '%s'" +msgstr "" + +#: ../libsvn_wc/conflicts.c:3275 +#, c-format +msgid "Unable to resolve conflicts on '%s'" +msgstr "" + +#: ../libsvn_wc/copy.c:103 #, c-format msgid "Source '%s' is unexpected kind" msgstr "" -#: ../libsvn_wc/copy.c:410 +#: ../libsvn_wc/copy.c:471 #, c-format msgid "cannot handle node kind for '%s'" msgstr "" -#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4524 ../libsvn_wc/wc_db.c:5099 +#: ../libsvn_wc/copy.c:493 ../libsvn_wc/wc_db.c:4626 ../libsvn_wc/wc_db.c:5429 #, c-format msgid "Cannot handle status of '%s'" msgstr "" -#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4515 ../libsvn_wc/wc_db.c:5093 -#: ../libsvn_wc/wc_db.c:5338 +#: ../libsvn_wc/copy.c:502 ../libsvn_wc/wc_db.c:4617 ../libsvn_wc/wc_db.c:5423 +#: ../libsvn_wc/wc_db.c:5667 #, c-format msgid "Cannot copy '%s' excluded by server" msgstr "" -#: ../libsvn_wc/copy.c:578 +#: ../libsvn_wc/copy.c:643 #, c-format msgid "Deleted node '%s' can't be copied." msgstr "" -#: ../libsvn_wc/copy.c:596 +#: ../libsvn_wc/copy.c:661 #, c-format msgid "'%s' is the root of a working copy and cannot be moved" msgstr "" -#: ../libsvn_wc/copy.c:604 +#: ../libsvn_wc/copy.c:669 #, c-format msgid "'%s' represents the repository root and cannot be moved" msgstr "" -#: ../libsvn_wc/copy.c:673 +#: ../libsvn_wc/copy.c:744 #, c-format msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'" msgstr "" -#: ../libsvn_wc/copy.c:681 +#: ../libsvn_wc/copy.c:752 #, c-format msgid "Cannot copy to '%s' as it is scheduled for deletion" msgstr "" -#: ../libsvn_wc/copy.c:709 +#: ../libsvn_wc/copy.c:780 #, c-format msgid "'%s' is already under version control but is excluded." msgstr "" -#: ../libsvn_wc/copy.c:724 +#: ../libsvn_wc/copy.c:795 #, c-format msgid "There is already a versioned item '%s'" msgstr "" -#: ../libsvn_wc/copy.c:740 +#: ../libsvn_wc/copy.c:811 #, c-format msgid "'%s' already exists and is in the way" msgstr "" -#: ../libsvn_wc/copy.c:791 +#: ../libsvn_wc/copy.c:863 #, c-format msgid "" "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first" msgstr "" -#: ../libsvn_wc/crop.c:208 +#: ../libsvn_wc/crop.c:206 #, c-format msgid "Cannot exclude '%s': it is a working copy root" msgstr "" -#: ../libsvn_wc/crop.c:216 +#: ../libsvn_wc/crop.c:214 #, c-format msgid "Cannot exclude '%s': it is a switched path" msgstr "" -#: ../libsvn_wc/crop.c:243 +#: ../libsvn_wc/crop.c:241 #, c-format msgid "" "Cannot exclude '%s': it is to be added to the repository. Try commit instead" msgstr "" -#: ../libsvn_wc/crop.c:250 +#: ../libsvn_wc/crop.c:248 #, c-format msgid "" "Cannot exclude '%s': it is to be deleted from the repository. Try commit " "instead" msgstr "" -#: ../libsvn_wc/crop.c:309 +#: ../libsvn_wc/crop.c:319 msgid "Can only crop a working copy with a restrictive depth" msgstr "" -#: ../libsvn_wc/crop.c:320 +#: ../libsvn_wc/crop.c:330 msgid "Can only crop directories" msgstr "" -#: ../libsvn_wc/crop.c:333 +#: ../libsvn_wc/crop.c:343 #, c-format msgid "" "Cannot crop '%s': it is going to be removed from repository. Try commit " "instead" msgstr "" -#: ../libsvn_wc/crop.c:340 +#: ../libsvn_wc/crop.c:350 #, c-format msgid "" "Cannot crop '%s': it is to be added to the repository. Try commit instead" msgstr "" -#: ../libsvn_wc/delete.c:237 ../libsvn_wc/delete.c:357 +#: ../libsvn_wc/delete.c:238 ../libsvn_wc/delete.c:358 #, c-format msgid "'%s' cannot be deleted" msgstr "" -#: ../libsvn_wc/delete.c:255 ../libsvn_wc/delete.c:373 +#: ../libsvn_wc/delete.c:256 ../libsvn_wc/delete.c:374 #, c-format msgid "'%s' is the root of a working copy and cannot be deleted" msgstr "" -#: ../libsvn_wc/delete.c:262 ../libsvn_wc/delete.c:379 +#: ../libsvn_wc/delete.c:263 ../libsvn_wc/delete.c:380 #, c-format msgid "'%s' represents the repository root and cannot be deleted" msgstr "" -#: ../libsvn_wc/delete.c:476 +#: ../libsvn_wc/delete.c:474 #, c-format msgid "File '%s' has local modifications" msgstr "" -#: ../libsvn_wc/deprecated.c:2284 +#: ../libsvn_wc/deprecated.c:2363 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "" -#: ../libsvn_wc/entries.c:1044 +#: ../libsvn_wc/entries.c:1100 #, c-format msgid "'%s' is not a versioned working copy" msgstr "" -#: ../libsvn_wc/entries.c:1290 +#: ../libsvn_wc/entries.c:1396 #, c-format msgid "Admin area of '%s' is missing" msgstr "" -#: ../libsvn_wc/entries.c:1310 +#: ../libsvn_wc/entries.c:1416 #, c-format msgid "'%s' is not of the right kind" msgstr "" -#: ../libsvn_wc/entries.c:1507 +#: ../libsvn_wc/entries.c:1578 #, c-format msgid "The file '%s' has no checksum" msgstr "" -#: ../libsvn_wc/entries.c:1619 +#: ../libsvn_wc/entries.c:1696 #, c-format msgid "Unable to upgrade '%s' at line %d" msgstr "" -#: ../libsvn_wc/entries.c:1837 +#: ../libsvn_wc/entries.c:1935 #, c-format msgid "No copyfrom URL for '%s'" msgstr "" -#: ../libsvn_wc/entries.c:2051 +#: ../libsvn_wc/entries.c:2167 #, c-format msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; " msgstr "" -#: ../libsvn_wc/entries.c:2399 +#: ../libsvn_wc/entries.c:2520 #, c-format msgid "No default entry in directory '%s'" msgstr "" -#: ../libsvn_wc/entries.c:2555 +#: ../libsvn_wc/entries.c:2676 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "" -#: ../libsvn_wc/entries.c:2736 ../libsvn_wc/node.c:528 +#: ../libsvn_wc/entries.c:2856 ../libsvn_wc/node.c:403 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "" -#: ../libsvn_wc/externals.c:154 ../libsvn_wc/externals.c:232 +#: ../libsvn_wc/externals.c:158 ../libsvn_wc/externals.c:247 #, c-format msgid "Error parsing %s property on '%s': '%s'" msgstr "" -#: ../libsvn_wc/externals.c:202 +#: ../libsvn_wc/externals.c:214 #, c-format msgid "Can't split line into components: '%s'" msgstr "" -#: ../libsvn_wc/externals.c:257 +#: ../libsvn_wc/externals.c:273 #, c-format msgid "" "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in " @@ -7219,50 +8264,50 @@ msgid "" "out to" msgstr "" -#: ../libsvn_wc/externals.c:266 ../libsvn_wc/externals.c:274 +#: ../libsvn_wc/externals.c:282 ../libsvn_wc/externals.c:290 #, c-format msgid "" "Invalid %s property on '%s': cannot use a URL '%s' as the target directory " "for an external definition" msgstr "" -#: ../libsvn_wc/externals.c:316 +#: ../libsvn_wc/externals.c:354 #, c-format msgid "" "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" msgstr "" -#: ../libsvn_wc/externals.c:491 ../libsvn_wc/externals.c:514 +#: ../libsvn_wc/externals.c:547 ../libsvn_wc/externals.c:570 #, c-format msgid "This editor can only update '%s'" msgstr "" -#: ../libsvn_wc/externals.c:529 ../libsvn_wc/externals.c:976 +#: ../libsvn_wc/externals.c:586 #, c-format msgid "Node '%s' is no existing file external" msgstr "" -#: ../libsvn_wc/externals.c:1551 +#: ../libsvn_wc/externals.c:1577 #, c-format msgid "URL '%s' does not begin with a scheme" msgstr "" -#: ../libsvn_wc/externals.c:1606 +#: ../libsvn_wc/externals.c:1632 #, c-format msgid "Illegal parent directory URL '%s'" msgstr "" -#: ../libsvn_wc/externals.c:1645 +#: ../libsvn_wc/externals.c:1671 #, c-format msgid "Illegal repository root URL '%s'" msgstr "" -#: ../libsvn_wc/externals.c:1690 +#: ../libsvn_wc/externals.c:1716 #, c-format msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" msgstr "" -#: ../libsvn_wc/externals.c:1718 +#: ../libsvn_wc/externals.c:1744 #, c-format msgid "Unrecognized format for the relative external URL '%s'" msgstr "" @@ -7272,7 +8317,7 @@ msgstr "" msgid "Path '%s' ends in '%s', which is unsupported for this operation" msgstr "" -#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:14193 +#: ../libsvn_wc/lock.c:773 #, c-format msgid "Working copy '%s' locked" msgstr "" @@ -7302,7 +8347,8 @@ msgstr "" msgid "Working copy '%s' is not locked" msgstr "" -#: ../libsvn_wc/lock.c:1382 +#: ../libsvn_wc/lock.c:1382 ../libsvn_wc/wc_db.c:4950 +#: ../libsvn_wc/wc_db.c:16270 ../libsvn_wc/wc_db_update_move.c:130 #, c-format msgid "No write-lock in '%s'" msgstr "" @@ -7312,22 +8358,22 @@ msgstr "" msgid "Can't obtain lock on non-directory '%s'." msgstr "" -#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:257 +#: ../libsvn_wc/merge.c:1285 ../libsvn_wc/props.c:232 #, c-format msgid "Can't merge into conflicted node '%s'" msgstr "" -#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:273 +#: ../libsvn_wc/merge.c:1328 ../libsvn_wc/props.c:248 #, c-format msgid "The property '%s' may not be merged into '%s'." msgstr "" -#: ../libsvn_wc/node.c:1047 +#: ../libsvn_wc/node.c:749 #, c-format msgid "Incomplete copy information on path '%s'." msgstr "" -#: ../libsvn_wc/node.c:1211 +#: ../libsvn_wc/node.c:914 #, c-format msgid "'%s' is not the root of the working copy '%s'" msgstr "" @@ -7425,164 +8471,168 @@ msgstr "" msgid "Error at entry %d in entries file for '%s':" msgstr "" -#: ../libsvn_wc/props.c:236 +#: ../libsvn_wc/props.c:211 #, c-format msgid "The node '%s' does not have properties in this state." msgstr "" -#: ../libsvn_wc/props.c:401 +#: ../libsvn_wc/props.c:377 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property already exists.\n" msgstr "" -#: ../libsvn_wc/props.c:410 +#: ../libsvn_wc/props.c:386 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property has been locally deleted.\n" msgstr "" -#: ../libsvn_wc/props.c:424 +#: ../libsvn_wc/props.c:400 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally added.\n" msgstr "" -#: ../libsvn_wc/props.c:440 +#: ../libsvn_wc/props.c:416 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally modified.\n" msgstr "" -#: ../libsvn_wc/props.c:450 +#: ../libsvn_wc/props.c:426 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally deleted and had a different value.\n" msgstr "" -#: ../libsvn_wc/props.c:462 +#: ../libsvn_wc/props.c:438 #, c-format msgid "" "Trying to delete property '%s'\n" "but the local property value is different.\n" msgstr "" -#: ../libsvn_wc/props.c:481 +#: ../libsvn_wc/props.c:457 #, c-format msgid "" "Trying to change property '%s'\n" "but the local property value conflicts with the incoming change.\n" msgstr "" -#: ../libsvn_wc/props.c:489 +#: ../libsvn_wc/props.c:465 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has already been locally changed to a different value.\n" msgstr "" -#: ../libsvn_wc/props.c:496 +#: ../libsvn_wc/props.c:472 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally deleted.\n" msgstr "" -#: ../libsvn_wc/props.c:502 +#: ../libsvn_wc/props.c:478 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally added with a different value.\n" msgstr "" -#: ../libsvn_wc/props.c:508 +#: ../libsvn_wc/props.c:484 #, c-format msgid "" "Trying to change property '%s'\n" "but the property does not exist locally.\n" msgstr "" -#: ../libsvn_wc/props.c:612 +#: ../libsvn_wc/props.c:594 msgid "<<<<<<< (local property value)" msgstr "" -#: ../libsvn_wc/props.c:613 -msgid ">>>>>>> (incoming property value)" +#: ../libsvn_wc/props.c:595 +msgid ">>>>>>> (incoming 'changed to' value)" +msgstr "" + +#: ../libsvn_wc/props.c:596 +msgid "||||||| (incoming 'changed from' value)" msgstr "" -#: ../libsvn_wc/props.c:648 +#: ../libsvn_wc/props.c:633 msgid "Local property value:\n" msgstr "" -#: ../libsvn_wc/props.c:650 ../libsvn_wc/props.c:661 +#: ../libsvn_wc/props.c:635 ../libsvn_wc/props.c:646 msgid "Cannot display: property value is binary data\n" msgstr "" -#: ../libsvn_wc/props.c:659 +#: ../libsvn_wc/props.c:644 msgid "Incoming property value:\n" msgstr "" -#: ../libsvn_wc/props.c:1475 ../libsvn_wc/props.c:1884 -#: ../libsvn_wc/props.c:1985 +#: ../libsvn_wc/props.c:1582 ../libsvn_wc/props.c:1991 +#: ../libsvn_wc/props.c:2092 #, c-format msgid "Property '%s' is an entry property" msgstr "" -#: ../libsvn_wc/props.c:1512 ../libsvn_wc/props.c:1519 +#: ../libsvn_wc/props.c:1619 ../libsvn_wc/props.c:1626 msgid "Failed to load properties" msgstr "" -#: ../libsvn_wc/props.c:1555 +#: ../libsvn_wc/props.c:1662 #, c-format msgid "Cannot set '%s' on a directory ('%s')" msgstr "" -#: ../libsvn_wc/props.c:1562 +#: ../libsvn_wc/props.c:1669 #, c-format msgid "Cannot set '%s' on a file ('%s')" msgstr "" -#: ../libsvn_wc/props.c:1641 +#: ../libsvn_wc/props.c:1748 #, c-format msgid "Can't set '%s': file '%s' has binary mime type property" msgstr "" -#: ../libsvn_wc/props.c:1686 +#: ../libsvn_wc/props.c:1793 msgid "Failed to load current properties" msgstr "" -#: ../libsvn_wc/props.c:1906 +#: ../libsvn_wc/props.c:2013 #, c-format msgid "Can't set properties on '%s': invalid status for updating properties." msgstr "" -#: ../libsvn_wc/props.c:1990 +#: ../libsvn_wc/props.c:2097 #, c-format msgid "Property '%s' is a WC property, not a regular property" msgstr "" -#: ../libsvn_wc/props.c:2084 +#: ../libsvn_wc/props.c:2191 #, c-format msgid "Unrecognized line ending style '%s' for '%s'" msgstr "" #. scratch_ -#: ../libsvn_wc/props.c:2135 +#: ../libsvn_wc/props.c:2242 #, c-format msgid " (%d more duplicate targets found)" msgstr "" -#: ../libsvn_wc/props.c:2140 +#: ../libsvn_wc/props.c:2247 #, c-format msgid "Invalid %s property on '%s': target '%s' appears more than once%s" msgstr "" -#: ../libsvn_wc/props.c:2171 +#: ../libsvn_wc/props.c:2278 #, c-format msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" msgstr "" @@ -7618,33 +8668,33 @@ msgstr "" msgid "Invalid relocation destination: '%s' (does not point to target)" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:136 +#: ../libsvn_wc/tree_conflicts.c:137 msgid "Unknown enumeration value in tree conflict description" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:160 +#: ../libsvn_wc/tree_conflicts.c:161 msgid "Invalid version info in tree conflict description" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:218 +#: ../libsvn_wc/tree_conflicts.c:219 #, c-format msgid "Invalid conflict info '%s' in tree conflict description" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:229 +#: ../libsvn_wc/tree_conflicts.c:230 msgid "Empty 'victim' field in tree conflict description" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:237 +#: ../libsvn_wc/tree_conflicts.c:238 msgid "Invalid 'node_kind' field in tree conflict description" msgstr "" -#: ../libsvn_wc/tree_conflicts.c:430 +#: ../libsvn_wc/tree_conflicts.c:432 #, c-format msgid "Attempt to add tree conflict that already exists at '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:999 +#: ../libsvn_wc/update_editor.c:994 #, c-format msgid "" "Checksum mismatch while updating '%s':\n" @@ -7652,47 +8702,40 @@ msgid "" " actual: %s\n" msgstr "" -#: ../libsvn_wc/update_editor.c:1134 +#: ../libsvn_wc/update_editor.c:1129 #, c-format msgid "'%s' is not valid as filename in directory '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:1611 +#: ../libsvn_wc/update_editor.c:1507 #, c-format msgid "Unexpected attempt to add a node at path '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:1622 +#: ../libsvn_wc/update_editor.c:1518 #, c-format msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:2036 +#: ../libsvn_wc/update_editor.c:1899 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " "directory" msgstr "" -#: ../libsvn_wc/update_editor.c:2693 +#: ../libsvn_wc/update_editor.c:2572 msgid "Couldn't do property merge" msgstr "" -#: ../libsvn_wc/update_editor.c:3086 -#, c-format -msgid "" -"Failed to mark '%s' absent: item of the same name is already scheduled for " -"addition" -msgstr "" - -#: ../libsvn_wc/update_editor.c:3174 +#: ../libsvn_wc/update_editor.c:3111 #, c-format msgid "" "Failed to add file '%s': object of the same name as the administrative " "directory" msgstr "" -#: ../libsvn_wc/update_editor.c:3695 +#: ../libsvn_wc/update_editor.c:3650 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -7700,69 +8743,81 @@ msgid "" " recorded: %s\n" msgstr "" -#: ../libsvn_wc/update_editor.c:5254 +#: ../libsvn_wc/update_editor.c:5309 #, c-format msgid "Node '%s' exists." msgstr "" -#: ../libsvn_wc/update_editor.c:5314 +#: ../libsvn_wc/update_editor.c:5369 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" msgstr "" -#: ../libsvn_wc/update_editor.c:5512 +#: ../libsvn_wc/update_editor.c:5581 #, c-format msgid "'%s' is not an unmodified copied directory" msgstr "" -#: ../libsvn_wc/update_editor.c:5523 +#: ../libsvn_wc/update_editor.c:5592 #, c-format msgid "Copyfrom '%s' doesn't match original location of '%s'" msgstr "" -#: ../libsvn_wc/upgrade.c:255 +#: ../libsvn_wc/upgrade.c:256 #, c-format msgid "Missing end of line in wcprops file for '%s'" msgstr "" -#: ../libsvn_wc/upgrade.c:631 +#: ../libsvn_wc/upgrade.c:632 #, c-format msgid "" "Working copy '%s' can't be upgraded because the repository root is not " "available and can't be retrieved" msgstr "" -#: ../libsvn_wc/upgrade.c:638 +#: ../libsvn_wc/upgrade.c:639 #, c-format msgid "" "Working copy '%s' can't be upgraded because the repository uuid is not " "available and can't be retrieved" msgstr "" -#: ../libsvn_wc/upgrade.c:645 +#: ../libsvn_wc/upgrade.c:646 #, c-format msgid "Working copy '%s' can't be upgraded because it doesn't have a url" msgstr "" -#: ../libsvn_wc/upgrade.c:690 +#: ../libsvn_wc/upgrade.c:691 msgid "Error parsing tree conflict skel" msgstr "" -#: ../libsvn_wc/upgrade.c:1173 +#: ../libsvn_wc/upgrade.c:922 +#, c-format +msgid "" +"The properties of '%s' are in an indeterminate state and cannot be upgraded. " +"See issue #2530." +msgstr "" + +#: ../libsvn_wc/upgrade.c:934 +#, c-format +msgid "Insufficient NODES rows for '%s'" +msgstr "" + +#: ../libsvn_wc/upgrade.c:1357 #, c-format msgid "" "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 " "client to diff/revert before using this client" msgstr "" -#: ../libsvn_wc/upgrade.c:1217 +#: ../libsvn_wc/upgrade.c:1401 #, c-format msgid "" "The working copy at '%s' is format 26 with conflicts; use a format 26 client " "to resolve before using this client" msgstr "" -#: ../libsvn_wc/upgrade.c:1723 +#: ../libsvn_wc/upgrade.c:1945 msgid "" "Cannot upgrade with existing logs; run a cleanup operation on this working " "copy using a client version which is compatible with this working copy's " @@ -7770,22 +8825,22 @@ msgid "" "with the current version" msgstr "" -#: ../libsvn_wc/upgrade.c:1792 +#: ../libsvn_wc/upgrade.c:2014 msgid "" "This working copy is corrupt and cannot be upgraded. Please check out a new " "working copy." msgstr "" -#: ../libsvn_wc/upgrade.c:1837 +#: ../libsvn_wc/upgrade.c:2059 msgid "(unreleased development version)" msgstr "" -#: ../libsvn_wc/upgrade.c:1853 +#: ../libsvn_wc/upgrade.c:2075 #, c-format msgid "Working copy '%s' is too old (format %d, created by Subversion %s)" msgstr "" -#: ../libsvn_wc/upgrade.c:1863 +#: ../libsvn_wc/upgrade.c:2085 #, c-format msgid "" "Working copy '%s' is an old development version (format %d); to upgrade it, " @@ -7793,88 +8848,110 @@ msgid "" "the current client" msgstr "" -#: ../libsvn_wc/upgrade.c:2092 +#: ../libsvn_wc/upgrade.c:2314 #, c-format msgid "Can't upgrade '%s' as it is not a working copy" msgstr "" -#: ../libsvn_wc/upgrade.c:2141 +#: ../libsvn_wc/upgrade.c:2363 #, c-format msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'" msgstr "" -#: ../libsvn_wc/wc_db.c:452 +#: ../libsvn_wc/wc_db.c:445 #, c-format msgid "No REPOSITORY table entry for id '%ld'" msgstr "" -#: ../libsvn_wc/wc_db.c:773 +#: ../libsvn_wc/wc_db.c:778 #, c-format msgid "The file '%s' has no checksum." msgstr "" -#: ../libsvn_wc/wc_db.c:2548 ../libsvn_wc/wc_db.c:2933 -#: ../libsvn_wc/wc_db.c:9404 +#: ../libsvn_wc/wc_db.c:2092 +#, c-format +msgid "Path '%s' is not moved" +msgstr "" + +#: ../libsvn_wc/wc_db.c:2566 ../libsvn_wc/wc_db.c:3001 +#: ../libsvn_wc/wc_db.c:9922 #, c-format msgid "The node '%s' has a corrupt checksum value." msgstr "" -#: ../libsvn_wc/wc_db.c:2737 +#: ../libsvn_wc/wc_db.c:2786 #, c-format msgid "The node '%s' has a BASE status that has no properties." msgstr "" -#: ../libsvn_wc/wc_db.c:3563 +#: ../libsvn_wc/wc_db.c:3528 ../libsvn_wc/wc_db.c:3648 #, c-format msgid "The node '%s' is not an external." msgstr "" -#: ../libsvn_wc/wc_db.c:3977 +#: ../libsvn_wc/wc_db.c:4060 #, c-format msgid "Expected node '%s' to be deleted." msgstr "" -#: ../libsvn_wc/wc_db.c:6493 ../libsvn_wc/wc_db.c:6572 +#: ../libsvn_wc/wc_db.c:6924 ../libsvn_wc/wc_db.c:6971 #, c-format msgid "Can't revert '%s' without reverting children" msgstr "" -#: ../libsvn_wc/wc_db.c:6669 +#: ../libsvn_wc/wc_db.c:7085 #, c-format msgid "Can't revert '%s' without reverting parent" msgstr "" -#: ../libsvn_wc/wc_db.c:6788 +#: ../libsvn_wc/wc_db.c:7220 #, c-format msgid "Unsupported depth for revert of '%s'" msgstr "" -#: ../libsvn_wc/wc_db.c:7764 +#: ../libsvn_wc/wc_db.c:7790 +#, c-format +msgid "The node '%s' is not a committed directory" +msgstr "" + +#: ../libsvn_wc/wc_db.c:8180 #, c-format msgid "Cannot delete '%s' as '%s' is excluded by server" msgstr "" -#: ../libsvn_wc/wc_db.c:7775 +#: ../libsvn_wc/wc_db.c:8191 #, c-format msgid "Cannot delete '%s' as it is excluded by server" msgstr "" -#: ../libsvn_wc/wc_db.c:7782 +#: ../libsvn_wc/wc_db.c:8198 #, c-format msgid "Cannot delete '%s' as it is excluded" msgstr "" -#: ../libsvn_wc/wc_db.c:8239 +#: ../libsvn_wc/wc_db.c:8655 #, c-format msgid "Cannot move '%s' to '%s' because they are not in the same working copy" msgstr "" -#: ../libsvn_wc/wc_db.c:8597 +#: ../libsvn_wc/wc_db.c:8794 +#, c-format +msgid "" +"Encountered invalid node state in column %d of info query to working copy " +"database" +msgstr "" + +#: ../libsvn_wc/wc_db.c:9049 #, c-format msgid "Corrupt data for '%s'" msgstr "" -#: ../libsvn_wc/wc_db.c:8904 +#: ../libsvn_wc/wc_db.c:9121 +#, c-format +msgid "Error reading node '%s'" +msgstr "" + +#: ../libsvn_wc/wc_db.c:9379 #, c-format msgid "" "The node '%s' comes from unexpected repository '%s', expected '%s'; if this " @@ -7882,165 +8959,162 @@ msgid "" "fix the problem, see issue #4087" msgstr "" -#: ../libsvn_wc/wc_db.c:9529 +#: ../libsvn_wc/wc_db.c:10053 #, c-format msgid "The node '%s' is not in working copy '%s'" msgstr "" -#: ../libsvn_wc/wc_db.c:9566 +#: ../libsvn_wc/wc_db.c:10090 #, c-format msgid "The node '%s' is not installable" msgstr "" -#: ../libsvn_wc/wc_db.c:9995 ../libsvn_wc/wc_db.c:10254 +#: ../libsvn_wc/wc_db.c:10529 ../libsvn_wc/wc_db.c:10788 #, c-format msgid "The node '%s' has a status that has no properties." msgstr "" -#: ../libsvn_wc/wc_db.c:12121 +#: ../libsvn_wc/wc_db.c:12740 #, c-format msgid "Expected node '%s' to be added." msgstr "" -#: ../libsvn_wc/wc_db.c:12467 +#: ../libsvn_wc/wc_db.c:13069 #, c-format msgid "Path '%s' was not moved here" msgstr "" -#: ../libsvn_wc/wc_db.c:12536 -#, c-format -msgid "The base node '%s' was not found." -msgstr "" - -#: ../libsvn_wc/wc_db.c:12968 +#: ../libsvn_wc/wc_db.c:13257 #, c-format -msgid "" -"The properties of '%s' are in an indeterminate state and cannot be upgraded. " -"See issue #2530." +msgid "Node '%s' is not shadowed" msgstr "" -#: ../libsvn_wc/wc_db.c:12980 +#: ../libsvn_wc/wc_db.c:14498 ../libsvn_wc/wc_db.c:14546 #, c-format -msgid "Insufficient NODES rows for '%s'" -msgstr "" - -#: ../libsvn_wc/wc_db.c:13127 -#, c-format -msgid "Repository '%s' not found in the database" +msgid "'%s' is already locked." msgstr "" -#: ../libsvn_wc/wc_db.c:14114 ../libsvn_wc/wc_db.c:14162 +#: ../libsvn_wc/wc_db.c:14503 ../libsvn_wc/wc_db.c:14554 #, c-format -msgid "'%s' is already locked." +msgid "Working copy '%s' locked." msgstr "" -#: ../libsvn_wc/wc_db.c:14119 ../libsvn_wc/wc_db.c:14170 +#: ../libsvn_wc/wc_db.c:14577 #, c-format -msgid "Working copy '%s' locked." +msgid "Failed to lock working copy '%s'." msgstr "" -#: ../libsvn_wc/wc_db.c:14242 +#: ../libsvn_wc/wc_db.c:14626 #, c-format msgid "'%s' is already locked via '%s'." msgstr "" -#: ../libsvn_wc/wc_db.c:14416 +#: ../libsvn_wc/wc_db.c:14800 #, c-format msgid "Working copy not locked at '%s'." msgstr "" -#: ../libsvn_wc/wc_db.c:14799 +#: ../libsvn_wc/wc_db.c:15299 #, c-format msgid "Modification of '%s' already exists" msgstr "" #. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT #. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message. -#: ../libsvn_wc/wc_db.c:15441 +#: ../libsvn_wc/wc_db.c:15896 #, c-format msgid "database inconsistency at local_relpath='%s' verifying expression '%s'" msgstr "" -#: ../libsvn_wc/wc_db.c:15565 +#: ../libsvn_wc/wc_db.c:16084 #, c-format msgid "Can't upgrade '%s' as it is not a working copy root" msgstr "" -#: ../libsvn_wc/wc_db.c:15571 +#: ../libsvn_wc/wc_db.c:16090 #, c-format msgid "" "Working copy '%s' is too old and must be upgraded to at least format %d, as " "created by Subversion %s" msgstr "" -#: ../libsvn_wc/wc_db.c:15589 +#: ../libsvn_wc/wc_db.c:16108 msgid "Working copy upgrade failed" msgstr "" -#: ../libsvn_wc/wc_db_pristine.c:125 ../libsvn_wc/wc_db_pristine.c:457 +#: ../libsvn_wc/wc_db.c:16209 +#, c-format +msgid "The path '%s' is not in the working copy '%s'" +msgstr "" + +#: ../libsvn_wc/wc_db_pristine.c:128 ../libsvn_wc/wc_db_pristine.c:467 #, c-format msgid "The pristine text with checksum '%s' was not found" msgstr "" -#: ../libsvn_wc/wc_db_pristine.c:191 +#: ../libsvn_wc/wc_db_pristine.c:194 #, c-format msgid "Pristine text '%s' not present" msgstr "" -#: ../libsvn_wc/wc_db_pristine.c:224 +#: ../libsvn_wc/wc_db_pristine.c:237 #, c-format msgid "Can't read '%s' from pristine store because no checksum supplied" msgstr "" -#: ../libsvn_wc/wc_db_pristine.c:328 +#: ../libsvn_wc/wc_db_pristine.c:320 #, c-format msgid "New pristine text '%s' has different size: %ld versus %ld" msgstr "" -#: ../libsvn_wc/wc_db_pristine.c:496 +#: ../libsvn_wc/wc_db_pristine.c:388 +msgid "Unable to create pristine install stream" +msgstr "" + +#: ../libsvn_wc/wc_db_pristine.c:506 #, c-format msgid "The pristine text with MD5 checksum '%s' was not found" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:282 ../libsvn_wc/wc_db_update_move.c:306 +#: ../libsvn_wc/wc_db_update_move.c:170 #, c-format -msgid "'%s' already in conflict" +msgid "'%s' is not deleted" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1382 +#: ../libsvn_wc/wc_db_update_move.c:404 ../libsvn_wc/wc_db_update_move.c:428 #, c-format -msgid "'%s' is not in conflict" +msgid "'%s' already in conflict" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1395 +#: ../libsvn_wc/wc_db_update_move.c:1631 #, c-format -msgid "'%s' is not a tree-conflict victim" +msgid "" +"Cannot apply update because move source %s' is a mixed-revision working copy" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1754 +#: ../libsvn_wc/wc_db_update_move.c:1639 #, c-format -msgid "Cannot auto-resolve tree-conflict on '%s'" +msgid "Cannot apply update because move source '%s' is a switched subtree" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1817 +#: ../libsvn_wc/wc_db_update_move.c:1692 #, c-format -msgid "" -"Cannot apply update because move source %s' is a mixed-revision working copy" +msgid "The node '%s' has not been moved away" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1828 +#: ../libsvn_wc/wc_db_update_move.c:2300 #, c-format -msgid "Cannot apply update because move source '%s' is a switched subtree" +msgid "'%s' is not in conflict" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1879 +#: ../libsvn_wc/wc_db_update_move.c:2313 #, c-format -msgid "The node '%s' has not been moved away" +msgid "'%s' is not a valid tree-conflict victim" msgstr "" -#: ../libsvn_wc/wc_db_update_move.c:1908 +#: ../libsvn_wc/wc_db_update_move.c:2326 #, c-format -msgid "'%s' is not deleted" +msgid "'%s' is already a moved away tree-conflict" msgstr "" #: ../libsvn_wc/wc_db_util.c:69 @@ -8048,19 +9122,19 @@ msgstr "" msgid "Missing a row in WCROOT." msgstr "" -#: ../libsvn_wc/wc_db_util.c:135 +#: ../libsvn_wc/wc_db_util.c:136 #, c-format msgid "Working copy database '%s' not found" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:276 +#: ../libsvn_wc/wc_db_wcroot.c:318 #, c-format msgid "" "Working copy format of '%s' is too old (%d); please check out your working " "copy again" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:286 +#: ../libsvn_wc/wc_db_wcroot.c:328 #, c-format msgid "" "This client is too old to work with the working copy at\n" @@ -8069,11 +9143,11 @@ msgid "" " http://subversion.apache.org/faq.html#working-copy-format-change\n" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:307 +#: ../libsvn_wc/wc_db_wcroot.c:349 msgid "Cleanup with an older 1.7 client before upgrading with this client" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:318 +#: ../libsvn_wc/wc_db_wcroot.c:360 #, c-format msgid "" "The working copy at '%s'\n" @@ -8081,49 +9155,49 @@ msgid "" "You need to upgrade the working copy first.\n" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:396 +#: ../libsvn_wc/wc_db_wcroot.c:438 #, c-format msgid "The symlink at '%s' points nowhere" msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:716 +#: ../libsvn_wc/wc_db_wcroot.c:757 #, c-format msgid "Missing a row in WCROOT for '%s'." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:771 +#: ../libsvn_wc/wc_db_wcroot.c:811 #, c-format msgid "The working copy at '%s' is corrupt." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:787 +#: ../libsvn_wc/wc_db_wcroot.c:827 #, c-format msgid "The working copy database at '%s' is missing." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:796 +#: ../libsvn_wc/wc_db_wcroot.c:836 #, c-format msgid "The working copy database at '%s' is corrupt." msgstr "" -#: ../libsvn_wc/wc_db_wcroot.c:954 +#: ../libsvn_wc/wc_db_wcroot.c:994 #, c-format msgid "'%s' is not a working copy root" msgstr "" -#: ../libsvn_wc/workqueue.c:518 +#: ../libsvn_wc/workqueue.c:512 #, c-format msgid "" "Can't install '%s' from pristine store, because no checksum is recorded for " "this file" msgstr "" -#: ../libsvn_wc/workqueue.c:1499 +#: ../libsvn_wc/workqueue.c:1469 #, c-format msgid "Unrecognized work item in the queue" msgstr "" -#: ../libsvn_wc/workqueue.c:1579 +#: ../libsvn_wc/workqueue.c:1552 #, c-format msgid "" "Failed to run the WC DB work queue associated with '%s', work item %d %s" @@ -8137,211 +9211,382 @@ msgstr "" msgid "Could not add all targets because some targets are already versioned" msgstr "" -#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:300 +#: ../svn/auth-cmd.c:72 +#, c-format +msgid "Automatic certificate validity check failed because:\n" +msgstr "" + +#: ../svn/auth-cmd.c:77 +#, c-format +msgid " The certificate is not yet valid.\n" +msgstr "" + +#: ../svn/auth-cmd.c:81 +#, c-format +msgid " The certificate has expired.\n" +msgstr "" + +#: ../svn/auth-cmd.c:85 +#, c-format +msgid "" +" The certificate's Common Name (hostname) does not match the remote " +"hostname.\n" +msgstr "" + +#: ../svn/auth-cmd.c:90 +#, c-format +msgid " The certificate issuer is unknown.\n" +msgstr "" + +#: ../svn/auth-cmd.c:94 +#, c-format +msgid " Unknown verification failure.\n" +msgstr "" + +#: ../svn/auth-cmd.c:261 +#, c-format +msgid "Subject: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:263 +#, c-format +msgid "Valid from: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:267 +#, c-format +msgid "Valid until: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:271 +#, c-format +msgid "Issuer: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:273 +#, c-format +msgid "Fingerprint: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:290 +#, c-format +msgid "Hostnames: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:310 +#, c-format +msgid "Credential kind: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:330 +#, c-format +msgid "Password: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:332 +#, c-format +msgid "Password: [not shown]\n" +msgstr "" + +#: ../svn/auth-cmd.c:338 +#, c-format +msgid "Passphrase: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:341 +#, c-format +msgid "Passphrase: [not shown]\n" +msgstr "" + +#: ../svn/auth-cmd.c:344 +#, c-format +msgid "Password cache: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:347 +#, c-format +msgid "Username: %s\n" +msgstr "" + +#: ../svn/auth-cmd.c:399 +#, c-format +msgid "Deleting %s credential for realm '%s'\n" +msgstr "" + +#: ../svn/auth-cmd.c:446 +#, c-format +msgid "Credentials cache in '%s' is empty\n" +msgstr "" + +#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:473 +#, c-format +msgid "Credentials cache in '%s' contains no matching credentials" +msgstr "" + +#: ../svn/auth-cmd.c:458 +#, c-format +msgid "Credentials cache in '%s' contains %d credentials\n" +msgstr "" + +#: ../svn/auth-cmd.c:462 +#, c-format +msgid "Credentials cache in '%s' contains %d matching credentials\n" +msgstr "" + +#: ../svn/auth-cmd.c:477 +#, c-format +msgid "Deleted %d matching credentials from '%s'\n" +msgstr "" + +#: ../svn/blame-cmd.c:314 ../svn/list-cmd.c:310 msgid "'verbose' option invalid in XML mode" msgstr "" -#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312 -#: ../svn/status-cmd.c:308 +#: ../svn/blame-cmd.c:326 ../svn/list-cmd.c:322 ../svn/status-cmd.c:315 msgid "'incremental' option only valid in XML mode" msgstr "" -#: ../svn/blame-cmd.c:378 +#: ../svn/blame-cmd.c:389 #, c-format msgid "Skipping binary file (use --force to treat as text): '%s'\n" msgstr "" -#: ../svn/blame-cmd.c:415 +#: ../svn/blame-cmd.c:426 ../svnbench/null-blame-cmd.c:272 msgid "Could not perform blame on all targets because some targets don't exist" msgstr "" -#: ../svn/cat-cmd.c:102 +#: ../svn/cat-cmd.c:103 msgid "Could not cat all targets because some targets don't exist" msgstr "" -#: ../svn/cat-cmd.c:106 +#: ../svn/cat-cmd.c:107 msgid "Could not cat all targets because some targets are not versioned" msgstr "" -#: ../svn/cat-cmd.c:110 +#: ../svn/cat-cmd.c:111 msgid "Could not cat all targets because some targets are directories" msgstr "" -#: ../svn/changelist-cmd.c:135 +#: ../svn/changelist-cmd.c:117 msgid "" "Could not set changelists on all targets because some targets don't exist" msgstr "" -#: ../svn/changelist-cmd.c:140 +#: ../svn/changelist-cmd.c:122 msgid "" "Could not set changelists on all targets because some targets are not " "versioned" msgstr "" -#: ../svn/checkout-cmd.c:133 ../svn/switch-cmd.c:138 +#: ../svn/checkout-cmd.c:140 ../svn/switch-cmd.c:138 #, c-format msgid "'%s' does not appear to be a URL" msgstr "" -#: ../svn/cl-conflicts.c:80 -msgid "local file edit" +#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:424 +#: ../svn/switch-cmd.c:188 ../svn/update-cmd.c:177 +msgid "Failure occurred processing one or more externals definitions" msgstr "" #: ../svn/cl-conflicts.c:82 -msgid "local file obstruction" +msgid "local file edit" msgstr "" #: ../svn/cl-conflicts.c:84 -msgid "local file delete" +msgid "local file obstruction" msgstr "" #: ../svn/cl-conflicts.c:86 +msgid "local file delete" +msgstr "" + +#: ../svn/cl-conflicts.c:89 +msgid "local file missing or deleted or moved away" +msgstr "" + +#: ../svn/cl-conflicts.c:91 msgid "local file missing" msgstr "" -#: ../svn/cl-conflicts.c:88 +#: ../svn/cl-conflicts.c:93 msgid "local file unversioned" msgstr "" -#: ../svn/cl-conflicts.c:90 +#: ../svn/cl-conflicts.c:95 msgid "local file add" msgstr "" -#: ../svn/cl-conflicts.c:92 +#: ../svn/cl-conflicts.c:97 msgid "local file replace" msgstr "" -#: ../svn/cl-conflicts.c:94 +#: ../svn/cl-conflicts.c:99 msgid "local file moved away" msgstr "" -#: ../svn/cl-conflicts.c:96 +#: ../svn/cl-conflicts.c:101 msgid "local file moved here" msgstr "" -#: ../svn/cl-conflicts.c:103 +#: ../svn/cl-conflicts.c:108 msgid "local dir edit" msgstr "" -#: ../svn/cl-conflicts.c:105 +#: ../svn/cl-conflicts.c:110 msgid "local dir obstruction" msgstr "" -#: ../svn/cl-conflicts.c:107 +#: ../svn/cl-conflicts.c:112 msgid "local dir delete" msgstr "" -#: ../svn/cl-conflicts.c:109 +#: ../svn/cl-conflicts.c:115 +msgid "local dir missing or deleted or moved away" +msgstr "" + +#: ../svn/cl-conflicts.c:117 msgid "local dir missing" msgstr "" -#: ../svn/cl-conflicts.c:111 +#: ../svn/cl-conflicts.c:119 msgid "local dir unversioned" msgstr "" -#: ../svn/cl-conflicts.c:113 +#: ../svn/cl-conflicts.c:121 msgid "local dir add" msgstr "" -#: ../svn/cl-conflicts.c:115 +#: ../svn/cl-conflicts.c:123 msgid "local dir replace" msgstr "" -#: ../svn/cl-conflicts.c:117 +#: ../svn/cl-conflicts.c:125 msgid "local dir moved away" msgstr "" -#: ../svn/cl-conflicts.c:119 +#: ../svn/cl-conflicts.c:127 msgid "local dir moved here" msgstr "" -#: ../svn/cl-conflicts.c:141 -msgid "incoming file edit" +#: ../svn/cl-conflicts.c:135 ../svn/cl-conflicts.c:242 +msgid "local edit" msgstr "" -#: ../svn/cl-conflicts.c:143 -msgid "incoming file add" +#: ../svn/cl-conflicts.c:137 ../svn/cl-conflicts.c:251 +msgid "local obstruction" +msgstr "" + +#: ../svn/cl-conflicts.c:139 ../svn/cl-conflicts.c:248 +msgid "local delete" msgstr "" -#: ../svn/cl-conflicts.c:145 -msgid "incoming file delete" +#: ../svn/cl-conflicts.c:142 +msgid "local missing or deleted or moved away" msgstr "" -#: ../svn/cl-conflicts.c:147 -msgid "incoming file replace" +#: ../svn/cl-conflicts.c:144 +msgid "local missing" msgstr "" -#: ../svn/cl-conflicts.c:154 -msgid "incoming dir edit" +#: ../svn/cl-conflicts.c:146 +msgid "local unversioned" msgstr "" -#: ../svn/cl-conflicts.c:156 -msgid "incoming dir add" +#: ../svn/cl-conflicts.c:148 ../svn/cl-conflicts.c:245 +msgid "local add" msgstr "" -#: ../svn/cl-conflicts.c:158 -msgid "incoming dir delete" +#: ../svn/cl-conflicts.c:150 +msgid "local replace" msgstr "" -#: ../svn/cl-conflicts.c:160 -msgid "incoming dir replace" +#: ../svn/cl-conflicts.c:152 +msgid "local moved away" msgstr "" -#: ../svn/cl-conflicts.c:178 -msgid "upon update" +#: ../svn/cl-conflicts.c:154 +msgid "local moved here" +msgstr "" + +#: ../svn/cl-conflicts.c:173 +msgid "incoming file edit" +msgstr "" + +#: ../svn/cl-conflicts.c:175 +msgid "incoming file add" +msgstr "" + +#: ../svn/cl-conflicts.c:177 +msgid "incoming file delete or move" msgstr "" #: ../svn/cl-conflicts.c:179 -msgid "upon switch" +msgid "incoming replace with file" msgstr "" -#: ../svn/cl-conflicts.c:180 -msgid "upon merge" +#: ../svn/cl-conflicts.c:186 +msgid "incoming dir edit" msgstr "" -#: ../svn/cl-conflicts.c:181 -msgid "upon none" +#: ../svn/cl-conflicts.c:188 +msgid "incoming dir add" msgstr "" -#: ../svn/cl-conflicts.c:200 -msgid "local edit" +#: ../svn/cl-conflicts.c:190 +msgid "incoming dir delete or move" msgstr "" -#: ../svn/cl-conflicts.c:203 -msgid "local add" +#: ../svn/cl-conflicts.c:192 +msgid "incoming replace with dir" msgstr "" -#: ../svn/cl-conflicts.c:206 -msgid "local delete" +#: ../svn/cl-conflicts.c:200 ../svn/cl-conflicts.c:262 +msgid "incoming edit" msgstr "" -#: ../svn/cl-conflicts.c:209 -msgid "local obstruction" +#: ../svn/cl-conflicts.c:202 ../svn/cl-conflicts.c:265 +msgid "incoming add" msgstr "" -#: ../svn/cl-conflicts.c:212 -#, c-format -msgid "local %s" +#: ../svn/cl-conflicts.c:204 +msgid "incoming delete or move" +msgstr "" + +#: ../svn/cl-conflicts.c:206 +msgid "incoming replace" msgstr "" #: ../svn/cl-conflicts.c:220 -msgid "incoming edit" +msgid "upon update" +msgstr "" + +#: ../svn/cl-conflicts.c:221 +msgid "upon switch" +msgstr "" + +#: ../svn/cl-conflicts.c:222 +msgid "upon merge" msgstr "" #: ../svn/cl-conflicts.c:223 -msgid "incoming add" +msgid "upon none" +msgstr "" + +#: ../svn/cl-conflicts.c:254 +#, c-format +msgid "local %s" msgstr "" -#: ../svn/cl-conflicts.c:226 +#: ../svn/cl-conflicts.c:268 msgid "incoming delete" msgstr "" -#: ../svn/cl-conflicts.c:229 +#: ../svn/cl-conflicts.c:271 #, c-format msgid "incoming %s" msgstr "" -#: ../svn/cl-conflicts.c:235 ../svn/cl-conflicts.c:277 +#: ../svn/cl-conflicts.c:277 ../svn/cl-conflicts.c:320 #, c-format msgid "%s, %s %s" msgstr "" @@ -8349,12 +9594,30 @@ msgstr "" #. A catch-all message for very rare or nominally impossible cases. #. It will not be pretty, but is closer to an internal error than #. an ordinary user-facing string. -#: ../svn/cl-conflicts.c:285 +#: ../svn/cl-conflicts.c:328 #, c-format msgid "local: %s %s incoming: %s %s %s" msgstr "" -#: ../svn/cleanup-cmd.c:92 +#: ../svn/cl-conflicts.c:355 +#, c-format +msgid "%s %s" +msgstr "" + +#: ../svn/cleanup-cmd.c:87 +msgid "" +"Working copy locked; if no other Subversion client is currently using the " +"working copy, try running 'svn cleanup' without the --remove-unversioned and " +"--remove-ignored options first." +msgstr "" + +#: ../svn/cleanup-cmd.c:95 +msgid "" +"Cannot remove unversioned or ignored items from something that is not a " +"working copy" +msgstr "" + +#: ../svn/cleanup-cmd.c:122 #, c-format msgid "" "Working copy locked; try running 'svn cleanup' on the root of the working " @@ -8372,178 +9635,180 @@ msgstr "" msgid "Commit targets must be local paths" msgstr "" -#: ../svn/conflict-callbacks.c:155 ../svn/conflict-callbacks.c:172 +#: ../svn/conflict-callbacks.c:162 ../svn/conflict-callbacks.c:179 msgid "MINE" msgstr "" -#: ../svn/conflict-callbacks.c:160 ../svn/conflict-callbacks.c:170 +#: ../svn/conflict-callbacks.c:167 ../svn/conflict-callbacks.c:177 msgid "THEIRS" msgstr "" -#: ../svn/conflict-callbacks.c:163 +#: ../svn/conflict-callbacks.c:170 msgid "MERGED" msgstr "" -#: ../svn/conflict-callbacks.c:220 ../svn/conflict-callbacks.c:276 +#: ../svn/conflict-callbacks.c:232 ../svn/conflict-callbacks.c:292 msgid "||||||| ORIGINAL" msgstr "" -#: ../svn/conflict-callbacks.c:221 +#: ../svn/conflict-callbacks.c:233 msgid "<<<<<<< MINE (select with 'mc')" msgstr "" -#: ../svn/conflict-callbacks.c:222 +#: ../svn/conflict-callbacks.c:234 msgid ">>>>>>> THEIRS (select with 'tc')" msgstr "" -#: ../svn/conflict-callbacks.c:277 +#: ../svn/conflict-callbacks.c:293 msgid "<<<<<<< MINE" msgstr "" -#: ../svn/conflict-callbacks.c:278 +#: ../svn/conflict-callbacks.c:294 msgid ">>>>>>> THEIRS" msgstr "" -#: ../svn/conflict-callbacks.c:333 ../svn/file-merge.c:503 -msgid "No editor found." -msgstr "" - -#: ../svn/conflict-callbacks.c:342 ../svn/file-merge.c:515 -msgid "Error running editor." -msgstr "" - -#: ../svn/conflict-callbacks.c:352 +#: ../svn/conflict-callbacks.c:365 #, c-format msgid "" "Invalid option; there's no merged version to edit.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:411 -msgid "No merge tool found, try '(m) merge' instead.\n" -msgstr "" - -#: ../svn/conflict-callbacks.c:419 -msgid "Error running merge tool, try '(m) merge' instead." -msgstr "" - -#: ../svn/conflict-callbacks.c:451 +#: ../svn/conflict-callbacks.c:423 msgid "change merged file in an editor [edit]" msgstr "" #. Translators: keep long_desc below 70 characters (wrap with a left #. margin of 9 spaces if needed); don't translate the words within square #. brackets. -#: ../svn/conflict-callbacks.c:451 +#: ../svn/conflict-callbacks.c:423 msgid "edit file" msgstr "" -#: ../svn/conflict-callbacks.c:454 +#: ../svn/conflict-callbacks.c:426 msgid "show all changes made to merged file" msgstr "" -#: ../svn/conflict-callbacks.c:454 +#: ../svn/conflict-callbacks.c:426 msgid "show diff" msgstr "" -#: ../svn/conflict-callbacks.c:456 -msgid "accept merged version of file" +#: ../svn/conflict-callbacks.c:428 +msgid "accept merged version of file [working]" msgstr "" -#: ../svn/conflict-callbacks.c:456 ../svn/conflict-callbacks.c:501 -#: ../svn/conflict-callbacks.c:515 +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed); don't translate the words within square +#. brackets. +#: ../svn/conflict-callbacks.c:428 ../svn/conflict-callbacks.c:473 +#: ../svn/conflict-callbacks.c:503 ../svn/conflict-callbacks.c:518 msgid "mark resolved" msgstr "" -#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:498 +#: ../svn/conflict-callbacks.c:431 ../svn/conflict-callbacks.c:498 msgid "display conflict" msgstr "" -#: ../svn/conflict-callbacks.c:459 +#: ../svn/conflict-callbacks.c:431 msgid "show all conflicts (ignoring merged version)" msgstr "" -#: ../svn/conflict-callbacks.c:461 +#: ../svn/conflict-callbacks.c:434 msgid "accept my version for all conflicts (same) [mine-conflict]" msgstr "" -#: ../svn/conflict-callbacks.c:461 +#: ../svn/conflict-callbacks.c:434 msgid "my side of conflict" msgstr "" -#: ../svn/conflict-callbacks.c:464 +#: ../svn/conflict-callbacks.c:437 msgid "accept their version for all conflicts (same) [theirs-conflict]" msgstr "" -#: ../svn/conflict-callbacks.c:464 +#: ../svn/conflict-callbacks.c:437 msgid "their side of conflict" msgstr "" -#: ../svn/conflict-callbacks.c:469 +#: ../svn/conflict-callbacks.c:442 msgid "accept my version of entire file (even non-conflicts) [mine-full]" msgstr "" -#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:442 ../svn/conflict-callbacks.c:492 msgid "my version" msgstr "" -#: ../svn/conflict-callbacks.c:472 +#: ../svn/conflict-callbacks.c:445 msgid "accept their version of entire file (same) [theirs-full]" msgstr "" -#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495 +#: ../svn/conflict-callbacks.c:445 ../svn/conflict-callbacks.c:476 +#: ../svn/conflict-callbacks.c:495 msgid "their version" msgstr "" -#: ../svn/conflict-callbacks.c:476 ../svn/util.c:774 +#: ../svn/conflict-callbacks.c:449 ../svn/util.c:776 msgid "merge" msgstr "" -#: ../svn/conflict-callbacks.c:476 -msgid "use internal merge tool to resolve conflict" +#: ../svn/conflict-callbacks.c:449 +msgid "use merge tool to resolve conflict" msgstr "" -#: ../svn/conflict-callbacks.c:478 -msgid "launch external tool to resolve conflict [launch]" +#: ../svn/conflict-callbacks.c:451 +msgid "launch external merge tool to resolve conflict [launch]" msgstr "" -#: ../svn/conflict-callbacks.c:478 +#: ../svn/conflict-callbacks.c:451 msgid "launch tool" msgstr "" -#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503 +#: ../svn/conflict-callbacks.c:454 +msgid "internal merge tool" +msgstr "" + +#: ../svn/conflict-callbacks.c:454 +msgid "use built-in merge tool to resolve conflict" +msgstr "" + +#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:479 +#: ../svn/conflict-callbacks.c:505 msgid "mark the conflict to be resolved later [postpone]" msgstr "" -#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503 -#: ../svn/conflict-callbacks.c:517 ../svn/conflict-callbacks.c:535 -#: ../svn/conflict-callbacks.c:549 ../svn/conflict-callbacks.c:565 -#: ../svn/conflict-callbacks.c:581 +#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:479 +#: ../svn/conflict-callbacks.c:505 ../svn/conflict-callbacks.c:520 +#: ../svn/conflict-callbacks.c:535 ../svn/conflict-callbacks.c:550 msgid "postpone" msgstr "" -#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506 -#: ../svn/conflict-callbacks.c:519 ../svn/conflict-callbacks.c:537 -#: ../svn/conflict-callbacks.c:551 ../svn/conflict-callbacks.c:567 -#: ../svn/conflict-callbacks.c:583 +#: ../svn/conflict-callbacks.c:460 ../svn/conflict-callbacks.c:482 +#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:522 +#: ../svn/conflict-callbacks.c:537 ../svn/conflict-callbacks.c:552 msgid "postpone all remaining conflicts" msgstr "" -#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506 -#: ../svn/conflict-callbacks.c:519 ../svn/conflict-callbacks.c:537 -#: ../svn/conflict-callbacks.c:551 ../svn/conflict-callbacks.c:567 -#: ../svn/conflict-callbacks.c:583 +#: ../svn/conflict-callbacks.c:460 ../svn/conflict-callbacks.c:482 +#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:522 +#: ../svn/conflict-callbacks.c:537 ../svn/conflict-callbacks.c:552 msgid "quit resolution" msgstr "" -#: ../svn/conflict-callbacks.c:485 +#: ../svn/conflict-callbacks.c:462 ../svn/conflict-callbacks.c:484 msgid "show all options" msgstr "" -#: ../svn/conflict-callbacks.c:485 +#: ../svn/conflict-callbacks.c:462 ../svn/conflict-callbacks.c:484 msgid "show this list (also 'h', '?')" msgstr "" +#: ../svn/conflict-callbacks.c:473 +msgid "accept the working copy version of file [working]" +msgstr "" + +#: ../svn/conflict-callbacks.c:476 +msgid "accept the incoming version of file [theirs-full]" +msgstr "" + #: ../svn/conflict-callbacks.c:492 msgid "accept my version of entire property (even non-conflicts) [mine-full]" msgstr "" @@ -8556,122 +9821,92 @@ msgstr "" msgid "show conflicts in this property" msgstr "" -#: ../svn/conflict-callbacks.c:499 +#: ../svn/conflict-callbacks.c:500 msgid "change merged property value in an editor [edit]" msgstr "" -#: ../svn/conflict-callbacks.c:499 +#: ../svn/conflict-callbacks.c:500 msgid "edit property" msgstr "" -#: ../svn/conflict-callbacks.c:501 +#: ../svn/conflict-callbacks.c:503 msgid "accept edited version of property" msgstr "" -#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:521 -#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:553 -#: ../svn/conflict-callbacks.c:569 ../svn/conflict-callbacks.c:585 +#: ../svn/conflict-callbacks.c:510 ../svn/conflict-callbacks.c:524 +#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:554 msgid "help" msgstr "" -#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:521 -#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:553 -#: ../svn/conflict-callbacks.c:569 ../svn/conflict-callbacks.c:585 +#: ../svn/conflict-callbacks.c:510 ../svn/conflict-callbacks.c:524 +#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:554 msgid "show this help (also '?')" msgstr "" -#: ../svn/conflict-callbacks.c:515 +#: ../svn/conflict-callbacks.c:518 msgid "accept current working copy state" msgstr "" -#: ../svn/conflict-callbacks.c:517 ../svn/conflict-callbacks.c:535 -#: ../svn/conflict-callbacks.c:549 ../svn/conflict-callbacks.c:565 -#: ../svn/conflict-callbacks.c:581 +#: ../svn/conflict-callbacks.c:520 ../svn/conflict-callbacks.c:535 +#: ../svn/conflict-callbacks.c:550 msgid "resolve the conflict later [postpone]" msgstr "" -#: ../svn/conflict-callbacks.c:527 -msgid "apply update (recommended)" -msgstr "" - -#: ../svn/conflict-callbacks.c:528 -msgid "apply update to the move destination [mine-conflict]" -msgstr "" - -#: ../svn/conflict-callbacks.c:531 -msgid "discard update (breaks move)" -msgstr "" - #: ../svn/conflict-callbacks.c:531 -msgid "discard update, mark resolved, the move will will become a copy" -msgstr "" - -#: ../svn/conflict-callbacks.c:545 -msgid "apply update to move destination" +msgid "apply update to move destination (recommended)" msgstr "" -#: ../svn/conflict-callbacks.c:546 +#: ../svn/conflict-callbacks.c:532 msgid "apply incoming update to move destination [mine-conflict]" msgstr "" -#: ../svn/conflict-callbacks.c:559 ../svn/conflict-callbacks.c:575 -msgid "keep affected local moves" -msgstr "" - -#: ../svn/conflict-callbacks.c:559 -msgid "keep any local moves affected by this deletion [mine-conflict]" -msgstr "" - -#: ../svn/conflict-callbacks.c:562 ../svn/conflict-callbacks.c:578 -msgid "mark resolved (breaks moves)" -msgstr "" - -#: ../svn/conflict-callbacks.c:562 -msgid "mark resolved, any affected moves will become copies" -msgstr "" - -#: ../svn/conflict-callbacks.c:575 -msgid "keep any moves affected by this replacement [mine-conflict]" +#: ../svn/conflict-callbacks.c:546 +msgid "prepare for updating moved-away children, if any (recommended)" msgstr "" -#: ../svn/conflict-callbacks.c:578 -msgid "mark resolved (any affected moves will become copies)" +#: ../svn/conflict-callbacks.c:547 +msgid "allow updating moved-away children with 'svn resolve' [mine-conflict]" msgstr "" -#: ../svn/conflict-callbacks.c:614 +#: ../svn/conflict-callbacks.c:583 msgid "Select:" msgstr "" -#: ../svn/conflict-callbacks.c:641 +#: ../svn/conflict-callbacks.c:610 #, c-format msgid " (%s) %s" msgstr "" -#: ../svn/conflict-callbacks.c:681 +#: ../svn/conflict-callbacks.c:650 msgid "" "Words in square brackets are the corresponding --accept option arguments.\n" msgstr "" -#: ../svn/conflict-callbacks.c:720 +#: ../svn/conflict-callbacks.c:689 #, c-format msgid "" "Unrecognized option.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:748 +#: ../svn/conflict-callbacks.c:724 +#, c-format +msgid "Conflict discovered in binary file '%s'.\n" +msgstr "" + +#: ../svn/conflict-callbacks.c:728 #, c-format msgid "Conflict discovered in file '%s'.\n" msgstr "" -#: ../svn/conflict-callbacks.c:818 +#: ../svn/conflict-callbacks.c:814 #, c-format msgid "" "Invalid option; cannot display conflicts for a binary file.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:827 +#: ../svn/conflict-callbacks.c:823 #, c-format msgid "" "Invalid option; original files not available.\n" @@ -8685,135 +9920,121 @@ msgid "" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:859 +#: ../svn/conflict-callbacks.c:864 #, c-format msgid "" -"Invalid option; can only resolve text conflicts with the internal merge " -"tool.\n" +"Invalid option; there's no base path to merge.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:885 ../svn/conflict-callbacks.c:902 +#: ../svn/conflict-callbacks.c:958 #, c-format msgid "" "Invalid option.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:911 +#: ../svn/conflict-callbacks.c:987 #, c-format msgid "" "Invalid option; cannot choose based on conflicts in a binary file.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:925 +#: ../svn/conflict-callbacks.c:1001 #, c-format msgid "" "Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:966 +#: ../svn/conflict-callbacks.c:1042 #, c-format msgid "Conflict for property '%s' discovered on '%s'.\n" msgstr "" -#: ../svn/conflict-callbacks.c:1024 +#: ../svn/conflict-callbacks.c:1102 #, c-format msgid "" "Invalid option; please edit the property first.\n" "\n" msgstr "" -#: ../svn/conflict-callbacks.c:1061 +#: ../svn/conflict-callbacks.c:1139 #, c-format msgid "" "Tree conflict on '%s'\n" " > %s\n" msgstr "" -#: ../svn/conflict-callbacks.c:1179 -msgid "No editor found; leaving all conflicts." -msgstr "" - -#: ../svn/conflict-callbacks.c:1188 -msgid "Error running editor; leaving all conflicts." -msgstr "" - -#: ../svn/conflict-callbacks.c:1224 -msgid "No merge tool found; leaving all conflicts." -msgstr "" - -#: ../svn/conflict-callbacks.c:1233 -msgid "Error running merge tool; leaving all conflicts." -msgstr "" - -#: ../svn/copy-cmd.c:123 ../svn/util.c:957 +#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:959 #, c-format msgid "'%s': a peg revision is not allowed here" msgstr "" -#: ../svn/copy-cmd.c:163 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 +#: ../svn/copy-cmd.c:162 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 #: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260 msgid "" "Local, non-commit operations do not take a log message or revision properties" msgstr "" -#: ../svn/diff-cmd.c:208 +#: ../svn/diff-cmd.c:227 msgid "'--xml' option only valid with '--summarize' option" msgstr "" -#: ../svn/diff-cmd.c:299 +#: ../svn/diff-cmd.c:318 msgid "'--new' option only valid with '--old' option" msgstr "" -#: ../svn/diff-cmd.c:317 +#: ../svn/diff-cmd.c:336 msgid "" "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. " "Try using the --old and --new options or one of the shorthand invocations " "listed in 'svn help diff'." msgstr "" -#: ../svn/diff-cmd.c:355 +#: ../svn/diff-cmd.c:393 #, c-format msgid "Path '%s' not relative to base URLs" msgstr "" -#: ../svn/export-cmd.c:113 +#: ../svn/export-cmd.c:121 msgid "" "Destination directory exists; please remove the directory or use --force to " "overwrite" msgstr "" -#: ../svn/export-cmd.c:122 ../svn/list-cmd.c:412 ../svn/switch-cmd.c:188 -#: ../svn/update-cmd.c:177 -msgid "Failure occurred processing one or more externals definitions" -msgstr "" - -#: ../svn/file-merge.c:135 ../svn/file-merge.c:805 +#: ../svn/file-merge.c:139 ../svn/file-merge.c:809 msgid "Could not write data to merged file" msgstr "" -#: ../svn/file-merge.c:491 +#: ../svn/file-merge.c:495 msgid "Could not write data to temporary file" msgstr "" -#: ../svn/file-merge.c:600 +#: ../svn/file-merge.c:507 +msgid "No editor found." +msgstr "" + +#: ../svn/file-merge.c:519 +msgid "Error running editor." +msgstr "" + +#: ../svn/file-merge.c:604 msgid "Conflicting section found during merge:" msgstr "" -#: ../svn/file-merge.c:603 +#: ../svn/file-merge.c:607 #, c-format msgid "(1) their version (at line %lu)" msgstr "" -#: ../svn/file-merge.c:608 +#: ../svn/file-merge.c:612 #, c-format msgid "(2) your version (at line %lu)" msgstr "" -#: ../svn/file-merge.c:657 +#: ../svn/file-merge.c:661 msgid "" "Select: (1) use their version, (2) use your version,\n" " (12) their version first, then yours,\n" @@ -8825,38 +10046,37 @@ msgid "" " (a) abort file merge and return to main menu: " msgstr "" -#: ../svn/file-merge.c:888 +#: ../svn/file-merge.c:894 #, c-format msgid "Merging '%s'.\n" msgstr "" -#: ../svn/file-merge.c:935 +#: ../svn/file-merge.c:942 #, c-format msgid "Merge of '%s' aborted.\n" msgstr "" -#: ../svn/file-merge.c:953 +#: ../svn/file-merge.c:960 #, c-format msgid "" "Could not write merged result to '%s', saved instead at '%s'.\n" "'%s' remains in conflict.\n" msgstr "" -#: ../svn/file-merge.c:971 +#: ../svn/file-merge.c:978 #, c-format msgid "Merge of '%s' completed (remains in conflict).\n" msgstr "" -#: ../svn/file-merge.c:975 +#: ../svn/file-merge.c:982 #, c-format msgid "Merge of '%s' completed.\n" msgstr "" #: ../svn/help-cmd.c:53 -#, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" -"Subversion command-line client, version %s.\n" +"Subversion command-line client.\n" "Type 'svn help <subcommand>' for help on a specific subcommand.\n" "Type 'svn --version' to see the program version and RA modules\n" " or 'svn --version --quiet' to see just the version number.\n" @@ -8868,24 +10088,42 @@ msgid "" "Available subcommands:\n" msgstr "" -#: ../svn/help-cmd.c:66 +#: ../svn/help-cmd.c:66 ../svnbench/help-cmd.c:62 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.apache.org/\n" msgstr "" -#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1857 +#: ../svn/help-cmd.c:70 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:614 +#: ../svnsync/svnsync.c:1920 msgid "" "The following repository access (RA) modules are available:\n" "\n" msgstr "" -#: ../svn/help-cmd.c:127 +#: ../svn/help-cmd.c:124 msgid "" "WARNING: Plaintext password storage is enabled!\n" "\n" msgstr "" +#: ../svn/help-cmd.c:147 +msgid "" +"\n" +"The following authentication credential caches are available:\n" +"\n" +msgstr "" + +#: ../svn/help-cmd.c:152 +#, c-format +msgid "%s* Wincrypt cache in %s\n" +msgstr "" + +#: ../svn/help-cmd.c:159 +#, c-format +msgid "%s* Plaintext cache in %s\n" +msgstr "" + #: ../svn/import-cmd.c:87 msgid "Repository URL required when importing" msgstr "" @@ -8899,210 +10137,236 @@ msgstr "" msgid "Invalid URL '%s'" msgstr "" -#: ../svn/info-cmd.c:95 +#: ../svn/info-cmd.c:207 +#, c-format +msgid "'%s' is not a valid value for --show-item" +msgstr "" + +#: ../svn/info-cmd.c:215 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" +msgstr "" + +#: ../svn/info-cmd.c:225 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" +msgstr "" + +#: ../svn/info-cmd.c:236 +#, c-format +msgid "" +"'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" +msgstr "" + +#: ../svn/info-cmd.c:257 msgid "Resource is not under version control." msgstr "" -#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1744 +#: ../svn/info-cmd.c:424 ../svnadmin/svnadmin.c:1979 +#: ../svnadmin/svnadmin.c:2197 #, c-format msgid "Path: %s\n" msgstr "" -#: ../svn/info-cmd.c:273 +#: ../svn/info-cmd.c:431 #, c-format msgid "Name: %s\n" msgstr "" -#: ../svn/info-cmd.c:277 +#: ../svn/info-cmd.c:435 #, c-format msgid "Working Copy Root Path: %s\n" msgstr "" -#: ../svn/info-cmd.c:283 +#: ../svn/info-cmd.c:441 #, c-format msgid "URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:286 +#: ../svn/info-cmd.c:444 #, c-format -msgid "Relative URL: ^/%s\n" +msgid "Relative URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:293 +#: ../svn/info-cmd.c:448 #, c-format msgid "Repository Root: %s\n" msgstr "" -#: ../svn/info-cmd.c:297 +#: ../svn/info-cmd.c:452 #, c-format msgid "Repository UUID: %s\n" msgstr "" -#: ../svn/info-cmd.c:301 +#: ../svn/info-cmd.c:456 #, c-format msgid "Revision: %ld\n" msgstr "" -#: ../svn/info-cmd.c:306 +#: ../svn/info-cmd.c:461 #, c-format msgid "Node Kind: file\n" msgstr "" -#: ../svn/info-cmd.c:310 +#: ../svn/info-cmd.c:465 #, c-format msgid "Node Kind: directory\n" msgstr "" -#: ../svn/info-cmd.c:314 +#: ../svn/info-cmd.c:469 #, c-format msgid "Node Kind: none\n" msgstr "" -#: ../svn/info-cmd.c:319 +#: ../svn/info-cmd.c:474 #, c-format msgid "Node Kind: unknown\n" msgstr "" -#: ../svn/info-cmd.c:328 +#: ../svn/info-cmd.c:483 #, c-format msgid "Schedule: normal\n" msgstr "" -#: ../svn/info-cmd.c:332 +#: ../svn/info-cmd.c:487 #, c-format msgid "Schedule: add\n" msgstr "" -#: ../svn/info-cmd.c:336 +#: ../svn/info-cmd.c:491 #, c-format msgid "Schedule: delete\n" msgstr "" -#: ../svn/info-cmd.c:340 +#: ../svn/info-cmd.c:495 #, c-format msgid "Schedule: replace\n" msgstr "" -#: ../svn/info-cmd.c:356 +#: ../svn/info-cmd.c:511 #, c-format msgid "Depth: empty\n" msgstr "" -#: ../svn/info-cmd.c:360 +#: ../svn/info-cmd.c:515 #, c-format msgid "Depth: files\n" msgstr "" -#: ../svn/info-cmd.c:364 +#: ../svn/info-cmd.c:519 #, c-format msgid "Depth: immediates\n" msgstr "" -#: ../svn/info-cmd.c:368 +#: ../svn/info-cmd.c:523 #, c-format msgid "Depth: exclude\n" msgstr "" #. Other depths should never happen here. -#: ../svn/info-cmd.c:379 +#: ../svn/info-cmd.c:534 #, c-format msgid "Depth: INVALID\n" msgstr "" -#: ../svn/info-cmd.c:383 +#: ../svn/info-cmd.c:538 #, c-format msgid "Copied From URL: %s\n" msgstr "" -#: ../svn/info-cmd.c:387 +#: ../svn/info-cmd.c:542 #, c-format msgid "Copied From Rev: %ld\n" msgstr "" -#: ../svn/info-cmd.c:396 ../svn/info-cmd.c:398 +#: ../svn/info-cmd.c:545 #, c-format msgid "Moved From: %s\n" msgstr "" -#: ../svn/info-cmd.c:409 ../svn/info-cmd.c:411 +#: ../svn/info-cmd.c:552 #, c-format msgid "Moved To: %s\n" msgstr "" -#: ../svn/info-cmd.c:417 +#: ../svn/info-cmd.c:560 #, c-format msgid "Last Changed Author: %s\n" msgstr "" -#: ../svn/info-cmd.c:421 +#: ../svn/info-cmd.c:564 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "" -#: ../svn/info-cmd.c:426 +#: ../svn/info-cmd.c:569 msgid "Last Changed Date" msgstr "" -#: ../svn/info-cmd.c:432 +#: ../svn/info-cmd.c:575 msgid "Text Last Updated" msgstr "" -#: ../svn/info-cmd.c:435 +#: ../svn/info-cmd.c:578 #, c-format msgid "Checksum: %s\n" msgstr "" -#: ../svn/info-cmd.c:456 +#: ../svn/info-cmd.c:600 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "" -#: ../svn/info-cmd.c:463 +#: ../svn/info-cmd.c:608 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "" -#: ../svn/info-cmd.c:470 +#: ../svn/info-cmd.c:616 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "" -#: ../svn/info-cmd.c:479 +#: ../svn/info-cmd.c:626 #, c-format msgid "Conflict Properties File: %s\n" msgstr "" -#: ../svn/info-cmd.c:491 +#: ../svn/info-cmd.c:641 msgid "Tree conflict" msgstr "" -#: ../svn/info-cmd.c:517 +#: ../svn/info-cmd.c:667 +msgid "Conflict Details" +msgstr "" + +#: ../svn/info-cmd.c:680 msgid "Source left" msgstr "" -#: ../svn/info-cmd.c:526 +#: ../svn/info-cmd.c:689 msgid "Source right" msgstr "" -#: ../svn/info-cmd.c:535 +#: ../svn/info-cmd.c:698 #, c-format msgid "Lock Token: %s\n" msgstr "" -#: ../svn/info-cmd.c:539 +#: ../svn/info-cmd.c:702 #, c-format msgid "Lock Owner: %s\n" msgstr "" -#: ../svn/info-cmd.c:544 +#: ../svn/info-cmd.c:707 msgid "Lock Created" msgstr "" -#: ../svn/info-cmd.c:548 +#: ../svn/info-cmd.c:711 msgid "Lock Expires" msgstr "" -#: ../svn/info-cmd.c:556 +#: ../svn/info-cmd.c:719 #, c-format msgid "" "Lock Comment (%i line):\n" @@ -9113,29 +10377,51 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svn/info-cmd.c:565 +#: ../svn/info-cmd.c:728 #, c-format msgid "Changelist: %s\n" msgstr "" -#: ../svn/info-cmd.c:679 +#: ../svn/info-cmd.c:884 +msgid "--show-item is not valid in --xml mode" +msgstr "" + +#: ../svn/info-cmd.c:888 +msgid "--no-newline is not valid in --xml mode" +msgstr "" + +#: ../svn/info-cmd.c:903 ../svn/info-cmd.c:923 +msgid "--incremental is only valid in --xml mode" +msgstr "" + +#: ../svn/info-cmd.c:910 +msgid "" +"--no-newline is only available for single-target, non-recursive info " +"operations" +msgstr "" + +#: ../svn/info-cmd.c:927 +msgid "--no-newline' is only valid with --show-item" +msgstr "" + +#: ../svn/info-cmd.c:1000 ../svnbench/null-info-cmd.c:283 msgid "Could not display info for all targets because some targets don't exist" msgstr "" -#: ../svn/list-cmd.c:73 +#: ../svn/list-cmd.c:79 msgid "%b %d %H:%M" msgstr "" -#: ../svn/list-cmd.c:75 +#: ../svn/list-cmd.c:81 msgid "%b %d %Y" msgstr "" -#: ../svn/list-cmd.c:101 +#: ../svn/list-cmd.c:107 #, c-format msgid "Listing external '%s' defined on '%s':\n" msgstr "" -#: ../svn/list-cmd.c:421 +#: ../svn/list-cmd.c:433 ../svnbench/null-list-cmd.c:166 msgid "Could not list all targets because some targets don't exist" msgstr "" @@ -9143,183 +10429,208 @@ msgstr "" msgid "Lock comment contains a zero byte" msgstr "" -#: ../svn/log-cmd.c:144 +#: ../svn/lock-cmd.c:144 +msgid "One or more locks could not be obtained" +msgstr "" + +#: ../svn/log-cmd.c:109 msgid "\n" msgstr "" -#: ../svn/log-cmd.c:354 +#: ../svn/log-cmd.c:321 msgid "(no author)" msgstr "" -#: ../svn/log-cmd.c:360 +#: ../svn/log-cmd.c:327 msgid "(no date)" msgstr "" -#: ../svn/log-cmd.c:385 +#: ../svn/log-cmd.c:357 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] "" msgstr[1] "" -#: ../svn/log-cmd.c:401 +#: ../svn/log-cmd.c:374 #, c-format msgid "Changed paths:\n" msgstr "" -#: ../svn/log-cmd.c:418 +#: ../svn/log-cmd.c:394 #, c-format msgid " (from %s:%ld)" msgstr "" -#: ../svn/log-cmd.c:434 +#: ../svn/log-cmd.c:412 #, c-format msgid "Reverse merged via:" msgstr "" -#: ../svn/log-cmd.c:436 +#: ../svn/log-cmd.c:414 #, c-format msgid "Merged via:" msgstr "" -#: ../svn/log-cmd.c:689 +#: ../svn/log-cmd.c:697 msgid "'with-all-revprops' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:693 +#: ../svn/log-cmd.c:701 msgid "'with-no-revprops' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:697 +#: ../svn/log-cmd.c:705 msgid "'with-revprop' option only valid in XML mode" msgstr "" -#: ../svn/log-cmd.c:704 +#: ../svn/log-cmd.c:712 msgid "'diff' option is not supported in XML mode" msgstr "" -#: ../svn/log-cmd.c:710 +#: ../svn/log-cmd.c:718 msgid "'quiet' and 'diff' options are mutually exclusive" msgstr "" -#: ../svn/log-cmd.c:714 +#: ../svn/log-cmd.c:722 msgid "'diff-cmd' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:718 +#: ../svn/log-cmd.c:726 msgid "'internal-diff' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:722 +#: ../svn/log-cmd.c:730 msgid "'extensions' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:727 +#: ../svn/log-cmd.c:735 msgid "'depth' option requires 'diff' option" msgstr "" -#: ../svn/log-cmd.c:743 +#: ../svn/log-cmd.c:751 ../svnbench/null-log-cmd.c:158 msgid "-c and -r are mutually exclusive" msgstr "" -#: ../svn/log-cmd.c:775 +#: ../svn/log-cmd.c:783 #, c-format msgid "" "Only relative paths can be specified after a URL for 'svn log', but '%s' is " "not a relative path" msgstr "" -#: ../svn/log-cmd.c:821 +#: ../svn/log-cmd.c:829 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "" -#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:131 +#: ../svn/merge-cmd.c:103 ../svn/merge-cmd.c:132 #, c-format msgid "--- Merging\n" msgstr "" -#: ../svn/merge-cmd.c:175 +#: ../svn/merge-cmd.c:128 +#, c-format +msgid "Merge target '%s' must be a local path but looks like a URL" +msgstr "" + +#: ../svn/merge-cmd.c:176 msgid "-r and -c can't be used with --reintegrate" msgstr "" -#: ../svn/merge-cmd.c:230 +#: ../svn/merge-cmd.c:231 msgid "Merge source required" msgstr "" -#: ../svn/merge-cmd.c:276 +#: ../svn/merge-cmd.c:277 msgid "Second revision required" msgstr "" -#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267 -#: ../svnadmin/svnadmin.c:1719 ../svnlook/svnlook.c:2061 -#: ../svnlook/svnlook.c:2254 ../svnlook/svnlook.c:2358 -#: ../svnlook/svnlook.c:2393 +#: ../svn/merge-cmd.c:286 ../svn/merge-cmd.c:313 ../svn/mergeinfo-cmd.c:361 +#: ../svnadmin/svnadmin.c:2168 ../svnlook/svnlook.c:2062 +#: ../svnlook/svnlook.c:2256 ../svnlook/svnlook.c:2360 +#: ../svnlook/svnlook.c:2395 msgid "Too many arguments given" msgstr "" -#: ../svn/merge-cmd.c:302 +#: ../svn/merge-cmd.c:303 msgid "Cannot specify a revision range with two URLs" msgstr "" -#: ../svn/merge-cmd.c:406 +#: ../svn/merge-cmd.c:407 msgid "--reintegrate cannot be used with --ignore-ancestry" msgstr "" -#: ../svn/merge-cmd.c:411 +#: ../svn/merge-cmd.c:412 msgid "--reintegrate cannot be used with --record-only" msgstr "" -#: ../svn/merge-cmd.c:416 +#: ../svn/merge-cmd.c:417 msgid "--depth cannot be used with --reintegrate" msgstr "" -#: ../svn/merge-cmd.c:421 +#: ../svn/merge-cmd.c:422 msgid "--force cannot be used with --reintegrate" msgstr "" -#: ../svn/merge-cmd.c:426 +#: ../svn/merge-cmd.c:427 msgid "--reintegrate can only be used with a single merge source" msgstr "" -#: ../svn/merge-cmd.c:430 +#: ../svn/merge-cmd.c:431 msgid "--allow-mixed-revisions cannot be used with --reintegrate" msgstr "" -#: ../svn/merge-cmd.c:445 +#: ../svn/merge-cmd.c:446 msgid "" "Merge tracking not possible, use --ignore-ancestry or\n" "fix invalid mergeinfo in target with 'svn propset'" msgstr "" -#: ../svn/mergeinfo-cmd.c:171 +#: ../svn/mergeinfo-cmd.c:193 msgid "last full merge" msgstr "" -#: ../svn/mergeinfo-cmd.c:171 +#: ../svn/mergeinfo-cmd.c:193 msgid "youngest common ancestor" msgstr "" -#: ../svn/mergeinfo-cmd.c:172 +#: ../svn/mergeinfo-cmd.c:194 msgid "repository path" msgstr "" -#: ../svn/mergeinfo-cmd.c:172 +#: ../svn/mergeinfo-cmd.c:194 msgid "tip of branch" msgstr "" -#: ../svn/mergeinfo-cmd.c:264 +#: ../svn/mergeinfo-cmd.c:358 msgid "Not enough arguments given" msgstr "" -#: ../svn/mergeinfo-cmd.c:342 +#: ../svn/mergeinfo-cmd.c:404 +msgid "--quiet (-q) option valid only with --log option" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:409 +msgid "--verbose (-v) option valid only with --log option" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:414 +msgid "--incremental option valid only with --log option" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:444 msgid "--revision (-r) option valid only with --show-revs option" msgstr "" -#: ../svn/mergeinfo-cmd.c:346 +#: ../svn/mergeinfo-cmd.c:448 msgid "Depth specification options valid only with --show-revs option" msgstr "" +#: ../svn/mergeinfo-cmd.c:452 +msgid "--log option valid only with --show-revs option" +msgstr "" + #: ../svn/mkdir-cmd.c:92 msgid "Try 'svn add' or 'svn add --non-recursive' instead?" msgstr "" @@ -9382,392 +10693,431 @@ msgstr "" msgid " Skipped paths: %d\n" msgstr "" -#: ../svn/notify.c:235 +#: ../svn/notify.c:246 ../svnbench/notify.c:107 #, c-format msgid "Skipped missing target: '%s'\n" msgstr "" -#: ../svn/notify.c:242 +#: ../svn/notify.c:253 ../svnbench/notify.c:114 #, c-format msgid "Skipped target: '%s' -- copy-source is missing\n" msgstr "" -#: ../svn/notify.c:249 +#: ../svn/notify.c:258 ../svnbench/notify.c:121 #, c-format msgid "Skipped '%s'\n" msgstr "" -#: ../svn/notify.c:256 +#: ../svn/notify.c:265 ../svnbench/notify.c:128 #, c-format msgid "Skipped '%s' -- An obstructing working copy was found\n" msgstr "" -#: ../svn/notify.c:263 +#: ../svn/notify.c:271 ../svnbench/notify.c:135 #, c-format msgid "Skipped '%s' -- Has no versioned parent\n" msgstr "" -#: ../svn/notify.c:270 +#: ../svn/notify.c:277 ../svnbench/notify.c:142 #, c-format msgid "Skipped '%s' -- Access denied\n" msgstr "" -#: ../svn/notify.c:277 +#: ../svn/notify.c:283 ../svnbench/notify.c:149 #, c-format msgid "Skipped '%s' -- Node remains in conflict\n" msgstr "" -#: ../svn/notify.c:358 +#: ../svn/notify.c:299 +#, c-format +msgid "Removed external '%s': %s\n" +msgstr "" + +#: ../svn/notify.c:304 +#, c-format +msgid "Removed external '%s'\n" +msgstr "" + +#: ../svn/notify.c:310 +#, c-format +msgid "Left local modifications as '%s'\n" +msgstr "" + +#: ../svn/notify.c:354 ../svnbench/notify.c:233 #, c-format msgid "Restored '%s'\n" msgstr "" -#: ../svn/notify.c:364 +#: ../svn/notify.c:359 ../svnbench/notify.c:239 #, c-format msgid "Reverted '%s'\n" msgstr "" -#: ../svn/notify.c:370 +#: ../svn/notify.c:364 ../svnbench/notify.c:245 #, c-format msgid "Failed to revert '%s' -- try updating instead.\n" msgstr "" -#: ../svn/notify.c:378 +#: ../svn/notify.c:371 ../svnbench/notify.c:253 #, c-format msgid "Resolved conflicted state of '%s'\n" msgstr "" -#: ../svn/notify.c:473 ../svn/notify.c:513 +#: ../svn/notify.c:461 ../svn/notify.c:498 ../svnbench/notify.c:344 +#: ../svnbench/notify.c:384 #, c-format msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" msgstr "" -#: ../svn/notify.c:490 ../svn/notify.c:527 +#: ../svn/notify.c:478 ../svn/notify.c:512 ../svnbench/notify.c:361 +#: ../svnbench/notify.c:398 #, c-format msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" msgstr "" -#: ../svn/notify.c:548 +#: ../svn/notify.c:530 ../svnbench/notify.c:419 #, c-format msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" msgstr "" -#: ../svn/notify.c:558 +#: ../svn/notify.c:540 ../svnbench/notify.c:429 #, c-format msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" msgstr "" -#: ../svn/notify.c:576 +#: ../svn/notify.c:556 ../svnbench/notify.c:447 #, c-format msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" msgstr "" -#: ../svn/notify.c:585 +#: ../svn/notify.c:565 ../svnbench/notify.c:456 #, c-format msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" msgstr "" -#: ../svn/notify.c:599 +#: ../svn/notify.c:577 ../svnbench/notify.c:470 #, c-format msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" msgstr "" -#: ../svn/notify.c:609 +#: ../svn/notify.c:587 ../svnbench/notify.c:480 #, c-format msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" msgstr "" -#: ../svn/notify.c:669 +#: ../svn/notify.c:644 ../svnbench/notify.c:542 #, c-format msgid "" "\n" "Fetching external item into '%s':\n" msgstr "" -#: ../svn/notify.c:695 +#: ../svn/notify.c:668 ../svnbench/notify.c:568 #, c-format msgid "Error handling externals definition for '%s':" msgstr "" -#: ../svn/notify.c:708 +#: ../svn/notify.c:681 ../svnbench/notify.c:581 #, c-format msgid "Updating '%s':\n" msgstr "" -#: ../svn/notify.c:722 +#: ../svn/notify.c:694 ../svnbench/notify.c:595 #, c-format msgid "Exported external at revision %ld.\n" msgstr "" -#: ../svn/notify.c:723 +#: ../svn/notify.c:695 ../svnbench/notify.c:596 #, c-format msgid "Exported revision %ld.\n" msgstr "" -#: ../svn/notify.c:731 +#: ../svn/notify.c:702 ../svnbench/notify.c:604 #, c-format msgid "Checked out external at revision %ld.\n" msgstr "" -#: ../svn/notify.c:732 +#: ../svn/notify.c:703 ../svnbench/notify.c:605 #, c-format msgid "Checked out revision %ld.\n" msgstr "" -#: ../svn/notify.c:743 +#: ../svn/notify.c:713 ../svnbench/notify.c:616 #, c-format msgid "Updated external to revision %ld.\n" msgstr "" -#: ../svn/notify.c:744 +#: ../svn/notify.c:714 ../svnbench/notify.c:617 #, c-format msgid "Updated to revision %ld.\n" msgstr "" -#: ../svn/notify.c:752 +#: ../svn/notify.c:721 ../svnbench/notify.c:625 #, c-format msgid "External at revision %ld.\n" msgstr "" -#: ../svn/notify.c:753 +#: ../svn/notify.c:722 ../svnbench/notify.c:626 #, c-format msgid "At revision %ld.\n" msgstr "" -#: ../svn/notify.c:765 +#: ../svn/notify.c:733 ../svnbench/notify.c:638 #, c-format msgid "External export complete.\n" msgstr "" -#: ../svn/notify.c:766 +#: ../svn/notify.c:734 ../svnbench/notify.c:639 #, c-format msgid "Export complete.\n" msgstr "" -#: ../svn/notify.c:773 +#: ../svn/notify.c:740 ../svnbench/notify.c:646 #, c-format msgid "External checkout complete.\n" msgstr "" -#: ../svn/notify.c:774 +#: ../svn/notify.c:741 ../svnbench/notify.c:647 #, c-format msgid "Checkout complete.\n" msgstr "" -#: ../svn/notify.c:781 +#: ../svn/notify.c:747 ../svnbench/notify.c:654 #, c-format msgid "External update complete.\n" msgstr "" -#: ../svn/notify.c:782 +#: ../svn/notify.c:748 ../svnbench/notify.c:655 #, c-format msgid "Update complete.\n" msgstr "" -#: ../svn/notify.c:798 +#: ../svn/notify.c:762 ../svnbench/notify.c:671 #, c-format msgid "" "\n" "Performing status on external item at '%s':\n" msgstr "" -#: ../svn/notify.c:806 +#: ../svn/notify.c:768 +#, c-format +msgid "" +"\n" +"Performing info on external item at '%s':\n" +msgstr "" + +#: ../svn/notify.c:775 ../svnbench/notify.c:679 #, c-format msgid "Status against revision: %6ld\n" msgstr "" -#: ../svn/notify.c:815 +#: ../svn/notify.c:783 ../svnbench/notify.c:688 #, c-format msgid "Sending copy of %s\n" msgstr "" -#: ../svn/notify.c:816 +#: ../svn/notify.c:784 ../svnbench/notify.c:689 #, c-format msgid "Sending %s\n" msgstr "" -#: ../svn/notify.c:827 +#: ../svn/notify.c:794 ../svnbench/notify.c:700 #, c-format msgid "Adding copy of (bin) %s\n" msgstr "" -#: ../svn/notify.c:828 +#: ../svn/notify.c:795 ../svnbench/notify.c:701 #, c-format msgid "Adding (bin) %s\n" msgstr "" -#: ../svn/notify.c:836 +#: ../svn/notify.c:802 ../svnbench/notify.c:709 #, c-format msgid "Adding copy of %s\n" msgstr "" -#: ../svn/notify.c:837 +#: ../svn/notify.c:803 ../svnbench/notify.c:710 #, c-format msgid "Adding %s\n" msgstr "" -#: ../svn/notify.c:846 +#: ../svn/notify.c:811 ../svnbench/notify.c:719 #, c-format msgid "Deleting copy of %s\n" msgstr "" -#: ../svn/notify.c:847 +#: ../svn/notify.c:812 ../svnbench/notify.c:720 #, c-format msgid "Deleting %s\n" msgstr "" -#: ../svn/notify.c:856 +#: ../svn/notify.c:820 ../svnbench/notify.c:729 #, c-format msgid "Replacing copy of %s\n" msgstr "" -#: ../svn/notify.c:857 +#: ../svn/notify.c:821 ../svnbench/notify.c:730 #, c-format msgid "Replacing %s\n" msgstr "" -#: ../svn/notify.c:867 ../svnsync/sync.c:416 +#: ../svn/notify.c:830 ../svnbench/notify.c:740 ../svnsync/sync.c:416 #, c-format msgid "Transmitting file data " msgstr "" -#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1698 +#: ../svn/notify.c:837 ../svnadmin/svnadmin.c:2146 ../svnbench/notify.c:749 #, c-format msgid "'%s' locked by user '%s'.\n" msgstr "" -#: ../svn/notify.c:882 +#: ../svn/notify.c:842 ../svnbench/notify.c:755 #, c-format msgid "'%s' unlocked.\n" msgstr "" -#: ../svn/notify.c:909 +#: ../svn/notify.c:866 ../svnbench/notify.c:782 #, c-format msgid "--- Merging differences between repository URLs into '%s':\n" msgstr "" -#: ../svn/notify.c:914 +#: ../svn/notify.c:871 ../svnbench/notify.c:787 #, c-format msgid "--- Merging r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:918 +#: ../svn/notify.c:875 ../svnbench/notify.c:791 #, c-format msgid "--- Reverse-merging r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:922 +#: ../svn/notify.c:879 ../svnbench/notify.c:795 #, c-format msgid "--- Merging r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:928 +#: ../svn/notify.c:885 ../svnbench/notify.c:801 #, c-format msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:940 +#: ../svn/notify.c:895 ../svnbench/notify.c:813 #, c-format msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" msgstr "" -#: ../svn/notify.c:950 +#: ../svn/notify.c:905 ../svnbench/notify.c:823 #, c-format msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:955 +#: ../svn/notify.c:910 ../svnbench/notify.c:828 #, c-format msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:960 +#: ../svn/notify.c:915 ../svnbench/notify.c:833 #, c-format msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:965 +#: ../svn/notify.c:920 ../svnbench/notify.c:838 #, c-format msgid "" "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:975 +#: ../svn/notify.c:927 ../svnbench/notify.c:848 #, c-format msgid "--- Eliding mergeinfo from '%s':\n" msgstr "" -#: ../svn/notify.c:983 +#: ../svn/notify.c:934 ../svnbench/notify.c:856 #, c-format msgid "--- Merging differences between foreign repository URLs into '%s':\n" msgstr "" -#: ../svn/notify.c:989 +#: ../svn/notify.c:940 ../svnbench/notify.c:862 #, c-format msgid "--- Merging (from foreign repository) r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:994 +#: ../svn/notify.c:945 ../svnbench/notify.c:867 #, c-format msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:999 +#: ../svn/notify.c:950 ../svnbench/notify.c:872 #, c-format msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:1005 +#: ../svn/notify.c:956 ../svnbench/notify.c:878 #, c-format msgid "" "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" msgstr "" -#: ../svn/notify.c:1041 +#: ../svn/notify.c:986 ../svnbench/notify.c:915 #, c-format msgid "property '%s' set on '%s'\n" msgstr "" -#: ../svn/notify.c:1049 +#: ../svn/notify.c:992 ../svnbench/notify.c:923 #, c-format msgid "property '%s' deleted from '%s'.\n" msgstr "" -#: ../svn/notify.c:1057 +#: ../svn/notify.c:998 ../svnbench/notify.c:931 #, c-format msgid "Attempting to delete nonexistent property '%s' on '%s'\n" msgstr "" -#: ../svn/notify.c:1066 +#: ../svn/notify.c:1005 ../svnbench/notify.c:940 #, c-format msgid "property '%s' set on repository revision %ld\n" msgstr "" -#: ../svn/notify.c:1074 +#: ../svn/notify.c:1011 ../svnbench/notify.c:948 #, c-format msgid "property '%s' deleted from repository revision %ld\n" msgstr "" -#: ../svn/notify.c:1081 +#: ../svn/notify.c:1016 ../svnbench/notify.c:955 #, c-format msgid "Upgraded '%s'\n" msgstr "" -#: ../svn/notify.c:1087 +#: ../svn/notify.c:1020 ../svnbench/notify.c:961 #, c-format msgid "Redirecting to URL '%s':\n" msgstr "" -#: ../svn/notify.c:1115 +#: ../svn/notify.c:1044 #, c-format msgid "--- Copying from foreign repository URL '%s':\n" msgstr "" -#: ../svn/notify.c:1124 +#: ../svn/notify.c:1051 #, c-format msgid "Breaking move with source path '%s'\n" msgstr "" +#: ../svn/notify.c:1057 +#, c-format +msgid "Performing cleanup on external item at '%s'.\n" +msgstr "" + +#: ../svn/notify.c:1064 +#, c-format +msgid "done\n" +msgstr "" + +#: ../svn/notify.c:1066 +#, c-format +msgid "Committing transaction...\n" +msgstr "" + #: ../svn/propdel-cmd.c:88 #, c-format msgid "Cannot specify revision for deleting versioned property '%s'" @@ -9812,13 +11162,12 @@ msgstr "" msgid "No changes to property '%s' on '%s'\n" msgstr "" -#: ../svn/propget-cmd.c:66 +#: ../svn/propget-cmd.c:67 msgid "Error writing to stream" msgstr "" -#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156 -#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1754 -#: ../svnlook/svnlook.c:1908 +#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 ../svn/proplist-cmd.c:160 +#: ../svnlook/svnlook.c:1754 ../svnlook/svnlook.c:1908 #, c-format msgid "" "Inherited properties on '%s',\n" @@ -9826,24 +11175,34 @@ msgid "" msgstr "" #. Not a --revprop -#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175 -#: ../svnlook/svnlook.c:1790 ../svnlook/svnlook.c:1943 +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1789 +#: ../svnlook/svnlook.c:1943 #, c-format msgid "Properties on '%s':\n" msgstr "" -#: ../svn/propget-cmd.c:326 -msgid "--verbose cannot be used with --revprop or --strict or --xml" +#: ../svn/propget-cmd.c:328 +msgid "--verbose cannot be used with --revprop or --no-newline or --xml" msgstr "" -#: ../svn/propget-cmd.c:358 ../svn/proplist-cmd.c:214 +#: ../svn/propget-cmd.c:360 ../svn/proplist-cmd.c:214 msgid "--show-inherited-props can't be used with --revprop" msgstr "" -#: ../svn/propget-cmd.c:425 +#: ../svn/propget-cmd.c:373 +#, c-format +msgid "Property '%s' not found on revision %s" +msgstr "" + +#: ../svn/propget-cmd.c:438 msgid "" -"Strict output of property values only available for single-target, non-" -"recursive propget operations" +"--no-newline is only available for single-target, non-recursive propget " +"operations" +msgstr "" + +#: ../svn/propget-cmd.c:493 +#, c-format +msgid "Property '%s' not found on '%s'" msgstr "" #: ../svn/proplist-cmd.c:246 @@ -9883,57 +11242,49 @@ msgid "" "setting the property to '%s' will not turn it off." msgstr "" -#: ../svn/props.c:177 +#: ../svn/props.c:124 #, c-format -msgid "(To set the '%s' property, re-run with '--force'.)" +msgid "Use '--force' to set the '%s' property." msgstr "" -#: ../svn/props.c:182 +#: ../svn/props.c:129 #, c-format -msgid "(To edit the '%s' property, re-run with '--force'.)" +msgid "Use '--force' to edit the '%s' property." msgstr "" -#: ../svn/props.c:188 +#: ../svn/props.c:135 #, c-format -msgid "(To use the '%s' property, re-run with '--force'.)" +msgid "Use '--force' to use the '%s' property'." msgstr "" -#: ../svn/props.c:202 +#: ../svn/props.c:149 #, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to set it" +msgid "'%s' is not a valid %s property name; use '--force' to set it" msgstr "" -#: ../svn/props.c:208 +#: ../svn/props.c:154 #, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to edit it" +msgid "'%s' is not a valid %s property name; use '--force' to edit it" msgstr "" -#: ../svn/props.c:215 +#: ../svn/props.c:160 #, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to use it" +msgid "'%s' is not a valid %s property name; use '--force' to use it" msgstr "" -#: ../svn/props.c:281 ../svn/props.c:332 +#: ../svn/props.c:226 ../svn/props.c:269 #, c-format -msgid "" -"'%s' is not a valid %s property name; did you mean '%s'?\n" -"%s" +msgid "'%s' is not a valid %s property name; did you mean '%s'?" msgstr "" -#: ../svn/props.c:340 +#: ../svn/props.c:278 #, c-format -msgid "" -"'%s' is not a valid %s property name\n" -"Did you mean '%s' or '%s'?\n" -"%s" +msgid "'%s' is not a valid %s property name; did you mean '%s' or '%s'?" msgstr "" -#: ../svn/props.c:350 +#: ../svn/props.c:288 #, c-format -msgid "" -"'%s' is not a valid %s property name\n" -"Did you mean '%s', '%s' or '%s'?\n" -"%s" +msgid "'%s' is not a valid %s property name; did you mean '%s', '%s' or '%s'?" msgstr "" #: ../svn/propset-cmd.c:132 @@ -9958,7 +11309,7 @@ msgstr "" msgid "Failure occurred resolving one or more conflicts" msgstr "" -#: ../svn/revert-cmd.c:77 +#: ../svn/revert-cmd.c:80 msgid "Try 'svn revert --depth infinity' instead?" msgstr "" @@ -9977,60 +11328,66 @@ msgstr "" msgid " Tree conflicts: %u\n" msgstr "" -#: ../svn/status-cmd.c:398 +#: ../svn/status-cmd.c:296 +msgid "--revision (-r) option valid only with --show-updates (-u) option" +msgstr "" + +#: ../svn/status-cmd.c:406 #, c-format msgid "" "\n" "--- Changelist '%s':\n" msgstr "" -#: ../svn/status.c:318 +#: ../svn/status.c:316 #, c-format msgid "swapped places with %s" msgstr "" -#: ../svn/status.c:333 +#: ../svn/status.c:331 #, c-format msgid "moved from %s" msgstr "" -#: ../svn/status.c:345 +#: ../svn/status.c:343 #, c-format msgid "moved to %s" msgstr "" -#: ../svn/svn.c:147 +#: ../svn/svn.c:155 msgid "force operation to run" msgstr "" -#: ../svn/svn.c:149 +#: ../svn/svn.c:157 msgid "force validity of log message source" msgstr "" -#: ../svn/svn.c:150 ../svn/svn.c:151 ../svnadmin/svnadmin.c:208 -#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1047 -#: ../svndumpfilter/svndumpfilter.c:1050 ../svnlook/svnlook.c:114 -#: ../svnlook/svnlook.c:126 ../svnsync/svnsync.c:244 ../svnsync/svnsync.c:246 +#: ../svn/svn.c:158 ../svn/svn.c:159 ../svnadmin/svnadmin.c:227 +#: ../svnadmin/svnadmin.c:230 ../svnbench/svnbench.c:81 +#: ../svnbench/svnbench.c:82 ../svndumpfilter/svndumpfilter.c:977 +#: ../svndumpfilter/svndumpfilter.c:980 ../svnfsfs/svnfsfs.c:129 +#: ../svnfsfs/svnfsfs.c:132 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 +#: ../svnsync/svnsync.c:277 ../svnsync/svnsync.c:279 msgid "show help on a subcommand" msgstr "" -#: ../svn/svn.c:152 +#: ../svn/svn.c:160 msgid "specify log message ARG" msgstr "" -#: ../svn/svn.c:153 +#: ../svn/svn.c:161 ../svnbench/svnbench.c:83 msgid "print nothing, or only summary information" msgstr "" -#: ../svn/svn.c:154 +#: ../svn/svn.c:162 ../svnbench/svnbench.c:84 msgid "descend recursively, same as --depth=infinity" msgstr "" -#: ../svn/svn.c:155 +#: ../svn/svn.c:163 ../svnbench/svnbench.c:85 msgid "obsolete; try --depth=files or --depth=immediates" msgstr "" -#: ../svn/svn.c:157 +#: ../svn/svn.c:165 ../svnbench/svnbench.c:87 msgid "" "the change made by revision ARG (like -r ARG-1:ARG)\n" " If ARG is negative this is like -r ARG:ARG-1\n" @@ -10039,7 +11396,7 @@ msgid "" " ARG1:ARG2, where ARG1 is inclusive" msgstr "" -#: ../svn/svn.c:165 +#: ../svn/svn.c:173 ../svnbench/svnbench.c:95 msgid "" "ARG (some commands also take ARG1:ARG2 range)\n" " A revision argument can be one of:\n" @@ -10052,42 +11409,45 @@ msgid "" " 'PREV' revision just before COMMITTED" msgstr "" -#: ../svn/svn.c:180 +#: ../svn/svn.c:188 msgid "read log message from file ARG" msgstr "" -#: ../svn/svn.c:182 +#: ../svn/svn.c:190 msgid "give output suitable for concatenation" msgstr "" -#: ../svn/svn.c:184 +#: ../svn/svn.c:192 msgid "treat value as being in charset encoding ARG" msgstr "" -#: ../svn/svn.c:185 ../svnadmin/svnadmin.c:214 -#: ../svndumpfilter/svndumpfilter.c:1053 ../svnlook/svnlook.c:168 -#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:287 -#: ../svnsync/svnsync.c:242 ../svnversion/svnversion.c:141 +#: ../svn/svn.c:193 ../svnadmin/svnadmin.c:233 ../svnbench/svnbench.c:110 +#: ../svndumpfilter/svndumpfilter.c:983 ../svnfsfs/svnfsfs.c:135 +#: ../svnlook/svnlook.c:172 ../svnrdump/svnrdump.c:150 +#: ../svnserve/svnserve.c:378 ../svnsync/svnsync.c:275 +#: ../svnversion/svnversion.c:144 msgid "show program version information" msgstr "" -#: ../svn/svn.c:186 +#: ../svn/svn.c:194 ../svnbench/svnbench.c:111 msgid "print extra information" msgstr "" -#: ../svn/svn.c:187 +#: ../svn/svn.c:195 msgid "display update information" msgstr "" -#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:128 +#: ../svn/svn.c:196 ../svnbench/svnbench.c:112 ../svnrdump/svnrdump.c:134 msgid "specify a username ARG" msgstr "" -#: ../svn/svn.c:189 ../svnrdump/svnrdump.c:130 -msgid "specify a password ARG" +#: ../svn/svn.c:198 +msgid "" +"specify a password ARG (caution: on many operating\n" +" systems, other users will be able to see this)" msgstr "" -#: ../svn/svn.c:191 +#: ../svn/svn.c:202 msgid "" "Specify differencing options for external diff or\n" " internal diff or blame. Default: '-u'. Options " @@ -10102,113 +11462,128 @@ msgid "" "space\n" " --ignore-eol-style: Ignore changes in EOL " "style\n" +" -U ARG, --context ARG: Show ARG lines of " +"context\n" " -p, --show-c-function: Show C function name" msgstr "" -#: ../svn/svn.c:209 +#: ../svn/svn.c:222 ../svnbench/svnbench.c:115 msgid "pass contents of file ARG as additional args" msgstr "" -#: ../svn/svn.c:211 +#: ../svn/svn.c:224 ../svnbench/svnbench.c:117 msgid "" "limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')" msgstr "" -#: ../svn/svn.c:215 +#: ../svn/svn.c:228 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" msgstr "" -#: ../svn/svn.c:218 ../svnlook/svnlook.c:171 +#: ../svn/svn.c:231 ../svnlook/svnlook.c:175 msgid "output in XML" msgstr "" -#: ../svn/svn.c:219 -msgid "use strict semantics" +#: ../svn/svn.c:232 +msgid "DEPRECATED" msgstr "" -#: ../svn/svn.c:221 +#: ../svn/svn.c:234 ../svnbench/svnbench.c:122 msgid "do not cross copies while traversing history" msgstr "" -#: ../svn/svn.c:223 +#: ../svn/svn.c:236 msgid "" "disregard default and svn:ignore and\n" " svn:global-ignores property ignores" msgstr "" -#: ../svn/svn.c:227 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:188 +#: ../svn/svn.c:240 ../svnbench/svnbench.c:124 ../svnrdump/svnrdump.c:146 +#: ../svnsync/svnsync.c:191 msgid "do not cache authentication tokens" msgstr "" -#: ../svn/svn.c:229 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:198 +#: ../svn/svn.c:242 ../svnbench/svnbench.c:126 ../svnrdump/svnrdump.c:160 +msgid "" +"deprecated; same as\n" +" --trust-server-cert-failures=unknown-ca" +msgstr "" + +#: ../svn/svn.c:246 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:164 msgid "" -"accept SSL server certificates from unknown\n" -" certificate authorities without prompting (but " -"only\n" -" with '--non-interactive')" +"with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-" +"separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate), 'not-yet-valid' (Not " +"yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors)." msgstr "" -#: ../svn/svn.c:235 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:180 +#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:138 ../svnsync/svnsync.c:183 msgid "" "do no interactive prompting (default is to prompt\n" " only if standard input is a terminal device)" msgstr "" -#: ../svn/svn.c:239 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:184 +#: ../svn/svn.c:264 ../svnrdump/svnrdump.c:142 ../svnsync/svnsync.c:187 msgid "" "do interactive prompting even if standard input\n" " is not a terminal device" msgstr "" -#: ../svn/svn.c:243 +#: ../svn/svn.c:268 msgid "try operation but make no changes" msgstr "" -#: ../svn/svn.c:245 +#: ../svn/svn.c:270 msgid "disable merge tracking; diff nodes as if related" msgstr "" -#: ../svn/svn.c:247 +#: ../svn/svn.c:272 msgid "ignore externals definitions" msgstr "" -#: ../svn/svn.c:248 +#: ../svn/svn.c:273 msgid "use ARG as merge command" msgstr "" -#: ../svn/svn.c:249 +#: ../svn/svn.c:274 msgid "use ARG as external editor" msgstr "" -#: ../svn/svn.c:251 +#: ../svn/svn.c:276 msgid "merge only mergeinfo differences" msgstr "" -#: ../svn/svn.c:252 +#: ../svn/svn.c:277 msgid "use ARG as the older target" msgstr "" -#: ../svn/svn.c:253 +#: ../svn/svn.c:278 msgid "use ARG as the newer target" msgstr "" -#: ../svn/svn.c:255 +#: ../svn/svn.c:280 msgid "operate on a revision property (use with -r)" msgstr "" -#: ../svn/svn.c:256 +#: ../svn/svn.c:281 msgid "relocate via URL-rewriting" msgstr "" -#: ../svn/svn.c:258 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126 -#: ../svnsync/svnsync.c:212 +#: ../svn/svn.c:283 ../svnadmin/svnadmin.c:280 ../svnbench/svnbench.c:146 +#: ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:241 msgid "read user configuration files from directory ARG" msgstr "" -#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:214 +#: ../svn/svn.c:285 ../svnbench/svnbench.c:148 ../svnrdump/svnrdump.c:152 +#: ../svnsync/svnsync.c:243 msgid "" "set user configuration option in the format:\n" " FILE:SECTION:OPTION=[VALUE]\n" @@ -10216,15 +11591,15 @@ msgid "" " servers:global:http-library=serf" msgstr "" -#: ../svn/svn.c:267 +#: ../svn/svn.c:292 msgid "enable automatic properties" msgstr "" -#: ../svn/svn.c:268 +#: ../svn/svn.c:293 msgid "disable automatic properties" msgstr "" -#: ../svn/svn.c:270 +#: ../svn/svn.c:295 msgid "" "use a different EOL marker than the standard\n" " system marker for files with the svn:eol-style\n" @@ -10232,55 +11607,55 @@ msgid "" " ARG may be one of 'LF', 'CR', 'CRLF'" msgstr "" -#: ../svn/svn.c:277 +#: ../svn/svn.c:302 ../svnbench/svnbench.c:155 msgid "maximum number of log entries" msgstr "" -#: ../svn/svn.c:278 +#: ../svn/svn.c:303 msgid "don't unlock the targets" msgstr "" -#: ../svn/svn.c:279 +#: ../svn/svn.c:304 msgid "remove changelist association" msgstr "" -#: ../svn/svn.c:281 +#: ../svn/svn.c:306 msgid "operate only on members of changelist ARG" msgstr "" -#: ../svn/svn.c:283 +#: ../svn/svn.c:308 msgid "don't delete changelists after commit" msgstr "" -#: ../svn/svn.c:284 +#: ../svn/svn.c:309 msgid "keep path in working copy" msgstr "" -#: ../svn/svn.c:286 +#: ../svn/svn.c:311 ../svnbench/svnbench.c:157 msgid "retrieve all revision properties" msgstr "" -#: ../svn/svn.c:288 +#: ../svn/svn.c:313 ../svnbench/svnbench.c:159 msgid "retrieve no revision properties" msgstr "" -#: ../svn/svn.c:290 +#: ../svn/svn.c:315 ../svnbench/svnbench.c:161 msgid "" "set revision property ARG in new revision\n" " using the name[=value] format" msgstr "" -#: ../svn/svn.c:293 +#: ../svn/svn.c:318 msgid "make intermediate directories" msgstr "" -#: ../svn/svn.c:295 +#: ../svn/svn.c:320 ../svnbench/svnbench.c:165 msgid "" "use/display additional information from merge\n" " history" msgstr "" -#: ../svn/svn.c:299 +#: ../svn/svn.c:324 msgid "" "specify automatic conflict resolution action\n" " ('postpone', 'working', 'base', 'mine-" @@ -10291,17 +11666,17 @@ msgid "" "'l')" msgstr "" -#: ../svn/svn.c:310 +#: ../svn/svn.c:335 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" msgstr "" -#: ../svn/svn.c:314 +#: ../svn/svn.c:339 msgid "deprecated" msgstr "" -#: ../svn/svn.c:316 +#: ../svn/svn.c:341 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" @@ -10315,120 +11690,200 @@ msgid "" "component." msgstr "" -#: ../svn/svn.c:332 +#: ../svn/svn.c:357 msgid "don't expand keywords" msgstr "" -#: ../svn/svn.c:334 +#: ../svn/svn.c:359 msgid "apply the unidiff in reverse" msgstr "" -#: ../svn/svn.c:336 +#: ../svn/svn.c:361 msgid "ignore whitespace during pattern matching" msgstr "" -#: ../svn/svn.c:337 +#: ../svn/svn.c:362 msgid "produce diff output" msgstr "" #. maps to show_diff #. diff options -#: ../svn/svn.c:339 ../svnlook/svnlook.c:138 +#: ../svn/svn.c:364 ../svnlook/svnlook.c:139 msgid "use ARG as diff command" msgstr "" -#: ../svn/svn.c:341 +#: ../svn/svn.c:366 msgid "override diff-cmd specified in config file" msgstr "" -#: ../svn/svn.c:343 ../svnlook/svnlook.c:132 +#: ../svn/svn.c:368 ../svnlook/svnlook.c:133 msgid "do not print differences for added files" msgstr "" -#: ../svn/svn.c:345 ../svnlook/svnlook.c:135 +#: ../svn/svn.c:370 ../svnlook/svnlook.c:136 msgid "do not print differences for deleted files" msgstr "" -#: ../svn/svn.c:347 +#: ../svn/svn.c:372 msgid "don't diff copied or moved files with their source" msgstr "" -#: ../svn/svn.c:349 +#: ../svn/svn.c:374 msgid "diff unrelated nodes as delete and add" msgstr "" -#: ../svn/svn.c:350 +#: ../svn/svn.c:375 msgid "show a summary of the results" msgstr "" -#: ../svn/svn.c:352 +#: ../svn/svn.c:377 msgid "use git's extended diff format" msgstr "" -#: ../svn/svn.c:354 ../svnlook/svnlook.c:141 +#: ../svn/svn.c:379 ../svnlook/svnlook.c:142 msgid "ignore properties during the operation" msgstr "" -#: ../svn/svn.c:356 ../svnlook/svnlook.c:144 +#: ../svn/svn.c:381 ../svnlook/svnlook.c:145 msgid "show only properties during the operation" msgstr "" -#: ../svn/svn.c:358 +#: ../svn/svn.c:383 msgid "" "generate diff suitable for generic third-party\n" " patch tools; currently the same as\n" " --show-copies-as-adds --ignore-properties" msgstr "" -#: ../svn/svn.c:366 +#: ../svn/svn.c:391 msgid "" "Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" " Please run 'svn update' instead." msgstr "" -#: ../svn/svn.c:372 +#: ../svn/svn.c:397 msgid "" -"Also commit file and dir externals reached by\n" -" recursion. This does not include externals with " -"a\n" -" fixed revision. (See the svn:externals property)" +"also operate on externals defined by\n" +" svn:externals properties" msgstr "" -#: ../svn/svn.c:378 -msgid "retrieve target's inherited properties" +#: ../svn/svn.c:401 +msgid "retrieve properties set on parents of the target" msgstr "" -#: ../svn/svn.c:380 +#: ../svn/svn.c:403 msgid "use ARG as search pattern (glob syntax)" msgstr "" -#: ../svn/svn.c:382 +#: ../svn/svn.c:405 msgid "combine ARG with the previous search pattern" msgstr "" -#: ../svn/svn.c:430 +#: ../svn/svn.c:407 +msgid "show revision log message, author and date" +msgstr "" + +#: ../svn/svn.c:409 +msgid "remove unversioned items" +msgstr "" + +#: ../svn/svn.c:410 +msgid "remove ignored items" +msgstr "" + +#: ../svn/svn.c:411 ../svnlook/svnlook.c:148 ../svnversion/svnversion.c:140 +msgid "do not output the trailing newline" +msgstr "" + +#: ../svn/svn.c:412 +msgid "show cached passwords" +msgstr "" + +#: ../svn/svn.c:414 +msgid "" +"pin externals with no explicit revision to their\n" +" current revision (recommended when tagging)" +msgstr "" + +#: ../svn/svn.c:418 +msgid "" +"print only the item identified by ARG ('kind',\n" +" 'url', 'relative-url', 'repos-root-url',\n" +" 'repos-uuid', 'revision', 'last-changed-" +"revision',\n" +" 'last-changed-date', 'last-changed-author',\n" +" 'wc-root')" +msgstr "" + +#: ../svn/svn.c:475 msgid "" "Put files and directories under version control, scheduling\n" "them for addition to repository. They will be added in next commit.\n" "usage: add PATH...\n" msgstr "" -#: ../svn/svn.c:435 +#: ../svn/svn.c:480 msgid "add intermediate parents" msgstr "" -#: ../svn/svn.c:438 +#: ../svn/svn.c:483 +msgid "" +"Manage cached authentication credentials.\n" +"usage: 1. svn auth [PATTERN ...]\n" +"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" +"\n" +" With no arguments, list all cached authentication credentials.\n" +" Authentication credentials include usernames, passwords,\n" +" SSL certificates, and SSL client-certificate passphrases.\n" +" If PATTERN is specified, only list credentials with attributes matching " +"one\n" +" or more patterns. With the --remove option, remove cached authentication\n" +" credentials matching one or more patterns.\n" +"\n" +" If more than one pattern is specified credentials are considered only " +"they\n" +" match all specified patterns. Patterns are matched case-sensitively and " +"may\n" +" contain glob wildcards:\n" +" ? matches any single character\n" +" * matches a sequence of arbitrary characters\n" +" [abc] matches any of the characters listed inside the brackets\n" +" Note that wildcards will usually need to be quoted or escaped on the\n" +" command line because many command shells will interfere by trying to\n" +" expand them.\n" +msgstr "" + +#: ../svn/svn.c:504 +msgid "remove matching authentication credentials" +msgstr "" + +#: ../svn/svn.c:509 msgid "" -"Output the content of specified files or\n" -"URLs with revision and author information in-line.\n" -"usage: blame TARGET[@REV]...\n" +"Show when each line of a file was last (or\n" +"next) changed.\n" +"usage: blame [-rM:N] TARGET[@REV]...\n" +"\n" +" Annotate each line of a file with the revision number and author of the\n" +" last change (or optionally the next change) to that line.\n" +"\n" +" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the last revision at or before rN that changed or added the line,\n" +" looking back no further than rM.\n" +"\n" +" With a reverse revision range '-r M:N' where M > N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the next revision after rN that changed or deleted the line,\n" +" looking forward no further than rM.\n" "\n" " If specified, REV determines in which revision the target is first\n" " looked up.\n" +"\n" +" Write the annotated result to standard output.\n" msgstr "" -#: ../svn/svn.c:447 +#: ../svn/svn.c:533 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" @@ -10437,14 +11892,14 @@ msgid "" " looked up.\n" msgstr "" -#: ../svn/svn.c:455 +#: ../svn/svn.c:541 msgid "" "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" " 2. changelist --remove PATH...\n" msgstr "" -#: ../svn/svn.c:461 +#: ../svn/svn.c:547 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" @@ -10472,24 +11927,33 @@ msgid "" " reporting the action taken.\n" msgstr "" -#: ../svn/svn.c:488 +#: ../svn/svn.c:574 msgid "" "Recursively clean up the working copy, removing write locks, resuming\n" "unfinished operations, etc.\n" "usage: cleanup [WCPATH...]\n" "\n" -" Finish any unfinished business in the working copy at WCPATH, and remove\n" -" write locks (shown as 'L' by the 'svn status' command) from the working\n" -" copy. Usually, this is only necessary if a Subversion client has crashed\n" -" while using the working copy, leaving it in an unusable state.\n" +" By default, finish any unfinished business in the working copy at WCPATH,\n" +" and remove write locks (shown as 'L' by the 'svn status' command) from\n" +" the working copy. Usually, this is only necessary if a Subversion client\n" +" has crashed while using the working copy, leaving it in an unusable " +"state.\n" "\n" " WARNING: There is no mechanism that will protect write locks still\n" " being used by other Subversion clients. Running this command\n" " while another client is using the working copy can corrupt\n" " the working copy beyond repair!\n" +"\n" +" If the --remove-unversioned option or the --remove-ignored option\n" +" is given, remove any unversioned or ignored items within WCPATH.\n" +" To prevent accidental working copy corruption, unversioned or ignored\n" +" items can only be removed if the working copy is not already locked\n" +" for writing by another Subversion client.\n" +" Note that the 'svn status' command shows unversioned items as '?',\n" +" and ignored items as 'I' if the --no-ignore option is given to it.\n" msgstr "" -#: ../svn/svn.c:504 +#: ../svn/svn.c:599 msgid "" "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" @@ -10498,9 +11962,13 @@ msgid "" " given by a --message or --file option, an editor will be started.\n" " If any targets are (or contain) locked items, those will be\n" " unlocked after a successful commit.\n" +"\n" +" If --include-externals is given, also commit file and directory\n" +" externals reached by recursion. Do not commit externals with a\n" +" fixed revision.\n" msgstr "" -#: ../svn/svn.c:515 +#: ../svn/svn.c:614 msgid "" "Copy files and directories in a working copy or repository.\n" "usage: copy SRC[@REV]... DST\n" @@ -10520,7 +11988,7 @@ msgid "" " to the destination.\n" msgstr "" -#: ../svn/svn.c:534 +#: ../svn/svn.c:634 msgid "" "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" @@ -10537,7 +12005,7 @@ msgid "" " via an immediate commit.\n" msgstr "" -#: ../svn/svn.c:550 +#: ../svn/svn.c:650 msgid "" "Display local changes or differences between two revisions or paths.\n" "usage: 1. diff\n" @@ -10580,7 +12048,7 @@ msgid "" "URL[@NEWREV]'\n" msgstr "" -#: ../svn/svn.c:591 +#: ../svn/svn.c:691 msgid "" "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" @@ -10602,13 +12070,13 @@ msgid "" " looked up.\n" msgstr "" -#: ../svn/svn.c:613 +#: ../svn/svn.c:713 ../svnbench/svnbench.c:205 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: help [SUBCOMMAND...]\n" msgstr "" -#: ../svn/svn.c:619 +#: ../svn/svn.c:719 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" @@ -10622,7 +12090,7 @@ msgid "" " if --force is specified.\n" msgstr "" -#: ../svn/svn.c:633 +#: ../svn/svn.c:733 msgid "" "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" @@ -10630,9 +12098,24 @@ msgid "" " Print information about each TARGET (default: '.').\n" " TARGET may be either a working-copy path or URL. If specified, REV\n" " determines in which revision the target is first looked up.\n" +"\n" +" With --show-item, print only the value of one item of information\n" +" about TARGET. One of the following items can be selected:\n" +" kind the kind of TARGET\n" +" url the URL of TARGET in the repository\n" +" relative-url the repository-relative URL\n" +" repos-root-url the repository root URL\n" +" repos-uuid the repository UUID\n" +" revision the revision of TARGET (defaults to BASE\n" +" for working copy paths and HEAD for URLs)\n" +" last-changed-revision the most recent revision in which TARGET\n" +" was changed\n" +" last-changed-date the date of the last-changed revision\n" +" last-changed-author the author of the last-changed revision\n" +" wc-root the root of TARGET's working copy\n" msgstr "" -#: ../svn/svn.c:643 +#: ../svn/svn.c:759 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" @@ -10654,11 +12137,7 @@ msgid "" " Date and time of the last commit\n" msgstr "" -#: ../svn/svn.c:663 -msgid "include externals definitions" -msgstr "" - -#: ../svn/svn.c:666 +#: ../svn/svn.c:781 msgid "" "Lock working copy paths or URLs in the repository, so that\n" "no other user can commit changes to them.\n" @@ -10667,19 +12146,19 @@ msgid "" " Use --force to steal the lock from another user or working copy.\n" msgstr "" -#: ../svn/svn.c:672 +#: ../svn/svn.c:787 msgid "read lock comment from file ARG" msgstr "" -#: ../svn/svn.c:673 +#: ../svn/svn.c:788 msgid "specify lock comment ARG" msgstr "" -#: ../svn/svn.c:674 +#: ../svn/svn.c:789 msgid "force validity of lock comment source" msgstr "" -#: ../svn/svn.c:677 +#: ../svn/svn.c:792 msgid "" "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" @@ -10757,18 +12236,26 @@ msgid "" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" msgstr "" -#: ../svn/svn.c:755 +#: ../svn/svn.c:870 ../svnbench/svnbench.c:293 msgid "retrieve revision property ARG" msgstr "" -#: ../svn/svn.c:756 +#: ../svn/svn.c:871 ../svnbench/svnbench.c:294 msgid "the change made in revision ARG" msgstr "" +#: ../svn/svn.c:872 +msgid "also print all affected paths" +msgstr "" + +#: ../svn/svn.c:873 +msgid "do not print the log message" +msgstr "" + #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). -#: ../svn/svn.c:762 +#: ../svn/svn.c:879 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" @@ -11100,7 +12587,11 @@ msgid "" " repositories.\n" msgstr "" -#: ../svn/svn.c:1094 +#: ../svn/svn.c:1209 +msgid "force deletions even if deleted contents don't match" +msgstr "" + +#: ../svn/svn.c:1213 msgid "" "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" @@ -11132,7 +12623,7 @@ msgid "" " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" -#: ../svn/svn.c:1125 +#: ../svn/svn.c:1245 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" @@ -11150,7 +12641,7 @@ msgid "" " unless the --parents option is given.\n" msgstr "" -#: ../svn/svn.c:1142 +#: ../svn/svn.c:1262 msgid "" "Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" @@ -11173,7 +12664,7 @@ msgid "" " The --revision option has no use and is deprecated.\n" msgstr "" -#: ../svn/svn.c:1164 +#: ../svn/svn.c:1284 msgid "" "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" @@ -11220,7 +12711,7 @@ msgid "" " HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" -#: ../svn/svn.c:1212 +#: ../svn/svn.c:1332 msgid "" "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" @@ -11229,9 +12720,11 @@ msgid "" " 1. Removes versioned props in working copy.\n" " 2. Removes unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" +"\n" +" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1222 +#: ../svn/svn.c:1344 msgid "" "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" @@ -11241,10 +12734,10 @@ msgid "" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" See 'svn help propset' for more on setting properties.\n" +" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1234 +#: ../svn/svn.c:1356 msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" @@ -11261,20 +12754,23 @@ msgid "" " 'empty', the target path is printed on the same line before each value.\n" "\n" " By default, an extra newline is printed after the property value so that\n" -" the output looks pretty. With a single TARGET and depth 'empty', you can\n" -" use the --strict option to disable this (useful when redirecting a binary\n" -" property value to a file, for example).\n" +" the output looks pretty. With a single TARGET, depth 'empty' and without\n" +" --show-inherited-props, you can use the --no-newline option to disable " +"this\n" +" (useful when redirecting a binary property value to a file, for example).\n" +"\n" +" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1254 ../svn/svn.c:1271 +#: ../svn/svn.c:1378 ../svn/svn.c:1397 msgid "print path, name and value on separate lines" msgstr "" -#: ../svn/svn.c:1255 -msgid "don't print an extra newline" +#: ../svn/svn.c:1379 +msgid "(deprecated; use --no-newline)" msgstr "" -#: ../svn/svn.c:1258 +#: ../svn/svn.c:1382 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" @@ -11288,13 +12784,15 @@ msgid "" " With --verbose, the property values are printed as well, like 'svn " "propget\n" " --verbose'. With --quiet, the paths are not printed.\n" +"\n" +" See 'svn help propset' for descriptions of the svn:* special properties.\n" msgstr "" -#: ../svn/svn.c:1272 +#: ../svn/svn.c:1398 msgid "don't print the path" msgstr "" -#: ../svn/svn.c:1275 +#: ../svn/svn.c:1401 msgid "" "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" @@ -11353,6 +12851,18 @@ msgid "" " svn:ignore - A list of file glob patterns to ignore, one per " "line.\n" " svn:global-ignores - Like svn:ignore, but inheritable.\n" +" svn:auto-props - Automatically set properties on files when they " +"are\n" +" added or imported. Contains key-value pairs, one per line, in the " +"format:\n" +" PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE ...]\n" +" Example (where a literal ';' is escaped by adding another ';'):\n" +" *.html = svn:eol-style=native;svn:mime-type=text/html;; " +"charset=UTF8\n" +" Applies recursively to all files added or imported under the " +"directory\n" +" it is set on. See also [auto-props] in the client configuration " +"file.\n" " svn:externals - A list of module specifiers, one per line, in the\n" " following format similar to the syntax of 'svn checkout':\n" " [-r REV] URL[@PEG] LOCALPATH\n" @@ -11369,6 +12879,8 @@ msgid "" " ^/ to the repository root\n" " / to the server root\n" " // to the URL scheme\n" +" ^/../ to a sibling repository beneath the same SVNParentPath " +"location\n" " Use of the following format is discouraged but is supported for\n" " interoperability with Subversion 1.4 and earlier clients:\n" " LOCALPATH [-r PEG] URL\n" @@ -11377,11 +12889,11 @@ msgid "" " Lines starting with a '#' character are ignored.\n" msgstr "" -#: ../svn/svn.c:1354 +#: ../svn/svn.c:1488 msgid "read property value from file ARG" msgstr "" -#: ../svn/svn.c:1357 +#: ../svn/svn.c:1491 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" @@ -11405,7 +12917,7 @@ msgid "" " svn://svn.example.com/repo/project\n" msgstr "" -#: ../svn/svn.c:1380 +#: ../svn/svn.c:1514 msgid "" "Resolve conflicts on working copy files or directories.\n" "usage: resolve [PATH...]\n" @@ -11418,14 +12930,14 @@ msgid "" " In this mode, the command is not recursive by default (depth 'empty').\n" msgstr "" -#: ../svn/svn.c:1390 +#: ../svn/svn.c:1524 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full')" msgstr "" -#: ../svn/svn.c:1397 +#: ../svn/svn.c:1531 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" @@ -11436,7 +12948,7 @@ msgid "" " deprecated in favor of running 'svn resolve --accept working'.\n" msgstr "" -#: ../svn/svn.c:1407 +#: ../svn/svn.c:1541 msgid "" "Restore pristine working copy state (undo local changes).\n" "usage: revert PATH...\n" @@ -11449,7 +12961,7 @@ msgid "" " the output of 'svn help merge' for 'undo'.\n" msgstr "" -#: ../svn/svn.c:1419 +#: ../svn/svn.c:1553 msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" @@ -11480,9 +12992,10 @@ msgid "" " another Subversion client modifying the working copy\n" " ' ' not locked for writing\n" " 'L' locked for writing\n" -" Fourth column: Scheduled commit will contain addition-with-history\n" -" ' ' no history scheduled with commit\n" -" '+' history scheduled with commit\n" +" Fourth column: Scheduled commit will create a copy (addition-with-" +"history)\n" +" ' ' no history scheduled with commit (item was newly added)\n" +" '+' history scheduled with commit (item was copied)\n" " Fifth column: Whether the item is switched or a file external\n" " ' ' normal\n" " 'S' the item has a Switched URL relative to the parent\n" @@ -11546,11 +13059,11 @@ msgid "" " D wc/qax.c\n" msgstr "" -#: ../svn/svn.c:1512 +#: ../svn/svn.c:1646 msgid "don't print unversioned items" msgstr "" -#: ../svn/svn.c:1515 +#: ../svn/svn.c:1649 msgid "" "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" @@ -11594,11 +13107,15 @@ msgid "" " svn://svn.example.com/repo/project\n" msgstr "" -#: ../svn/svn.c:1557 +#: ../svn/svn.c:1691 msgid "allow switching to a node with no common ancestor" msgstr "" -#: ../svn/svn.c:1561 +#: ../svn/svn.c:1693 ../svn/svn.c:1753 +msgid "handle unversioned obstructions as changes" +msgstr "" + +#: ../svn/svn.c:1697 msgid "" "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" @@ -11606,7 +13123,7 @@ msgid "" " Use --force to break the lock.\n" msgstr "" -#: ../svn/svn.c:1568 +#: ../svn/svn.c:1704 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" @@ -11655,7 +13172,7 @@ msgid "" " targets of this operation.\n" msgstr "" -#: ../svn/svn.c:1618 +#: ../svn/svn.c:1756 msgid "" "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" @@ -11663,214 +13180,216 @@ msgid "" " Local modifications are preserved.\n" msgstr "" -#: ../svn/svn.c:1664 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:380 -#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:297 +#: ../svn/svn.c:1804 ../svnadmin/svnadmin.c:97 ../svnbench/svnbench.c:345 +#: ../svnfsfs/svnfsfs.c:79 ../svnlook/svnlook.c:387 ../svnrdump/svnrdump.c:66 +#: ../svnsync/svnsync.c:336 msgid "Caught signal" msgstr "" -#: ../svn/svn.c:1817 ../svnlook/svnlook.c:2565 +#: ../svn/svn.c:1950 ../svnbench/svnbench.c:437 ../svnlook/svnlook.c:2556 msgid "Non-numeric limit argument given" msgstr "" -#: ../svn/svn.c:1823 ../svnlook/svnlook.c:2571 +#: ../svn/svn.c:1955 ../svnbench/svnbench.c:442 ../svnlook/svnlook.c:2561 msgid "Argument to --limit must be positive" msgstr "" -#: ../svn/svn.c:1844 ../svn/svn.c:2121 +#: ../svn/svn.c:1975 ../svn/svn.c:2247 msgid "Can't specify -c with --old" msgstr "" -#: ../svn/svn.c:1875 +#: ../svn/svn.c:2005 ../svnbench/svnbench.c:478 #, c-format msgid "Negative number in range (%s) not supported with -c" msgstr "" -#: ../svn/svn.c:1888 +#: ../svn/svn.c:2017 ../svnbench/svnbench.c:490 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "" -#: ../svn/svn.c:1896 +#: ../svn/svn.c:2024 ../svnbench/svnbench.c:497 msgid "There is no change 0" msgstr "" -#: ../svn/svn.c:1939 ../svnadmin/svnadmin.c:2037 ../svnrdump/svnrdump.c:937 -#: ../svnsync/svnsync.c:2052 +#: ../svn/svn.c:2065 ../svnadmin/svnadmin.c:2518 ../svnbench/svnbench.c:539 +#: ../svnfsfs/svnfsfs.c:331 ../svnrdump/svnrdump.c:876 +#: ../svnsync/svnsync.c:2124 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "" -#: ../svn/svn.c:2005 ../svn/svn.c:2024 +#: ../svn/svn.c:2128 ../svn/svn.c:2145 ../svnbench/svnbench.c:578 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "" -#: ../svn/svn.c:2013 +#: ../svn/svn.c:2135 ../svnbench/svnbench.c:585 #, c-format msgid "" "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" msgstr "" -#: ../svn/svn.c:2032 +#: ../svn/svn.c:2152 #, c-format msgid "" "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or " "'infinity'" msgstr "" -#: ../svn/svn.c:2161 +#: ../svn/svn.c:2284 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "" -#: ../svn/svn.c:2181 +#: ../svn/svn.c:2302 msgid "Changelist names must not be empty" msgstr "" -#: ../svn/svn.c:2215 +#: ../svn/svn.c:2335 #, c-format msgid "'%s' is not a valid --accept value" msgstr "" -#: ../svn/svn.c:2223 +#: ../svn/svn.c:2343 #, c-format msgid "'%s' is not a valid --show-revs value" msgstr "" -#: ../svn/svn.c:2235 +#: ../svn/svn.c:2359 #, c-format msgid "Invalid strip count '%s'" msgstr "" -#: ../svn/svn.c:2241 +#: ../svn/svn.c:2365 msgid "Argument to --strip must be positive" msgstr "" -#: ../svn/svn.c:2296 ../svnmucc/svnmucc.c:1208 ../svnrdump/svnrdump.c:993 -#: ../svnsync/svnsync.c:2096 +#: ../svn/svn.c:2441 ../svnmucc/svnmucc.c:646 ../svnrdump/svnrdump.c:947 +#: ../svnsync/svnsync.c:2182 msgid "--non-interactive and --force-interactive are mutually exclusive" msgstr "" -#: ../svn/svn.c:2350 ../svndumpfilter/svndumpfilter.c:1538 -#: ../svnlook/svnlook.c:2667 +#: ../svn/svn.c:2494 ../svnbench/svnbench.c:708 +#: ../svndumpfilter/svndumpfilter.c:1456 ../svnlook/svnlook.c:2660 #, c-format msgid "Subcommand argument required\n" msgstr "" -#: ../svn/svn.c:2367 ../svnadmin/svnadmin.c:2220 -#: ../svndumpfilter/svndumpfilter.c:1558 ../svnlook/svnlook.c:2686 -#: ../svnrdump/svnrdump.c:1039 +#: ../svn/svn.c:2512 ../svnadmin/svnadmin.c:2718 ../svnbench/svnbench.c:726 +#: ../svndumpfilter/svndumpfilter.c:1474 ../svnfsfs/svnfsfs.c:403 +#: ../svnlook/svnlook.c:2677 ../svnrdump/svnrdump.c:991 #, c-format msgid "Unknown subcommand: '%s'\n" msgstr "" -#: ../svn/svn.c:2376 +#: ../svn/svn.c:2521 #, c-format msgid "" "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" msgstr "" -#: ../svn/svn.c:2411 +#: ../svn/svn.c:2557 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svn help %s' for usage.\n" msgstr "" -#: ../svn/svn.c:2425 +#: ../svn/svn.c:2572 ../svnbench/svnbench.c:774 msgid "" "Multiple revision arguments encountered; can't specify -c twice, or both -c " "and -r" msgstr "" -#: ../svn/svn.c:2437 +#: ../svn/svn.c:2583 msgid "--depth and --set-depth are mutually exclusive" msgstr "" -#: ../svn/svn.c:2447 +#: ../svn/svn.c:2592 ../svnbench/svnbench.c:785 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" msgstr "" -#: ../svn/svn.c:2457 +#: ../svn/svn.c:2601 ../svnbench/svnbench.c:794 msgid "--with-revprop and --with-no-revprops are mutually exclusive" msgstr "" -#: ../svn/svn.c:2470 +#: ../svn/svn.c:2631 msgid "--message (-m) and --file (-F) are mutually exclusive" msgstr "" -#: ../svn/svn.c:2479 ../svnmucc/svnmucc.c:1219 ../svnrdump/svnrdump.c:1098 -#: ../svnsync/svnsync.c:2147 -msgid "--trust-server-cert requires --non-interactive" +#: ../svn/svn.c:2644 ../svnbench/svnbench.c:807 ../svnmucc/svnmucc.c:658 +#: ../svnrdump/svnrdump.c:1050 +msgid "--trust-server-cert-failures requires --non-interactive" msgstr "" -#: ../svn/svn.c:2489 +#: ../svn/svn.c:2653 msgid "--diff-cmd and --internal-diff are mutually exclusive" msgstr "" -#: ../svn/svn.c:2537 +#: ../svn/svn.c:2695 msgid "--relocate and --depth are mutually exclusive" msgstr "" -#: ../svn/svn.c:2545 +#: ../svn/svn.c:2702 msgid "--relocate and --non-recursive (-N) are mutually exclusive" msgstr "" -#: ../svn/svn.c:2667 +#: ../svn/svn.c:2821 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "" -#: ../svn/svn.c:2674 +#: ../svn/svn.c:2828 msgid "Lock comment file is a versioned file; use '--force-log' to override" msgstr "" -#: ../svn/svn.c:2695 +#: ../svn/svn.c:2848 msgid "" "The log message is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "" -#: ../svn/svn.c:2702 +#: ../svn/svn.c:2855 msgid "" "The lock comment is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "" -#: ../svn/svn.c:2726 +#: ../svn/svn.c:2878 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "" -#: ../svn/svn.c:2831 ../svn/svn.c:2838 +#: ../svn/svn.c:2987 ../svn/svn.c:2994 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "" -#: ../svn/svn.c:2894 +#: ../svn/svn.c:3050 #, c-format msgid "Try 'svn help %s' for more information" msgstr "" -#: ../svn/svn.c:2900 +#: ../svn/svn.c:3056 ../svnbench/svnbench.c:957 msgid "Please see the 'svn upgrade' command" msgstr "" -#: ../svn/svn.c:2906 ../svnmucc/svnmucc.c:1457 ../svnrdump/svnrdump.c:1175 +#: ../svn/svn.c:3062 ../svnmucc/svnmucc.c:939 ../svnrdump/svnrdump.c:1126 msgid "" "Authentication failed and interactive prompting is disabled; see the --force-" "interactive option" msgstr "" -#: ../svn/svn.c:2911 +#: ../svn/svn.c:3067 msgid "" "Reading file from standard input because of -F option; this can interfere " "with interactive prompting" msgstr "" -#: ../svn/svn.c:2922 +#: ../svn/svn.c:3078 ../svnbench/svnbench.c:965 msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" msgstr "" -#: ../svn/svn.c:2929 +#: ../svn/svn.c:3085 msgid "" "Another process is blocking the working copy database, or the underlying " "filesystem does not support file locking; if the working copy is on a " @@ -11878,7 +13397,7 @@ msgid "" "server" msgstr "" -#: ../svn/svn.c:2942 +#: ../svn/svn.c:3098 msgid "" "When using svn+ssh:// URLs, keep in mind that the --username and --password " "options are ignored because authentication is performed by SSH, not " @@ -11903,6 +13422,10 @@ msgid "" "repository" msgstr "" +#: ../svn/unlock-cmd.c:101 +msgid "One or more locks could not be released" +msgstr "" + #: ../svn/update-cmd.c:93 #, c-format msgid "Summary of updates:\n" @@ -11913,221 +13436,244 @@ msgstr "" msgid " Updated '%s' to r%ld.\n" msgstr "" -#: ../svn/util.c:79 +#: ../svn/util.c:86 #, c-format -msgid "" -"\n" -"Committed revision %ld%s.\n" +msgid "Committed revision %ld%s.\n" msgstr "" -#: ../svn/util.c:83 +#: ../svn/util.c:90 msgid " (the answer to life, the universe, and everything)" msgstr "" -#: ../svn/util.c:92 +#: ../svn/util.c:99 #, c-format msgid "" "\n" "Warning: %s\n" msgstr "" -#: ../svn/util.c:133 +#: ../svn/util.c:140 msgid "" "The SVN_MERGE environment variable is empty or consists solely of " "whitespace. Expected a shell command.\n" msgstr "" -#: ../svn/util.c:139 +#: ../svn/util.c:146 msgid "" "The environment variable SVN_MERGE and the merge-tool-cmd run-time " "configuration option were not set.\n" msgstr "" -#: ../svn/util.c:169 +#: ../svn/util.c:175 #, c-format -msgid "The external merge tool exited with exit code %d" +msgid "The external merge tool '%s' exited with exit code %d." msgstr "" -#: ../svn/util.c:211 +#: ../svn/util.c:218 msgid "Log message contains a zero byte" msgstr "" -#: ../svn/util.c:269 +#: ../svn/util.c:278 #, c-format msgid " '%s'" msgstr "" -#: ../svn/util.c:273 +#: ../svn/util.c:282 msgid "Your commit message was left in a temporary file:" msgstr "" -#: ../svn/util.c:325 +#: ../svn/util.c:334 msgid "--This line, and those below, will be ignored--" msgstr "" -#: ../svn/util.c:360 +#: ../svn/util.c:360 ../svnmucc/svnmucc.c:421 msgid "Error normalizing log message to internal format" msgstr "" -#: ../svn/util.c:447 ../svnmucc/svnmucc.c:764 +#: ../svn/util.c:449 ../svnmucc/svnmucc.c:431 msgid "Cannot invoke editor to get log message when non-interactive" msgstr "" -#: ../svn/util.c:460 +#: ../svn/util.c:462 msgid "" "Could not use external editor to fetch log message; consider setting the " "$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) " "options" msgstr "" -#: ../svn/util.c:496 +#: ../svn/util.c:498 msgid "" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit:\n" msgstr "" -#: ../svn/util.c:549 +#: ../svn/util.c:551 msgid "" "Use --force to override this restriction (local modifications may be lost)" msgstr "" -#: ../svn/util.c:738 ../svn/util.c:771 +#: ../svn/util.c:740 ../svn/util.c:773 msgid "none" msgstr "" -#: ../svn/util.c:739 +#: ../svn/util.c:741 msgid "file" msgstr "" -#: ../svn/util.c:740 +#: ../svn/util.c:742 msgid "dir" msgstr "" -#: ../svn/util.c:772 +#: ../svn/util.c:774 msgid "update" msgstr "" -#: ../svn/util.c:773 +#: ../svn/util.c:775 msgid "switch" msgstr "" -#: ../svn/util.c:896 +#: ../svn/util.c:898 msgid "(invalid date)" msgstr "" -#: ../svn/util.c:1056 +#: ../svn/util.c:1058 #, c-format msgid "" "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; " "diff, merge, blame, and other operations will stop working on this file\n" msgstr "" -#: ../svnadmin/svnadmin.c:217 ../svnrdump/svnrdump.c:120 +#: ../svnadmin/svnadmin.c:236 ../svnfsfs/svnfsfs.c:141 +#: ../svnrdump/svnrdump.c:124 msgid "specify revision number ARG (or X:Y range)" msgstr "" -#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:162 +#: ../svnadmin/svnadmin.c:239 ../svnlook/svnlook.c:166 msgid "specify transaction name ARG" msgstr "" -#: ../svnadmin/svnadmin.c:223 +#: ../svnadmin/svnadmin.c:242 msgid "dump or hotcopy incrementally" msgstr "" -#: ../svnadmin/svnadmin.c:226 +#: ../svnadmin/svnadmin.c:245 msgid "use deltas in dump output" msgstr "" -#: ../svnadmin/svnadmin.c:229 +#: ../svnadmin/svnadmin.c:248 msgid "bypass the repository hook system" msgstr "" -#: ../svnadmin/svnadmin.c:232 +#: ../svnadmin/svnadmin.c:251 msgid "bypass property validation logic" msgstr "" -#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:193 -#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:289 -#: ../svnversion/svnversion.c:143 -msgid "no progress (only errors) to stderr" +#: ../svnadmin/svnadmin.c:254 +msgid "ignore revision datestamps found in the stream" msgstr "" -#: ../svnadmin/svnadmin.c:238 +#: ../svnadmin/svnadmin.c:257 ../svnfsfs/svnfsfs.c:138 +msgid "no progress (only errors to stderr)" +msgstr "" + +#: ../svnadmin/svnadmin.c:260 msgid "ignore any repos UUID found in the stream" msgstr "" -#: ../svnadmin/svnadmin.c:241 +#: ../svnadmin/svnadmin.c:263 msgid "set repos UUID to that found in stream, if any" msgstr "" -#: ../svnadmin/svnadmin.c:244 -msgid "type of repository: 'fsfs' (default) or 'bdb'" +#: ../svnadmin/svnadmin.c:266 +msgid "" +"type of repository:\n" +" 'fsfs' (default), 'bdb' or 'fsx'\n" +" CAUTION: FSX is for EXPERIMENTAL use only!" msgstr "" -#: ../svnadmin/svnadmin.c:247 +#: ../svnadmin/svnadmin.c:271 msgid "load at specified directory in repository" msgstr "" -#: ../svnadmin/svnadmin.c:250 +#: ../svnadmin/svnadmin.c:274 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:253 +#: ../svnadmin/svnadmin.c:277 msgid "disable automatic log file removal [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:259 +#: ../svnadmin/svnadmin.c:283 msgid "" "remove redundant Berkeley DB log files\n" " from source repository [Berkeley DB]" msgstr "" -#: ../svnadmin/svnadmin.c:263 +#: ../svnadmin/svnadmin.c:287 msgid "call pre-commit hook before committing revisions" msgstr "" -#: ../svnadmin/svnadmin.c:266 +#: ../svnadmin/svnadmin.c:290 msgid "call post-commit hook after committing revisions" msgstr "" -#: ../svnadmin/svnadmin.c:269 +#: ../svnadmin/svnadmin.c:293 msgid "call hook before changing revision property" msgstr "" -#: ../svnadmin/svnadmin.c:272 +#: ../svnadmin/svnadmin.c:296 msgid "call hook after changing revision property" msgstr "" -#: ../svnadmin/svnadmin.c:275 +#: ../svnadmin/svnadmin.c:299 msgid "" "wait instead of exit if the repository is in\n" " use by another process" msgstr "" -#: ../svnadmin/svnadmin.c:279 ../svnadmin/svnadmin.c:282 -#: ../svnadmin/svnadmin.c:285 +#: ../svnadmin/svnadmin.c:303 ../svnadmin/svnadmin.c:306 +#: ../svnadmin/svnadmin.c:309 msgid "deprecated; see --compatible-version" msgstr "" -#: ../svnadmin/svnadmin.c:288 +#: ../svnadmin/svnadmin.c:312 +msgid "continue verification after detecting a corruption" +msgstr "" + +#: ../svnadmin/svnadmin.c:315 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations. Default: 16.\n" " [used for FSFS repositories only]" msgstr "" -#: ../svnadmin/svnadmin.c:293 +#: ../svnadmin/svnadmin.c:320 msgid "" "use repository format compatible with Subversion\n" " version ARG (\"1.5.5\", \"1.7\", etc.)" msgstr "" -#: ../svnadmin/svnadmin.c:296 +#: ../svnadmin/svnadmin.c:323 msgid "read repository paths from file ARG" msgstr "" -#: ../svnadmin/svnadmin.c:308 +#: ../svnadmin/svnadmin.c:326 +msgid "" +"report any names within the same directory or\n" +" svn:mergeinfo property value that differ only\n" +" in character representation, but are otherwise\n" +" identical" +msgstr "" + +#: ../svnadmin/svnadmin.c:332 +msgid "" +"verify metadata only (ignored for BDB),\n" +" checking against external corruption in\n" +" Subversion 1.9+ format repositories.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:346 msgid "" "usage: svnadmin crashtest REPOS_PATH\n" "\n" @@ -12135,14 +13681,31 @@ msgid "" "a process that crashes while holding an open repository handle.\n" msgstr "" -#: ../svnadmin/svnadmin.c:314 +#: ../svnadmin/svnadmin.c:352 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" "Create a new, empty repository at REPOS_PATH.\n" msgstr "" -#: ../svnadmin/svnadmin.c:323 +#: ../svnadmin/svnadmin.c:361 +msgid "" +"usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" +" 2. svnadmin delrevprop REPO_PATH -t TXN NAME\n" +"\n" +"1. Delete the property NAME on revision REVISION.\n" +"\n" +"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" +"trigger the revision property-related hooks (for example, if you want\n" +"an email notification sent from your post-revprop-change hook).\n" +"\n" +"NOTE: Revision properties are not versioned, so this command will\n" +"irreversibly destroy the previous value of the property.\n" +"\n" +"2. Delete the property NAME on transaction TXN.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:374 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" @@ -12153,7 +13716,7 @@ msgid "" "this will simply deltify the HEAD revision.\n" msgstr "" -#: ../svnadmin/svnadmin.c:332 +#: ../svnadmin/svnadmin.c:383 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" @@ -12168,26 +13731,27 @@ msgid "" "changed in those revisions.)\n" msgstr "" -#: ../svnadmin/svnadmin.c:345 +#: ../svnadmin/svnadmin.c:396 msgid "" "usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" " 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" "\n" "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" +" Allows safe use of third-party backup tools on a live repository.\n" "\n" "2. Like 1 except all repositories listed in FILE are locked. The file\n" " format is repository paths separated by newlines. Repositories are\n" " locked in the same order as they are listed in the file.\n" msgstr "" -#: ../svnadmin/svnadmin.c:355 +#: ../svnadmin/svnadmin.c:407 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" "Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnadmin/svnadmin.c:360 +#: ../svnadmin/svnadmin.c:412 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" @@ -12197,7 +13761,14 @@ msgid "" "repositories.\n" msgstr "" -#: ../svnadmin/svnadmin.c:367 +#: ../svnadmin/svnadmin.c:419 +msgid "" +"usage: svnadmin info REPOS_PATH\n" +"\n" +"Print information about the repository at REPOS_PATH.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:424 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" @@ -12207,7 +13778,7 @@ msgid "" "will cause your repository to be corrupted.\n" msgstr "" -#: ../svnadmin/svnadmin.c:374 +#: ../svnadmin/svnadmin.c:431 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" @@ -12215,7 +13786,7 @@ msgid "" "\n" msgstr "" -#: ../svnadmin/svnadmin.c:379 +#: ../svnadmin/svnadmin.c:436 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" @@ -12227,7 +13798,7 @@ msgid "" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -#: ../svnadmin/svnadmin.c:391 +#: ../svnadmin/svnadmin.c:449 msgid "" "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" "\n" @@ -12236,7 +13807,7 @@ msgid "" "triggering the pre-lock and post-lock hook scripts.\n" msgstr "" -#: ../svnadmin/svnadmin.c:398 +#: ../svnadmin/svnadmin.c:456 msgid "" "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" @@ -12244,14 +13815,14 @@ msgid "" "if not provided, is the root of the repository).\n" msgstr "" -#: ../svnadmin/svnadmin.c:404 +#: ../svnadmin/svnadmin.c:462 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" "Print the names of all uncommitted transactions.\n" msgstr "" -#: ../svnadmin/svnadmin.c:409 +#: ../svnadmin/svnadmin.c:467 msgid "" "usage: svnadmin pack REPOS_PATH\n" "\n" @@ -12259,7 +13830,7 @@ msgid "" "This may not apply to all repositories, in which case, exit.\n" msgstr "" -#: ../svnadmin/svnadmin.c:415 +#: ../svnadmin/svnadmin.c:473 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" @@ -12269,21 +13840,21 @@ msgid "" "exit if the repository is in use by another process.\n" msgstr "" -#: ../svnadmin/svnadmin.c:423 +#: ../svnadmin/svnadmin.c:481 msgid "" "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" "Unconditionally remove lock from each LOCKED_PATH.\n" msgstr "" -#: ../svnadmin/svnadmin.c:428 +#: ../svnadmin/svnadmin.c:486 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" "Delete the named transaction(s).\n" msgstr "" -#: ../svnadmin/svnadmin.c:433 +#: ../svnadmin/svnadmin.c:491 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" @@ -12298,20 +13869,24 @@ msgid "" "overwrite the previous log message.\n" msgstr "" -#: ../svnadmin/svnadmin.c:445 +#: ../svnadmin/svnadmin.c:503 msgid "" -"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" +"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" +" 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" +"\n" +"1. Set the property NAME on revision REVISION to the contents of FILE.\n" "\n" -"Set the property NAME on revision REVISION to the contents of FILE. Use\n" -"--use-pre-revprop-change-hook/--use-post-revprop-change-hook to trigger\n" -"the revision property-related hooks (for example, if you want an email\n" -"notification sent from your post-revprop-change hook).\n" +"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" +"trigger the revision property-related hooks (for example, if you want\n" +"an email notification sent from your post-revprop-change hook).\n" "\n" "NOTE: Revision properties are not versioned, so this command will\n" "overwrite the previous value of the property.\n" +"\n" +"2. Set the property NAME on transaction TXN to the contents of FILE.\n" msgstr "" -#: ../svnadmin/svnadmin.c:456 +#: ../svnadmin/svnadmin.c:516 msgid "" "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" @@ -12320,7 +13895,7 @@ msgid "" "generate a brand new UUID for the repository.\n" msgstr "" -#: ../svnadmin/svnadmin.c:463 +#: ../svnadmin/svnadmin.c:523 msgid "" "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" @@ -12329,7 +13904,7 @@ msgid "" "triggering the pre-unlock and post-unlock hook scripts.\n" msgstr "" -#: ../svnadmin/svnadmin.c:470 +#: ../svnadmin/svnadmin.c:530 msgid "" "usage: svnadmin upgrade REPOS_PATH\n" "\n" @@ -12345,186 +13920,328 @@ msgid "" "repository state as a dump and subsequent load would.\n" msgstr "" -#: ../svnadmin/svnadmin.c:483 +#: ../svnadmin/svnadmin.c:543 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" "Verify the data stored in the repository.\n" msgstr "" -#: ../svnadmin/svnadmin.c:545 +#: ../svnadmin/svnadmin.c:607 msgid "Invalid revision specifier" msgstr "" -#: ../svnadmin/svnadmin.c:549 +#: ../svnadmin/svnadmin.c:611 #, c-format msgid "Revisions must not be greater than the youngest revision (%ld)" msgstr "" -#: ../svnadmin/svnadmin.c:656 +#: ../svnadmin/svnadmin.c:629 +#, c-format +msgid "Path '%s' is not a local path" +msgstr "" + +#: ../svnadmin/svnadmin.c:658 +msgid "Not enough arguments" +msgstr "" + +#: ../svnadmin/svnadmin.c:661 +msgid "Too many arguments" +msgstr "" + +#: ../svnadmin/svnadmin.c:697 +#, c-format +msgid "" +"Successfully opened repository '%s'.\n" +"Will now crash to simulate a crashing server process.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:736 #, c-format msgid "" "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s" "\" instead.\n" msgstr "" -#: ../svnadmin/svnadmin.c:696 +#: ../svnadmin/svnadmin.c:777 msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" msgstr "" -#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1011 -#: ../svnadmin/svnadmin.c:1192 +#: ../svnadmin/svnadmin.c:785 +#, c-format +msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" +msgstr "" + +#: ../svnadmin/svnadmin.c:830 ../svnadmin/svnadmin.c:1214 +#: ../svnadmin/svnadmin.c:1399 msgid "First revision cannot be higher than second" msgstr "" -#: ../svnadmin/svnadmin.c:748 +#: ../svnadmin/svnadmin.c:839 #, c-format msgid "Deltifying revision %ld..." msgstr "" -#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:812 -#: ../svnadmin/svnadmin.c:827 +#: ../svnadmin/svnadmin.c:843 ../svnadmin/svnadmin.c:974 +#: ../svnadmin/svnadmin.c:989 #, c-format msgid "done.\n" msgstr "" -#: ../svnadmin/svnadmin.c:793 +#: ../svnadmin/svnadmin.c:892 +msgid "* Error verifying repository metadata.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:898 #, c-format +msgid "* Error verifying revision %ld.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:955 msgid "* Verifying repository metadata ...\n" msgstr "" -#: ../svnadmin/svnadmin.c:796 +#: ../svnadmin/svnadmin.c:958 #, c-format msgid "* Verifying metadata at revision %ld ...\n" msgstr "" -#: ../svnadmin/svnadmin.c:806 +#: ../svnadmin/svnadmin.c:968 #, c-format msgid "Packing revisions in shard %s..." msgstr "" -#: ../svnadmin/svnadmin.c:821 +#: ../svnadmin/svnadmin.c:983 #, c-format msgid "Packing revprops in shard %s..." msgstr "" -#: ../svnadmin/svnadmin.c:898 +#: ../svnadmin/svnadmin.c:1058 #, c-format msgid "<<< Skipped original revision %ld\n" msgstr "" -#: ../svnadmin/svnadmin.c:915 -#, c-format +#: ../svnadmin/svnadmin.c:1075 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" msgstr "" -#: ../svnadmin/svnadmin.c:922 +#: ../svnadmin/svnadmin.c:1082 msgid "" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" msgstr "" -#: ../svnadmin/svnadmin.c:1072 +#: ../svnadmin/svnadmin.c:1093 +#, c-format +msgid "Packed revision properties in shard %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1104 +#, c-format +msgid "Removed non-packed revision properties in shard %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1112 +#, c-format +msgid "Bumped repository format to %ld\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1120 +#, c-format +msgid "* Copied revision %ld.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1126 +#, c-format +msgid "* Copied revisions from %ld to %ld.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1275 msgid "No program provided" msgstr "" -#: ../svnadmin/svnadmin.c:1108 +#: ../svnadmin/svnadmin.c:1313 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion repository administration tool.\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" "Type 'svnadmin --version' to see the program version and FS modules.\n" "\n" "Available subcommands:\n" msgstr "" -#: ../svnadmin/svnadmin.c:1115 ../svnlook/svnlook.c:2226 -#: ../svnserve/svnserve.c:335 +#: ../svnadmin/svnadmin.c:1321 ../svnlook/svnlook.c:2228 +#: ../svnserve/svnserve.c:429 msgid "" "The following repository back-end (FS) modules are available:\n" "\n" msgstr "" -#: ../svnadmin/svnadmin.c:1144 +#: ../svnadmin/svnadmin.c:1350 #, c-format msgid "Invalid revision number (%ld) specified" msgstr "" -#: ../svnadmin/svnadmin.c:1154 +#: ../svnadmin/svnadmin.c:1360 msgid "Non-numeric revision specified" msgstr "" -#: ../svnadmin/svnadmin.c:1213 +#: ../svnadmin/svnadmin.c:1421 msgid "" "Invalid property value found in dumpstream; consider repairing the source or " "using --bypass-prop-validation while loading." msgstr "" -#: ../svnadmin/svnadmin.c:1279 ../svnadmin/svnadmin.c:1911 +#: ../svnadmin/svnadmin.c:1487 ../svnadmin/svnadmin.c:2366 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" msgstr "" -#: ../svnadmin/svnadmin.c:1284 ../svnadmin/svnadmin.c:1916 +#: ../svnadmin/svnadmin.c:1492 ../svnadmin/svnadmin.c:2371 #, c-format msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "" -#: ../svnadmin/svnadmin.c:1292 +#: ../svnadmin/svnadmin.c:1500 #, c-format msgid "" "\n" "Recovery completed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1299 +#: ../svnadmin/svnadmin.c:1507 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1414 +#: ../svnadmin/svnadmin.c:1622 #, c-format msgid "Transaction '%s' removed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1476 ../svnadmin/svnadmin.c:1521 +#: ../svnadmin/svnadmin.c:1704 ../svnadmin/svnadmin.c:1818 +#: ../svnadmin/svnadmin.c:2416 +#, c-format +msgid "--revision (-r) and --transaction (-t) are mutually exclusive" +msgstr "" + +#: ../svnadmin/svnadmin.c:1710 ../svnadmin/svnadmin.c:2422 +#, c-format +msgid "Calling hooks is incompatible with --transaction (-t)" +msgstr "" + +#: ../svnadmin/svnadmin.c:1715 ../svnadmin/svnadmin.c:1760 +#: ../svnadmin/svnadmin.c:2427 #, c-format msgid "Missing revision" msgstr "" -#: ../svnadmin/svnadmin.c:1479 ../svnadmin/svnadmin.c:1524 +#: ../svnadmin/svnadmin.c:1718 ../svnadmin/svnadmin.c:1763 +#: ../svnadmin/svnadmin.c:2430 #, c-format msgid "Only one revision allowed" msgstr "" -#: ../svnadmin/svnadmin.c:1578 +#: ../svnadmin/svnadmin.c:1881 +msgid "" +"\n" +"-----Summary of corrupt revisions-----\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1933 #, c-format -msgid "--revision (-r) and --transaction (-t) are mutually exclusive" +msgid "Failed to verify repository '%s'" +msgstr "" + +#: ../svnadmin/svnadmin.c:1984 +#, c-format +msgid "UUID: %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:1990 +#, c-format +msgid "Repository Format: %d\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2004 +#, c-format +msgid "Compatible With Version: %d.%d.0\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2023 +#, c-format +msgid "Repository Capability: %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2032 +#, c-format +msgid "Filesystem Type: %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2034 +#, c-format +msgid "Filesystem Format: %d\n" msgstr "" -#: ../svnadmin/svnadmin.c:1745 ../svnlook/svnlook.c:2289 +#: ../svnadmin/svnadmin.c:2043 +#, c-format +msgid "FSFS Sharded: yes\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2045 +#, c-format +msgid "FSFS Sharded: no\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2048 +#, c-format +msgid "FSFS Shard Size: %d\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2057 +#, c-format +msgid "FSFS Shards Packed: %ld/%ld\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2062 +#, c-format +msgid "FSFS Logical Addressing: yes\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2064 +#, c-format +msgid "FSFS Logical Addressing: no\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2074 +#, c-format +msgid "Configuration File: %s\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:2198 ../svnlook/svnlook.c:2291 #, c-format msgid "UUID Token: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1746 ../svnlook/svnlook.c:2290 +#: ../svnadmin/svnadmin.c:2199 ../svnlook/svnlook.c:2292 #, c-format msgid "Owner: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1747 ../svnlook/svnlook.c:2291 +#: ../svnadmin/svnadmin.c:2200 ../svnlook/svnlook.c:2293 #, c-format msgid "Created: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1748 ../svnlook/svnlook.c:2292 +#: ../svnadmin/svnadmin.c:2201 ../svnlook/svnlook.c:2294 #, c-format msgid "Expires: %s\n" msgstr "" -#: ../svnadmin/svnadmin.c:1750 +#: ../svnadmin/svnadmin.c:2203 #, c-format msgid "" "Comment (%i line):\n" @@ -12537,244 +14254,436 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svnadmin/svnadmin.c:1796 +#: ../svnadmin/svnadmin.c:2251 msgid "No paths to unlock provided" msgstr "" -#: ../svnadmin/svnadmin.c:1814 +#: ../svnadmin/svnadmin.c:2269 #, c-format msgid "Path '%s' isn't locked.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1826 +#: ../svnadmin/svnadmin.c:2281 #, c-format msgid "Removed lock on '%s'.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1879 +#: ../svnadmin/svnadmin.c:2334 #, c-format msgid "'%s' unlocked by user '%s'.\n" msgstr "" -#: ../svnadmin/svnadmin.c:1926 +#: ../svnadmin/svnadmin.c:2381 msgid "" "Upgrade of this repository's underlying versioned filesystem is not " "supported; consider dumping and loading the data elsewhere" msgstr "" -#: ../svnadmin/svnadmin.c:1933 +#: ../svnadmin/svnadmin.c:2388 msgid "" "Upgrade of this repository is not supported; consider dumping and loading " "the data elsewhere" msgstr "" -#: ../svnadmin/svnadmin.c:1939 +#: ../svnadmin/svnadmin.c:2394 #, c-format msgid "" "\n" "Upgrade completed.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2024 ../svnrdump/svnrdump.c:923 +#: ../svnadmin/svnadmin.c:2508 ../svnfsfs/svnfsfs.c:321 +#: ../svnrdump/svnrdump.c:864 msgid "" "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" msgstr "" -#: ../svnadmin/svnadmin.c:2102 +#: ../svnadmin/svnadmin.c:2588 #, c-format msgid "Cannot create pre-1.0-compatible repositories" msgstr "" -#: ../svnadmin/svnadmin.c:2115 +#: ../svnadmin/svnadmin.c:2600 #, c-format msgid "Cannot guarantee compatibility beyond the current running version (%s)" msgstr "" -#: ../svnadmin/svnadmin.c:2204 +#: ../svnadmin/svnadmin.c:2701 ../svnfsfs/svnfsfs.c:386 #, c-format msgid "subcommand argument required\n" msgstr "" -#: ../svnadmin/svnadmin.c:2239 +#: ../svnadmin/svnadmin.c:2738 ../svnfsfs/svnfsfs.c:421 msgid "Repository argument required" msgstr "" -#: ../svnadmin/svnadmin.c:2252 +#: ../svnadmin/svnadmin.c:2746 ../svnfsfs/svnfsfs.c:429 #, c-format msgid "'%s' is a URL when it should be a local path" msgstr "" -#: ../svnadmin/svnadmin.c:2283 +#: ../svnadmin/svnadmin.c:2776 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnadmin help %s' for usage.\n" msgstr "" -#: ../svnadmin/svnadmin.c:2326 +#: ../svnadmin/svnadmin.c:2820 msgid "Try 'svnadmin help' for more info" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:79 +#: ../svnbench/help-cmd.c:49 +msgid "" +"usage: svnbench <subcommand> [options] [args]\n" +"Subversion benchmarking tool.\n" +"Type 'svnbench help <subcommand>' for help on a specific subcommand.\n" +"Type 'svnbench --version' to see the program version and RA modules\n" +" or 'svnbench --version --quiet' to see just the version number.\n" +"\n" +"Most subcommands take file and/or directory arguments, recursing\n" +"on the directories. If no arguments are supplied to such a\n" +"command, it recurses on the current directory (inclusive) by default.\n" +"\n" +"Available subcommands:\n" +msgstr "" + +#: ../svnbench/null-blame-cmd.c:156 +#, c-format +msgid "" +"%15s revisions\n" +"%15s deltas\n" +"%15s bytes in deltas\n" +msgstr "" + +#: ../svnbench/null-export-cmd.c:334 +#, c-format +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s bytes in files\n" +"%15s properties\n" +"%15s bytes in properties\n" +msgstr "" + +#: ../svnbench/null-info-cmd.c:273 +#, c-format +msgid "Number of status notifications received: %d\n" +msgstr "" + +#: ../svnbench/null-list-cmd.c:153 +#, c-format +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s locks\n" +msgstr "" + +#: ../svnbench/null-log-cmd.c:190 +#, c-format +msgid "" +"Only relative paths can be specified after a URL for 'svnbench log', but " +"'%s' is not a relative path" +msgstr "" + +#: ../svnbench/null-log-cmd.c:222 +#, c-format +msgid "" +"%15s revisions, %15s merged in %s merges\n" +"%15s msg lines, %15s in merged revisions\n" +"%15s changes, %15s in merged revisions\n" +msgstr "" + +#: ../svnbench/null-log-cmd.c:234 +#, c-format +msgid "" +"%15s revisions\n" +"%15s msg lines\n" +"%15s changes\n" +msgstr "" + +#: ../svnbench/svnbench.c:113 ../svnrdump/svnrdump.c:136 +msgid "specify a password ARG" +msgstr "" + +#: ../svnbench/svnbench.c:120 +msgid "use strict semantics" +msgstr "" + +#: ../svnbench/svnbench.c:144 +msgid "do no interactive prompting" +msgstr "" + +#: ../svnbench/svnbench.c:211 +msgid "" +"Fetch all versions of a file in a batch.\n" +"usage: null-blame [-rM:N] TARGET[@REV]...\n" +"\n" +" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the last revision at or before rN that changed or added the line,\n" +" looking back no further than rM.\n" +"\n" +" With a reverse revision range '-r M:N' where M > N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the next revision after rN that changed or deleted the line,\n" +" looking forward no further than rM.\n" +"\n" +" If specified, REV determines in which revision the target is first\n" +" looked up.\n" +"\n" +" Write the annotated result to standard output.\n" +msgstr "" + +#: ../svnbench/svnbench.c:231 +msgid "" +"Create an unversioned copy of a tree.\n" +"usage: null-export [-r REV] URL[@PEGREV]\n" +"\n" +" Exports a clean directory tree from the repository specified by\n" +" URL, at revision REV if it is given, otherwise at HEAD.\n" +"\n" +" If specified, PEGREV determines in which revision the target is first\n" +" looked up.\n" +msgstr "" + +#: ../svnbench/svnbench.c:242 +msgid "" +"List directory entries in the repository.\n" +"usage: null-list [TARGET[@REV]...]\n" +"\n" +" List each TARGET file and the contents of each TARGET directory as\n" +" they exist in the repository. If TARGET is a working copy path, the\n" +" corresponding repository URL will be used. If specified, REV determines\n" +" in which revision the target is first looked up.\n" +"\n" +" The default TARGET is '.', meaning the repository URL of the current\n" +" working directory.\n" +"\n" +" With --verbose, the following fields will be fetched for each item:\n" +"\n" +" Revision number of the last commit\n" +" Author of the last commit\n" +" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" +" Size (in bytes)\n" +" Date and time of the last commit\n" +msgstr "" + +#: ../svnbench/svnbench.c:263 +msgid "" +"Fetch the log messages for a set of revision(s) and/or path(s).\n" +"usage: 1. null-log [PATH][@REV]\n" +" 2. null-log URL[@REV] [PATH...]\n" +"\n" +" 1. Fetch the log messages for the URL corresponding to PATH\n" +" (default: '.'). If specified, REV is the revision in which the\n" +" URL is first looked up, and the default revision range is REV:1.\n" +" If REV is not specified, the default revision range is BASE:1,\n" +" since the URL might not exist in the HEAD revision.\n" +"\n" +" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" +" If specified, REV is the revision in which the URL is first\n" +" looked up, and the default revision range is REV:1; otherwise,\n" +" the URL is looked up in HEAD, and the default revision range is\n" +" HEAD:1.\n" +"\n" +" Multiple '-c' or '-r' options may be specified (but not a\n" +" combination of '-c' and '-r' options), and mixing of forward and\n" +" reverse ranges is allowed.\n" +"\n" +" With -v, also print all affected paths with each log message.\n" +" With -q, don't print the log message body itself (note that this is\n" +" compatible with -v).\n" +"\n" +" Each log message is printed just once, even if more than one of the\n" +" affected paths for that revision were explicitly requested. Logs\n" +" follow copy history by default. Use --stop-on-copy to disable this\n" +" behavior, which can be useful for determining branchpoints.\n" +msgstr "" + +#: ../svnbench/svnbench.c:297 +msgid "" +"Display information about a local or remote item.\n" +"usage: null-info [TARGET[@REV]...]\n" +"\n" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or URL. If specified, REV\n" +" determines in which revision the target is first looked up.\n" +msgstr "" + +#: ../svnbench/svnbench.c:760 +#, c-format +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnbench help %s' for usage.\n" +msgstr "" + +#: ../svnbench/svnbench.c:951 +#, c-format +msgid "Try 'svnbench help %s' for more information" +msgstr "" + +#: ../svndumpfilter/svndumpfilter.c:80 #, c-format msgid "Can't open stdio file" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:406 +#: ../svndumpfilter/svndumpfilter.c:394 msgid "This is an empty revision for padding." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:489 +#: ../svndumpfilter/svndumpfilter.c:446 #, c-format msgid "Revision %ld committed as %ld.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:512 +#: ../svndumpfilter/svndumpfilter.c:469 #, c-format msgid "Revision %ld skipped.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:608 +#: ../svndumpfilter/svndumpfilter.c:566 #, c-format msgid "Invalid copy source path '%s'" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:649 +#: ../svndumpfilter/svndumpfilter.c:604 #, c-format msgid "Missing Node-action for path '%s'" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:692 +#: ../svndumpfilter/svndumpfilter.c:647 #, c-format msgid "No valid copyfrom revision in filtered stream" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:816 +#: ../svndumpfilter/svndumpfilter.c:715 #, c-format msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:838 +#: ../svndumpfilter/svndumpfilter.c:737 #, c-format msgid "No valid revision range 'start' in filtered stream" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:845 +#: ../svndumpfilter/svndumpfilter.c:744 #, c-format msgid "No valid revision range 'end' in filtered stream" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:891 ../svndumpfilter/svndumpfilter.c:922 +#: ../svndumpfilter/svndumpfilter.c:792 ../svndumpfilter/svndumpfilter.c:823 #, c-format msgid "" "Delta property block detected, but deltas are not enabled for node '%s' in " "original revision %ld" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1055 +#: ../svndumpfilter/svndumpfilter.c:985 msgid "Do not display filtering statistics." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1057 +#: ../svndumpfilter/svndumpfilter.c:987 msgid "Treat the path prefixes as file glob patterns." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1059 +#: ../svndumpfilter/svndumpfilter.c:989 msgid "Remove revisions emptied by filtering." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1061 +#: ../svndumpfilter/svndumpfilter.c:991 msgid "" "Remove all empty revisions found in dumpstream\n" " except revision 0." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1064 +#: ../svndumpfilter/svndumpfilter.c:994 msgid "Renumber revisions left after filtering." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1067 +#: ../svndumpfilter/svndumpfilter.c:997 msgid "Skip missing merge sources." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1069 +#: ../svndumpfilter/svndumpfilter.c:999 msgid "Don't filter revision properties." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1071 +#: ../svndumpfilter/svndumpfilter.c:1001 msgid "" "Read additional prefixes, one per line, from\n" " file ARG." msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1083 +#: ../svndumpfilter/svndumpfilter.c:1013 msgid "" "Filter out nodes with given prefixes from dumpstream.\n" "usage: svndumpfilter exclude PATH_PREFIX...\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1092 +#: ../svndumpfilter/svndumpfilter.c:1022 msgid "" "Filter out nodes without given prefixes from dumpstream.\n" "usage: svndumpfilter include PATH_PREFIX...\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1101 +#: ../svndumpfilter/svndumpfilter.c:1031 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1177 +#: ../svndumpfilter/svndumpfilter.c:1107 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" +"Subversion repository dump filtering tool.\n" "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n" "Type 'svndumpfilter --version' to see the program version.\n" "\n" "Available subcommands:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1235 +#: ../svndumpfilter/svndumpfilter.c:1166 #, c-format msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1237 +#: ../svndumpfilter/svndumpfilter.c:1168 #, c-format msgid "Excluding prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1240 +#: ../svndumpfilter/svndumpfilter.c:1171 #, c-format msgid "Including (and dropping empty revisions for) prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1242 +#: ../svndumpfilter/svndumpfilter.c:1173 #, c-format msgid "Including prefix patterns:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1250 +#: ../svndumpfilter/svndumpfilter.c:1181 #, c-format msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1252 +#: ../svndumpfilter/svndumpfilter.c:1183 #, c-format msgid "Excluding prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1255 +#: ../svndumpfilter/svndumpfilter.c:1186 #, c-format msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1257 +#: ../svndumpfilter/svndumpfilter.c:1188 #, c-format msgid "Including prefixes:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1285 +#: ../svndumpfilter/svndumpfilter.c:1216 #, c-format msgid "" "Dropped %d revision.\n" @@ -12785,85 +14694,260 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svndumpfilter/svndumpfilter.c:1293 +#: ../svndumpfilter/svndumpfilter.c:1224 msgid "Revisions renumbered as follows:\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1321 +#: ../svndumpfilter/svndumpfilter.c:1251 #, c-format msgid " %ld => (dropped)\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1336 +#: ../svndumpfilter/svndumpfilter.c:1266 #, c-format msgid "Dropped %d node:\n" msgid_plural "Dropped %d nodes:\n" msgstr[0] "" msgstr[1] "" -#: ../svndumpfilter/svndumpfilter.c:1505 +#: ../svndumpfilter/svndumpfilter.c:1424 msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1625 +#: ../svndumpfilter/svndumpfilter.c:1541 #, c-format msgid "" "\n" "Error: no prefixes supplied.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1656 +#: ../svndumpfilter/svndumpfilter.c:1572 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svndumpfilter help %s' for usage.\n" msgstr "" -#: ../svndumpfilter/svndumpfilter.c:1674 +#: ../svndumpfilter/svndumpfilter.c:1590 msgid "Try 'svndumpfilter help' for more info" msgstr "" -#: ../svnlook/svnlook.c:117 +#: ../svnfsfs/load-index-cmd.c:54 +#, c-format +msgid "Unknown item type '%s'" +msgstr "" + +#: ../svnfsfs/load-index-cmd.c:75 +#, c-format +msgid "%i columns needed, %i provided" +msgstr "" + +#: ../svnfsfs/load-index-cmd.c:85 +#, c-format +msgid "%s is not a value HEX string" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:72 +#, c-format +msgid "" +"%20s bytes in %12s reps\n" +"%20s bytes in %12s shared reps\n" +"%20s bytes expanded size\n" +"%20s bytes expanded shared size\n" +"%20s bytes with rep-sharing off\n" +"%20s shared references\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:96 +#, c-format +msgid "%12s r%-8ld %s\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:122 +#, c-format +msgid " %4s .. < %-4s %19s (%2d%%) bytes in %12s (%2d%%) items\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:245 ../svnfsfs/stats-cmd.c:254 +#, c-format +msgid "%11s %20s (%2d%%) representations\n" +msgstr "" + +#. Total sum can't be zero here. +#: ../svnfsfs/stats-cmd.c:292 ../svnfsfs/stats-cmd.c:302 +#: ../svnfsfs/stats-cmd.c:327 ../svnfsfs/stats-cmd.c:337 +#, c-format +msgid "%11s %20s (%2d%%) bytes\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:379 +#, c-format +msgid "" +"%20s bytes in %12s revisions\n" +"%20s bytes in %12s changes\n" +"%20s bytes in %12s node revision records\n" +"%20s bytes in %12s representations\n" +"%20s bytes expanded representation size\n" +"%20s bytes with rep-sharing off\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:399 +#, c-format +msgid "" +"%20s bytes in %12s nodes total\n" +"%20s bytes in %12s directory noderevs\n" +"%20s bytes in %12s file noderevs\n" +msgstr "" + +#: ../svnfsfs/stats-cmd.c:410 +#, c-format +msgid "" +"%20s bytes in %12s representations total\n" +"%20s bytes in %12s directory representations\n" +"%20s bytes in %12s file representations\n" +"%20s bytes in %12s representations of added file nodes\n" +"%20s bytes in %12s directory property representations\n" +"%20s bytes in %12s file property representations\n" +"%20s bytes in header & footer overhead\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:144 +msgid "" +"size of the extra in-memory cache in MB used to\n" +" minimize redundant operations. Default: 16." +msgstr "" + +#: ../svnfsfs/svnfsfs.c:157 +msgid "" +"usage: svnfsfs help [SUBCOMMAND...]\n" +"\n" +"Describe the usage of this program or its subcommands.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:162 +msgid "" +"usage: svnfsfs dump-index REPOS_PATH -r REV\n" +"\n" +"Dump the index contents for the revision / pack file containing revision " +"REV\n" +"to console. This is only available for FSFS format 7 (SVN 1.9+) " +"repositories.\n" +"The table produced contains a header in the first line followed by one line\n" +"per index entry, ordered by location in the revision / pack file. Columns:\n" +"\n" +" * Byte offset (hex) at which the item starts\n" +" * Length (hex) of the item in bytes\n" +" * Item type (string) is one of the following:\n" +"\n" +" none ... Unused section. File contents shall be NULs.\n" +" frep ... File representation.\n" +" drep ... Directory representation.\n" +" fprop .. File property.\n" +" dprop .. Directory property.\n" +" node ... Node revision.\n" +" chgs ... Changed paths list.\n" +" rep .... Representation of unknown type. Should not be used.\n" +" ??? .... Invalid. Index data is corrupt.\n" +"\n" +" The distinction between frep, drep, fprop and dprop is a mere " +"internal\n" +" classification used for various optimizations and does not affect " +"the\n" +" operational correctness.\n" +"\n" +" * Revision that the item belongs to (decimal)\n" +" * Item number (decimal) within that revision\n" +" * Modified FNV1a checksum (8 hex digits)\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:188 +msgid "" +"usage: svnfsfs load-index REPOS_PATH\n" +"\n" +"Read index contents from console. The format is the same as produced by " +"the\n" +"dump-index command, except that checksum as well as header are optional and " +"will\n" +"be ignored. The data must cover the full revision / pack file; the " +"revision\n" +"number is automatically extracted from input stream. No ordering is " +"required.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:196 +msgid "" +"usage: svnfsfs stats REPOS_PATH\n" +"\n" +"Write object size statistics to console.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:216 +#, c-format +msgid "%s repositories are not supported" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:232 +msgid "" +"general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion FSFS repository manipulation tool.\n" +"Type 'svnfsfs help <subcommand>' for help on a specific subcommand.\n" +"Type 'svnfsfs --version' to see the program version.\n" +"\n" +"Available subcommands:\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:459 +#, c-format +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnfsfs help %s' for usage.\n" +msgstr "" + +#: ../svnfsfs/svnfsfs.c:503 +msgid "Try 'svnfsfs help' for more info" +msgstr "" + +#: ../svnlook/svnlook.c:118 msgid "show details for copies" msgstr "" -#: ../svnlook/svnlook.c:120 +#: ../svnlook/svnlook.c:121 msgid "print differences against the copy source" msgstr "" -#: ../svnlook/svnlook.c:123 +#: ../svnlook/svnlook.c:124 msgid "show full paths instead of indenting them" msgstr "" -#: ../svnlook/svnlook.c:129 +#: ../svnlook/svnlook.c:130 msgid "maximum number of history entries" msgstr "" -#: ../svnlook/svnlook.c:147 +#: ../svnlook/svnlook.c:151 msgid "operate on single directory only" msgstr "" -#: ../svnlook/svnlook.c:150 +#: ../svnlook/svnlook.c:154 msgid "specify revision number ARG" msgstr "" -#: ../svnlook/svnlook.c:153 +#: ../svnlook/svnlook.c:157 msgid "operate on a revision property (use with -r or -t)" msgstr "" -#: ../svnlook/svnlook.c:156 +#: ../svnlook/svnlook.c:160 msgid "show node revision ids for each path" msgstr "" -#: ../svnlook/svnlook.c:159 +#: ../svnlook/svnlook.c:163 msgid "show path's inherited properties" msgstr "" -#: ../svnlook/svnlook.c:165 +#: ../svnlook/svnlook.c:169 msgid "be verbose" msgstr "" -#: ../svnlook/svnlook.c:174 +#: ../svnlook/svnlook.c:178 msgid "" "Specify differencing options for external diff or\n" " internal diff. Default: '-u'. Options are\n" @@ -12876,45 +14960,52 @@ msgid "" "space\n" " --ignore-eol-style: Ignore changes in EOL " "style\n" +" -U ARG, --context ARG: Show ARG lines of " +"context\n" " -p, --show-c-function: Show C function name" msgstr "" -#: ../svnlook/svnlook.c:205 +#: ../svnlook/svnlook.c:199 ../svnrdump/svnrdump.c:126 +#: ../svnserve/svnserve.c:380 ../svnversion/svnversion.c:146 +msgid "no progress (only errors) to stderr" +msgstr "" + +#: ../svnlook/svnlook.c:211 msgid "" "usage: svnlook author REPOS_PATH\n" "\n" "Print the author.\n" msgstr "" -#: ../svnlook/svnlook.c:210 +#: ../svnlook/svnlook.c:216 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" msgstr "" -#: ../svnlook/svnlook.c:215 +#: ../svnlook/svnlook.c:221 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" "Print the paths that were changed.\n" msgstr "" -#: ../svnlook/svnlook.c:220 +#: ../svnlook/svnlook.c:226 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" "Print the datestamp.\n" msgstr "" -#: ../svnlook/svnlook.c:225 +#: ../svnlook/svnlook.c:231 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" "Print GNU-style diffs of changed files and properties.\n" msgstr "" -#: ../svnlook/svnlook.c:232 +#: ../svnlook/svnlook.c:238 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" @@ -12922,7 +15013,7 @@ msgid "" "or whose file children were changed.\n" msgstr "" -#: ../svnlook/svnlook.c:238 +#: ../svnlook/svnlook.c:244 msgid "" "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" @@ -12930,14 +15021,14 @@ msgid "" "it is represented in the repository.\n" msgstr "" -#: ../svnlook/svnlook.c:244 +#: ../svnlook/svnlook.c:250 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" "Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnlook/svnlook.c:249 +#: ../svnlook/svnlook.c:255 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -12945,28 +15036,28 @@ msgid "" "the root directory if no path is supplied).\n" msgstr "" -#: ../svnlook/svnlook.c:255 +#: ../svnlook/svnlook.c:261 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" "Print the author, datestamp, log message size, and log message.\n" msgstr "" -#: ../svnlook/svnlook.c:260 +#: ../svnlook/svnlook.c:266 msgid "" "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" "If a lock exists on a path in the repository, describe it.\n" msgstr "" -#: ../svnlook/svnlook.c:265 +#: ../svnlook/svnlook.c:271 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" "Print the log message.\n" msgstr "" -#: ../svnlook/svnlook.c:270 +#: ../svnlook/svnlook.c:276 msgid "" "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" @@ -12975,7 +15066,7 @@ msgid "" "With --revprop, print the raw value of a revision property.\n" msgstr "" -#: ../svnlook/svnlook.c:279 +#: ../svnlook/svnlook.c:285 msgid "" "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " 2. svnlook proplist --revprop REPOS_PATH\n" @@ -12985,7 +15076,7 @@ msgid "" "With -v, show the property values too.\n" msgstr "" -#: ../svnlook/svnlook.c:290 +#: ../svnlook/svnlook.c:296 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -12993,89 +15084,94 @@ msgid "" "of the tree otherwise), optionally showing node revision ids.\n" msgstr "" -#: ../svnlook/svnlook.c:296 +#: ../svnlook/svnlook.c:302 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" "Print the repository's UUID.\n" msgstr "" -#: ../svnlook/svnlook.c:301 +#: ../svnlook/svnlook.c:307 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" "Print the youngest revision number.\n" msgstr "" -#: ../svnlook/svnlook.c:861 +#: ../svnlook/svnlook.c:868 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "" -#: ../svnlook/svnlook.c:929 +#: ../svnlook/svnlook.c:936 msgid "Added" msgstr "" -#: ../svnlook/svnlook.c:930 +#: ../svnlook/svnlook.c:937 msgid "Deleted" msgstr "" -#: ../svnlook/svnlook.c:931 +#: ../svnlook/svnlook.c:938 msgid "Modified" msgstr "" -#: ../svnlook/svnlook.c:932 +#: ../svnlook/svnlook.c:939 msgid "Index" msgstr "" -#: ../svnlook/svnlook.c:943 +#: ../svnlook/svnlook.c:950 msgid "" "(Binary files differ)\n" "\n" msgstr "" -#: ../svnlook/svnlook.c:1222 +#: ../svnlook/svnlook.c:1219 msgid "unknown" msgstr "" -#: ../svnlook/svnlook.c:1279 +#: ../svnlook/svnlook.c:1276 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" msgstr "" -#: ../svnlook/svnlook.c:1422 +#: ../svnlook/svnlook.c:1419 #, c-format msgid "'%s' is a URL, probably should be a path" msgstr "" -#: ../svnlook/svnlook.c:1445 ../svnlook/svnlook.c:1468 +#: ../svnlook/svnlook.c:1442 ../svnlook/svnlook.c:1465 #, c-format msgid "Path '%s' is not a file" msgstr "" -#: ../svnlook/svnlook.c:1604 +#: ../svnlook/svnlook.c:1599 msgid "History item limit reached" msgstr "" -#: ../svnlook/svnlook.c:1623 +#: ../svnlook/svnlook.c:1618 #, c-format msgid "" "REVISION PATH <ID>\n" "-------- ---------\n" msgstr "" -#: ../svnlook/svnlook.c:1628 +#: ../svnlook/svnlook.c:1623 #, c-format msgid "" "REVISION PATH\n" "-------- ----\n" msgstr "" -#: ../svnlook/svnlook.c:1700 +#: ../svnlook/svnlook.c:1696 #, c-format msgid "Property '%s' not found on revision %ld" msgstr "" +#: ../svnlook/svnlook.c:1700 +#, c-format +msgid "Property '%s' not found on transaction %s" +msgstr "" + #: ../svnlook/svnlook.c:1709 #, c-format msgid "" @@ -13100,23 +15196,24 @@ msgstr "" msgid "Property '%s' not found on path '%s' in transaction %s" msgstr "" -#: ../svnlook/svnlook.c:2064 +#: ../svnlook/svnlook.c:2065 msgid "Missing repository path argument" msgstr "" -#: ../svnlook/svnlook.c:2216 +#: ../svnlook/svnlook.c:2217 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion repository inspection tool.\n" +"Type 'svnlook help <subcommand>' for help on a specific subcommand.\n" +"Type 'svnlook --version' to see the program version and FS modules.\n" "Note: any subcommand which takes the '--revision' and '--transaction'\n" " options will, if invoked without one of those options, act on\n" " the repository's youngest revision.\n" -"Type 'svnlook help <subcommand>' for help on a specific subcommand.\n" -"Type 'svnlook --version' to see the program version and FS modules.\n" "\n" "Available subcommands:\n" msgstr "" -#: ../svnlook/svnlook.c:2294 +#: ../svnlook/svnlook.c:2296 #, c-format msgid "" "Comment (%i line):\n" @@ -13127,64 +15224,70 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../svnlook/svnlook.c:2346 +#: ../svnlook/svnlook.c:2348 #, c-format msgid "Missing propname argument" msgstr "" -#: ../svnlook/svnlook.c:2347 +#: ../svnlook/svnlook.c:2349 #, c-format msgid "Missing propname and repository path arguments" msgstr "" -#: ../svnlook/svnlook.c:2353 +#: ../svnlook/svnlook.c:2355 msgid "Missing propname or repository path argument" msgstr "" -#: ../svnlook/svnlook.c:2517 +#: ../svnlook/svnlook.c:2508 msgid "Invalid revision number supplied" msgstr "" -#: ../svnlook/svnlook.c:2629 +#: ../svnlook/svnlook.c:2622 msgid "" "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" msgstr "" -#: ../svnlook/svnlook.c:2636 +#: ../svnlook/svnlook.c:2629 msgid "" "Cannot use the '--show-inherited-props' option with the '--revprop' option" msgstr "" -#: ../svnlook/svnlook.c:2695 +#: ../svnlook/svnlook.c:2686 #, c-format msgid "Try 'svnadmin verify' instead.\n" msgstr "" -#: ../svnlook/svnlook.c:2729 +#: ../svnlook/svnlook.c:2719 #, c-format msgid "Repository argument required\n" msgstr "" -#: ../svnlook/svnlook.c:2738 +#: ../svnlook/svnlook.c:2728 #, c-format msgid "'%s' is a URL when it should be a path\n" msgstr "" -#: ../svnlook/svnlook.c:2790 +#: ../svnlook/svnlook.c:2778 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnlook help %s' for usage.\n" msgstr "" -#: ../svnlook/svnlook.c:2833 +#: ../svnlook/svnlook.c:2821 msgid "Try 'svnlook help' for more info" msgstr "" -#: ../svnmucc/svnmucc.c:927 +#: ../svnmucc/svnmucc.c:258 +#, c-format +msgid "Type 'svnmucc --help' for usage.\n" +msgstr "" + +#: ../svnmucc/svnmucc.c:266 msgid "" -"Subversion multiple URL command client\n" "usage: svnmucc ACTION...\n" +"Subversion multiple URL command client.\n" +"Type 'svnmucc --version' to see the program version and RA modules.\n" "\n" " Perform one or more Subversion repository URL-based ACTIONs, committing\n" " the result as a (single) new revision.\n" @@ -13214,9 +15317,17 @@ msgid "" " prompt only if standard input is a terminal)\n" " --force-interactive : do interactive prompting even if standard\n" " input is not a terminal\n" -" --trust-server-cert : accept SSL server certificates from unknown\n" -" certificate authorities without prompting (but\n" -" only with '--non-interactive')\n" +" --trust-server-cert : deprecated;\n" +" same as --trust-server-cert-failures=unknown-ca\n" +" --trust-server-cert-failures ARG\n" +" with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-" +"separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate),'not-yet-valid' (Not yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors).\n" " -X [--extra-args] ARG : append arguments from file ARG (one per line;\n" " use \"-\" to read from standard input)\n" " --config-dir ARG : use ARG to override the config directory\n" @@ -13225,24 +15336,29 @@ msgid "" " --version : print version information\n" msgstr "" -#: ../svnmucc/svnmucc.c:1003 +#: ../svnmucc/svnmucc.c:347 msgid "" "--message (-m), --file (-F), and --with-revprop=svn:log are mutually " "exclusive" msgstr "" -#: ../svnrdump/load_editor.c:392 ../svnsync/svnsync.c:327 +#: ../svnmucc/svnmucc.c:580 +#, c-format +msgid "Invalid revision number '%s'" +msgstr "" + +#: ../svnrdump/load_editor.c:231 ../svnsync/svnsync.c:366 #, c-format msgid "Failed to get lock on destination repos, currently held by '%s'\n" msgstr "" -#: ../svnrdump/load_editor.c:536 +#: ../svnrdump/load_editor.c:375 msgid "" "Target server does not support atomic revision property edits; consider " "upgrading it to 1.7." msgstr "" -#: ../svnrdump/svnrdump.c:101 +#: ../svnrdump/svnrdump.c:105 msgid "" "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" @@ -13251,153 +15367,173 @@ msgid "" "one revision.\n" msgstr "" -#: ../svnrdump/svnrdump.c:107 +#: ../svnrdump/svnrdump.c:111 msgid "" "usage: svnrdump load URL\n" "\n" "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" msgstr "" -#: ../svnrdump/svnrdump.c:111 +#: ../svnrdump/svnrdump.c:115 msgid "" "usage: svnrdump help [SUBCOMMAND...]\n" "\n" "Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnrdump/svnrdump.c:124 +#: ../svnrdump/svnrdump.c:128 msgid "dump incrementally" msgstr "" -#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:281 -#: ../svnversion/svnversion.c:139 +#: ../svnrdump/svnrdump.c:130 +msgid "skip revision property ARG (e.g., \"svn:author\")" +msgstr "" + +#: ../svnrdump/svnrdump.c:148 ../svnserve/svnserve.c:372 +#: ../svnversion/svnversion.c:142 msgid "display this help" msgstr "" -#: ../svnrdump/svnrdump.c:731 +#: ../svnrdump/svnrdump.c:669 msgid "" "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" +"Subversion remote repository dump and load tool.\n" "Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n" "Type 'svnrdump --version' to see the program version and RA modules.\n" "\n" "Available subcommands:\n" msgstr "" -#: ../svnrdump/svnrdump.c:775 ../svnrdump/svnrdump.c:809 +#: ../svnrdump/svnrdump.c:714 ../svnrdump/svnrdump.c:748 msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" msgstr "" -#: ../svnrdump/svnrdump.c:783 ../svnrdump/svnrdump.c:817 +#: ../svnrdump/svnrdump.c:722 ../svnrdump/svnrdump.c:756 #, c-format msgid "Revision '%ld' does not exist" msgstr "" -#: ../svnrdump/svnrdump.c:827 +#: ../svnrdump/svnrdump.c:766 msgid "" "LOWER revision cannot be greater than UPPER revision; consider reversing " "your revision range" msgstr "" -#: ../svnrdump/svnrdump.c:1072 +#: ../svnrdump/svnrdump.c:1024 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnrdump help %s' for usage.\n" msgstr "" -#: ../svnserve/cyrus_auth.c:119 +#: ../svnserve/cyrus_auth.c:121 msgid "Could not initialize the SASL library" msgstr "" -#: ../svnserve/cyrus_auth.c:260 +#: ../svnserve/cyrus_auth.c:193 +#, c-format +msgid "Initial token is too long" +msgstr "" + +#: ../svnserve/cyrus_auth.c:224 +#, c-format +msgid "Step response is too long" +msgstr "" + +#: ../svnserve/cyrus_auth.c:274 #, c-format msgid "Can't get hostname" msgstr "" -#: ../svnserve/cyrus_auth.c:325 +#: ../svnserve/cyrus_auth.c:331 msgid "Could not obtain the list of SASL mechanisms" msgstr "" -#: ../svnserve/cyrus_auth.c:367 +#: ../svnserve/cyrus_auth.c:374 msgid "Couldn't obtain the authenticated username" msgstr "" -#: ../svnserve/serve.c:2061 +#: ../svnserve/serve.c:2079 msgid "Path is not a string" msgstr "" -#: ../svnserve/serve.c:2218 +#: ../svnserve/serve.c:2249 msgid "Log revprop entry not a string" msgstr "" -#: ../svnserve/serve.c:2224 +#: ../svnserve/serve.c:2255 #, c-format msgid "Unknown revprop word '%s' in log command" msgstr "" -#: ../svnserve/serve.c:2240 +#: ../svnserve/serve.c:2271 msgid "Log path entry not a string" msgstr "" -#: ../svnserve/svnserve.c:162 +#: ../svnserve/serve.c:2894 ../svnserve/serve.c:3070 +#, c-format +msgid "No result for '%s'." +msgstr "" + +#: ../svnserve/svnserve.c:216 msgid "daemon mode" msgstr "" -#: ../svnserve/svnserve.c:163 +#: ../svnserve/svnserve.c:217 msgid "inetd mode" msgstr "" -#: ../svnserve/svnserve.c:164 +#: ../svnserve/svnserve.c:218 msgid "tunnel mode" msgstr "" -#: ../svnserve/svnserve.c:165 +#: ../svnserve/svnserve.c:219 msgid "listen-once mode (useful for debugging)" msgstr "" -#: ../svnserve/svnserve.c:168 +#: ../svnserve/svnserve.c:222 msgid "Windows service mode (Service Control Manager)" msgstr "" -#: ../svnserve/svnserve.c:170 +#: ../svnserve/svnserve.c:224 msgid "root of directory to serve" msgstr "" -#: ../svnserve/svnserve.c:172 +#: ../svnserve/svnserve.c:226 msgid "force read only, overriding repository config file" msgstr "" -#: ../svnserve/svnserve.c:174 +#: ../svnserve/svnserve.c:228 msgid "read configuration from file ARG" msgstr "" -#: ../svnserve/svnserve.c:177 +#: ../svnserve/svnserve.c:231 msgid "" "listen port. The default port is 3690.\n" " [mode: daemon, service, listen-once]" msgstr "" -#: ../svnserve/svnserve.c:181 +#: ../svnserve/svnserve.c:235 msgid "" "listen port. The default port is 3690.\n" " [mode: daemon, listen-once]" msgstr "" -#: ../svnserve/svnserve.c:187 +#: ../svnserve/svnserve.c:241 msgid "" "listen hostname or IP address\n" " By default svnserve listens on all addresses.\n" " [mode: daemon, service, listen-once]" msgstr "" -#: ../svnserve/svnserve.c:193 +#: ../svnserve/svnserve.c:247 msgid "" "listen hostname or IP address\n" " By default svnserve listens on all addresses.\n" " [mode: daemon, listen-once]" msgstr "" -#: ../svnserve/svnserve.c:200 +#: ../svnserve/svnserve.c:254 msgid "" "prefer IPv6 when resolving the listen hostname\n" " [IPv4 is preferred by default. Using IPv4 and " @@ -13407,46 +15543,47 @@ msgid "" " Use inetd mode or tunnel mode if you need this.]" msgstr "" -#: ../svnserve/svnserve.c:208 +#: ../svnserve/svnserve.c:262 msgid "" "compression level to use for network transmissions\n" " [0 .. no compression, 5 .. default, \n" " 9 .. maximum compression]" msgstr "" -#: ../svnserve/svnserve.c:214 +#: ../svnserve/svnserve.c:268 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations.\n" " Default is 16.\n" -" [used for FSFS repositories only]" +" 0 switches to dynamically sized caches.\n" +" [used for FSFS and FSX repositories only]" msgstr "" -#: ../svnserve/svnserve.c:222 +#: ../svnserve/svnserve.c:278 msgid "" "enable or disable caching of deltas between older\n" " revisions.\n" -" Default is no.\n" -" [used for FSFS repositories only]" +" Default is yes.\n" +" [used for FSFS and FSX repositories only]" msgstr "" -#: ../svnserve/svnserve.c:230 +#: ../svnserve/svnserve.c:286 msgid "" "enable or disable caching of file contents\n" " Default is yes.\n" -" [used for FSFS repositories only]" +" [used for FSFS and FSX repositories only]" msgstr "" -#: ../svnserve/svnserve.c:236 +#: ../svnserve/svnserve.c:292 msgid "" "enable or disable caching of revision properties.\n" " Consult the documentation before activating " "this.\n" " Default is no.\n" -" [used for FSFS repositories only]" +" [used for FSFS and FSX repositories only]" msgstr "" -#: ../svnserve/svnserve.c:244 +#: ../svnserve/svnserve.c:300 msgid "" "Optimize network handling based on the assumption\n" " that most clients are connected with a bitrate " @@ -13455,149 +15592,184 @@ msgid "" " Default is 0 (optimizations disabled)." msgstr "" +#: ../svnserve/svnserve.c:308 +msgid "" +"Parse and cache all data found in block instead\n" +" of just the requested item.\n" +" Default is no.\n" +" [used for FSFS repositories in 1.9 format only]" +msgstr "" + #. ### Making the assumption here that WIN32 never has fork and so #. * ### this option never exists when --service exists. -#: ../svnserve/svnserve.c:254 +#: ../svnserve/svnserve.c:318 msgid "use threads instead of fork [mode: daemon]" msgstr "" -#: ../svnserve/svnserve.c:258 +#: ../svnserve/svnserve.c:321 +msgid "" +"Minimum number of server threads, even if idle.\n" +" Capped to max-threads; minimum value is 0.\n" +" Default is 1.\n" +" [used only with --threads]" +msgstr "" + +#: ../svnserve/svnserve.c:330 +msgid "" +"Maximum number of server threads, even if there\n" +" are more connections. Minimum value is 1.\n" +" Default is 64.\n" +" [used only with --threads]" +msgstr "" + +#: ../svnserve/svnserve.c:339 +msgid "" +"Maximum number of server threads, even if there\n" +" are more connections. Minimum value is 1.\n" +" Default is 256.\n" +" [used only with --threads]" +msgstr "" + +#: ../svnserve/svnserve.c:349 msgid "" "run in foreground (useful for debugging)\n" " [mode: daemon]" msgstr "" -#: ../svnserve/svnserve.c:262 +#: ../svnserve/svnserve.c:353 msgid "" -"handle one connection at a time in the parent process\n" -" (useful for debugging)" +"handle one connection at a time in the parent\n" +" process (useful for debugging)" msgstr "" -#: ../svnserve/svnserve.c:266 +#: ../svnserve/svnserve.c:357 msgid "svnserve log file" msgstr "" -#: ../svnserve/svnserve.c:269 +#: ../svnserve/svnserve.c:360 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once, service]" msgstr "" -#: ../svnserve/svnserve.c:273 +#: ../svnserve/svnserve.c:364 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once]" msgstr "" -#: ../svnserve/svnserve.c:278 +#: ../svnserve/svnserve.c:369 msgid "" "tunnel username (default is current uid's name)\n" " [mode: tunnel]" msgstr "" -#: ../svnserve/svnserve.c:283 +#: ../svnserve/svnserve.c:374 msgid "" "virtual host mode (look for repo in directory\n" " of provided hostname)" msgstr "" -#: ../svnserve/svnserve.c:300 +#: ../svnserve/svnserve.c:390 #, c-format msgid "Type '%s --help' for usage.\n" msgstr "" -#: ../svnserve/svnserve.c:310 +#: ../svnserve/svnserve.c:399 msgid "" "usage: svnserve [-d | -i | -t | -X | --service] [options]\n" +"Subversion repository server.\n" +"Type 'svnserve --version' to see the program version.\n" "\n" "Valid options:\n" msgstr "" -#: ../svnserve/svnserve.c:316 +#: ../svnserve/svnserve.c:408 msgid "" "usage: svnserve [-d | -i | -t | -X] [options]\n" +"Subversion repository server.\n" +"Type 'svnserve --version' to see the program version.\n" "\n" "Valid options:\n" msgstr "" -#: ../svnserve/svnserve.c:344 +#: ../svnserve/svnserve.c:438 msgid "" "\n" "Cyrus SASL authentication is available.\n" msgstr "" -#: ../svnserve/svnserve.c:616 +#: ../svnserve/svnserve.c:524 +#, c-format +msgid "Can't accept client connection" +msgstr "" + +#: ../svnserve/svnserve.c:796 #, c-format msgid "Invalid port '%s'" msgstr "" -#: ../svnserve/svnserve.c:657 +#: ../svnserve/svnserve.c:832 #, c-format -msgid "svnserve: Root path '%s' does not exist or is not a directory.\n" +msgid "Root path '%s' does not exist or is not a directory" msgstr "" -#: ../svnserve/svnserve.c:770 +#: ../svnserve/svnserve.c:955 msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n" msgstr "" -#: ../svnserve/svnserve.c:773 +#: ../svnserve/svnserve.c:958 msgid "You must specify exactly one of -d, -i, -t or -X.\n" msgstr "" -#: ../svnserve/svnserve.c:782 +#: ../svnserve/svnserve.c:969 msgid "You may only specify one of -T or --single-thread\n" msgstr "" -#: ../svnserve/svnserve.c:810 -#, c-format -msgid "Option --tunnel-user is only valid in tunnel mode.\n" +#: ../svnserve/svnserve.c:1019 +msgid "Option --tunnel-user is only valid in tunnel mode" msgstr "" -#: ../svnserve/svnserve.c:829 -#, c-format -msgid "Can't open stdout" -msgstr "" - -#: ../svnserve/svnserve.c:883 +#: ../svnserve/svnserve.c:1088 #, c-format msgid "" "svnserve: The --service flag is only valid if the process is started by the " "Service Control Manager.\n" msgstr "" -#: ../svnserve/svnserve.c:933 +#: ../svnserve/svnserve.c:1139 #, c-format msgid "Can't get address info" msgstr "" -#: ../svnserve/svnserve.c:947 +#: ../svnserve/svnserve.c:1152 #, c-format msgid "Can't create server socket" msgstr "" -#: ../svnserve/svnserve.c:958 +#: ../svnserve/svnserve.c:1160 #, c-format -msgid "Can't bind server socket" +msgid "Can't set options on server socket" msgstr "" -#: ../svnserve/svnserve.c:1056 +#: ../svnserve/svnserve.c:1166 #, c-format -msgid "Can't accept client connection" +msgid "Can't bind server socket" msgstr "" -#: ../svnserve/svnserve.c:1137 +#: ../svnserve/svnserve.c:1172 #, c-format -msgid "Can't create threadattr" +msgid "Can't listen on server socket" msgstr "" -#: ../svnserve/svnserve.c:1145 +#: ../svnserve/svnserve.c:1253 #, c-format -msgid "Can't set detached state" +msgid "Can't create thread pool" msgstr "" -#: ../svnserve/svnserve.c:1158 +#: ../svnserve/svnserve.c:1316 #, c-format -msgid "Can't create thread" +msgid "Can't push task" msgstr "" #: ../svnserve/winservice.c:346 @@ -13622,7 +15794,7 @@ msgid "" "service" msgstr "" -#: ../svnsync/svnsync.c:92 +#: ../svnsync/svnsync.c:95 msgid "" "usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" @@ -13648,7 +15820,7 @@ msgid "" "mirror of the source repository.\n" msgstr "" -#: ../svnsync/svnsync.c:118 +#: ../svnsync/svnsync.c:121 msgid "" "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" "\n" @@ -13662,7 +15834,7 @@ msgid "" "DEST_URL repository.\n" msgstr "" -#: ../svnsync/svnsync.c:131 +#: ../svnsync/svnsync.c:134 msgid "" "usage:\n" "\n" @@ -13684,7 +15856,7 @@ msgid "" "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" msgstr "" -#: ../svnsync/svnsync.c:152 +#: ../svnsync/svnsync.c:155 msgid "" "usage: svnsync info DEST_URL\n" "\n" @@ -13692,18 +15864,18 @@ msgid "" "located at DEST_URL.\n" msgstr "" -#: ../svnsync/svnsync.c:158 +#: ../svnsync/svnsync.c:161 msgid "" "usage: svnsync help [SUBCOMMAND...]\n" "\n" "Describe the usage of this program or its subcommands.\n" msgstr "" -#: ../svnsync/svnsync.c:168 +#: ../svnsync/svnsync.c:171 msgid "print as little as possible" msgstr "" -#: ../svnsync/svnsync.c:170 +#: ../svnsync/svnsync.c:173 msgid "" "operate on revision ARG (or range ARG1:ARG2)\n" " A revision argument can be one of:\n" @@ -13711,39 +15883,67 @@ msgid "" " 'HEAD' latest in repository" msgstr "" -#: ../svnsync/svnsync.c:178 +#: ../svnsync/svnsync.c:181 msgid "allow a non-empty destination repository" msgstr "" -#: ../svnsync/svnsync.c:190 +#: ../svnsync/svnsync.c:193 msgid "" "specify a username ARG (deprecated;\n" " see --source-username and --sync-username)" msgstr "" -#: ../svnsync/svnsync.c:194 +#: ../svnsync/svnsync.c:197 msgid "" "specify a password ARG (deprecated;\n" " see --source-password and --sync-password)" msgstr "" -#: ../svnsync/svnsync.c:204 +#: ../svnsync/svnsync.c:201 +msgid "" +"deprecated; same as\n" +" --source-trust-server-cert-failures=unknown-ca\n" +" --sync-trust-server-cert-failures=unknown-ca" +msgstr "" + +#: ../svnsync/svnsync.c:207 +msgid "" +"with --non-interactive, accept SSL\n" +" server certificates with failures.\n" +" ARG is a comma-separated list of:\n" +" - 'unknown-ca' (Unknown Authority)\n" +" - 'cn-mismatch' (Hostname mismatch)\n" +" - 'expired' (Expired certificate)\n" +" - 'not-yet-valid' (Not yet valid certificate)\n" +" - 'other' (all other not separately classified\n" +" certificate errors).\n" +" Applied to the source URL." +msgstr "" + +#: ../svnsync/svnsync.c:227 +msgid "" +"Like\n" +" --source-trust-server-cert-failures,\n" +" but applied to the destination URL." +msgstr "" + +#: ../svnsync/svnsync.c:233 msgid "connect to source repository with username ARG" msgstr "" -#: ../svnsync/svnsync.c:206 +#: ../svnsync/svnsync.c:235 msgid "connect to source repository with password ARG" msgstr "" -#: ../svnsync/svnsync.c:208 +#: ../svnsync/svnsync.c:237 msgid "connect to sync repository with username ARG" msgstr "" -#: ../svnsync/svnsync.c:210 +#: ../svnsync/svnsync.c:239 msgid "connect to sync repository with password ARG" msgstr "" -#: ../svnsync/svnsync.c:222 +#: ../svnsync/svnsync.c:251 msgid "" "convert translatable properties from encoding ARG\n" " to UTF-8. If not specified, then properties " @@ -13751,7 +15951,7 @@ msgid "" " presumed to be encoded in UTF-8." msgstr "" -#: ../svnsync/svnsync.c:228 +#: ../svnsync/svnsync.c:257 msgid "" "Disable built-in locking. Use of this option can\n" " corrupt the mirror unless you ensure that no " @@ -13759,7 +15959,7 @@ msgid "" " instance of svnsync is running concurrently." msgstr "" -#: ../svnsync/svnsync.c:234 +#: ../svnsync/svnsync.c:263 msgid "" "Steal locks as necessary. Use, with caution,\n" " if your mirror repository contains stale locks\n" @@ -13768,77 +15968,83 @@ msgid "" " svnsync instance." msgstr "" -#: ../svnsync/svnsync.c:357 +#: ../svnsync/svnsync.c:271 +msgid "" +"size of the extra in-memory cache in MB used to\n" +" minimize operations for local 'file' scheme.\n" +msgstr "" + +#: ../svnsync/svnsync.c:396 msgid "" "Target server does not support atomic revision property edits; consider " "upgrading it to 1.7 or using an external locking program" msgstr "" -#: ../svnsync/svnsync.c:371 +#: ../svnsync/svnsync.c:410 #, c-format msgid "Stole lock previously held by '%s'\n" msgstr "" -#: ../svnsync/svnsync.c:460 +#: ../svnsync/svnsync.c:499 #, c-format msgid "Session is rooted at '%s' but the repos root is '%s'" msgstr "" -#: ../svnsync/svnsync.c:602 +#: ../svnsync/svnsync.c:641 #, c-format msgid "Copied properties for revision %ld (%s* properties skipped).\n" msgstr "" -#: ../svnsync/svnsync.c:607 +#: ../svnsync/svnsync.c:646 #, c-format msgid "Copied properties for revision %ld.\n" msgstr "" -#: ../svnsync/svnsync.c:623 +#: ../svnsync/svnsync.c:662 #, c-format msgid "" "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-" "props).\n" msgstr "" -#: ../svnsync/svnsync.c:753 +#: ../svnsync/svnsync.c:794 msgid "" "Destination repository already contains revision history; consider using --" "allow-non-empty if the repository's revisions are known to mirror their " "respective revisions in the source repository" msgstr "" -#: ../svnsync/svnsync.c:762 +#: ../svnsync/svnsync.c:803 #, c-format msgid "Destination repository is already synchronizing from '%s'" msgstr "" -#: ../svnsync/svnsync.c:797 +#: ../svnsync/svnsync.c:838 msgid "Destination repository has more revisions than source repository" msgstr "" -#: ../svnsync/svnsync.c:862 ../svnsync/svnsync.c:865 ../svnsync/svnsync.c:1518 -#: ../svnsync/svnsync.c:1525 ../svnsync/svnsync.c:1762 -#: ../svnsync/svnsync.c:1765 ../svnsync/svnsync.c:1809 +#: ../svnsync/svnsync.c:903 ../svnsync/svnsync.c:906 ../svnsync/svnsync.c:1578 +#: ../svnsync/svnsync.c:1585 ../svnsync/svnsync.c:1824 +#: ../svnsync/svnsync.c:1827 ../svnsync/svnsync.c:1871 #, c-format msgid "Path '%s' is not a URL" msgstr "" -#: ../svnsync/svnsync.c:892 +#: ../svnsync/svnsync.c:933 #, c-format msgid "Committed revision %ld.\n" msgstr "" -#: ../svnsync/svnsync.c:935 +#: ../svnsync/svnsync.c:976 msgid "Destination repository has not been initialized" msgstr "" -#: ../svnsync/svnsync.c:1301 +#: ../svnsync/svnsync.c:1351 #, c-format msgid "Commit created r%ld but should have created r%ld" msgstr "" -#: ../svnsync/svnsync.c:1416 +#: ../svnsync/svnsync.c:1471 #, c-format msgid "" "Revision being currently copied (%ld), last merged revision (%ld), and " @@ -13846,83 +16052,90 @@ msgid "" "destination without using svnsync?" msgstr "" -#: ../svnsync/svnsync.c:1453 +#: ../svnsync/svnsync.c:1508 #, c-format msgid "" "Destination HEAD (%ld) is not the last merged revision (%ld); have you " "committed to the destination without using svnsync?" msgstr "" -#: ../svnsync/svnsync.c:1576 ../svnsync/svnsync.c:1581 +#: ../svnsync/svnsync.c:1638 ../svnsync/svnsync.c:1643 #, c-format msgid "" "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" msgstr "" -#: ../svnsync/svnsync.c:1645 ../svnsync/svnsync.c:1665 +#: ../svnsync/svnsync.c:1707 ../svnsync/svnsync.c:1727 #, c-format msgid "Invalid revision number (%ld)" msgstr "" -#: ../svnsync/svnsync.c:1715 +#: ../svnsync/svnsync.c:1777 msgid "" "Cannot specify revisions via both command-line arguments and the --revision " "(-r) option" msgstr "" -#: ../svnsync/svnsync.c:1723 ../svnsync/svnsync.c:2066 +#: ../svnsync/svnsync.c:1785 ../svnsync/svnsync.c:2137 #, c-format msgid "Invalid revision range '%s' provided" msgstr "" -#: ../svnsync/svnsync.c:1822 +#: ../svnsync/svnsync.c:1884 #, c-format msgid "Repository '%s' is not initialized for synchronization" msgstr "" #. Print the info. -#: ../svnsync/svnsync.c:1828 +#: ../svnsync/svnsync.c:1890 #, c-format msgid "Source URL: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1830 +#: ../svnsync/svnsync.c:1892 #, c-format msgid "Source Repository UUID: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1833 +#: ../svnsync/svnsync.c:1895 #, c-format msgid "Last Merged Revision: %s\n" msgstr "" -#: ../svnsync/svnsync.c:1850 +#: ../svnsync/svnsync.c:1912 msgid "" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" +"Subversion repository replication tool.\n" "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n" "Type 'svnsync --version' to see the program version and RA modules.\n" "\n" "Available subcommands:\n" msgstr "" -#: ../svnsync/svnsync.c:2114 +#: ../svnsync/svnsync.c:2199 msgid "" "Cannot use --username or --password with any of --source-username, --source-" "password, --sync-username, or --sync-password.\n" msgstr "" -#: ../svnsync/svnsync.c:2138 +#: ../svnsync/svnsync.c:2222 msgid "--disable-locking and --steal-lock are mutually exclusive" msgstr "" -#: ../svnsync/svnsync.c:2214 +#: ../svnsync/svnsync.c:2240 +msgid "" +"--source-trust-server-cert-failures and --sync-trust-server-cert-failures " +"require --non-interactive" +msgstr "" + +#: ../svnsync/svnsync.c:2306 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnsync help %s' for usage.\n" msgstr "" -#: ../svnsync/svnsync.c:2297 +#: ../svnsync/svnsync.c:2396 msgid "Try 'svnsync help' for more info" msgstr "" @@ -13931,15 +16144,17 @@ msgstr "" msgid "Missing colon in svn:mergeinfo property" msgstr "" -#: ../svnversion/svnversion.c:50 +#: ../svnversion/svnversion.c:49 #, c-format msgid "Type 'svnversion --help' for usage.\n" msgstr "" -#: ../svnversion/svnversion.c:61 +#: ../svnversion/svnversion.c:59 #, c-format msgid "" "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" +"Subversion working copy identification tool.\n" +"Type 'svnversion --version' to see the program version.\n" "\n" " Produce a compact version identifier for the working copy path\n" " WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n" @@ -13971,41 +16186,37 @@ msgid "" "Valid options:\n" msgstr "" -#: ../svnversion/svnversion.c:137 -msgid "do not output the trailing newline" -msgstr "" - -#: ../svnversion/svnversion.c:138 +#: ../svnversion/svnversion.c:141 msgid "last changed rather than current revisions" msgstr "" -#: ../svnversion/svnversion.c:246 +#: ../svnversion/svnversion.c:241 #, c-format msgid "Unversioned symlink%s" msgstr "" -#: ../svnversion/svnversion.c:249 +#: ../svnversion/svnversion.c:244 #, c-format msgid "Unversioned directory%s" msgstr "" -#: ../svnversion/svnversion.c:252 +#: ../svnversion/svnversion.c:247 #, c-format msgid "Unversioned file%s" msgstr "" -#: ../svnversion/svnversion.c:258 +#: ../svnversion/svnversion.c:253 #, c-format msgid "'%s' doesn't exist\n" msgstr "" -#: ../svnversion/svnversion.c:259 +#: ../svnversion/svnversion.c:254 #, c-format msgid "'%s' is of unknown type\n" msgstr "" #. Local uncommitted modifications, no revision info was found. -#: ../svnversion/svnversion.c:274 +#: ../svnversion/svnversion.c:268 #, c-format msgid "Uncommitted local addition, copy or move%s" msgstr "" |