==== Patch level 1 Source: [No source] Target: 5bde6c3d-d5f0-0310-af72-f936f2d43f65:/myproject/trunk/lib/SVK/I18N:1325 Log: patch === i_default.po ================================================================== --- i_default.po (revision 1325) +++ i_default.po (patch patch level 1) @@ -15,25 +15,44 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/SVK/Command.pm:405 +#: lib/SVK/Command.pm:420 msgid "" "\n" -"First, you need to choose a depot path to store this mirrored repository,\n" -"usually something like //mirror/your_project/. Enter a suitable name below\n" -"to place it under //mirror/; you may also press enter and accept the default.\n" +"Before svk start mirroring a remote repository, we would like to\n" +"explain two terms to you: 'depot path' and 'mirrored path'. A depot\n" +"path is like any path in a file system, only that the path is\n" +"stored in svk's internal virtual file system. To avoid confusion,\n" +"svk's default depot path begins with //, for example //depot or\n" +"//mirror/project. Now a mirrored path is a depot path with special\n" +"properties, which serves as the 'mirror' of a remote repository and\n" +"is by convention stored under //mirror/.\n" "\n" +"Now, you have to assign a name to identify the mirrored repository.\n" +"For example, if you name it 'your_project' (without the quotes),\n" +"svk will create a mirrored path called //mirror/your_project.\n" +"Of course, you can assign a 'full path' for it, for example,\n" +"//mymirror/myproject, although this is not really necessary. If you\n" +"just don't care, simply press enter and use svk's default, which is\n" +"usually good enough.\n" +"\n" msgstr "" -#: lib/SVK/Command.pm:804 -#. ($depot) +#: lib/SVK/Command.pm:840 +#. ($1) msgid "" "\n" -"Next, please choose another depot path to serve as your private branch,\n" -"usually something like %1your_project/. SVK will copy the mirrored path\n" -"into this new path, so you can commit into it without affecting the remote\n" -"repository. Enter a suitable name below to place it under %1; you may also\n" -"press enter and accept the default.\n" +"Next, svk will create another depot path, and you have to name it too.\n" +"It is usally something like %1your_project/. svk will copy what's in\n" +"the mirrored path into the new path. This depot path is where your\n" +"own private branch goes. You can commit files to it or check out files\n" +"from it without affecting the remote repository. Which means you can\n" +"work with version control even when you're offline (yes, this is one\n" +"of svk's main features).\n" "\n" +"Please enter a name for your private branch, and it will be placed\n" +"under %1. If, again, you just don't care, simply press enter and let\n" +"svk use the default.\n" +"\n" msgstr "" #: lib/SVK/Command.pod:2 @@ -175,19 +194,19 @@ " and merge source for this depot path." msgstr "" -#: lib/SVK/Command.pm:429 +#: lib/SVK/Command.pm:457 msgid " -count : At most 'count' recent revisions\n" msgstr "" -#: lib/SVK/Command.pm:427 +#: lib/SVK/Command.pm:455 msgid " a : Retrieve all revisions (default)\n" msgstr "" -#: lib/SVK/Command.pm:428 +#: lib/SVK/Command.pm:456 msgid " h : Only the most recent revision\n" msgstr "" -#: lib/SVK/Command.pm:430 +#: lib/SVK/Command.pm:458 msgid " revision : Start from the specified revision\n" msgstr "" @@ -195,6 +214,10 @@ msgid "# You may also list the target part first:" msgstr "" +#: lib/SVK/Command.pm:129 +msgid "$self->options" +msgstr "" + #: lib/SVK/Command.pod:53 msgid "% svk info //svk/trunk" msgstr "" @@ -203,7 +226,7 @@ msgid "% svk info ~/dev/svk" msgstr "" -#: lib/SVK/Command/Commit.pm:256 +#: lib/SVK/Command/Commit.pm:268 #. ($conflicts) msgid "%*(%1,conflict) detected. Use 'svk resolved' after resolving them.\n" msgstr "" @@ -218,23 +241,23 @@ msgid "%*(%1,conflict) found, update aborted.\n" msgstr "" -#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:347 +#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:348 #. ($editor->{conflicts}) #. ($conflicts) msgid "%*(%1,conflict) found.\n" msgstr "" -#: lib/SVK/Merge.pm:349 +#: lib/SVK/Merge.pm:350 #. ($editor->{skipped}) msgid "%*(%1,file) skipped, you might want to rerun merge with --track-rename.\n" msgstr "" -#: lib/SVK/Notify.pm:32 +#: lib/SVK/Notify.pm:33 #. ($path) msgid "%1 - skipped\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:183 +#: lib/SVK/Command/Mirror.pm:226 #. ($target->{report}) msgid "%1 added back to the list of mirrored paths.\n" msgstr "" @@ -244,17 +267,17 @@ msgid "%1 already added.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:100 +#: lib/SVK/Command/Mirror.pm:37 #. ($target->path) msgid "%1 already exists.\n" msgstr "" -#: lib/SVK/XD.pm:219 +#: lib/SVK/XD.pm:214 #. ($path) msgid "%1 already locked, use 'svk cleanup' if lock is stalled\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:102 +#: lib/SVK/Command/Mirror.pm:41 #. ($target->{depotpath}) msgid "%1 already mirrored, use 'svk mirror --detach' to remove it first.\n" msgstr "" @@ -264,27 +287,27 @@ msgid "%1 already under version control.\n" msgstr "" -#: lib/SVK/Command/Merge.pm:92 +#: lib/SVK/Command/Merge.pm:93 #. ($dst->{report}) msgid "%1 can not be used as merge target, because it contains mirrored path:\n" msgstr "" -#: lib/SVK/XD.pm:631 +#: lib/SVK/XD.pm:629 #. ($report) msgid "%1 changed" msgstr "" -#: lib/SVK/Command/Commit.pm:383 +#: lib/SVK/Command/Commit.pm:397 #. (abs2rel ($_[1], $target->{copath} => $target->{report}) msgid "%1 is a mirrored path, please commit separately.\n" msgstr "" -#: lib/SVK/XD.pm:693 +#: lib/SVK/XD.pm:691 #. ($arg{copath}) msgid "%1 is already scheduled for delete" msgstr "" -#: lib/SVK/Command/Mirror.pm:72 +#: lib/SVK/Command/Mirror.pm:77 #. ($target->{depotpath}) msgid "%1 is inside a mirrored path.\n" msgstr "" @@ -299,7 +322,7 @@ msgid "%1 is modified.\n" msgstr "" -#: lib/SVK/XD.pm:318 +#: lib/SVK/XD.pm:313 #. ($depotpath) msgid "%1 is not a depot path.\n" msgstr "" @@ -309,7 +332,7 @@ msgid "%1 is not a directory.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:71 +#: lib/SVK/Command/Mirror.pm:76 #. ($target->{depotpath}) msgid "%1 is not a mirrored path.\n" msgstr "" @@ -319,17 +342,17 @@ msgid "%1 is not a number.\n" msgstr "" -#: lib/SVK/Command.pm:358 +#: lib/SVK/Command.pm:373 #. ($arg) msgid "%1 is not a valid URI.\n" msgstr "" -#: lib/SVK/Command/Switch.pm:42 +#: lib/SVK/Command/Switch.pm:44 #. ($cotarget->{report}, $target->{report}) msgid "%1 is not related to %2.\n" msgstr "" -#: lib/SVK/XD.pm:641 +#: lib/SVK/XD.pm:639 #. ($_[0]) msgid "%1 is not under version control" msgstr "" @@ -339,27 +362,27 @@ msgid "%1 is not versioned; ignored.\n" msgstr "" -#: lib/SVK/XD.pm:637 +#: lib/SVK/XD.pm:634 #. ($report) -msgid "%1 is scheduled, use 'svk revert'" +msgid "%1 is scheduled, use 'svk revert'.\n" msgstr "" -#: lib/SVK/Command/Commit.pm:49 +#: lib/SVK/Command/Commit.pm:51 #. ($target->{depotpath}) msgid "%1 is under mirrored path.\n" msgstr "" -#: lib/SVK/XD.pm:1239 +#: lib/SVK/XD.pm:1253 #. ($entry) msgid "%1 marked as resolved.\n" msgstr "" -#: lib/SVK/Util.pm:198 +#: lib/SVK/Util.pm:218 #. (ucfirst($what) msgid "%1 not modified: a)bort, e)dit, c)ommit?" msgstr "" -#: lib/SVK/XD.pm:688 +#: lib/SVK/XD.pm:686 #. ($arg{copath}, $source_path) msgid "%1(%2) is not under version control" msgstr "" @@ -369,12 +392,12 @@ msgid "'%1' does not contain a depot name.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:68 lib/SVK/Command/Checkout.pm:93 +#: lib/SVK/Command/Checkout.pm:131 lib/SVK/Command/Checkout.pm:179 #. ($path) msgid "'%1' is not a checkout path.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:95 +#: lib/SVK/Command/Checkout.pm:133 #. ($path) msgid "'%1' maps to multiple checkout paths.\n" msgstr "" @@ -383,12 +406,12 @@ msgid "(always enabled for 'pull PATH' for now)" msgstr "" -#: lib/SVK/Command/Log.pm:150 +#: lib/SVK/Command/Log.pm:154 #. ($copyfrom_path, $copyfrom_rev) msgid "(from %1:%2)" msgstr "" -#: lib/SVK/Command/Log.pm:136 +#: lib/SVK/Command/Log.pm:137 msgid "(no author)" msgstr "" @@ -410,38 +433,42 @@ msgstr "" #: lib/SVK/Command.pod:57 +msgid "--encoding ENC: treat value as being in charset encoding ENC" +msgstr "" + +#: lib/SVK/Command.pod:58 msgid "--export: export mode; checkout a detached copy" msgstr "" -#: lib/SVK/Command.pod:58 +#: lib/SVK/Command.pod:59 msgid "--host arg: use ARG as the hostname shown in merge log" msgstr "" -#: lib/SVK/Command.pod:59 +#: lib/SVK/Command.pod:60 msgid "--import: import mode; automatically add and delete nodes" msgstr "" -#: lib/SVK/Command.pod:60 +#: lib/SVK/Command.pod:61 msgid "--no-ticket: do not record this merge point" msgstr "" -#: lib/SVK/Command.pod:61 +#: lib/SVK/Command.pod:62 msgid "--recover: recover the state of a mirror path" msgstr "" -#: lib/SVK/Command.pod:62 +#: lib/SVK/Command.pod:63 msgid "--relocate: relocate the checkout to another path" msgstr "" -#: lib/SVK/Command.pod:63 +#: lib/SVK/Command.pod:64 msgid "--relocate: relocate the depot to another path" msgstr "" -#: lib/SVK/Command.pod:64 +#: lib/SVK/Command.pod:65 msgid "--relocate: relocate the mirror to another URI" msgstr "" -#: lib/SVK/Command.pod:65 +#: lib/SVK/Command.pod:66 msgid "--remoterev: use remote revision numbers in merge log" msgstr "" @@ -449,244 +476,244 @@ msgid "--revision cannot be used in conjunction with --sync or --merge.\n" msgstr "" -#: lib/SVK/Command.pod:66 +#: lib/SVK/Command.pod:67 msgid "--revprop: operate on a revision property (use with -r)" msgstr "" -#: lib/SVK/Command.pod:67 +#: lib/SVK/Command.pod:68 msgid "--strict: do not print an extra newline at the end of the" msgstr "" -#: lib/SVK/Command.pod:68 +#: lib/SVK/Command.pod:69 msgid "--track-rename: track changes made to renamed node" msgstr "" -#: lib/SVK/Command.pod:69 +#: lib/SVK/Command.pod:70 msgid "--upgrade: upgrade mirror state to the latest version" msgstr "" -#: lib/SVK/Command.pod:70 +#: lib/SVK/Command.pod:71 msgid "--verbatim: verbatim merge log without indents and header" msgstr "" -#: lib/SVK/Command.pod:71 +#: lib/SVK/Command.pod:72 msgid "-B [--baseless]: use the earliest revision as the merge point" msgstr "" -#: lib/SVK/Command.pod:72 +#: lib/SVK/Command.pod:73 msgid "-C [--check-only]: try operation but make no changes" msgstr "" -#: lib/SVK/Command.pod:73 +#: lib/SVK/Command.pod:74 msgid "-I [--incremental]: apply each change individually" msgstr "" -#: lib/SVK/Command.pod:74 +#: lib/SVK/Command.pod:75 msgid "-K [--keep-local]: do not remove the local file" msgstr "" -#: lib/SVK/Command.pod:75 +#: lib/SVK/Command.pod:76 msgid "-N [--non-recursive]: do not descend recursively" msgstr "" -#: lib/SVK/Command.pod:76 +#: lib/SVK/Command.pod:77 msgid "-P [--patch] arg: instead of commit, save this change as a patch" msgstr "" -#: lib/SVK/Command.pod:77 +#: lib/SVK/Command.pod:78 msgid "-R [--recursive]: descend recursively" msgstr "" -#: lib/SVK/Command.pod:78 +#: lib/SVK/Command.pod:79 msgid "-S [--sign]: sign this change" msgstr "" -#: lib/SVK/Command.pod:79 +#: lib/SVK/Command.pod:80 msgid "-a [--all]: pull into all checkout paths" msgstr "" -#: lib/SVK/Command.pod:80 +#: lib/SVK/Command.pod:81 msgid "-a [--all]: remove all stalled locks" msgstr "" -#: lib/SVK/Command.pod:81 +#: lib/SVK/Command.pod:82 msgid "-a [--all]: synchronize all mirrored paths" msgstr "" -#: lib/SVK/Command.pod:82 +#: lib/SVK/Command.pod:83 msgid "-a [--auto]: merge from the previous merge point" msgstr "" -#: lib/SVK/Command.pod:83 +#: lib/SVK/Command.pod:84 msgid "-b [--base] arg: use revision ARG as the merge point" msgstr "" -#: lib/SVK/Command.pod:84 +#: lib/SVK/Command.pod:85 msgid "-c [--change] arg: act on comma-separated revisions ARG" msgstr "" -#: lib/SVK/Command.pod:85 +#: lib/SVK/Command.pod:86 msgid "-d [--depth] arg: recurse at most ARG levels deep; use with -R" msgstr "" -#: lib/SVK/Command.pod:86 +#: lib/SVK/Command.pod:87 msgid "-d [--detach]: mark a depotpath as no longer mirrored" msgstr "" -#: lib/SVK/Command.pod:87 +#: lib/SVK/Command.pod:88 msgid "-d [--detach]: mark a path as no longer checked out" msgstr "" -#: lib/SVK/Command.pod:88 +#: lib/SVK/Command.pod:89 msgid "-d [--detach]: remove a depot from the mapping" msgstr "" -#: lib/SVK/Command.pod:89 +#: lib/SVK/Command.pod:90 msgid "-f [--from-checkout]: import from a checkout path" msgstr "" -#: lib/SVK/Command.pod:90 +#: lib/SVK/Command.pod:91 msgid "-f [--from] arg: push from the specified path" msgstr "" -#: lib/SVK/Command.pod:91 +#: lib/SVK/Command.pod:92 msgid "-f [--from]: merge from the specified path" msgstr "" -#: lib/SVK/Command.pod:92 +#: lib/SVK/Command.pod:93 msgid "-f [--full-path]: show pathname for each entry, instead of a tree" msgstr "" -#: lib/SVK/Command.pod:93 +#: lib/SVK/Command.pod:94 msgid "-i [--init]: initialize a default depot" msgstr "" -#: lib/SVK/Command.pod:94 +#: lib/SVK/Command.pod:95 msgid "-l [--limit] arg: stop after displaying ARG revisions" msgstr "" -#: lib/SVK/Command.pod:95 +#: lib/SVK/Command.pod:96 msgid "-l [--list]: list checkout paths" msgstr "" -#: lib/SVK/Command.pod:96 +#: lib/SVK/Command.pod:97 msgid "-l [--list]: list current depot mappings" msgstr "" -#: lib/SVK/Command.pod:97 +#: lib/SVK/Command.pod:98 msgid "-l [--list]: list mirrored paths" msgstr "" -#: lib/SVK/Command.pod:98 +#: lib/SVK/Command.pod:99 msgid "-l [--log]: use logs of merged revisions as commit message" msgstr "" -#: lib/SVK/Command.pod:99 +#: lib/SVK/Command.pod:100 msgid "-l [--lump]: merge everything into a single commit log" msgstr "" -#: lib/SVK/Command.pod:100 +#: lib/SVK/Command.pod:101 msgid "-m [--merge]: smerge from copied sources before update" msgstr "" -#: lib/SVK/Command.pod:101 +#: lib/SVK/Command.pod:102 msgid "-m [--message] arg: specify commit message ARG" msgstr "" -#: lib/SVK/Command/Merge.pm:146 +#: lib/SVK/Command/Merge.pm:147 msgid "-m ignored in incremental merge\n" msgstr "" -#: lib/SVK/Command.pod:102 +#: lib/SVK/Command.pod:103 msgid "-p [--parent]: create intermediate directories as required" msgstr "" -#: lib/SVK/Command.pod:103 +#: lib/SVK/Command.pod:104 msgid "-q [--quiet]: do not display changed nodes" msgstr "" -#: lib/SVK/Command.pod:104 +#: lib/SVK/Command.pod:105 msgid "-q [--quiet]: do not display files not under version control" msgstr "" -#: lib/SVK/Command.pod:105 +#: lib/SVK/Command.pod:106 msgid "-q [--quiet]: quiet mode" msgstr "" -#: lib/SVK/Command.pod:106 +#: lib/SVK/Command.pod:107 msgid "-r [--revision] N:M: act on revisions between N and M" msgstr "" -#: lib/SVK/Command.pod:107 +#: lib/SVK/Command.pod:108 msgid "-r [--revision] REV: annotate up to revision" msgstr "" -#: lib/SVK/Command.pod:108 +#: lib/SVK/Command.pod:109 msgid "-r [--revision] arg: act on revision ARG instead of the head revision" msgstr "" -#: lib/SVK/Command.pod:109 +#: lib/SVK/Command.pod:110 msgid "-s [--skipto] arg: start synchronization at revision ARG" msgstr "" -#: lib/SVK/Command.pod:110 +#: lib/SVK/Command.pod:111 msgid "-s [--summarize]: show summary only" msgstr "" -#: lib/SVK/Command.pod:111 +#: lib/SVK/Command.pod:112 msgid "-s [--sync]: synchronize mirrored sources before update" msgstr "" -#: lib/SVK/Command.pod:112 +#: lib/SVK/Command.pod:113 msgid "-t [--to-checkout]: turn the source into a checkout path" msgstr "" -#: lib/SVK/Command.pod:113 +#: lib/SVK/Command.pod:114 msgid "-t [--to]: merge to the specified path" msgstr "" -#: lib/SVK/Command.pod:114 +#: lib/SVK/Command.pod:115 msgid "-t [--torev] arg: stop synchronization at revision ARG" msgstr "" -#: lib/SVK/Command.pod:115 +#: lib/SVK/Command.pod:116 msgid "-v [--verbose]: print extra information" msgstr "" -#: lib/SVK/Command.pod:116 +#: lib/SVK/Command.pod:117 msgid "-x [--cross]: track revisions copied from elsewhere" msgstr "" -#: lib/SVK/Command.pod:117 +#: lib/SVK/Command.pod:118 msgid "/depotname/path/inside/repos" msgstr "" -#: lib/SVK/Command/Commit.pm:38 +#: lib/SVK/Command/Commit.pm:40 msgid "=== Please enter your commit message above this line ===" msgstr "" -#: lib/SVK/Command/Commit.pm:34 +#: lib/SVK/Command/Commit.pm:36 msgid "=== Targets to commit (you may delete items from it) ===" msgstr "" -#: lib/SVK/Command.pod:118 +#: lib/SVK/Command.pod:119 msgid "A Added" msgstr "" -#: lib/SVK/Command/Mirror.pm:150 lib/SVK/Util.pm:202 +#: lib/SVK/Command/Mirror.pm:193 lib/SVK/Util.pm:222 msgid "Aborted.\n" msgstr "" -#: lib/SVK/Util.pm:190 +#: lib/SVK/Util.pm:210 #. ($!) msgid "Aborted: %1\n" msgstr "" -#: lib/SVK/Command.pod:119 +#: lib/SVK/Command.pod:120 msgid "Accept:" msgstr "" -#: lib/SVK/Command/Mirror.pm:120 +#: lib/SVK/Command/Mirror.pm:163 #. ($rev) msgid "Analyzing revision %1...\n" msgstr "" @@ -701,11 +728,11 @@ msgid "Auto-merging (%1, %2) %3 to %4 (base %5:%6).\n" msgstr "" -#: lib/SVK/Command/Help.pm:20 +#: lib/SVK/Command/Help.pm:21 msgid "Available commands:\n" msgstr "" -#: lib/SVK/Command.pod:120 +#: lib/SVK/Command.pod:121 msgid "C Conflict" msgstr "" @@ -713,21 +740,36 @@ msgid "Can only switch checkout root.\n" msgstr "" -#: lib/SVK/Command.pm:573 +#: lib/SVK/Command.pm:603 msgid "Can't assign --revision and --change at the same time.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:137 +#: lib/SVK/Command/Checkout.pm:51 #. ($anchor, $!) msgid "Can't create checkout path %1: %2\n" msgstr "" +#: lib/SVK/Command/Update.pm:114 +#. ($cotarget->{report}, $!) +msgid "Can't create directory %1 for checkout: %2.\n" +msgstr "" + +#: lib/SVK/Util.pm:282 +#. ($_[1], $enc->name) +msgid "Can't decode %1 as %2.\n" +msgstr "" + +#: lib/SVK/Util.pm:296 +#. ($_[1], $enc->name) +msgid "Can't encode %1 as %2.\n" +msgstr "" + #: lib/SVK/Merge.pm:130 #. ($src->path, $dst->path) msgid "Can't find merge base for %1 and %2\n" msgstr "" -#: lib/SVK/XD.pm:125 +#: lib/SVK/XD.pm:120 #. ("$self->{statefile}.backup") msgid "Can't load statefile, old statefile saved as %1\n" msgstr "" @@ -736,16 +778,20 @@ msgid "Can't merge across depots.\n" msgstr "" -#: lib/SVK/Command/Commit.pm:58 +#: lib/SVK/Command/Propset.pm:100 +msgid "Can't set svn:eol-style on depotpath.\n" +msgstr "" + +#: lib/SVK/Command/Commit.pm:60 msgid "Can't use -F with -m.\n" msgstr "" -#: lib/SVK/XD.pm:92 +#: lib/SVK/XD.pm:87 #. ($self->{svkpath}, $!) msgid "Cannot create svk-config-directory at '%1': %2" msgstr "" -#: lib/SVK/Editor/Diff.pm:66 +#: lib/SVK/Editor/Diff.pm:69 msgid "Cannot display: file marked as a binary type.\n" msgstr "" @@ -754,12 +800,12 @@ msgid "Cannot find a patch block in %1.\n" msgstr "" -#: lib/SVK/Command/Help.pm:44 +#: lib/SVK/Command/Help.pm:45 #. ($topic) msgid "Cannot find help topic '%1'.\n" msgstr "" -#: lib/SVK/Util.pm:211 +#: lib/SVK/Util.pm:231 msgid "Cannot find separator; aborted.\n" msgstr "" @@ -778,7 +824,7 @@ msgid "Cannot launch an external merge tool for %1.\n" msgstr "" -#: lib/SVK/Util.pm:668 +#: lib/SVK/Util.pm:740 #. (catfile($source) msgid "Cannot rename %1 to %2; please move it manually.\n" msgstr "" @@ -791,21 +837,21 @@ msgid "Cannot specify both 'to' and 'from'.\n" msgstr "" -#: lib/SVK/Command.pm:586 +#: lib/SVK/Command.pm:616 #. ($_) msgid "Change spec %1 not recognized.\n" msgstr "" -#: lib/SVK/Command/Log.pm:138 +#: lib/SVK/Command/Log.pm:139 msgid "Changed paths:\n" msgstr "" -#: lib/SVK/Command/Commit.pm:126 +#: lib/SVK/Command/Commit.pm:136 #. ($m->{source}) msgid "Checking locally against mirror source %1.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:119 +#: lib/SVK/Command/Checkout.pm:157 #. ($path, $target) msgid "Checkout '%1' relocated to '%2'.\n" msgstr "" @@ -815,21 +861,26 @@ msgid "Checkout Path: %1\n" msgstr "" -#: lib/SVK/Command.pod:121 +#: lib/SVK/Command.pod:122 msgid "Checkout Path: /Users/gugod/dev/svk" msgstr "" -#: lib/SVK/Command/Checkout.pm:128 +#: lib/SVK/Command/Update.pm:111 +#. ($update_target->{depotpath}, $cotarget->{report}) +msgid "Checkout directory gone. Use 'checkout %1 %2' instead.\n" +msgstr "" + +#: lib/SVK/Command/Checkout.pm:42 #. ($report) msgid "Checkout path %1 already exists.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:73 +#: lib/SVK/Command/Checkout.pm:184 #. ($copath) msgid "Checkout path '%1' detached.\n" msgstr "" -#: lib/SVK/Command.pm:388 +#: lib/SVK/Command.pm:403 #. ($uri) msgid "Choose a base URI to mirror from (press enter to use the full URI): " msgstr "" @@ -843,11 +894,11 @@ msgid "Cleaned up stalled lock on %1.\n" msgstr "" -#: lib/SVK/Command/Commit.pm:347 +#: lib/SVK/Command/Commit.pm:361 msgid "Commit into mirrored path: merging back directly.\n" msgstr "" -#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:176 +#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:186 #. ($_[0]) msgid "Committed revision %1.\n" msgstr "" @@ -868,7 +919,7 @@ msgid "Copied From: %1, Rev. %2\n" msgstr "" -#: lib/SVK/Command.pod:122 +#: lib/SVK/Command.pod:123 msgid "Copied From: /svk/trunk, Rev. 434" msgstr "" @@ -877,46 +928,51 @@ msgid "Copying more than one source requires %1 to be directory.\n" msgstr "" -#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:108 lib/SVK/Resolve/Emacs.pm:66 +#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:111 lib/SVK/Resolve/Emacs.pm:66 +#. ($cmd, $!) +#. ($self->{external}, $?) #. ('svnadmin', $?) -#. ($self->{external}, $?) -#. ($cmd, $!) msgid "Could not run %1: %2" msgstr "" -#: lib/SVK/Command.pod:123 +#: lib/SVK/Command.pod:124 msgid "D Deleted" msgstr "" -#: lib/SVK/Command.pod:124 +#: lib/SVK/Command.pod:125 msgid "DESCRIPTION" msgstr "" -#: lib/SVK/Command/Depotmap.pm:68 +#: lib/SVK/Command/Depotmap.pm:125 msgid "Depot" msgstr "" -#: lib/SVK/Command/Depotmap.pm:96 +#: lib/SVK/Command/Depotmap.pm:76 #. ($depot) msgid "Depot '%1' already exists; use 'svk depotmap --detach' to remove it first.\n" msgstr "" -#: lib/SVK/Command/Depotmap.pm:123 +#: lib/SVK/Command/Depotmap.pm:110 #. ($depot) msgid "Depot '%1' detached.\n" msgstr "" -#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:121 +#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:92 #. ($depot) msgid "Depot '%1' does not exist in the depot map.\n" msgstr "" -#: lib/SVK/Command/Depotmap.pm:113 +#: lib/SVK/Command/Depotmap.pm:97 #. ($depot, $path) msgid "Depot '%1' relocated to '%2'.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:84 +#: lib/SVK/Command/Mirror.pm:115 +#. ($depot) +msgid "Depot /%1/ not loadable.\n" +msgstr "" + +#: lib/SVK/Command/Checkout.pm:108 msgid "Depot Path" msgstr "" @@ -925,20 +981,20 @@ msgid "Depot Path: %1\n" msgstr "" -#: lib/SVK/Command.pod:125 +#: lib/SVK/Command.pod:126 msgid "Depot Path: //svk/local" msgstr "" -#: lib/SVK/Command.pod:126 +#: lib/SVK/Command.pod:127 msgid "Depot Path: //svk/trunk" msgstr "" -#: lib/SVK/Command.pm:418 +#: lib/SVK/Command.pm:446 #. ($default) msgid "Depot path: [//mirror/%1] " msgstr "" -#: lib/SVK/Command.pod:127 +#: lib/SVK/Command.pod:128 msgid "Diff:" msgstr "" @@ -951,11 +1007,16 @@ msgid "Directory %1 imported to depotpath %2 as revision %3.\n" msgstr "" -#: lib/SVK/Command.pod:128 +#: lib/SVK/Command/Checkout.pm:120 +#. ($arg[0]) +msgid "Do you mean svk switch %1?\n" +msgstr "" + +#: lib/SVK/Command.pod:129 msgid "EDITOR: Editor to use for 'e'." msgstr "" -#: lib/SVK/Command.pod:129 +#: lib/SVK/Command.pod:130 msgid "Edit:" msgstr "" @@ -963,38 +1024,43 @@ msgid "Emerge %1 done.\n" msgstr "" -#: lib/SVK/Command/Merge.pm:133 lib/SVK/Editor/Merge.pm:696 +#: lib/SVK/Command/Merge.pm:134 lib/SVK/Editor/Merge.pm:742 msgid "Empty merge.\n" msgstr "" -#: lib/SVK/Command.pm:821 +#: lib/SVK/Command.pm:860 #. (loc($action) msgid "Enter a depot path to %1 into (under // if no leading '/'): " msgstr "" -#: lib/SVK/Command.pm:814 +#: lib/SVK/Command.pm:855 #. (loc($action) msgid "Enter a depot path to %1 into: [%2] " msgstr "" -#: lib/SVK/Command.pod:130 +#: lib/SVK/Command.pod:131 msgid "Environment variables:" msgstr "" +#: lib/SVK/Command/Propset.pm:85 +#. ($target->{report}) +msgid "File %1 has inconsistent newlines.\n" +msgstr "" + #: lib/SVK/Command/Patch.pm:26 msgid "Filename required.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:131 +#: lib/SVK/Command/Mirror.pm:174 #. ($rev, $rrev) msgid "Found merge ticket at revision %1 (remote %2); use it? (y/n) " msgstr "" -#: lib/SVK/Command.pod:131 +#: lib/SVK/Command.pod:132 msgid "G Merged" msgstr "" -#: lib/SVK/Command/Commit.pm:155 +#: lib/SVK/Command/Commit.pm:165 #. ($self->{patch}) msgid "Illegal patch name: %1.\n" msgstr "" @@ -1014,15 +1080,15 @@ msgid "Import source (%1) is a checkout path; use --from-checkout.\n" msgstr "" -#: lib/SVK/Command/Merge.pm:180 +#: lib/SVK/Command/Merge.pm:181 msgid "Incremental merge not guaranteed even if check is successful\n" msgstr "" -#: lib/SVK/Command/Merge.pm:122 +#: lib/SVK/Command/Merge.pm:123 msgid "Incremental merge not supported\n" msgstr "" -#: bin/svk:84 lib/SVK/Util.pm:128 lib/SVK/XD.pm:1225 +#: bin/svk:77 lib/SVK/Util.pm:146 lib/SVK/XD.pm:1239 msgid "Interrupted.\n" msgstr "" @@ -1036,19 +1102,19 @@ msgid "Last Changed Rev.: %1\n" msgstr "" -#: lib/SVK/Command.pod:132 +#: lib/SVK/Command.pod:133 msgid "Last Changed Rev.: 445" msgstr "" -#: lib/SVK/Command.pod:133 +#: lib/SVK/Command.pod:134 msgid "Last Changed Rev.: 447" msgstr "" -#: lib/SVK/Command.pod:134 +#: lib/SVK/Command.pod:135 msgid "Merge From: /svk/trunk, Rev. 445" msgstr "" -#: lib/SVK/Command/Commit.pm:134 +#: lib/SVK/Command/Commit.pm:144 #. ($_[0]) msgid "Merge back committed as revision %1.\n" msgstr "" @@ -1069,7 +1135,7 @@ msgid "Merged file" msgstr "" -#: lib/SVK/Command/Commit.pm:129 +#: lib/SVK/Command/Commit.pm:139 #. ($m->{source}) msgid "Merging back to mirror source %1.\n" msgstr "" @@ -1079,12 +1145,12 @@ msgid "Merging with base %1 %2: applying %3 %4:%5.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:75 +#: lib/SVK/Command/Mirror.pm:80 #. ($target->{depotpath}) msgid "Mirror path '%1' detached.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:167 +#: lib/SVK/Command/Mirror.pm:210 msgid "Mirror state successfully recovered.\n" msgstr "" @@ -1093,11 +1159,11 @@ msgid "Mirrored From: %1, Rev. %2\n" msgstr "" -#: lib/SVK/Command.pod:135 +#: lib/SVK/Command.pod:136 msgid "Mirrored From: svn://svn.clkao.org/svk, Rev. 1744" msgstr "" -#: lib/SVK/Command.pod:136 +#: lib/SVK/Command.pod:137 msgid "Misc:" msgstr "" @@ -1105,33 +1171,33 @@ msgid "Multiple merge tools found, choose one:\n" msgstr "" -#: lib/SVK/Command.pod:137 +#: lib/SVK/Command.pod:138 msgid "NAME" msgstr "" -#: lib/SVK/Command.pod:138 +#: lib/SVK/Command.pod:139 msgid "NOTES" msgstr "" -#: lib/SVK/Editor/Diff.pm:166 +#: lib/SVK/Editor/Diff.pm:169 #. ($_) msgid "Name: %1\n" msgstr "" -#: lib/SVK/Command/Depotmap.pm:26 +#: lib/SVK/Command/Depotmap.pm:28 msgid "Need to specify a depot name" msgstr "" -#: lib/SVK/Command/Depotmap.pm:29 +#: lib/SVK/Command/Depotmap.pm:31 msgid "Need to specify a path name" msgstr "" -#: lib/SVK/Command.pm:380 +#: lib/SVK/Command.pm:395 #. ($uri) msgid "New URI encountered: %1\n" msgstr "" -#: lib/SVK/Command/Depotmap.pm:101 lib/SVK/Command/Depotmap.pm:86 +#: lib/SVK/Command/Depotmap.pm:62 lib/SVK/Command/Depotmap.pm:81 msgid "New depot map saved.\n" msgstr "" @@ -1140,40 +1206,40 @@ msgid "New merge ticket: %1:%2\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:139 +#: lib/SVK/Command/Mirror.pm:182 msgid "No mirror history found; cannot recover.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:143 +#: lib/SVK/Command/Mirror.pm:186 msgid "No need to revert; it is already the head revision.\n" msgstr "" -#: lib/SVK/Command/Merge.pm:111 +#: lib/SVK/Command/Merge.pm:112 msgid "No need to track rename for smerge\n" msgstr "" -#: lib/SVK/XD.pm:320 +#: lib/SVK/XD.pm:315 #. ($depot) msgid "No such depot: %1.\n" msgstr "" -#: lib/SVK/Command/Commit.pm:255 lib/SVK/Command/Commit.pm:268 +#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:280 msgid "No targets to commit.\n" msgstr "" -#: lib/SVK/Command.pod:139 +#: lib/SVK/Command.pod:140 msgid "None" msgstr "" -#: lib/SVK/Command/Merge.pm:144 +#: lib/SVK/Command/Merge.pm:145 msgid "Not possible to do incremental merge without a merge ticket.\n" msgstr "" -#: lib/SVK/Command.pod:140 +#: lib/SVK/Command.pod:141 msgid "OPTIONS" msgstr "" -#: lib/SVK/Command/Checkout.pm:100 lib/SVK/Command/Checkout.pm:144 +#: lib/SVK/Command/Checkout.pm:138 lib/SVK/Command/Checkout.pm:58 #. ($where[0]) msgid "Overlapping checkout path is not supported (%1); use 'svk checkout --detach' to remove it first.\n" msgstr "" @@ -1183,16 +1249,17 @@ msgid "Patch %1 created.\n" msgstr "" -#: lib/SVK/Command/Commit.pm:122 +#: lib/SVK/Command/Commit.pm:132 #. ($m->{source}) msgid "Patching locally against mirror source %1.\n" msgstr "" -#: lib/SVK/Command/Checkout.pm:84 lib/SVK/Command/Depotmap.pm:68 lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Checkout.pm:108 lib/SVK/Command/Depotmap.pm:125 lib/SVK/Command/Mirror.pm:109 msgid "Path" msgstr "" -#: lib/SVK/Command/Copy.pm:145 lib/SVK/Command/Copy.pm:62 +#: lib/SVK/Command.pm:872 lib/SVK/Command/Copy.pm:145 lib/SVK/Command/Copy.pm:62 +#. ($path) #. ($dst->{copath}) #. ($cpdst->{report}) msgid "Path %1 already exists.\n" @@ -1203,7 +1270,7 @@ msgid "Path %1 does not exist.\n" msgstr "" -#: lib/SVK/Command/List.pm:36 +#: lib/SVK/Command/List.pm:37 #. ($target->{path}) msgid "Path %1 is not a versioned directory\n" msgstr "" @@ -1227,7 +1294,7 @@ msgid "Properties on %1:\n" msgstr "" -#: lib/SVK/Editor/Merge.pm:625 +#: lib/SVK/Editor/Merge.pm:670 #. ($propname, $path) msgid "Property %1 of %2" msgstr "" @@ -1237,17 +1304,17 @@ msgid "Property '%1' set on repository revision %2.\n" msgstr "" -#: lib/SVK/Editor/Diff.pm:164 +#: lib/SVK/Editor/Diff.pm:167 #. ($rpath) msgid "Property changes on: %1\n" msgstr "" -#: lib/SVK/XD.pm:152 +#: lib/SVK/XD.pm:147 #. ($path) msgid "Repository %1 does not exist, create? (y/n)" msgstr "" -#: lib/SVK/Command/Mirror.pm:149 +#: lib/SVK/Command/Mirror.pm:192 #. ($rev, $skipped) msgid "Revert to revision %1 and discard %*(%2,revision)? (y/n) " msgstr "" @@ -1257,11 +1324,11 @@ msgid "Reverted %1\n" msgstr "" -#: lib/SVK/Command.pm:572 lib/SVK/Command/Proplist.pm:26 +#: lib/SVK/Command.pm:602 lib/SVK/Command/Proplist.pm:26 msgid "Revision required.\n" msgstr "" -#: lib/SVK/Command.pm:598 +#: lib/SVK/Command.pm:628 msgid "Revision spec must be N:M.\n" msgstr "" @@ -1275,23 +1342,23 @@ msgid "Revision: %1\n" msgstr "" -#: lib/SVK/Command.pod:141 +#: lib/SVK/Command.pod:142 msgid "Revision: 447" msgstr "" -#: lib/SVK/Command/Help.pm:72 +#: lib/SVK/Command/Help.pm:61 msgid "SVK::Help" msgstr "" -#: lib/SVK/Command.pod:142 +#: lib/SVK/Command.pod:143 msgid "SVKMERGE: External merge tool to always use for 'm'." msgstr "" -#: lib/SVK/Command.pod:143 +#: lib/SVK/Command.pod:144 msgid "SVKRESOLVE: The resolve action to take, instead of asking." msgstr "" -#: lib/SVK/Command.pod:144 +#: lib/SVK/Command.pod:145 msgid "SYNOPSIS" msgstr "" @@ -1299,7 +1366,7 @@ msgid "Signature verification failed.\n" msgstr "" -#: lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Mirror.pm:109 msgid "Source" msgstr "" @@ -1318,7 +1385,7 @@ msgid "Starting to synchronize %1\n" msgstr "" -#: lib/SVK/Command.pm:426 +#: lib/SVK/Command.pm:454 msgid "Synchronizing the mirror for the first time:\n" msgstr "" @@ -1343,20 +1410,20 @@ msgid "Target not local nor mirrored, unable to view patch.\n" msgstr "" -#: bin/svk:64 +#: bin/svk:57 #. ($VERSION) msgid "This is svk, version %1.\n" msgstr "" -#: lib/SVK/Command.pod:145 +#: lib/SVK/Command.pod:146 msgid "U Updated" msgstr "" -#: lib/SVK/Command.pm:199 +#: lib/SVK/Command.pm:214 msgid "Unknown options.\n" msgstr "" -#: lib/SVK/XD.pm:1193 +#: lib/SVK/XD.pm:1206 #. ($_) msgid "Unknown target: %1.\n" msgstr "" @@ -1366,111 +1433,111 @@ msgid "Unversioned properties on revision %1:\n" msgstr "" -#: lib/SVK/Command.pod:146 +#: lib/SVK/Command.pod:147 msgid "Update your local branch and checkout path from the remote" msgstr "" -#: lib/SVK/Command.pod:147 +#: lib/SVK/Command.pod:148 msgid "Update your local branch from the remote master repository." msgstr "" -#: lib/SVK/Util.pm:187 +#: lib/SVK/Util.pm:207 msgid "Waiting for editor...\n" msgstr "" -#: lib/SVK/Command.pm:434 +#: lib/SVK/Command.pm:462 msgid "a)ll, h)ead, -count, revision? [a] " msgstr "" -#: lib/SVK/Command.pod:148 +#: lib/SVK/Command.pod:149 msgid "a: Accept the merged/edited file." msgstr "" -#: lib/SVK/Command.pod:149 +#: lib/SVK/Command.pod:150 msgid "add - Put files and directories under version control" msgstr "" -#: lib/SVK/Command.pod:150 +#: lib/SVK/Command.pod:151 msgid "add [PATH...]" msgstr "" -#: lib/SVK/Command.pod:151 +#: lib/SVK/Command.pod:152 msgid "admin - Administration tools" msgstr "" -#: lib/SVK/Command.pod:152 +#: lib/SVK/Command.pod:153 msgid "admin deltify [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:153 +#: lib/SVK/Command.pod:154 msgid "admin dump [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:154 +#: lib/SVK/Command.pod:155 msgid "admin help [COMMAND]" msgstr "" -#: lib/SVK/Command.pod:155 +#: lib/SVK/Command.pod:156 msgid "admin hotcopy /path/to/repository [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:156 +#: lib/SVK/Command.pod:157 msgid "admin list-dblogs [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:157 +#: lib/SVK/Command.pod:158 msgid "admin list-unused-dblogs [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:158 +#: lib/SVK/Command.pod:159 msgid "admin load [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:159 +#: lib/SVK/Command.pod:160 msgid "admin lstxns [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:160 +#: lib/SVK/Command.pod:161 msgid "admin recover [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:161 +#: lib/SVK/Command.pod:162 msgid "admin rmcache" msgstr "" -#: lib/SVK/Command.pod:162 +#: lib/SVK/Command.pod:163 msgid "admin rmtxns [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:163 +#: lib/SVK/Command.pod:164 msgid "admin setlog -r REVISION FILE [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:164 +#: lib/SVK/Command.pod:165 msgid "admin verify [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:165 +#: lib/SVK/Command.pod:166 msgid "annotate - Display per-line revision and author info" msgstr "" -#: lib/SVK/Command.pod:166 +#: lib/SVK/Command.pod:167 msgid "annotate DEPOTPATH[@REV]" msgstr "" -#: lib/SVK/Command.pod:167 +#: lib/SVK/Command.pod:168 msgid "annotate [-r REV] DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:168 +#: lib/SVK/Command.pod:169 msgid "annotate [-r REV] [PATH]" msgstr "" -#: lib/SVK/Command.pod:169 +#: lib/SVK/Command.pod:170 msgid "annotate [PATH][@REV]" msgstr "" -#: lib/SVK/XD.pm:262 +#: lib/SVK/XD.pm:257 #. ($self->{giantlock}) msgid "another svk might be running; remove %1 if not" msgstr "" @@ -1479,11 +1546,11 @@ msgid "argument skipto not allowed when multiple target specified" msgstr "" -#: lib/SVK/XD.pm:266 +#: lib/SVK/XD.pm:261 msgid "cannot acquire giant lock" msgstr "" -#: lib/SVK/Editor/Sign.pm:46 +#: lib/SVK/Editor/Sign.pm:48 #. ($sigfile) msgid "cannot find %1, signing aborted" msgstr "" @@ -1492,163 +1559,163 @@ msgid "cannot find a path for temporary branch" msgstr "" -#: lib/SVK/Command.pm:354 lib/SVK/Command/Mirror.pm:38 lib/SVK/Command/Sync.pm:31 lib/SVK/Command/Update.pm:60 +#: lib/SVK/Command.pm:369 lib/SVK/Command/Mirror.pm:102 lib/SVK/Command/Mirror.pm:21 lib/SVK/Command/Sync.pm:31 lib/SVK/Command/Update.pm:60 msgid "cannot load SVN::Mirror" msgstr "" -#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:49 lib/SVK/Patch.pm:80 +#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:51 lib/SVK/Patch.pm:80 #. ($file, $!) +#. ($sigfile, $!) #. ($dir, $!) -#. ($sigfile, $!) msgid "cannot open %1: %2" msgstr "" -#: lib/SVK/Command.pod:170 +#: lib/SVK/Command.pod:171 msgid "cat - Output the file from depot" msgstr "" -#: lib/SVK/Command.pod:171 +#: lib/SVK/Command.pod:172 msgid "cat [DEPOTPATH | PATH...]" msgstr "" -#: lib/SVK/Command.pod:172 +#: lib/SVK/Command.pod:173 msgid "checkout - Checkout the depotpath" msgstr "" -#: lib/SVK/Command.pod:173 +#: lib/SVK/Command.pod:174 msgid "checkout --detach [DEPOTPATH | PATH]" msgstr "" -#: lib/SVK/Command.pod:174 +#: lib/SVK/Command.pod:175 msgid "checkout --list" msgstr "" -#: lib/SVK/Command.pod:175 -msgid "checkout --relocate [DEPOTPATH | PATH] PATH" +#: lib/SVK/Command.pod:176 +msgid "checkout --relocate DEPOTPATH|PATH PATH" msgstr "" -#: lib/SVK/Command.pod:176 +#: lib/SVK/Command.pod:177 msgid "checkout DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:177 +#: lib/SVK/Command.pod:178 msgid "cleanup - Remove stalled locks" msgstr "" -#: lib/SVK/Command.pod:178 +#: lib/SVK/Command.pod:179 msgid "cleanup [PATH...]" msgstr "" -#: lib/SVK/Command.pod:179 +#: lib/SVK/Command.pod:180 msgid "cmerge - Merge specific changes" msgstr "" -#: lib/SVK/Command.pod:180 +#: lib/SVK/Command.pod:181 msgid "cmerge -c CHGSPEC DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:181 +#: lib/SVK/Command.pod:182 msgid "cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/Command.pod:182 +#: lib/SVK/Command.pod:183 msgid "commit - Commit changes to depot" msgstr "" -#: lib/SVK/Command.pod:183 +#: lib/SVK/Command.pod:184 msgid "commit [PATH...]" msgstr "" -#: lib/SVK/Command.pod:184 +#: lib/SVK/Command.pod:185 msgid "copy - Make a versioned copy" msgstr "" -#: lib/SVK/Command.pod:185 +#: lib/SVK/Command.pod:186 msgid "copy DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:186 +#: lib/SVK/Command.pod:187 msgid "copy DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/Editor/Sign.pm:40 +#: lib/SVK/Editor/Sign.pm:42 #. ($!) msgid "could not call gpg: %1" msgstr "" -#: lib/SVK/Command.pod:187 +#: lib/SVK/Command.pod:188 msgid "d: Diff your file against merged file." msgstr "" -#: lib/SVK/Command.pod:188 +#: lib/SVK/Command.pod:189 msgid "delete - Remove versioned item" msgstr "" -#: lib/SVK/Command.pod:189 +#: lib/SVK/Command.pod:190 msgid "delete [DEPOTPATH...]" msgstr "" -#: lib/SVK/Command.pod:190 +#: lib/SVK/Command.pod:191 msgid "delete [PATH...]" msgstr "" -#: lib/SVK/Command/Depotmap.pm:82 +#: lib/SVK/Command/Depotmap.pm:58 msgid "depot map" msgstr "" -#: lib/SVK/Command.pod:191 +#: lib/SVK/Command.pod:192 msgid "depotmap - Create or edit the depot mapping configuration" msgstr "" -#: lib/SVK/Command.pod:192 +#: lib/SVK/Command.pod:193 msgid "depotmap --detach [DEPOTNAME | PATH]" msgstr "" -#: lib/SVK/Command.pod:193 +#: lib/SVK/Command.pod:194 msgid "depotmap --list" msgstr "" -#: lib/SVK/Command.pod:194 +#: lib/SVK/Command.pod:195 msgid "depotmap --relocate [DEPOTNAME | PATH] PATH" msgstr "" -#: lib/SVK/Command.pod:195 +#: lib/SVK/Command.pod:196 msgid "depotmap DEPOTNAME /path/to/repository" msgstr "" -#: lib/SVK/Command.pod:196 +#: lib/SVK/Command.pod:197 msgid "depotmap [OPTIONS]" msgstr "" -#: lib/SVK/Command.pod:197 +#: lib/SVK/Command.pod:198 msgid "depotname: '/path/to/repos'" msgstr "" -#: lib/SVK/Command.pod:198 +#: lib/SVK/Command.pod:199 msgid "describe - Describe a change" msgstr "" -#: lib/SVK/Command.pod:199 +#: lib/SVK/Command.pod:200 msgid "describe REV [DEPOTPATH | PATH]" msgstr "" -#: lib/SVK/Command.pod:200 +#: lib/SVK/Command.pod:201 msgid "diff - Display diff between revisions or checkout copies" msgstr "" -#: lib/SVK/Command.pod:201 +#: lib/SVK/Command.pod:202 msgid "diff -r N[:M] DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:202 +#: lib/SVK/Command.pod:203 msgid "diff DEPOTPATH PATH" msgstr "" -#: lib/SVK/Command.pod:203 +#: lib/SVK/Command.pod:204 msgid "diff DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/Command.pod:204 +#: lib/SVK/Command.pod:205 msgid "diff [-r REV] [PATH...]" msgstr "" @@ -1656,57 +1723,57 @@ msgid "different depot" msgstr "" -#: lib/SVK/Command.pod:205 +#: lib/SVK/Command.pod:206 msgid "dm: See merged changes." msgstr "" -#: lib/SVK/Command/Checkout.pm:27 +#: lib/SVK/Command/Checkout.pm:23 #. ($arg[0]) msgid "don't know where to checkout %1\n" msgstr "" -#: lib/SVK/Command.pod:206 +#: lib/SVK/Command.pod:207 msgid "dt: See their changes alone." msgstr "" -#: lib/SVK/Command.pod:207 +#: lib/SVK/Command.pod:208 msgid "dy: See your changes alone." msgstr "" -#: lib/SVK/Command.pod:208 +#: lib/SVK/Command.pod:209 msgid "e: Edit merged file with an editor." msgstr "" -#: lib/SVK/Command/Commit.pm:164 +#: lib/SVK/Command/Commit.pm:174 #. ($fname) msgid "file %1 already exists.\n" msgstr "" -#: lib/SVK/Command.pod:209 +#: lib/SVK/Command.pod:210 msgid "g Merged without actual change" msgstr "" -#: lib/SVK/Command.pod:210 +#: lib/SVK/Command.pod:211 msgid "h: Print this help message." msgstr "" -#: lib/SVK/Command.pod:211 +#: lib/SVK/Command.pod:212 msgid "help - Show help" msgstr "" -#: lib/SVK/Command.pod:212 +#: lib/SVK/Command.pod:213 msgid "help COMMAND" msgstr "" -#: lib/SVK/Command.pod:213 +#: lib/SVK/Command.pod:214 msgid "import - Import directory into depot" msgstr "" -#: lib/SVK/Command.pod:214 +#: lib/SVK/Command.pod:215 msgid "import DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:215 +#: lib/SVK/Command.pod:216 msgid "import [PATH] DEPOTPATH" msgstr "" @@ -1714,208 +1781,213 @@ msgid "import destination cannot be a file" msgstr "" -#: lib/SVK/Command.pod:216 +#: lib/SVK/Command.pod:217 msgid "info - Display information about a file or directory" msgstr "" -#: lib/SVK/Command.pod:217 +#: lib/SVK/Command.pod:218 msgid "info [PATH | DEPOTPATH]" msgstr "" -#: lib/SVK/Command/Diff.pm:36 lib/SVK/Command/Diff.pm:41 +#: lib/SVK/Command/Diff.pm:34 lib/SVK/Command/Diff.pm:39 msgid "invalid arguments" msgstr "" -#: lib/SVK/Command.pod:218 +#: lib/SVK/Command.pod:219 msgid "involved, do not prefix path names before values" msgstr "" -#: lib/SVK/Command.pod:219 +#: lib/SVK/Command.pod:220 msgid "list - List entries in a directory from depot" msgstr "" -#: lib/SVK/Command.pod:220 +#: lib/SVK/Command.pod:221 msgid "list [DEPOTPATH | PATH...]" msgstr "" -#: lib/SVK/Command.pod:221 +#: lib/SVK/Command.pod:222 msgid "log - Show log messages for revisions" msgstr "" -#: lib/SVK/Command.pod:222 +#: lib/SVK/Command.pod:223 msgid "log DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:223 +#: lib/SVK/Command.pod:224 msgid "log PATH" msgstr "" -#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:70 +#: lib/SVK/Command/Commit.pm:279 lib/SVK/Command/Commit.pm:71 msgid "log message" msgstr "" -#: lib/SVK/Command.pod:224 +#: lib/SVK/Command.pod:225 msgid "m: Run an external merge tool to edit merged file." msgstr "" -#: lib/SVK/Command.pod:225 +#: lib/SVK/Command.pod:226 msgid "master repository." msgstr "" -#: lib/SVK/Command.pod:226 +#: lib/SVK/Command.pod:227 msgid "merge - Apply differences between two sources" msgstr "" -#: lib/SVK/Command.pod:227 +#: lib/SVK/Command.pod:228 msgid "merge -r N:M DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:228 +#: lib/SVK/Command.pod:229 msgid "merge -r N:M DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/Command.pod:229 +#: lib/SVK/Command.pod:230 msgid "merge -r N:M [--to|--from] [PATH]" msgstr "" -#: lib/SVK/Command.pod:230 +#: lib/SVK/Command.pod:231 msgid "mirror - Initialize a mirrored depotpath" msgstr "" -#: lib/SVK/Command.pod:231 +#: lib/SVK/Command.pod:232 msgid "mirror --detach DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:232 +#: lib/SVK/Command.pod:233 msgid "mirror --list [DEPOTNAME...]" msgstr "" -#: lib/SVK/Command.pod:233 +#: lib/SVK/Command.pod:234 msgid "mirror --recover DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:234 +#: lib/SVK/Command.pod:235 msgid "mirror --relocate DEPOTPATH [http|svn]://host/path " msgstr "" -#: lib/SVK/Command.pod:235 +#: lib/SVK/Command.pod:236 msgid "mirror --upgrade //" msgstr "" -#: lib/SVK/Command.pod:236 +#: lib/SVK/Command.pod:237 msgid "mirror --upgrade /DEPOTNAME/" msgstr "" -#: lib/SVK/Command.pod:237 +#: lib/SVK/Command.pod:238 msgid "mirror DEPOTPATH [http|svn]://host/path" msgstr "" -#: lib/SVK/Command.pod:238 +#: lib/SVK/Command.pod:239 msgid "mirror [http|svn]://host/path DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:239 +#: lib/SVK/Command.pod:240 msgid "mirror cvs::pserver:user@host:/cvsroot:module/... DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:240 +#: lib/SVK/Command.pod:241 msgid "mirror p4:user@host:1666://path/... DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:241 +#: lib/SVK/Command.pod:242 msgid "mkdir - Create a versioned directory" msgstr "" -#: lib/SVK/Command.pod:242 +#: lib/SVK/Command.pod:243 msgid "mkdir DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:243 +#: lib/SVK/Command.pod:244 +msgid "mkdir PATH" +msgstr "" + +#: lib/SVK/Command.pod:245 msgid "move - Move a file or directory" msgstr "" -#: lib/SVK/Command.pod:244 +#: lib/SVK/Command.pod:246 msgid "move DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/XD.pm:317 +#: lib/SVK/XD.pm:312 msgid "no depot spec" msgstr "" -#: lib/SVK/Command.pod:245 +#: lib/SVK/Command.pod:247 msgid "patch - Manage patches" msgstr "" -#: lib/SVK/Command.pod:246 +#: lib/SVK/Command.pod:248 msgid "patch apply PATCHNAME [DEPOTPATH | PATH] [-- MERGEOPTIONS]" msgstr "" -#: lib/SVK/Command.pod:247 +#: lib/SVK/Command.pod:249 msgid "patch delete PATCHNAME" msgstr "" -#: lib/SVK/Command.pod:248 +#: lib/SVK/Command.pod:250 msgid "patch list" msgstr "" -#: lib/SVK/Command.pod:249 +#: lib/SVK/Command.pod:251 msgid "patch regen PATCHNAME" msgstr "" -#: lib/SVK/Command.pod:250 +#: lib/SVK/Command.pod:252 msgid "patch send PATCHNAME" msgstr "" -#: lib/SVK/Command.pod:251 +#: lib/SVK/Command.pod:253 msgid "patch update PATCHNAME" msgstr "" -#: lib/SVK/Command.pod:252 +#: lib/SVK/Command.pod:254 msgid "patch view PATCHNAME" msgstr "" -#: lib/SVK/Editor/XD.pm:174 lib/SVK/Editor/XD.pm:98 +#: lib/SVK/Editor/XD.pm:181 lib/SVK/Editor/XD.pm:99 #. ($path) #. ($copath) msgid "path %1 already exists" msgstr "" -#: lib/SVK/Editor/XD.pm:107 +#: lib/SVK/Editor/XD.pm:108 #. ($path) msgid "path %1 does not exist" msgstr "" -#: lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Update.pm:94 +#: lib/SVK/Command/Diff.pm:120 lib/SVK/Command/Diff.pm:42 lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Switch.pm:40 lib/SVK/Command/Update.pm:94 +#. ($target->{report}) +#. ($update_target->{path}) #. ($target->path) -#. ($update_target->{path}) msgid "path %1 does not exist.\n" msgstr "" -#: lib/SVK/XD.pm:338 lib/SVK/XD.pm:341 lib/SVK/XD.pm:394 +#: lib/SVK/XD.pm:333 lib/SVK/XD.pm:336 lib/SVK/XD.pm:389 #. ($report) #. ($copath) #. ($path) msgid "path %1 is not a checkout path.\n" msgstr "" -#: lib/SVK/XD.pm:1432 +#: lib/SVK/XD.pm:1448 #. ($path) msgid "path %1 not found" msgstr "" -#: lib/SVK/Command.pod:253 +#: lib/SVK/Command.pod:255 msgid "propdel - Delete a property on files or dirs" msgstr "" -#: lib/SVK/Command.pod:254 +#: lib/SVK/Command.pod:256 msgid "propdel PROPNAME [DEPOTPATH | PATH...]" msgstr "" -#: lib/SVK/Command.pod:255 +#: lib/SVK/Command.pod:257 msgid "propedit - Edit a property on path" msgstr "" -#: lib/SVK/Command.pod:256 +#: lib/SVK/Command.pod:258 msgid "propedit PROPNAME [DEPOTPATH | PATH...]" msgstr "" @@ -1924,51 +1996,51 @@ msgid "property %1" msgstr "" -#: lib/SVK/Command.pod:257 +#: lib/SVK/Command.pod:259 msgid "property values; when there are multiple paths" msgstr "" -#: lib/SVK/Command.pod:258 +#: lib/SVK/Command.pod:260 msgid "propget - Display a property on path" msgstr "" -#: lib/SVK/Command.pod:259 +#: lib/SVK/Command.pod:261 msgid "propget PROPNAME [DEPOTPATH | PATH...]" msgstr "" -#: lib/SVK/Command.pod:260 +#: lib/SVK/Command.pod:262 msgid "proplist - List all properties on files or dirs" msgstr "" -#: lib/SVK/Command.pod:261 +#: lib/SVK/Command.pod:263 msgid "proplist PATH..." msgstr "" -#: lib/SVK/Command.pod:262 +#: lib/SVK/Command.pod:264 msgid "propset - Set a property on path" msgstr "" -#: lib/SVK/Command.pod:263 +#: lib/SVK/Command.pod:265 msgid "propset PROPNAME PROPVAL [DEPOTPATH | PATH...]" msgstr "" -#: lib/SVK/Command.pod:264 +#: lib/SVK/Command.pod:266 msgid "pull - Bring changes from another repository" msgstr "" -#: lib/SVK/Command.pod:265 +#: lib/SVK/Command.pod:267 msgid "pull DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:266 +#: lib/SVK/Command.pod:268 msgid "pull [PATH...]" msgstr "" -#: lib/SVK/Command.pod:267 +#: lib/SVK/Command.pod:269 msgid "push - Move changes into another repository" msgstr "" -#: lib/SVK/Command.pod:268 +#: lib/SVK/Command.pod:270 msgid "push [DEPOTPATH | PATH]" msgstr "" @@ -1976,108 +2048,112 @@ msgid "q)uit? " msgstr "" -#: lib/SVK/Editor/XD.pm:123 +#: lib/SVK/Editor/XD.pm:124 #. ($copath, $basename, $!) msgid "rename %1 to %2 failed: %3" msgstr "" -#: lib/SVK/Command.pod:269 +#: lib/SVK/Command.pod:271 msgid "resolved - Remove conflict mark from checkout items" msgstr "" -#: lib/SVK/Command.pod:270 +#: lib/SVK/Command.pod:272 msgid "resolved PATH..." msgstr "" -#: lib/SVK/Command.pod:271 +#: lib/SVK/Command.pod:273 msgid "revert - Revert changes made in checkout copies" msgstr "" -#: lib/SVK/Command.pod:272 +#: lib/SVK/Command.pod:274 msgid "revert PATH..." msgstr "" -#: lib/SVK/Command.pod:273 +#: lib/SVK/Command.pod:275 msgid "s: Skip this file." msgstr "" -#: lib/SVK/Command.pod:274 +#: lib/SVK/Command.pod:276 msgid "smerge - Automatically merge all changes between branches" msgstr "" -#: lib/SVK/Command.pod:275 +#: lib/SVK/Command.pod:277 msgid "smerge DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:276 +#: lib/SVK/Command.pod:278 msgid "smerge DEPOTPATH1 DEPOTPATH2" msgstr "" -#: lib/SVK/Command.pod:277 +#: lib/SVK/Command.pod:279 msgid "smerge [--to|--from] [PATH]" msgstr "" -#: lib/SVK/Editor/XD.pm:128 +#: lib/SVK/Editor/XD.pm:129 msgid "source checksum mismatch" msgstr "" -#: lib/SVK/Command.pod:278 +#: lib/SVK/Command.pod:280 msgid "status - Display the status of items in the checkout copy" msgstr "" -#: lib/SVK/Command.pod:279 +#: lib/SVK/Command.pod:281 msgid "status [PATH..]" msgstr "" -#: lib/SVK/Command.pod:280 +#: lib/SVK/Command.pod:282 msgid "switch - Switch to another branch and keep local changes" msgstr "" -#: lib/SVK/Command.pod:281 +#: lib/SVK/Command.pod:283 msgid "switch DEPOTPATH [PATH]" msgstr "" -#: lib/SVK/Command.pod:282 +#: lib/SVK/Command.pod:284 msgid "sync - Synchronize a mirrored depotpath" msgstr "" -#: lib/SVK/Command.pod:283 +#: lib/SVK/Command.pod:285 msgid "sync --all [DEPOTNAME...]" msgstr "" -#: lib/SVK/Command.pod:284 +#: lib/SVK/Command.pod:286 msgid "sync DEPOTPATH" msgstr "" -#: lib/SVK/Command.pod:285 +#: lib/SVK/Command.pod:287 msgid "t: Keep only changes to their file." msgstr "" -#: lib/SVK/Command/Commit.pm:365 +#: lib/SVK/Command/Commit.pm:79 +msgid "try --encoding.\n" +msgstr "" + +#: lib/SVK/Command/Commit.pm:379 msgid "unexpected error: commit to mirrored path but no mirror object" msgstr "" -#: lib/SVK/Command.pod:286 +#: lib/SVK/Command.pod:288 msgid "update - Bring changes from repository to checkout copies" msgstr "" -#: lib/SVK/Command.pod:287 +#: lib/SVK/Command.pod:289 msgid "update [PATH...]" msgstr "" -#: lib/SVK/Command/Commit.pm:165 +#: lib/SVK/Command/Commit.pm:175 #. ($self->{patch}) msgid "use 'svk patch regen %1' instead.\n" msgstr "" -#: lib/SVK/Command.pod:288 +#: lib/SVK/Command.pod:290 msgid "verify - Verify change signatures" msgstr "" -#: lib/SVK/Command.pod:289 +#: lib/SVK/Command.pod:291 msgid "verify CHANGE [DEPOTNAME]" msgstr "" -#: lib/SVK/Command.pod:290 +#: lib/SVK/Command.pod:292 msgid "y: Keep only changes to your file." msgstr "" === zh_cn.po ================================================================== --- zh_cn.po (revision 1325) +++ zh_cn.po (patch patch level 1) @@ -4,47 +4,78 @@ # msgid "" msgstr "" -"Project-Id-Version: SVK 0.12\n" +"Project-Id-Version: SVK 0.30\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2004-03-17 20:20+8\n" -"Last-Translator: Autrijus Tang \n" +"Last-Translator: Cheng-Lung Sung \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/SVK/Command.pm:405 +#: lib/SVK/Command.pm:420 msgid "" "\n" -"First, you need to choose a depot path to store this mirrored repository,\n" -"usually something like //mirror/your_project/. Enter a suitable name below\n" -"to place it under //mirror/; you may also press enter and accept the " -"default.\n" +"Before svk start mirroring a remote repository, we would like to\n" +"explain two terms to you: 'depot path' and 'mirrored path'. A depot\n" +"path is like any path in a file system, only that the path is\n" +"stored in svk's internal virtual file system. To avoid confusion,\n" +"svk's default depot path begins with //, for example //depot or\n" +"//mirror/project. Now a mirrored path is a depot path with special\n" +"properties, which serves as the 'mirror' of a remote repository and\n" +"is by convention stored under //mirror/.\n" "\n" +"Now, you have to assign a name to identify the mirrored repository.\n" +"For example, if you name it 'your_project' (without the quotes),\n" +"svk will create a mirrored path called //mirror/your_project.\n" +"Of course, you can assign a 'full path' for it, for example,\n" +"//mymirror/myproject, although this is not really necessary. If you\n" +"just don't care, simply press enter and use svk's default, which is\n" +"usually good enough.\n" +"\n" msgstr "" "\n" -"首先，请为这个远程网址取一个名称（例如 //mirror/your_project/），作为\n" -"本地端的映像档案库路径。请键入路径名称（预设将置于 //mirror/ 之下），或\n" -"直接按 enter 键，采用系统建议的路径。\n" +"在 svk 开始映像远程档案库之前，我们要先为您解释两个名词：\n" +"'档案库路径（depot path）' 以及 '映像路径（mirrored path）'。\n" +"一个档案库路径就如同档案系统的任何路径，差别只在于该路径只存放在 svk 内部\n" +"虚拟档案系统。为了避免混淆，svk 预设的档案库路径会以 // 做开始，例如\n" +"//depot 或 //mirror/project。而映像路径则是有特殊属性的档案库路径，可以把\n" +"它视为远程档案库的 '映像' ，通常是储存于 //mirror/ 之下。\n" "\n" +"现在，你必须要指定一个名称以识别映像的档案库。\n" +"例如，如果你的名称为 'your_project' （没有引号）， svk 将会建立\n" +"//mirror/your_project 做为映像路径。当然，你可以指定一个 '完整路径' 给它，\n" +"例如 //mymirror/myproject，虽然这并不是真的很重要。 如果你不想管这些，那只\n" +"要按下 Enter 并且使用 svk 的预设值，这样也就够用了。\n" +"\n" -#. ($depot) -#: lib/SVK/Command.pm:804 +#. ($1) +#: lib/SVK/Command.pm:840 msgid "" "\n" -"Next, please choose another depot path to serve as your private branch,\n" -"usually something like %1your_project/. SVK will copy the mirrored path\n" -"into this new path, so you can commit into it without affecting the remote\n" -"repository. Enter a suitable name below to place it under %1; you may also\n" -"press enter and accept the default.\n" +"Next, svk will create another depot path, and you have to name it too.\n" +"It is usally something like %1your_project/. svk will copy what's in\n" +"the mirrored path into the new path. This depot path is where your\n" +"own private branch goes. You can commit files to it or check out files\n" +"from it without affecting the remote repository. Which means you can\n" +"work with version control even when you're offline (yes, this is one\n" +"of svk's main features).\n" "\n" +"Please enter a name for your private branch, and it will be placed\n" +"under %1. If, again, you just don't care, simply press enter and let\n" +"svk use the default.\n" +"\n" msgstr "" "\n" -"接下来，请为你个人使用的分支取一个名称（例如 %1your_project）。系统会\n" -"将上面的映像路径复制到新的档案库路径下；如此一来，送交到这个路径的更动就\n" -"不会直接影响远程的档案库。请键入路径名称（预设将置于 %1 之下），或直接\n" -"按 enter 键，采用系统建议的路径。\n" +"接下来，svk 将会建立另一个档案库路径，当然你也得为它取名。\n" +"它通常长得像 %1your_project/。 svk 将会复制映像路径中的档案到新的路径。\n" +"这个档案库路径是你私有的分支版本存放的位置。你可以送交档案给它或是取出\n" +"档案而不会影响到远程档案库。这表示即使你没有联机到网络，你还是可以使用\n" +"版本控制来工作（是的，这是 svk 主要的功能之一）。\n" "\n" +"请输入你私有分支版本的名称，它将会被放在 %1 下。\n" +"同样地，如果你不在乎的话，只要按下 Enter 让 svk 以预设值运作吧。\n" +"\n" #: lib/SVK/Command.pod:2 msgid "" @@ -211,19 +242,19 @@ " 在这讯息之中，可看到一些基本信息，像是实际档案库路径，以及目前版号。\n" " 也有一些比较进阶的信息，像是此档案库复制与合并的路径。" -#: lib/SVK/Command.pm:429 +#: lib/SVK/Command.pm:457 msgid " -count : At most 'count' recent revisions\n" msgstr " -个数 : 仅同步最新的数份更动\n" -#: lib/SVK/Command.pm:427 +#: lib/SVK/Command.pm:455 msgid " a : Retrieve all revisions (default)\n" msgstr " a : 取得所有的更动（预设选项）\n" -#: lib/SVK/Command.pm:428 +#: lib/SVK/Command.pm:456 msgid " h : Only the most recent revision\n" msgstr " h : 仅同步最新的一份更动\n" -#: lib/SVK/Command.pm:430 +#: lib/SVK/Command.pm:458 msgid " revision : Start from the specified revision\n" msgstr " 更动编号 : 从指定的更动编号开始同步\n" @@ -231,6 +262,10 @@ msgid "# You may also list the target part first:" msgstr "# 目标也可以写在来源前面：" +#: lib/SVK/Command.pm:129 +msgid "$self->options" +msgstr "" + #: lib/SVK/Command.pod:53 msgid "% svk info //svk/trunk" msgstr "% svk info //svk/trunk" @@ -240,7 +275,7 @@ msgstr "% svk info ~/dev/svk" #. ($conflicts) -#: lib/SVK/Command/Commit.pm:256 +#: lib/SVK/Command/Commit.pm:268 msgid "%*(%1,conflict) detected. Use 'svk resolved' after resolving them.\n" msgstr "侦测到 %1 项冲突。请在解决后执行‘svk resolved’。\n" @@ -256,23 +291,23 @@ #. ($editor->{conflicts}) #. ($conflicts) -#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:347 +#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:348 msgid "%*(%1,conflict) found.\n" msgstr "找到 %1 项冲突。\n" #. ($editor->{skipped}) -#: lib/SVK/Merge.pm:349 +#: lib/SVK/Merge.pm:350 msgid "" "%*(%1,file) skipped, you might want to rerun merge with --track-rename.\n" msgstr "略过 %1 个档案；请考虑用 --track-rename 选项重新执行合并。\n" #. ($path) -#: lib/SVK/Notify.pm:32 +#: lib/SVK/Notify.pm:33 msgid "%1 - skipped\n" msgstr "%1 - 略过\n" #. ($target->{report}) -#: lib/SVK/Command/Mirror.pm:183 +#: lib/SVK/Command/Mirror.pm:226 msgid "%1 added back to the list of mirrored paths.\n" msgstr "已将 %1 加回映像路径列表中。\n" @@ -282,17 +317,17 @@ msgstr "已经准备加入 %1。\n" #. ($target->path) -#: lib/SVK/Command/Mirror.pm:100 +#: lib/SVK/Command/Mirror.pm:37 msgid "%1 already exists.\n" msgstr "路径 %1 已存在。\n" #. ($path) -#: lib/SVK/XD.pm:219 +#: lib/SVK/XD.pm:214 msgid "%1 already locked, use 'svk cleanup' if lock is stalled\n" msgstr "%1 已被锁定，若卡住时请用‘svk cleanup’解除\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:102 +#: lib/SVK/Command/Mirror.pm:41 msgid "%1 already mirrored, use 'svk mirror --detach' to remove it first.\n" msgstr "%1 已经是映像路径，请先用‘svk mirror --detach’移除原本的映像设定。\n" @@ -302,28 +337,28 @@ msgstr "%1 已纳入版本控制。\n" #. ($dst->{report}) -#: lib/SVK/Command/Merge.pm:92 +#: lib/SVK/Command/Merge.pm:93 msgid "" "%1 can not be used as merge target, because it contains mirrored path:\n" msgstr "%1 不能作为合并的目标，因为它包含了下列映像路径：\n" #. ($report) -#: lib/SVK/XD.pm:631 +#: lib/SVK/XD.pm:629 msgid "%1 changed" msgstr "%1 已更动" #. (abs2rel ($_[1], $target->{copath} => $target->{report}) -#: lib/SVK/Command/Commit.pm:383 +#: lib/SVK/Command/Commit.pm:397 msgid "%1 is a mirrored path, please commit separately.\n" msgstr "%1 不是一个映像路径，请另行送交更动。\n" #. ($arg{copath}) -#: lib/SVK/XD.pm:693 +#: lib/SVK/XD.pm:691 msgid "%1 is already scheduled for delete" msgstr "%1 已被排程纳入下次要删除的项目" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:72 +#: lib/SVK/Command/Mirror.pm:77 msgid "%1 is inside a mirrored path.\n" msgstr "%1 位于映像路径之下。\n" @@ -338,7 +373,7 @@ msgstr "%1 已修改。\n" #. ($depotpath) -#: lib/SVK/XD.pm:318 +#: lib/SVK/XD.pm:313 msgid "%1 is not a depot path.\n" msgstr "%1 不是档案库路径。\n" @@ -348,7 +383,7 @@ msgstr "路径 %1 不是一个目录。\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:71 +#: lib/SVK/Command/Mirror.pm:76 msgid "%1 is not a mirrored path.\n" msgstr "%1 不是一个映像路径。\n" @@ -358,17 +393,17 @@ msgstr "%1 不是一个数字。\n" #. ($arg) -#: lib/SVK/Command.pm:358 +#: lib/SVK/Command.pm:373 msgid "%1 is not a valid URI.\n" msgstr "%1 不是一个网址。\n" #. ($cotarget->{report}, $target->{report}) -#: lib/SVK/Command/Switch.pm:42 +#: lib/SVK/Command/Switch.pm:44 msgid "%1 is not related to %2.\n" msgstr "找不到 %1 和 %2 的共同来源。\n" #. ($_[0]) -#: lib/SVK/XD.pm:641 +#: lib/SVK/XD.pm:639 msgid "%1 is not under version control" msgstr "%1 未受版本控制" @@ -378,27 +413,28 @@ msgstr "%1 无版本信息；略过。\n" #. ($report) -#: lib/SVK/XD.pm:637 -msgid "%1 is scheduled, use 'svk revert'" +#: lib/SVK/XD.pm:634 +#, fuzzy +msgid "%1 is scheduled, use 'svk revert'.\n" msgstr "%1 已排程，请用‘svk revert’" #. ($target->{depotpath}) -#: lib/SVK/Command/Commit.pm:49 +#: lib/SVK/Command/Commit.pm:51 msgid "%1 is under mirrored path.\n" msgstr "%1 位于映像路径之下。\n" #. ($entry) -#: lib/SVK/XD.pm:1239 +#: lib/SVK/XD.pm:1253 msgid "%1 marked as resolved.\n" msgstr "%1 已标记为已解决。\n" #. (ucfirst($what) -#: lib/SVK/Util.pm:198 +#: lib/SVK/Util.pm:218 msgid "%1 not modified: a)bort, e)dit, c)ommit?" msgstr "%1并未修改：a)取消，e)编辑，c)送交？" #. ($arg{copath}, $source_path) -#: lib/SVK/XD.pm:688 +#: lib/SVK/XD.pm:686 msgid "%1(%2) is not under version control" msgstr "%1（%2）未受版本控制" @@ -408,12 +444,12 @@ msgstr "‘%1’里没有档案库名称。\n" #. ($path) -#: lib/SVK/Command/Checkout.pm:68 lib/SVK/Command/Checkout.pm:93 +#: lib/SVK/Command/Checkout.pm:131 lib/SVK/Command/Checkout.pm:179 msgid "'%1' is not a checkout path.\n" msgstr "‘%1’不是取出的路径。\n" #. ($path) -#: lib/SVK/Command/Checkout.pm:95 +#: lib/SVK/Command/Checkout.pm:133 msgid "'%1' maps to multiple checkout paths.\n" msgstr "‘%1’对映到两项以上的取出路径。\n" @@ -422,11 +458,11 @@ msgstr "（目前此选项在‘pull 路径’时自动生效）" #. ($copyfrom_path, $copyfrom_rev) -#: lib/SVK/Command/Log.pm:150 +#: lib/SVK/Command/Log.pm:154 msgid "(from %1:%2)" msgstr "（来自 %1:%2）" -#: lib/SVK/Command/Log.pm:136 +#: lib/SVK/Command/Log.pm:137 msgid "(no author)" msgstr "(no author)" @@ -449,38 +485,42 @@ msgstr "--direct: 即使路径是映像目录，还是直接送交更动" #: lib/SVK/Command.pod:57 +msgid "--encoding ENC: treat value as being in charset encoding ENC" +msgstr "--encoding ENC: 视为字元集 ENC 的编码" + +#: lib/SVK/Command.pod:58 msgid "--export: export mode; checkout a detached copy" msgstr "--export: 汇出模式：解除路径的取出状态" -#: lib/SVK/Command.pod:58 +#: lib/SVK/Command.pod:59 msgid "--host arg: use ARG as the hostname shown in merge log" msgstr "--host arg: 指定显示在合并纪录里的计算机名称" -#: lib/SVK/Command.pod:59 +#: lib/SVK/Command.pod:60 msgid "--import: import mode; automatically add and delete nodes" msgstr "--import: 汇入模式；自动进行新增及删除" -#: lib/SVK/Command.pod:60 +#: lib/SVK/Command.pod:61 msgid "--no-ticket: do not record this merge point" msgstr "--no-ticket: 不留下此次合并的历史纪录" -#: lib/SVK/Command.pod:61 +#: lib/SVK/Command.pod:62 msgid "--recover: recover the state of a mirror path" msgstr "--recover: 修复映像路径的状态" -#: lib/SVK/Command.pod:62 +#: lib/SVK/Command.pod:63 msgid "--relocate: relocate the checkout to another path" msgstr "--relocate: 将取出路径指向另一个路径" -#: lib/SVK/Command.pod:63 +#: lib/SVK/Command.pod:64 msgid "--relocate: relocate the depot to another path" msgstr "--relocate: 将档案库指向另一个路径" -#: lib/SVK/Command.pod:64 +#: lib/SVK/Command.pod:65 msgid "--relocate: relocate the mirror to another URI" msgstr "--relocate: 将映像路径指向另一个网址" -#: lib/SVK/Command.pod:65 +#: lib/SVK/Command.pod:66 msgid "--remoterev: use remote revision numbers in merge log" msgstr "--remoterev: 在合并纪录里，使用远程的更动编号" @@ -488,247 +528,247 @@ msgid "--revision cannot be used in conjunction with --sync or --merge.\n" msgstr "--revision 不能与 --sync 或 --merge 合并使用。\n" -#: lib/SVK/Command.pod:66 +#: lib/SVK/Command.pod:67 msgid "--revprop: operate on a revision property (use with -r)" msgstr "--revprop: 操作修订版属性（需与 -r 一同使用）" -#: lib/SVK/Command.pod:67 +#: lib/SVK/Command.pod:68 msgid "--strict: do not print an extra newline at the end of the" msgstr "--strict: 不要在显示的属性值后面加上换列符号；" -#: lib/SVK/Command.pod:68 +#: lib/SVK/Command.pod:69 msgid "--track-rename: track changes made to renamed node" msgstr "--track-rename: 对于改名过的项目，一并追踪改名前的更动" -#: lib/SVK/Command.pod:69 +#: lib/SVK/Command.pod:70 msgid "--upgrade: upgrade mirror state to the latest version" msgstr "--upgrade: 更新映像状态信息的储存格式" -#: lib/SVK/Command.pod:70 +#: lib/SVK/Command.pod:71 msgid "--verbatim: verbatim merge log without indents and header" msgstr "--verbatim: 保留原先的送交纪录，不要加上缩排和标头" -#: lib/SVK/Command.pod:71 +#: lib/SVK/Command.pod:72 msgid "-B [--baseless]: use the earliest revision as the merge point" msgstr "-B [--baseless]: 使用最早的更动当作合并点" -#: lib/SVK/Command.pod:72 +#: lib/SVK/Command.pod:73 msgid "-C [--check-only]: try operation but make no changes" msgstr "-C [--check-only]: 不真的执行写入，只做检查" -#: lib/SVK/Command.pod:73 +#: lib/SVK/Command.pod:74 msgid "-I [--incremental]: apply each change individually" msgstr "-I [--incremental]: 渐进式合并；逐一套用每项更动" -#: lib/SVK/Command.pod:74 +#: lib/SVK/Command.pod:75 msgid "-K [--keep-local]: do not remove the local file" msgstr "-K [--keep-local]: 不要删除本地端的档案" -#: lib/SVK/Command.pod:75 +#: lib/SVK/Command.pod:76 msgid "-N [--non-recursive]: do not descend recursively" msgstr "-N [--non-recursive]: 不要递回处理子目录" -#: lib/SVK/Command.pod:76 +#: lib/SVK/Command.pod:77 msgid "-P [--patch] arg: instead of commit, save this change as a patch" msgstr "-P [--patch] arg: 将更动储存为补缀，但不送交更动" -#: lib/SVK/Command.pod:77 +#: lib/SVK/Command.pod:78 msgid "-R [--recursive]: descend recursively" msgstr "-R [--recursive]: 递回处理子目录" -#: lib/SVK/Command.pod:78 +#: lib/SVK/Command.pod:79 msgid "-S [--sign]: sign this change" msgstr "-S [--sign]: 签署送交更动" -#: lib/SVK/Command.pod:79 +#: lib/SVK/Command.pod:80 msgid "-a [--all]: pull into all checkout paths" msgstr "-a [--all]: 拉取所有的取出路径" -#: lib/SVK/Command.pod:80 +#: lib/SVK/Command.pod:81 msgid "-a [--all]: remove all stalled locks" msgstr "-a [--all]: 移除所有卡住的锁定" -#: lib/SVK/Command.pod:81 +#: lib/SVK/Command.pod:82 msgid "-a [--all]: synchronize all mirrored paths" msgstr "-a [--all]: 同步化所有的映像路径" -#: lib/SVK/Command.pod:82 +#: lib/SVK/Command.pod:83 msgid "-a [--auto]: merge from the previous merge point" msgstr "-a [--auto]: 使用上次的合并点" -#: lib/SVK/Command.pod:83 +#: lib/SVK/Command.pod:84 msgid "-b [--base] arg: use revision ARG as the merge point" msgstr "-b [--base] arg: 使用指定的更动当作合并点" -#: lib/SVK/Command.pod:84 +#: lib/SVK/Command.pod:85 msgid "-c [--change] arg: act on comma-separated revisions ARG" msgstr "-c [--change] arg: 指定一系列要处理的更动，编号之间用逗号隔开" -#: lib/SVK/Command.pod:85 +#: lib/SVK/Command.pod:86 msgid "-d [--depth] arg: recurse at most ARG levels deep; use with -R" msgstr "-d [--depth] arg: 指定递回层数的上限；仅在指定 -R 时适用" -#: lib/SVK/Command.pod:86 +#: lib/SVK/Command.pod:87 msgid "-d [--detach]: mark a depotpath as no longer mirrored" msgstr "-d [--detach]: 解除档案库路径的映像状态" -#: lib/SVK/Command.pod:87 +#: lib/SVK/Command.pod:88 msgid "-d [--detach]: mark a path as no longer checked out" msgstr "-d [--detach]: 解除路径的取出状态" -#: lib/SVK/Command.pod:88 +#: lib/SVK/Command.pod:89 msgid "-d [--detach]: remove a depot from the mapping" msgstr "-d [--detach]: 将档案库从对映表中移除" -#: lib/SVK/Command.pod:89 +#: lib/SVK/Command.pod:90 msgid "-f [--from-checkout]: import from a checkout path" msgstr "-f [--from-checkout]: 使用取出路径作为汇入来源" -#: lib/SVK/Command.pod:90 +#: lib/SVK/Command.pod:91 msgid "-f [--from] arg: push from the specified path" msgstr "-f [--from] arg: 从指定的路径推送更动" -#: lib/SVK/Command.pod:91 +#: lib/SVK/Command.pod:92 msgid "-f [--from]: merge from the specified path" msgstr "-f [--from]: 从指定的路径合并到它的复制来源" -#: lib/SVK/Command.pod:92 +#: lib/SVK/Command.pod:93 msgid "-f [--full-path]: show pathname for each entry, instead of a tree" msgstr "-f [--full-path]: 显示每个项目的完整路径，而不是树状结构" -#: lib/SVK/Command.pod:93 +#: lib/SVK/Command.pod:94 msgid "-i [--init]: initialize a default depot" msgstr "-i [--init]: 初始化预设的档案库" -#: lib/SVK/Command.pod:94 +#: lib/SVK/Command.pod:95 msgid "-l [--limit] arg: stop after displaying ARG revisions" msgstr "-l [--limit] arg: 指定显示更动数的上限" -#: lib/SVK/Command.pod:95 +#: lib/SVK/Command.pod:96 msgid "-l [--list]: list checkout paths" msgstr "-l [--list]: 列出所有的取出路径" -#: lib/SVK/Command.pod:96 +#: lib/SVK/Command.pod:97 msgid "-l [--list]: list current depot mappings" msgstr "-l [--list]: 列出现有的档案库对映" -#: lib/SVK/Command.pod:97 +#: lib/SVK/Command.pod:98 msgid "-l [--list]: list mirrored paths" msgstr "-l [--list]: 列出所有的映像路径" -#: lib/SVK/Command.pod:98 +#: lib/SVK/Command.pod:99 msgid "-l [--log]: use logs of merged revisions as commit message" msgstr "-l [--log]: 采用各更动的纪录做为合并纪录" -#: lib/SVK/Command.pod:99 +#: lib/SVK/Command.pod:100 msgid "-l [--lump]: merge everything into a single commit log" msgstr "-l [--lump]: 将所有更动合并为一项送交纪录" -#: lib/SVK/Command.pod:100 +#: lib/SVK/Command.pod:101 msgid "-m [--merge]: smerge from copied sources before update" msgstr "-m [--merge]: 在更新之前，先从复制来源执行 smerge" -#: lib/SVK/Command.pod:101 +#: lib/SVK/Command.pod:102 msgid "-m [--message] arg: specify commit message ARG" msgstr "-m [--message] arg: 指定送交更动的描述" -#: lib/SVK/Command/Merge.pm:146 +#: lib/SVK/Command/Merge.pm:147 msgid "-m ignored in incremental merge\n" msgstr "渐进式合并；已忽略 -m 选项\n" -#: lib/SVK/Command.pod:102 +#: lib/SVK/Command.pod:103 msgid "-p [--parent]: create intermediate directories as required" msgstr "-p [--parent]: 依需要而建立中间的目录" -#: lib/SVK/Command.pod:103 +#: lib/SVK/Command.pod:104 msgid "-q [--quiet]: do not display changed nodes" msgstr "-q [--quiet]: 不要显示更动的项目" -#: lib/SVK/Command.pod:104 +#: lib/SVK/Command.pod:105 msgid "-q [--quiet]: do not display files not under version control" msgstr "-q [--quiet]: 不要显示未加入版本控制的项目" -#: lib/SVK/Command.pod:105 +#: lib/SVK/Command.pod:106 msgid "-q [--quiet]: quiet mode" msgstr "-q [--quiet]: 极简输出" -#: lib/SVK/Command.pod:106 +#: lib/SVK/Command.pod:107 msgid "-r [--revision] N:M: act on revisions between N and M" msgstr "-r [--revision] N:M: 指定要处理的更动编号范围" -#: lib/SVK/Command.pod:107 +#: lib/SVK/Command.pod:108 msgid "-r [--revision] REV: annotate up to revision" msgstr "-r [--revision] REV: 指定要处理的更动编号范围" -#: lib/SVK/Command.pod:108 +#: lib/SVK/Command.pod:109 msgid "-r [--revision] arg: act on revision ARG instead of the head revision" msgstr "-r [--revision] arg: 指定要处理的更动编号；预设为最新版本" -#: lib/SVK/Command.pod:109 +#: lib/SVK/Command.pod:110 msgid "-s [--skipto] arg: start synchronization at revision ARG" msgstr "-s [--skipto] arg: 指定开始同步的更动编号" -#: lib/SVK/Command.pod:110 +#: lib/SVK/Command.pod:111 msgid "-s [--summarize]: show summary only" msgstr "-s [--summarize]: 仅显示摘要信息" -#: lib/SVK/Command.pod:111 +#: lib/SVK/Command.pod:112 msgid "-s [--sync]: synchronize mirrored sources before update" msgstr "-s [--sync]: 在更新前，先同步化来源映像路径" -#: lib/SVK/Command.pod:112 +#: lib/SVK/Command.pod:113 msgid "-t [--to-checkout]: turn the source into a checkout path" msgstr "-t [--to-checkout]: 将汇入来源设为取出路径" -#: lib/SVK/Command.pod:113 +#: lib/SVK/Command.pod:114 msgid "-t [--to]: merge to the specified path" msgstr "-t [--to]: 从指定路径的复制来源，合并到指定的路径" -#: lib/SVK/Command.pod:114 +#: lib/SVK/Command.pod:115 msgid "-t [--torev] arg: stop synchronization at revision ARG" msgstr "-t [--torev] arg: 指定结束同步的更动编号" -#: lib/SVK/Command.pod:115 +#: lib/SVK/Command.pod:116 msgid "-v [--verbose]: print extra information" msgstr "-v [--verbose]: 印出额外的信息" -#: lib/SVK/Command.pod:116 +#: lib/SVK/Command.pod:117 msgid "-x [--cross]: track revisions copied from elsewhere" msgstr "-x [--cross]: 追踪从别处复制来的版本" -#: lib/SVK/Command.pod:117 +#: lib/SVK/Command.pod:118 msgid "/depotname/path/inside/repos" msgstr "/档案库名称/内部的/路径" # as-is -#: lib/SVK/Command/Commit.pm:38 +#: lib/SVK/Command/Commit.pm:40 msgid "=== Please enter your commit message above this line ===" msgstr "=== Please enter your commit message above this line ===" # as-is -#: lib/SVK/Command/Commit.pm:34 +#: lib/SVK/Command/Commit.pm:36 msgid "=== Targets to commit (you may delete items from it) ===" msgstr "=== Targets to commit (you may delete items from it) ===" -#: lib/SVK/Command.pod:118 +#: lib/SVK/Command.pod:119 msgid "A Added" msgstr "A 新增" -#: lib/SVK/Command/Mirror.pm:150 lib/SVK/Util.pm:202 +#: lib/SVK/Command/Mirror.pm:193 lib/SVK/Util.pm:222 msgid "Aborted.\n" msgstr "取消。\n" #. ($!) -#: lib/SVK/Util.pm:190 +#: lib/SVK/Util.pm:210 msgid "Aborted: %1\n" msgstr "已中止：%1\n" -#: lib/SVK/Command.pod:119 +#: lib/SVK/Command.pod:120 msgid "Accept:" msgstr "接受：" #. ($rev) -#: lib/SVK/Command/Mirror.pm:120 +#: lib/SVK/Command/Mirror.pm:163 msgid "Analyzing revision %1...\n" msgstr "正在分析编号 %1 的更动...\n" @@ -742,11 +782,11 @@ msgid "Auto-merging (%1, %2) %3 to %4 (base %5:%6).\n" msgstr "自动合并（%1, %2）%3 到 %4（源头为 %5:%6）\n" -#: lib/SVK/Command/Help.pm:20 +#: lib/SVK/Command/Help.pm:21 msgid "Available commands:\n" msgstr "可用的命令：\n" -#: lib/SVK/Command.pod:120 +#: lib/SVK/Command.pod:121 msgid "C Conflict" msgstr "C 冲突" @@ -754,22 +794,40 @@ msgid "Can only switch checkout root.\n" msgstr "只能切换取出路径的根目录。\n" -#: lib/SVK/Command.pm:573 +#: lib/SVK/Command.pm:603 msgid "Can't assign --revision and --change at the same time.\n" msgstr "无法同时指定 --revision 与 --change。\n" #. ($anchor, $!) -#: lib/SVK/Command/Checkout.pm:137 +#: lib/SVK/Command/Checkout.pm:51 msgid "Can't create checkout path %1: %2\n" msgstr "无法建立取出路径 %1：%2\n" +#. ($cotarget->{report}, $!) +#: lib/SVK/Command/Update.pm:114 +#, fuzzy +msgid "Can't create directory %1 for checkout: %2.\n" +msgstr "无法建立取出路径 %1：%2\n" + +#. ($_[1], $enc->name) +#: lib/SVK/Util.pm:282 +#, fuzzy +msgid "Can't decode %1 as %2.\n" +msgstr "无法找到 %1 和 %2 的合并源头\n" + +#. ($_[1], $enc->name) +#: lib/SVK/Util.pm:296 +#, fuzzy +msgid "Can't encode %1 as %2.\n" +msgstr "无法找到 %1 和 %2 的合并源头\n" + #. ($src->path, $dst->path) #: lib/SVK/Merge.pm:130 msgid "Can't find merge base for %1 and %2\n" msgstr "无法找到 %1 和 %2 的合并源头\n" #. ("$self->{statefile}.backup") -#: lib/SVK/XD.pm:125 +#: lib/SVK/XD.pm:120 msgid "Can't load statefile, old statefile saved as %1\n" msgstr "无法加载状态档；旧版状态档已存为 %1\n" @@ -777,16 +835,21 @@ msgid "Can't merge across depots.\n" msgstr "无法跨档案库进行合并。\n" -#: lib/SVK/Command/Commit.pm:58 +#: lib/SVK/Command/Propset.pm:100 +#, fuzzy +msgid "Can't set svn:eol-style on depotpath.\n" +msgstr "%1 不是档案库路径。\n" + +#: lib/SVK/Command/Commit.pm:60 msgid "Can't use -F with -m.\n" msgstr "无法同时指定 -F 及 -m。\n" #. ($self->{svkpath}, $!) -#: lib/SVK/XD.pm:92 +#: lib/SVK/XD.pm:87 msgid "Cannot create svk-config-directory at '%1': %2" msgstr "无法于‘%1’建立 SVK 的设定目录：%2" -#: lib/SVK/Editor/Diff.pm:66 +#: lib/SVK/Editor/Diff.pm:69 msgid "Cannot display: file marked as a binary type.\n" msgstr "无法显示二进制档案的差异。\n" @@ -796,11 +859,11 @@ msgstr "在 %1 里找不到补缀区段。\n" #. ($topic) -#: lib/SVK/Command/Help.pm:44 +#: lib/SVK/Command/Help.pm:45 msgid "Cannot find help topic '%1'.\n" msgstr "找不到说明主题‘%1’。\n" -#: lib/SVK/Util.pm:211 +#: lib/SVK/Util.pm:231 msgid "Cannot find separator; aborted.\n" msgstr "找不到分隔线，放弃编辑。\n" @@ -820,7 +883,7 @@ msgstr "无法激活外部合并工具来编辑 %1。\n" #. (catfile($source) -#: lib/SVK/Util.pm:668 +#: lib/SVK/Util.pm:740 msgid "Cannot rename %1 to %2; please move it manually.\n" msgstr "无法将 %1 改名为 %2；请自行移动此路径。\n" @@ -834,21 +897,21 @@ msgstr "不能同时指定‘to’及‘from’。\n" #. ($_) -#: lib/SVK/Command.pm:586 +#: lib/SVK/Command.pm:616 msgid "Change spec %1 not recognized.\n" msgstr "无法辨识的更动语法 %1。\n" -#: lib/SVK/Command/Log.pm:138 +#: lib/SVK/Command/Log.pm:139 msgid "Changed paths:\n" msgstr "已修改路径：\n" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:126 +#: lib/SVK/Command/Commit.pm:136 msgid "Checking locally against mirror source %1.\n" msgstr "正在本地端检查映像来源 %1。\n" #. ($path, $target) -#: lib/SVK/Command/Checkout.pm:119 +#: lib/SVK/Command/Checkout.pm:157 msgid "Checkout '%1' relocated to '%2'.\n" msgstr "取出路径‘%1’已改为指向‘%2’。\n" @@ -857,22 +920,27 @@ msgid "Checkout Path: %1\n" msgstr "取出路径：%1\n" -#: lib/SVK/Command.pod:121 +#: lib/SVK/Command.pod:122 msgid "Checkout Path: /Users/gugod/dev/svk" msgstr "取出路径：/Users/gugod/dev/svk" +#. ($update_target->{depotpath}, $cotarget->{report}) +#: lib/SVK/Command/Update.pm:111 +msgid "Checkout directory gone. Use 'checkout %1 %2' instead.\n" +msgstr "取出目录没有了。请改用 'checkout %1 %2'。\n" + #. ($report) -#: lib/SVK/Command/Checkout.pm:128 +#: lib/SVK/Command/Checkout.pm:42 msgid "Checkout path %1 already exists.\n" msgstr "指定的取出路径 %1 已存在。\n" #. ($copath) -#: lib/SVK/Command/Checkout.pm:73 +#: lib/SVK/Command/Checkout.pm:184 msgid "Checkout path '%1' detached.\n" msgstr "成功解除路径‘%1’的取出状态。\n" #. ($uri) -#: lib/SVK/Command.pm:388 +#: lib/SVK/Command.pm:403 msgid "Choose a base URI to mirror from (press enter to use the full URI): " msgstr "要映像的基底网址（如果与上列完整网址相同，请直接按 Enter）：" @@ -885,12 +953,12 @@ msgid "Cleaned up stalled lock on %1.\n" msgstr "己清除 %1 上卡住的锁定。\n" -#: lib/SVK/Command/Commit.pm:347 +#: lib/SVK/Command/Commit.pm:361 msgid "Commit into mirrored path: merging back directly.\n" msgstr "送交进映像路径：正在直接合并回去。\n" #. ($_[0]) -#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:176 +#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:186 msgid "Committed revision %1.\n" msgstr "已送交编号 %1 的更动。\n" @@ -912,7 +980,7 @@ msgid "Copied From: %1, Rev. %2\n" msgstr "复制来源：%1，更动编号 %2\n" -#: lib/SVK/Command.pod:122 +#: lib/SVK/Command.pod:123 msgid "Copied From: /svk/trunk, Rev. 434" msgstr "复制来源：/svk/trunk，更动编号 434" @@ -921,48 +989,54 @@ msgid "Copying more than one source requires %1 to be directory.\n" msgstr "复制超过一项来源时，%1 必须是目录。\n" +#. ($cmd, $!) +#. ($self->{external}, $?) #. ('svnadmin', $?) -#. ($self->{external}, $?) -#. ($cmd, $!) -#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:108 +#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:111 #: lib/SVK/Resolve/Emacs.pm:66 msgid "Could not run %1: %2" msgstr "无法执行 %1：%2" -#: lib/SVK/Command.pod:123 +#: lib/SVK/Command.pod:124 msgid "D Deleted" msgstr "D 删除" -#: lib/SVK/Command.pod:124 +#: lib/SVK/Command.pod:125 msgid "DESCRIPTION" msgstr "说明" -#: lib/SVK/Command/Depotmap.pm:68 +#: lib/SVK/Command/Depotmap.pm:125 msgid "Depot" msgstr "档案库" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:96 +#: lib/SVK/Command/Depotmap.pm:76 msgid "" "Depot '%1' already exists; use 'svk depotmap --detach' to remove it first.\n" msgstr "档案库‘%1’已经存在；请先用‘svk depotmap --detach’将它移除。\n" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:123 +#: lib/SVK/Command/Depotmap.pm:110 msgid "Depot '%1' detached.\n" msgstr "档案库‘%1’已成功解除。\n" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:121 +#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:92 msgid "Depot '%1' does not exist in the depot map.\n" msgstr "档案库‘%1’不存在于对映表中。\n" #. ($depot, $path) -#: lib/SVK/Command/Depotmap.pm:113 +#: lib/SVK/Command/Depotmap.pm:97 msgid "Depot '%1' relocated to '%2'.\n" msgstr "档案库‘%1’已改为指向‘%2’。\n" -#: lib/SVK/Command/Checkout.pm:84 +#. ($depot) +#: lib/SVK/Command/Mirror.pm:115 +#, fuzzy +msgid "Depot /%1/ not loadable.\n" +msgstr "档案库‘%1’已成功解除。\n" + +#: lib/SVK/Command/Checkout.pm:108 msgid "Depot Path" msgstr "档案库路径" @@ -971,20 +1045,20 @@ msgid "Depot Path: %1\n" msgstr "档案库路径：%1\n" -#: lib/SVK/Command.pod:125 +#: lib/SVK/Command.pod:126 msgid "Depot Path: //svk/local" msgstr "档案库路径：//svk/local" -#: lib/SVK/Command.pod:126 +#: lib/SVK/Command.pod:127 msgid "Depot Path: //svk/trunk" msgstr "档案库路径：//svk/trunk" #. ($default) -#: lib/SVK/Command.pm:418 +#: lib/SVK/Command.pm:446 msgid "Depot path: [//mirror/%1] " msgstr "档案库路径：[//mirror/%1] " -#: lib/SVK/Command.pod:127 +#: lib/SVK/Command.pod:128 msgid "Diff:" msgstr "差异：" @@ -997,11 +1071,16 @@ msgid "Directory %1 imported to depotpath %2 as revision %3.\n" msgstr "目录 %1 已汇入档案库路径 %2，更动编号为 %3。\n" -#: lib/SVK/Command.pod:128 +#. ($arg[0]) +#: lib/SVK/Command/Checkout.pm:120 +msgid "Do you mean svk switch %1?\n" +msgstr "你是要 svk 变更 %1 吗？\n" + +#: lib/SVK/Command.pod:129 msgid "EDITOR: Editor to use for 'e'." msgstr "EDITOR: 要在 'e' 时采用的编辑器。" -#: lib/SVK/Command.pod:129 +#: lib/SVK/Command.pod:130 msgid "Edit:" msgstr "编辑：" @@ -1009,39 +1088,44 @@ msgid "Emerge %1 done.\n" msgstr "Emerge %1 执行完毕。\n" -#: lib/SVK/Command/Merge.pm:133 lib/SVK/Editor/Merge.pm:696 +#: lib/SVK/Command/Merge.pm:134 lib/SVK/Editor/Merge.pm:742 msgid "Empty merge.\n" msgstr "合并后无任何更动。\n" #. (loc($action) -#: lib/SVK/Command.pm:821 +#: lib/SVK/Command.pm:860 msgid "Enter a depot path to %1 into (under // if no leading '/'): " msgstr "要%1到的档案库路径名称（若不以‘/’开头，则置于 // 之下）：" #. (loc($action) -#: lib/SVK/Command.pm:814 +#: lib/SVK/Command.pm:855 msgid "Enter a depot path to %1 into: [%2] " msgstr "要%1到的档案库路径名称：[%2]" -#: lib/SVK/Command.pod:130 +#: lib/SVK/Command.pod:131 msgid "Environment variables:" msgstr "环境变数：" +#. ($target->{report}) +#: lib/SVK/Command/Propset.pm:85 +msgid "File %1 has inconsistent newlines.\n" +msgstr "档案 %1 有不一致的换行符号。\n" + #: lib/SVK/Command/Patch.pm:26 msgid "Filename required.\n" msgstr "需要指定档名。\n" #. ($rev, $rrev) -#: lib/SVK/Command/Mirror.pm:131 +#: lib/SVK/Command/Mirror.pm:174 msgid "Found merge ticket at revision %1 (remote %2); use it? (y/n) " msgstr "在更动编号 %1 发现了合并历史纪录（远程为 %2）；要采用吗？(y/n) " -#: lib/SVK/Command.pod:131 +#: lib/SVK/Command.pod:132 msgid "G Merged" msgstr "G 合并" #. ($self->{patch}) -#: lib/SVK/Command/Commit.pm:155 +#: lib/SVK/Command/Commit.pm:165 msgid "Illegal patch name: %1.\n" msgstr "%1 不是合理的补缀名称。\n" @@ -1060,15 +1144,15 @@ msgid "Import source (%1) is a checkout path; use --from-checkout.\n" msgstr "汇入来源（%1）是取出路径；请使用 --from-checkout 选项。\n" -#: lib/SVK/Command/Merge.pm:180 +#: lib/SVK/Command/Merge.pm:181 msgid "Incremental merge not guaranteed even if check is successful\n" msgstr "即使检查成功，也不保证渐进式合并能顺利完成\n" -#: lib/SVK/Command/Merge.pm:122 +#: lib/SVK/Command/Merge.pm:123 msgid "Incremental merge not supported\n" msgstr "不支持渐进式合并\n" -#: bin/svk:84 lib/SVK/Util.pm:128 lib/SVK/XD.pm:1225 +#: bin/svk:77 lib/SVK/Util.pm:146 lib/SVK/XD.pm:1239 msgid "Interrupted.\n" msgstr "已中断。\n" @@ -1082,20 +1166,20 @@ msgid "Last Changed Rev.: %1\n" msgstr "前次改变的更动编号：%1\n" -#: lib/SVK/Command.pod:132 +#: lib/SVK/Command.pod:133 msgid "Last Changed Rev.: 445" msgstr "前次改变的更动编号：445" -#: lib/SVK/Command.pod:133 +#: lib/SVK/Command.pod:134 msgid "Last Changed Rev.: 447" msgstr "前次改变的更动编号：447" -#: lib/SVK/Command.pod:134 +#: lib/SVK/Command.pod:135 msgid "Merge From: /svk/trunk, Rev. 445" msgstr "合并来源：/svk/trunk，更动编号 445" #. ($_[0]) -#: lib/SVK/Command/Commit.pm:134 +#: lib/SVK/Command/Commit.pm:144 msgid "Merge back committed as revision %1.\n" msgstr "合并已送交为更动编号 %1。\n" @@ -1118,7 +1202,7 @@ msgstr "合并后的档案" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:129 +#: lib/SVK/Command/Commit.pm:139 msgid "Merging back to mirror source %1.\n" msgstr "正在合并至映像来源 %1。\n" @@ -1128,11 +1212,11 @@ msgstr "与 %1 %2 合并：正在套用 %3 %4:%5。\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:75 +#: lib/SVK/Command/Mirror.pm:80 msgid "Mirror path '%1' detached.\n" msgstr "成功解除路径‘%1’的映像状态。\n" -#: lib/SVK/Command/Mirror.pm:167 +#: lib/SVK/Command/Mirror.pm:210 msgid "Mirror state successfully recovered.\n" msgstr "成功修复路径的映像状态。\n" @@ -1141,11 +1225,11 @@ msgid "Mirrored From: %1, Rev. %2\n" msgstr "映像来源：%1，更动编号 %2\n" -#: lib/SVK/Command.pod:135 +#: lib/SVK/Command.pod:136 msgid "Mirrored From: svn://svn.clkao.org/svk, Rev. 1744" msgstr "映像来源：svn://svn.clkao.org/svk，更动编号 1744" -#: lib/SVK/Command.pod:136 +#: lib/SVK/Command.pod:137 msgid "Misc:" msgstr "其它：" @@ -1153,33 +1237,33 @@ msgid "Multiple merge tools found, choose one:\n" msgstr "找到几项合并工具，请选择一种：\n" -#: lib/SVK/Command.pod:137 +#: lib/SVK/Command.pod:138 msgid "NAME" msgstr "名称" -#: lib/SVK/Command.pod:138 +#: lib/SVK/Command.pod:139 msgid "NOTES" msgstr "备注" #. ($_) -#: lib/SVK/Editor/Diff.pm:166 +#: lib/SVK/Editor/Diff.pm:169 msgid "Name: %1\n" msgstr "名称：%1\n" -#: lib/SVK/Command/Depotmap.pm:26 +#: lib/SVK/Command/Depotmap.pm:28 msgid "Need to specify a depot name" msgstr "请先指定档案库名称" -#: lib/SVK/Command/Depotmap.pm:29 +#: lib/SVK/Command/Depotmap.pm:31 msgid "Need to specify a path name" msgstr "请先指定路径名称" #. ($uri) -#: lib/SVK/Command.pm:380 +#: lib/SVK/Command.pm:395 msgid "New URI encountered: %1\n" msgstr "新出现的网址：%1\n" -#: lib/SVK/Command/Depotmap.pm:101 lib/SVK/Command/Depotmap.pm:86 +#: lib/SVK/Command/Depotmap.pm:62 lib/SVK/Command/Depotmap.pm:81 msgid "New depot map saved.\n" msgstr "已储存新的档案库对映表。\n" @@ -1188,41 +1272,41 @@ msgid "New merge ticket: %1:%2\n" msgstr "新的合并历史纪录：%1:%2\n" -#: lib/SVK/Command/Mirror.pm:139 +#: lib/SVK/Command/Mirror.pm:182 msgid "No mirror history found; cannot recover.\n" msgstr "找不到映像纪录；无法回复。\n" -#: lib/SVK/Command/Mirror.pm:143 +#: lib/SVK/Command/Mirror.pm:186 msgid "No need to revert; it is already the head revision.\n" msgstr "这已经是最新的版本；毋须回复。\n" -#: lib/SVK/Command/Merge.pm:111 +#: lib/SVK/Command/Merge.pm:112 msgid "No need to track rename for smerge\n" msgstr "smerge 时不需要追踪改名\n" #. ($depot) -#: lib/SVK/XD.pm:320 +#: lib/SVK/XD.pm:315 msgid "No such depot: %1.\n" msgstr "无此档案库：%1。\n" -#: lib/SVK/Command/Commit.pm:255 lib/SVK/Command/Commit.pm:268 +#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:280 msgid "No targets to commit.\n" msgstr "没有送交更动的目标。\n" -#: lib/SVK/Command.pod:139 +#: lib/SVK/Command.pod:140 msgid "None" msgstr "无" -#: lib/SVK/Command/Merge.pm:144 +#: lib/SVK/Command/Merge.pm:145 msgid "Not possible to do incremental merge without a merge ticket.\n" msgstr "没有合并的历史纪录，无法执行渐进式合并。\n" -#: lib/SVK/Command.pod:140 +#: lib/SVK/Command.pod:141 msgid "OPTIONS" msgstr "选项" #. ($where[0]) -#: lib/SVK/Command/Checkout.pm:100 lib/SVK/Command/Checkout.pm:144 +#: lib/SVK/Command/Checkout.pm:138 lib/SVK/Command/Checkout.pm:58 msgid "" "Overlapping checkout path is not supported (%1); use 'svk checkout --detach' " "to remove it first.\n" @@ -1234,18 +1318,20 @@ msgstr "补缀 %1 建立成功。\n" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:122 +#: lib/SVK/Command/Commit.pm:132 msgid "Patching locally against mirror source %1.\n" msgstr "正在本地端补缀映像来源 %1。\n" -#: lib/SVK/Command/Checkout.pm:84 lib/SVK/Command/Depotmap.pm:68 -#: lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Checkout.pm:108 lib/SVK/Command/Depotmap.pm:125 +#: lib/SVK/Command/Mirror.pm:109 msgid "Path" msgstr "路径" +#. ($path) #. ($dst->{copath}) #. ($cpdst->{report}) -#: lib/SVK/Command/Copy.pm:145 lib/SVK/Command/Copy.pm:62 +#: lib/SVK/Command.pm:872 lib/SVK/Command/Copy.pm:145 +#: lib/SVK/Command/Copy.pm:62 msgid "Path %1 already exists.\n" msgstr "路径 %1 已存在。\n" @@ -1255,7 +1341,7 @@ msgstr "路径 %1 不存在。\n" #. ($target->{path}) -#: lib/SVK/Command/List.pm:36 +#: lib/SVK/Command/List.pm:37 msgid "Path %1 is not a versioned directory\n" msgstr "路径 %1 并未纳入版本控制\n" @@ -1279,7 +1365,7 @@ msgstr "%1 的属性列表：\n" #. ($propname, $path) -#: lib/SVK/Editor/Merge.pm:625 +#: lib/SVK/Editor/Merge.pm:670 msgid "Property %1 of %2" msgstr "%2 的 %1 属性" @@ -1289,17 +1375,17 @@ msgstr "已设定更动编号 %2 的属性 '%1'。\n" #. ($rpath) -#: lib/SVK/Editor/Diff.pm:164 +#: lib/SVK/Editor/Diff.pm:167 msgid "Property changes on: %1\n" msgstr "%1 的属性更动：\n" #. ($path) -#: lib/SVK/XD.pm:152 +#: lib/SVK/XD.pm:147 msgid "Repository %1 does not exist, create? (y/n)" msgstr "档案库 %1 不存在。要建立吗？(y/n)" #. ($rev, $skipped) -#: lib/SVK/Command/Mirror.pm:149 +#: lib/SVK/Command/Mirror.pm:192 msgid "Revert to revision %1 and discard %*(%2,revision)? (y/n) " msgstr "确定要回复到更动编号 %1，并取消 %2 份之后的更动？(y/n) " @@ -1308,11 +1394,11 @@ msgid "Reverted %1\n" msgstr "已复原 %1\n" -#: lib/SVK/Command.pm:572 lib/SVK/Command/Proplist.pm:26 +#: lib/SVK/Command.pm:602 lib/SVK/Command/Proplist.pm:26 msgid "Revision required.\n" msgstr "需要指定更动编号。\n" -#: lib/SVK/Command.pm:598 +#: lib/SVK/Command.pm:628 msgid "Revision spec must be N:M.\n" msgstr "更动编号的格式必需为 N:M。\n" @@ -1326,23 +1412,23 @@ msgid "Revision: %1\n" msgstr "更动编号：%1\n" -#: lib/SVK/Command.pod:141 +#: lib/SVK/Command.pod:142 msgid "Revision: 447" msgstr "更动编号：447" -#: lib/SVK/Command/Help.pm:72 +#: lib/SVK/Command/Help.pm:61 msgid "SVK::Help" msgstr "SVK::Help::zh_tw" -#: lib/SVK/Command.pod:142 +#: lib/SVK/Command.pod:143 msgid "SVKMERGE: External merge tool to always use for 'm'." msgstr "SVKMERGE: 要在 'm' 时采用的外部合并工具。" -#: lib/SVK/Command.pod:143 +#: lib/SVK/Command.pod:144 msgid "SVKRESOLVE: The resolve action to take, instead of asking." msgstr "SVKRESOLVE: 在解决冲突时，要自动采取的动作。" -#: lib/SVK/Command.pod:144 +#: lib/SVK/Command.pod:145 msgid "SYNOPSIS" msgstr "用法" @@ -1350,7 +1436,7 @@ msgid "Signature verification failed.\n" msgstr "签章检查失败。" -#: lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Mirror.pm:109 msgid "Source" msgstr "来源" @@ -1369,7 +1455,7 @@ msgid "Starting to synchronize %1\n" msgstr "开始同步 %1\n" -#: lib/SVK/Command.pm:426 +#: lib/SVK/Command.pm:454 msgid "Synchronizing the mirror for the first time:\n" msgstr "初次同步化映像路径：\n" @@ -1395,20 +1481,20 @@ msgstr "目标不是本地或映像路径，无法检视补缀。\n" #. ($VERSION) -#: bin/svk:64 +#: bin/svk:57 msgid "This is svk, version %1.\n" msgstr "这是 svk，第 %1 版。\n" -#: lib/SVK/Command.pod:145 +#: lib/SVK/Command.pod:146 msgid "U Updated" msgstr "U 更新" -#: lib/SVK/Command.pm:199 +#: lib/SVK/Command.pm:214 msgid "Unknown options.\n" msgstr "未知的选项。\n" #. ($_) -#: lib/SVK/XD.pm:1193 +#: lib/SVK/XD.pm:1206 msgid "Unknown target: %1.\n" msgstr "未知的目标：%1。\n" @@ -1417,112 +1503,112 @@ msgid "Unversioned properties on revision %1:\n" msgstr "更动编号 %1 上未纳入版本控制的属性：\n" -#: lib/SVK/Command.pod:146 +#: lib/SVK/Command.pod:147 msgid "Update your local branch and checkout path from the remote" msgstr "从远程档案库拉取更动，更新本地端的分支版本及取出路径。" -#: lib/SVK/Command.pod:147 +#: lib/SVK/Command.pod:148 msgid "Update your local branch from the remote master repository." msgstr "从远程档案库拉取更动，更新本地端的分支版本。" -#: lib/SVK/Util.pm:187 +#: lib/SVK/Util.pm:207 msgid "Waiting for editor...\n" msgstr "呼叫编辑器…\n" -#: lib/SVK/Command.pm:434 +#: lib/SVK/Command.pm:462 msgid "a)ll, h)ead, -count, revision? [a] " msgstr "a)全部，h)最新，-个数，更动编号？[a] " -#: lib/SVK/Command.pod:148 +#: lib/SVK/Command.pod:149 msgid "a: Accept the merged/edited file." msgstr "a: 接受合并/编辑过的档案。" -#: lib/SVK/Command.pod:149 +#: lib/SVK/Command.pod:150 msgid "add - Put files and directories under version control" msgstr "add - 将档案及目录纳入版本控制" -#: lib/SVK/Command.pod:150 +#: lib/SVK/Command.pod:151 msgid "add [PATH...]" msgstr "add [路径...]" -#: lib/SVK/Command.pod:151 +#: lib/SVK/Command.pod:152 msgid "admin - Administration tools" msgstr "admin - 管理工具" -#: lib/SVK/Command.pod:152 +#: lib/SVK/Command.pod:153 msgid "admin deltify [DEPOTNAME]" msgstr "admin deltify [档案库名称]" -#: lib/SVK/Command.pod:153 +#: lib/SVK/Command.pod:154 msgid "admin dump [DEPOTNAME]" msgstr "admin dump [档案库名称]" -#: lib/SVK/Command.pod:154 +#: lib/SVK/Command.pod:155 msgid "admin help [COMMAND]" msgstr "admin help [命令]" -#: lib/SVK/Command.pod:155 +#: lib/SVK/Command.pod:156 msgid "admin hotcopy /path/to/repository [DEPOTNAME]" msgstr "admin hotcopy /磁盘上的/档案库/路径 [档案库名称]" -#: lib/SVK/Command.pod:156 +#: lib/SVK/Command.pod:157 msgid "admin list-dblogs [DEPOTNAME]" msgstr "admin list-dblogs [档案库名称]" -#: lib/SVK/Command.pod:157 +#: lib/SVK/Command.pod:158 msgid "admin list-unused-dblogs [DEPOTNAME]" msgstr "admin list-unused-dblogs [档案库名称]" -#: lib/SVK/Command.pod:158 +#: lib/SVK/Command.pod:159 msgid "admin load [DEPOTNAME]" msgstr "admin load [档案库名称]" -#: lib/SVK/Command.pod:159 +#: lib/SVK/Command.pod:160 msgid "admin lstxns [DEPOTNAME]" msgstr "admin lstxns [档案库名称]" -#: lib/SVK/Command.pod:160 +#: lib/SVK/Command.pod:161 msgid "admin recover [DEPOTNAME]" msgstr "admin recover [档案库名称]" -#: lib/SVK/Command.pod:161 +#: lib/SVK/Command.pod:162 msgid "admin rmcache" msgstr "admin rmcache" -#: lib/SVK/Command.pod:162 +#: lib/SVK/Command.pod:163 msgid "admin rmtxns [DEPOTNAME]" msgstr "admin rmtxns [档案库名称]" -#: lib/SVK/Command.pod:163 +#: lib/SVK/Command.pod:164 msgid "admin setlog -r REVISION FILE [DEPOTNAME]" msgstr "admin setlog -r 更动编号 档案 [档案库名称]" -#: lib/SVK/Command.pod:164 +#: lib/SVK/Command.pod:165 msgid "admin verify [DEPOTNAME]" msgstr "admin verify [档案库名称]" -#: lib/SVK/Command.pod:165 +#: lib/SVK/Command.pod:166 msgid "annotate - Display per-line revision and author info" msgstr "annotate - 显示档案里每一列的更动编号与作者信息" -#: lib/SVK/Command.pod:166 +#: lib/SVK/Command.pod:167 msgid "annotate DEPOTPATH[@REV]" msgstr "annotate 档案库路径[@更动编号]" -#: lib/SVK/Command.pod:167 +#: lib/SVK/Command.pod:168 msgid "annotate [-r REV] DEPOTPATH" msgstr "annotate [-r 更动编号] 档案库路径" -#: lib/SVK/Command.pod:168 +#: lib/SVK/Command.pod:169 msgid "annotate [-r REV] [PATH]" msgstr "annotate [-r 更动编号] [路径]" -#: lib/SVK/Command.pod:169 +#: lib/SVK/Command.pod:170 msgid "annotate [PATH][@REV]" msgstr "annotate [路径][@更动编号]" #. ($self->{giantlock}) -#: lib/SVK/XD.pm:262 +#: lib/SVK/XD.pm:257 msgid "another svk might be running; remove %1 if not" msgstr "可能另有 svk 执行中。若无则请删除 %1" @@ -1530,12 +1616,12 @@ msgid "argument skipto not allowed when multiple target specified" msgstr "指定多个目标时不可加上 skipto 参数" -#: lib/SVK/XD.pm:266 +#: lib/SVK/XD.pm:261 msgid "cannot acquire giant lock" msgstr "无法取得主控锁定" #. ($sigfile) -#: lib/SVK/Editor/Sign.pm:46 +#: lib/SVK/Editor/Sign.pm:48 msgid "cannot find %1, signing aborted" msgstr "找不到 %1，放弃签署" @@ -1543,164 +1629,166 @@ msgid "cannot find a path for temporary branch" msgstr "找不到可用于暂存分支的路径" -#: lib/SVK/Command.pm:354 lib/SVK/Command/Mirror.pm:38 -#: lib/SVK/Command/Sync.pm:31 lib/SVK/Command/Update.pm:60 +#: lib/SVK/Command.pm:369 lib/SVK/Command/Mirror.pm:102 +#: lib/SVK/Command/Mirror.pm:21 lib/SVK/Command/Sync.pm:31 +#: lib/SVK/Command/Update.pm:60 msgid "cannot load SVN::Mirror" msgstr "无法加载 SVN::Mirror" #. ($file, $!) +#. ($sigfile, $!) #. ($dir, $!) -#. ($sigfile, $!) -#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:49 lib/SVK/Patch.pm:80 +#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:51 lib/SVK/Patch.pm:80 msgid "cannot open %1: %2" msgstr "无法开启 %1：%2" -#: lib/SVK/Command.pod:170 +#: lib/SVK/Command.pod:171 msgid "cat - Output the file from depot" msgstr "cat - 由档案库输出档案" -#: lib/SVK/Command.pod:171 +#: lib/SVK/Command.pod:172 msgid "cat [DEPOTPATH | PATH...]" msgstr "cat [档案库路径 | 路径...]" -#: lib/SVK/Command.pod:172 +#: lib/SVK/Command.pod:173 msgid "checkout - Checkout the depotpath" msgstr "checkout - 取出档案库指定路径的内容" -#: lib/SVK/Command.pod:173 +#: lib/SVK/Command.pod:174 msgid "checkout --detach [DEPOTPATH | PATH]" msgstr "checkout --detach [档案库路径 | 路径]" -#: lib/SVK/Command.pod:174 +#: lib/SVK/Command.pod:175 msgid "checkout --list" msgstr "checkout --list" -#: lib/SVK/Command.pod:175 -msgid "checkout --relocate [DEPOTPATH | PATH] PATH" +#: lib/SVK/Command.pod:176 +#, fuzzy +msgid "checkout --relocate DEPOTPATH|PATH PATH" msgstr "checkout --relocate [档案库路径 | 路径] 路径" -#: lib/SVK/Command.pod:176 +#: lib/SVK/Command.pod:177 msgid "checkout DEPOTPATH [PATH]" msgstr "checkout 档案库路径 [路径]" -#: lib/SVK/Command.pod:177 +#: lib/SVK/Command.pod:178 msgid "cleanup - Remove stalled locks" msgstr "cleanup - 移除卡住的锁定" -#: lib/SVK/Command.pod:178 +#: lib/SVK/Command.pod:179 msgid "cleanup [PATH...]" msgstr "cleanup [路径...]" -#: lib/SVK/Command.pod:179 +#: lib/SVK/Command.pod:180 msgid "cmerge - Merge specific changes" msgstr "cmerge - 合并指定的更动" -#: lib/SVK/Command.pod:180 +#: lib/SVK/Command.pod:181 msgid "cmerge -c CHGSPEC DEPOTPATH [PATH]" msgstr "cmerge -c 合并方式 档案库路径 [路径]" -#: lib/SVK/Command.pod:181 +#: lib/SVK/Command.pod:182 msgid "cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2" msgstr "cmerge -c 合并方式 档案库路径1 档案库路径2" -#: lib/SVK/Command.pod:182 +#: lib/SVK/Command.pod:183 msgid "commit - Commit changes to depot" msgstr "commit - 送交更动至档案库" -#: lib/SVK/Command.pod:183 +#: lib/SVK/Command.pod:184 msgid "commit [PATH...]" msgstr "commit [路径...]" -#: lib/SVK/Command.pod:184 +#: lib/SVK/Command.pod:185 msgid "copy - Make a versioned copy" msgstr "copy - 复制一份版本" -#: lib/SVK/Command.pod:185 +#: lib/SVK/Command.pod:186 msgid "copy DEPOTPATH [PATH]" msgstr "copy 档案库路径 [路径]" -#: lib/SVK/Command.pod:186 +#: lib/SVK/Command.pod:187 msgid "copy DEPOTPATH1 DEPOTPATH2" msgstr "copy 档案库路径1 档案库路径2" #. ($!) -#: lib/SVK/Editor/Sign.pm:40 +#: lib/SVK/Editor/Sign.pm:42 msgid "could not call gpg: %1" msgstr "无法呼叫 gpg：%1" -#: lib/SVK/Command.pod:187 +#: lib/SVK/Command.pod:188 msgid "d: Diff your file against merged file." msgstr "d: 检视已方与合并后的差异。" -#: lib/SVK/Command.pod:188 +#: lib/SVK/Command.pod:189 msgid "delete - Remove versioned item" msgstr "delete - 移除纳入版本控制的项目" -#: lib/SVK/Command.pod:189 +#: lib/SVK/Command.pod:190 msgid "delete [DEPOTPATH...]" msgstr "delete [路径...]" -#: lib/SVK/Command.pod:190 +#: lib/SVK/Command.pod:191 msgid "delete [PATH...]" msgstr "delete [路径...]" -#: lib/SVK/Command/Depotmap.pm:82 +#: lib/SVK/Command/Depotmap.pm:58 msgid "depot map" msgstr "档案库对映表" -#: lib/SVK/Command.pod:191 +#: lib/SVK/Command.pod:192 msgid "depotmap - Create or edit the depot mapping configuration" msgstr "depotmap - 建立或编辑档案库对映表" -#: lib/SVK/Command.pod:192 +#: lib/SVK/Command.pod:193 msgid "depotmap --detach [DEPOTNAME | PATH]" msgstr "depotmap --detach [档案库名称 | 路径]" -#: lib/SVK/Command.pod:193 +#: lib/SVK/Command.pod:194 msgid "depotmap --list" msgstr "depotmap --list" -#: lib/SVK/Command.pod:194 +#: lib/SVK/Command.pod:195 msgid "depotmap --relocate [DEPOTNAME | PATH] PATH" msgstr "depotmap --relocate [档案库名称 | 路径] 路径" -#: lib/SVK/Command.pod:195 +#: lib/SVK/Command.pod:196 msgid "depotmap DEPOTNAME /path/to/repository" msgstr "depotmap 档案库名称 /磁盘上的/档案库/路径" -#: lib/SVK/Command.pod:196 +#: lib/SVK/Command.pod:197 msgid "depotmap [OPTIONS]" msgstr "depotmap [选项]" -#: lib/SVK/Command.pod:197 +#: lib/SVK/Command.pod:198 msgid "depotname: '/path/to/repos'" msgstr "档案库名称: '/磁盘上的/档案库/路径'" -#: lib/SVK/Command.pod:198 +#: lib/SVK/Command.pod:199 msgid "describe - Describe a change" msgstr "describe - 描述更动内容" -#: lib/SVK/Command.pod:199 +#: lib/SVK/Command.pod:200 msgid "describe REV [DEPOTPATH | PATH]" msgstr "describe 更动编号 [档案库路径 | 路径]" -#: lib/SVK/Command.pod:200 +#: lib/SVK/Command.pod:201 msgid "diff - Display diff between revisions or checkout copies" msgstr "diff - 显示两次更动之间或与工作复本的差异处" -#: lib/SVK/Command.pod:201 +#: lib/SVK/Command.pod:202 msgid "diff -r N[:M] DEPOTPATH" msgstr "diff -r N[:M] 档案库路径" -#: lib/SVK/Command.pod:202 +#: lib/SVK/Command.pod:203 msgid "diff DEPOTPATH PATH" msgstr "diff 档案库路径 [路径]" -#: lib/SVK/Command.pod:203 +#: lib/SVK/Command.pod:204 msgid "diff DEPOTPATH1 DEPOTPATH2" msgstr "diff 档案库路径1 档案库路径2" -#: lib/SVK/Command.pod:204 +#: lib/SVK/Command.pod:205 msgid "diff [-r REV] [PATH...]" msgstr "diff [-r 更动编号] [路径...]" @@ -1708,57 +1796,57 @@ msgid "different depot" msgstr "不同的档案库" -#: lib/SVK/Command.pod:205 +#: lib/SVK/Command.pod:206 msgid "dm: See merged changes." msgstr "dm: 检视源头与合并后的差异。" #. ($arg[0]) -#: lib/SVK/Command/Checkout.pm:27 +#: lib/SVK/Command/Checkout.pm:23 msgid "don't know where to checkout %1\n" msgstr "不知道要将 %1 取出到哪里\n" -#: lib/SVK/Command.pod:206 +#: lib/SVK/Command.pod:207 msgid "dt: See their changes alone." msgstr "dt: 检视对方的更动。" -#: lib/SVK/Command.pod:207 +#: lib/SVK/Command.pod:208 msgid "dy: See your changes alone." msgstr "dy: 检视已方的更动。" -#: lib/SVK/Command.pod:208 +#: lib/SVK/Command.pod:209 msgid "e: Edit merged file with an editor." msgstr "e: 用编辑器来编辑合并的档案。" #. ($fname) -#: lib/SVK/Command/Commit.pm:164 +#: lib/SVK/Command/Commit.pm:174 msgid "file %1 already exists.\n" msgstr "档案 %1 已存在。\n" -#: lib/SVK/Command.pod:209 +#: lib/SVK/Command.pod:210 msgid "g Merged without actual change" msgstr "g 合并但毋须更新" -#: lib/SVK/Command.pod:210 +#: lib/SVK/Command.pod:211 msgid "h: Print this help message." msgstr "h: 显示这份说明讯息。" -#: lib/SVK/Command.pod:211 +#: lib/SVK/Command.pod:212 msgid "help - Show help" msgstr "help - 显示说明" -#: lib/SVK/Command.pod:212 +#: lib/SVK/Command.pod:213 msgid "help COMMAND" msgstr "help 命令" -#: lib/SVK/Command.pod:213 +#: lib/SVK/Command.pod:214 msgid "import - Import directory into depot" msgstr "import - 把已有目录汇入档案库" -#: lib/SVK/Command.pod:214 +#: lib/SVK/Command.pod:215 msgid "import DEPOTPATH [PATH]" msgstr "import 档案库路径 [路径]" -#: lib/SVK/Command.pod:215 +#: lib/SVK/Command.pod:216 msgid "import [PATH] DEPOTPATH" msgstr "import [路径] 档案库路径" @@ -1766,208 +1854,216 @@ msgid "import destination cannot be a file" msgstr "不能用档案作为汇入的目的地" -#: lib/SVK/Command.pod:216 +#: lib/SVK/Command.pod:217 msgid "info - Display information about a file or directory" msgstr "info - 显示档案或目录的信息" -#: lib/SVK/Command.pod:217 +#: lib/SVK/Command.pod:218 msgid "info [PATH | DEPOTPATH]" msgstr "info [路径 | 档案库路径]" -#: lib/SVK/Command/Diff.pm:36 lib/SVK/Command/Diff.pm:41 +#: lib/SVK/Command/Diff.pm:34 lib/SVK/Command/Diff.pm:39 msgid "invalid arguments" msgstr "错误的参数" -#: lib/SVK/Command.pod:218 +#: lib/SVK/Command.pod:219 msgid "involved, do not prefix path names before values" -msgstr " " +msgstr "混乱了，请勿将路径名称置于值前面" -#: lib/SVK/Command.pod:219 +#: lib/SVK/Command.pod:220 msgid "list - List entries in a directory from depot" msgstr "list - 列出档案库目录内的项目" -#: lib/SVK/Command.pod:220 +#: lib/SVK/Command.pod:221 msgid "list [DEPOTPATH | PATH...]" msgstr "list [档案库路径 | 路径...]" -#: lib/SVK/Command.pod:221 +#: lib/SVK/Command.pod:222 msgid "log - Show log messages for revisions" msgstr "log - 显示各项更动的记录讯息" -#: lib/SVK/Command.pod:222 +#: lib/SVK/Command.pod:223 msgid "log DEPOTPATH" msgstr "log 档案库路径" -#: lib/SVK/Command.pod:223 +#: lib/SVK/Command.pod:224 msgid "log PATH" msgstr "log 路径" -#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:70 +#: lib/SVK/Command/Commit.pm:279 lib/SVK/Command/Commit.pm:71 msgid "log message" msgstr "纪录讯息" -#: lib/SVK/Command.pod:224 +#: lib/SVK/Command.pod:225 msgid "m: Run an external merge tool to edit merged file." msgstr "m: 执行外部合并工具，来编辑合并的档案。" -#: lib/SVK/Command.pod:225 +#: lib/SVK/Command.pod:226 msgid "master repository." -msgstr " " +msgstr "主档案库." -#: lib/SVK/Command.pod:226 +#: lib/SVK/Command.pod:227 msgid "merge - Apply differences between two sources" msgstr "merge - 合并两份来源之间的差异" -#: lib/SVK/Command.pod:227 +#: lib/SVK/Command.pod:228 msgid "merge -r N:M DEPOTPATH [PATH]" msgstr "merge -r N:M 档案库路径 [路径]" -#: lib/SVK/Command.pod:228 +#: lib/SVK/Command.pod:229 msgid "merge -r N:M DEPOTPATH1 DEPOTPATH2" msgstr "merge -r N:M 档案库路径1 档案库路径2" -#: lib/SVK/Command.pod:229 +#: lib/SVK/Command.pod:230 msgid "merge -r N:M [--to|--from] [PATH]" msgstr "merge -r N:M [--to|--from] [路径]" -#: lib/SVK/Command.pod:230 +#: lib/SVK/Command.pod:231 msgid "mirror - Initialize a mirrored depotpath" msgstr "mirror - 初始化映像的档案库路径" -#: lib/SVK/Command.pod:231 +#: lib/SVK/Command.pod:232 msgid "mirror --detach DEPOTPATH" msgstr "mirror --detach 档案库路径" -#: lib/SVK/Command.pod:232 +#: lib/SVK/Command.pod:233 msgid "mirror --list [DEPOTNAME...]" msgstr "mirror --list [档案库名称...]" -#: lib/SVK/Command.pod:233 +#: lib/SVK/Command.pod:234 msgid "mirror --recover DEPOTPATH" msgstr "mirror --recover 档案库路径" -#: lib/SVK/Command.pod:234 +#: lib/SVK/Command.pod:235 msgid "mirror --relocate DEPOTPATH [http|svn]://host/path " msgstr "mirror --relocate 档案库路径 [http|svn]://服务器/路径" -#: lib/SVK/Command.pod:235 +#: lib/SVK/Command.pod:236 msgid "mirror --upgrade //" msgstr "mirror --upgrade //" -#: lib/SVK/Command.pod:236 +#: lib/SVK/Command.pod:237 msgid "mirror --upgrade /DEPOTNAME/" msgstr "mirror --upgrade /档案库名称/" -#: lib/SVK/Command.pod:237 +#: lib/SVK/Command.pod:238 msgid "mirror DEPOTPATH [http|svn]://host/path" msgstr "mirror 档案库路径 [http|svn]://服务器/路径" -#: lib/SVK/Command.pod:238 +#: lib/SVK/Command.pod:239 msgid "mirror [http|svn]://host/path DEPOTPATH" msgstr "mirror [http|svn]://服务器/路径 档案库路径" -#: lib/SVK/Command.pod:239 +#: lib/SVK/Command.pod:240 msgid "mirror cvs::pserver:user@host:/cvsroot:module/... DEPOTPATH" msgstr "mirror cvs::pserver:使用者@服务器:/cvsroot:module/... 档案库路径" -#: lib/SVK/Command.pod:240 +#: lib/SVK/Command.pod:241 msgid "mirror p4:user@host:1666://path/... DEPOTPATH" msgstr "mirror p4:使用者@服务器:1666://路径/... 档案库路径" -#: lib/SVK/Command.pod:241 +#: lib/SVK/Command.pod:242 msgid "mkdir - Create a versioned directory" msgstr "mkdir - 建立纳入版本控制的目录" -#: lib/SVK/Command.pod:242 +#: lib/SVK/Command.pod:243 msgid "mkdir DEPOTPATH" msgstr "mkdir 档案库路径" -#: lib/SVK/Command.pod:243 +#: lib/SVK/Command.pod:244 +#, fuzzy +msgid "mkdir PATH" +msgstr "mkdir 档案库路径" + +#: lib/SVK/Command.pod:245 msgid "move - Move a file or directory" msgstr "move - 移动档案或目录" -#: lib/SVK/Command.pod:244 +#: lib/SVK/Command.pod:246 msgid "move DEPOTPATH1 DEPOTPATH2" msgstr "move 档案库路径1 档案库路径2" -#: lib/SVK/XD.pm:317 +#: lib/SVK/XD.pm:312 msgid "no depot spec" msgstr "未指定档案库" -#: lib/SVK/Command.pod:245 +#: lib/SVK/Command.pod:247 msgid "patch - Manage patches" msgstr "patch - 管理补缀档" -#: lib/SVK/Command.pod:246 +#: lib/SVK/Command.pod:248 msgid "patch apply PATCHNAME [DEPOTPATH | PATH] [-- MERGEOPTIONS]" msgstr "patch apply 补缀名称 [档案库路径 | 路径] [-- 合并选项]" -#: lib/SVK/Command.pod:247 +#: lib/SVK/Command.pod:249 msgid "patch delete PATCHNAME" msgstr "patch delete 补缀名称" -#: lib/SVK/Command.pod:248 +#: lib/SVK/Command.pod:250 msgid "patch list" msgstr "patch list" -#: lib/SVK/Command.pod:249 +#: lib/SVK/Command.pod:251 msgid "patch regen PATCHNAME" msgstr "patch regen 补缀名称" -#: lib/SVK/Command.pod:250 +#: lib/SVK/Command.pod:252 msgid "patch send PATCHNAME" msgstr "patch send 补缀名称" -#: lib/SVK/Command.pod:251 +#: lib/SVK/Command.pod:253 msgid "patch update PATCHNAME" msgstr "patch update 补缀名称" -#: lib/SVK/Command.pod:252 +#: lib/SVK/Command.pod:254 msgid "patch view PATCHNAME" msgstr "patch view 补缀名称" #. ($path) #. ($copath) -#: lib/SVK/Editor/XD.pm:174 lib/SVK/Editor/XD.pm:98 +#: lib/SVK/Editor/XD.pm:181 lib/SVK/Editor/XD.pm:99 msgid "path %1 already exists" msgstr "路径 %1 已存在" #. ($path) -#: lib/SVK/Editor/XD.pm:107 +#: lib/SVK/Editor/XD.pm:108 msgid "path %1 does not exist" msgstr "路径 %1 不存在。" +#. ($target->{report}) +#. ($update_target->{path}) #. ($target->path) -#. ($update_target->{path}) -#: lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Update.pm:94 +#: lib/SVK/Command/Diff.pm:120 lib/SVK/Command/Diff.pm:42 +#: lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Switch.pm:40 +#: lib/SVK/Command/Update.pm:94 msgid "path %1 does not exist.\n" msgstr "路径 %1 不存在。\n" #. ($report) #. ($copath) #. ($path) -#: lib/SVK/XD.pm:338 lib/SVK/XD.pm:341 lib/SVK/XD.pm:394 +#: lib/SVK/XD.pm:333 lib/SVK/XD.pm:336 lib/SVK/XD.pm:389 msgid "path %1 is not a checkout path.\n" msgstr "路径 %1 不是已取出的路径。\n" #. ($path) -#: lib/SVK/XD.pm:1432 +#: lib/SVK/XD.pm:1448 msgid "path %1 not found" msgstr "找不到路径 %1" -#: lib/SVK/Command.pod:253 +#: lib/SVK/Command.pod:255 msgid "propdel - Delete a property on files or dirs" msgstr "propdel - 删除档案或目录的属性" -#: lib/SVK/Command.pod:254 +#: lib/SVK/Command.pod:256 msgid "propdel PROPNAME [DEPOTPATH | PATH...]" msgstr "propdel 属性名称 [档案库路径 | 路径...]" -#: lib/SVK/Command.pod:255 +#: lib/SVK/Command.pod:257 msgid "propedit - Edit a property on path" msgstr "propedit - 编辑某路径的属性" -#: lib/SVK/Command.pod:256 +#: lib/SVK/Command.pod:258 msgid "propedit PROPNAME [DEPOTPATH | PATH...]" msgstr "propedit 属性名称 [档案库路径 | 路径...]" @@ -1976,51 +2072,51 @@ msgid "property %1" msgstr "属性 %1" -#: lib/SVK/Command.pod:257 +#: lib/SVK/Command.pod:259 msgid "property values; when there are multiple paths" msgstr "即使指定的路径不止一个，也不要在每项之前显示路径名称" -#: lib/SVK/Command.pod:258 +#: lib/SVK/Command.pod:260 msgid "propget - Display a property on path" msgstr "propget - 显示某路径的属性" -#: lib/SVK/Command.pod:259 +#: lib/SVK/Command.pod:261 msgid "propget PROPNAME [DEPOTPATH | PATH...]" msgstr "propget 属性名称 [档案库路径 | 路径...]" -#: lib/SVK/Command.pod:260 +#: lib/SVK/Command.pod:262 msgid "proplist - List all properties on files or dirs" msgstr "proplist - 列出档案或目录的所有属性" -#: lib/SVK/Command.pod:261 +#: lib/SVK/Command.pod:263 msgid "proplist PATH..." msgstr "proplist 路径..." -#: lib/SVK/Command.pod:262 +#: lib/SVK/Command.pod:264 msgid "propset - Set a property on path" msgstr "propset - 设定路径的某项属性" -#: lib/SVK/Command.pod:263 +#: lib/SVK/Command.pod:265 msgid "propset PROPNAME PROPVAL [DEPOTPATH | PATH...]" msgstr "propset 属性名称 属性值 [档案库路径 | 路径...]" -#: lib/SVK/Command.pod:264 +#: lib/SVK/Command.pod:266 msgid "pull - Bring changes from another repository" msgstr "pull - 拉取远程档案库里的更动" -#: lib/SVK/Command.pod:265 +#: lib/SVK/Command.pod:267 msgid "pull DEPOTPATH" msgstr "pull 档案库路径" -#: lib/SVK/Command.pod:266 +#: lib/SVK/Command.pod:268 msgid "pull [PATH...]" msgstr "pull [路径...]" -#: lib/SVK/Command.pod:267 +#: lib/SVK/Command.pod:269 msgid "push - Move changes into another repository" msgstr "push - 推送更动到远程档案库里" -#: lib/SVK/Command.pod:268 +#: lib/SVK/Command.pod:270 msgid "push [DEPOTPATH | PATH]" msgstr "push [档案库路径 | 路径]" @@ -2029,107 +2125,145 @@ msgstr "q)离开？" #. ($copath, $basename, $!) -#: lib/SVK/Editor/XD.pm:123 +#: lib/SVK/Editor/XD.pm:124 msgid "rename %1 to %2 failed: %3" msgstr "无法将 %1 改名成 %2：%3" -#: lib/SVK/Command.pod:269 +#: lib/SVK/Command.pod:271 msgid "resolved - Remove conflict mark from checkout items" msgstr "resolved - 移除已取出项目上的冲突标记" -#: lib/SVK/Command.pod:270 +#: lib/SVK/Command.pod:272 msgid "resolved PATH..." msgstr "resolved 路径..." -#: lib/SVK/Command.pod:271 +#: lib/SVK/Command.pod:273 msgid "revert - Revert changes made in checkout copies" msgstr "revert - 复原对已取出的复本所作过的更动" -#: lib/SVK/Command.pod:272 +#: lib/SVK/Command.pod:274 msgid "revert PATH..." msgstr "revert 路径..." -#: lib/SVK/Command.pod:273 +#: lib/SVK/Command.pod:275 msgid "s: Skip this file." msgstr "s: 略过这个档案。" -#: lib/SVK/Command.pod:274 +#: lib/SVK/Command.pod:276 msgid "smerge - Automatically merge all changes between branches" msgstr "smerge - 自动合并不同分支的所有差异" -#: lib/SVK/Command.pod:275 +#: lib/SVK/Command.pod:277 msgid "smerge DEPOTPATH [PATH]" msgstr "smerge 档案库路径 [路径]" -#: lib/SVK/Command.pod:276 +#: lib/SVK/Command.pod:278 msgid "smerge DEPOTPATH1 DEPOTPATH2" msgstr "smerge 档案库路径1 档案库路径2" -#: lib/SVK/Command.pod:277 +#: lib/SVK/Command.pod:279 msgid "smerge [--to|--from] [PATH]" msgstr "smerge [--to|--from] [路径]" -#: lib/SVK/Editor/XD.pm:128 +#: lib/SVK/Editor/XD.pm:129 msgid "source checksum mismatch" msgstr "来源的检查值不符" -#: lib/SVK/Command.pod:278 +#: lib/SVK/Command.pod:280 msgid "status - Display the status of items in the checkout copy" msgstr "status - 显示已取出复本的状态" -#: lib/SVK/Command.pod:279 +#: lib/SVK/Command.pod:281 msgid "status [PATH..]" msgstr "status [路径..]" -#: lib/SVK/Command.pod:280 +#: lib/SVK/Command.pod:282 msgid "switch - Switch to another branch and keep local changes" msgstr "switch - 切换到另一个分支，并保留本地版本" -#: lib/SVK/Command.pod:281 +#: lib/SVK/Command.pod:283 msgid "switch DEPOTPATH [PATH]" msgstr "switch 档案库路径 [路径]" -#: lib/SVK/Command.pod:282 +#: lib/SVK/Command.pod:284 msgid "sync - Synchronize a mirrored depotpath" msgstr "sync - 同步化映像的档案库路径" -#: lib/SVK/Command.pod:283 +#: lib/SVK/Command.pod:285 msgid "sync --all [DEPOTNAME...]" msgstr "sync --all [档案库名称...]" -#: lib/SVK/Command.pod:284 +#: lib/SVK/Command.pod:286 msgid "sync DEPOTPATH" msgstr "sync 档案库路径" -#: lib/SVK/Command.pod:285 +#: lib/SVK/Command.pod:287 msgid "t: Keep only changes to their file." msgstr "t: 仅保留对方更动，舍弃已方的更动。" -#: lib/SVK/Command/Commit.pm:365 +#: lib/SVK/Command/Commit.pm:79 +msgid "try --encoding.\n" +msgstr "用 --encoding.\n" + +#: lib/SVK/Command/Commit.pm:379 msgid "unexpected error: commit to mirrored path but no mirror object" msgstr "未预期的错误：送交更动至映像的路径，但找不到映像对象" -#: lib/SVK/Command.pod:286 +#: lib/SVK/Command.pod:288 msgid "update - Bring changes from repository to checkout copies" msgstr "update - 将档案库里的更动更新到取出的工作复本上" -#: lib/SVK/Command.pod:287 +#: lib/SVK/Command.pod:289 msgid "update [PATH...]" msgstr "update [路径...]" #. ($self->{patch}) -#: lib/SVK/Command/Commit.pm:165 +#: lib/SVK/Command/Commit.pm:175 msgid "use 'svk patch regen %1' instead.\n" msgstr "请改用‘svk patch regen %1’。\n" -#: lib/SVK/Command.pod:288 +#: lib/SVK/Command.pod:290 msgid "verify - Verify change signatures" msgstr "verify - 检验更动的签章" -#: lib/SVK/Command.pod:289 +#: lib/SVK/Command.pod:291 msgid "verify CHANGE [DEPOTNAME]" msgstr "verify 更动 档案库名称" -#: lib/SVK/Command.pod:290 +#: lib/SVK/Command.pod:292 msgid "y: Keep only changes to your file." msgstr "y: 仅保留已方更动，舍弃对方的更动。" + +#~ msgid "" +#~ "\n" +#~ "First, you need to choose a depot path to store this mirrored " +#~ "repository,\n" +#~ "usually something like //mirror/your_project/. Enter a suitable name " +#~ "below\n" +#~ "to place it under //mirror/; you may also press enter and accept the " +#~ "default.\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "首先，请为这个远程网址取一个名称（例如 //mirror/your_project/），作为\n" +#~ "本地端的映像档案库路径。请键入路径名称（预设将置于 //mirror/ 之下），或\n" +#~ "直接按 enter 键，采用系统建议的路径。\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "Next, please choose another depot path to serve as your private branch,\n" +#~ "usually something like %1your_project/. SVK will copy the mirrored path\n" +#~ "into this new path, so you can commit into it without affecting the " +#~ "remote\n" +#~ "repository. Enter a suitable name below to place it under %1; you may " +#~ "also\n" +#~ "press enter and accept the default.\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "接下来，请为你个人使用的分支取一个名称（例如 %1your_project）。系统会\n" +#~ "将上面的映像路径复制到新的档案库路径下；如此一来，送交到这个路径的更动就\n" +#~ "不会直接影响远程的档案库。请键入路径名称（预设将置于 %1 之下），或直接\n" +#~ "按 enter 键，采用系统建议的路径。\n" +#~ "\n" === zh_tw.po ================================================================== --- zh_tw.po (revision 1325) +++ zh_tw.po (patch patch level 1) @@ -4,47 +4,78 @@ # msgid "" msgstr "" -"Project-Id-Version: SVK 0.12\n" +"Project-Id-Version: SVK 0.30\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2004-03-17 20:20+8\n" -"Last-Translator: Autrijus Tang \n" +"Last-Translator: Cheng-Lung Sung \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/SVK/Command.pm:405 +#: lib/SVK/Command.pm:420 msgid "" "\n" -"First, you need to choose a depot path to store this mirrored repository,\n" -"usually something like //mirror/your_project/. Enter a suitable name below\n" -"to place it under //mirror/; you may also press enter and accept the " -"default.\n" +"Before svk start mirroring a remote repository, we would like to\n" +"explain two terms to you: 'depot path' and 'mirrored path'. A depot\n" +"path is like any path in a file system, only that the path is\n" +"stored in svk's internal virtual file system. To avoid confusion,\n" +"svk's default depot path begins with //, for example //depot or\n" +"//mirror/project. Now a mirrored path is a depot path with special\n" +"properties, which serves as the 'mirror' of a remote repository and\n" +"is by convention stored under //mirror/.\n" "\n" +"Now, you have to assign a name to identify the mirrored repository.\n" +"For example, if you name it 'your_project' (without the quotes),\n" +"svk will create a mirrored path called //mirror/your_project.\n" +"Of course, you can assign a 'full path' for it, for example,\n" +"//mymirror/myproject, although this is not really necessary. If you\n" +"just don't care, simply press enter and use svk's default, which is\n" +"usually good enough.\n" +"\n" msgstr "" "\n" -"首先，請為這個遠端網址取一個名稱（例如 //mirror/your_project/），作為\n" -"本地端的映射檔案庫路徑。請鍵入路徑名稱（預設將置於 //mirror/ 之下），或\n" -"直接按 enter 鍵，採用系統建議的路徑。\n" +"在 svk 開始映射遠端檔案庫之前，我們要先為您解釋兩個名詞：\n" +"'檔案庫路徑（depot path）' 以及 '映射路徑（mirrored path）'。\n" +"一個檔案庫路徑就如同檔案系統的任何路徑，差別只在於該路徑只存放在 svk 內部\n" +"虛擬檔案系統。為了避免混淆，svk 預設的檔案庫路徑會以 // 做開始，例如\n" +"//depot 或 //mirror/project。而映射路徑則是有特殊屬性的檔案庫路徑，可以把\n" +"它視為遠端檔案庫的 '映射' ，通常是儲存於 //mirror/ 之下。\n" "\n" +"現在，你必須要指定一個名稱以識別映射的檔案庫。\n" +"例如，如果你的名稱為 'your_project' （沒有引號）， svk 將會建立\n" +"//mirror/your_project 做為映射路徑。當然，你可以指定一個 '完整路徑' 給它，\n" +"例如 //mymirror/myproject，雖然這並不是真的很重要。 如果你不想管這些，那只\n" +"要按下 Enter 並且使用 svk 的預設值，這樣也就夠用了。\n" +"\n" -#. ($depot) -#: lib/SVK/Command.pm:804 +#. ($1) +#: lib/SVK/Command.pm:840 msgid "" "\n" -"Next, please choose another depot path to serve as your private branch,\n" -"usually something like %1your_project/. SVK will copy the mirrored path\n" -"into this new path, so you can commit into it without affecting the remote\n" -"repository. Enter a suitable name below to place it under %1; you may also\n" -"press enter and accept the default.\n" +"Next, svk will create another depot path, and you have to name it too.\n" +"It is usally something like %1your_project/. svk will copy what's in\n" +"the mirrored path into the new path. This depot path is where your\n" +"own private branch goes. You can commit files to it or check out files\n" +"from it without affecting the remote repository. Which means you can\n" +"work with version control even when you're offline (yes, this is one\n" +"of svk's main features).\n" "\n" +"Please enter a name for your private branch, and it will be placed\n" +"under %1. If, again, you just don't care, simply press enter and let\n" +"svk use the default.\n" +"\n" msgstr "" "\n" -"接下來，請為你個人使用的分支取一個名稱（例如 %1your_project）。系統會\n" -"將上面的映射路徑複製到新的檔案庫路徑下；如此一來，送交到這個路徑的更動就\n" -"不會直接影響遠端的檔案庫。請鍵入路徑名稱（預設將置於 %1 之下），或直接\n" -"按 enter 鍵，採用系統建議的路徑。\n" +"接下來，svk 將會建立另一個檔案庫路徑，當然你也得為它取名。\n" +"它通常長得像 %1your_project/。 svk 將會複製映射路徑中的檔案到新的路徑。\n" +"這個檔案庫路徑是你私有的分支版本存放的位置。你可以送交檔案給它或是取出\n" +"檔案而不會影響到遠端檔案庫。這表示即使你沒有連線到網路，你還是可以使用\n" +"版本控制來工作（是的，這是 svk 主要的功能之一）。\n" "\n" +"請輸入你私有分支版本的名稱，它將會被放在 %1 下。\n" +"同樣地，如果你不在乎的話，只要按下 Enter 讓 svk 以預設值運作吧。\n" +"\n" #: lib/SVK/Command.pod:2 msgid "" @@ -211,19 +242,19 @@ " 在這訊息之中，可看到一些基本資訊，像是實際檔案庫路徑，以及目前版號。\n" " 也有一些比較進階的資訊，像是此檔案庫複製與合併的路徑。" -#: lib/SVK/Command.pm:429 +#: lib/SVK/Command.pm:457 msgid " -count : At most 'count' recent revisions\n" msgstr " -個數 : 僅同步最新的數份更動\n" -#: lib/SVK/Command.pm:427 +#: lib/SVK/Command.pm:455 msgid " a : Retrieve all revisions (default)\n" msgstr " a : 取得所有的更動（預設選項）\n" -#: lib/SVK/Command.pm:428 +#: lib/SVK/Command.pm:456 msgid " h : Only the most recent revision\n" msgstr " h : 僅同步最新的一份更動\n" -#: lib/SVK/Command.pm:430 +#: lib/SVK/Command.pm:458 msgid " revision : Start from the specified revision\n" msgstr " 更動編號 : 從指定的更動編號開始同步\n" @@ -231,6 +262,10 @@ msgid "# You may also list the target part first:" msgstr "# 目標也可以寫在來源前面：" +#: lib/SVK/Command.pm:129 +msgid "$self->options" +msgstr "" + #: lib/SVK/Command.pod:53 msgid "% svk info //svk/trunk" msgstr "% svk info //svk/trunk" @@ -240,7 +275,7 @@ msgstr "% svk info ~/dev/svk" #. ($conflicts) -#: lib/SVK/Command/Commit.pm:256 +#: lib/SVK/Command/Commit.pm:268 msgid "%*(%1,conflict) detected. Use 'svk resolved' after resolving them.\n" msgstr "偵測到 %1 項衝突。請在解決後執行「svk resolved」。\n" @@ -256,23 +291,23 @@ #. ($editor->{conflicts}) #. ($conflicts) -#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:347 +#: lib/SVK/Command/Patch.pm:48 lib/SVK/Merge.pm:348 msgid "%*(%1,conflict) found.\n" msgstr "找到 %1 項衝突。\n" #. ($editor->{skipped}) -#: lib/SVK/Merge.pm:349 +#: lib/SVK/Merge.pm:350 msgid "" "%*(%1,file) skipped, you might want to rerun merge with --track-rename.\n" msgstr "略過 %1 個檔案；請考慮用 --track-rename 選項重新執行合併。\n" #. ($path) -#: lib/SVK/Notify.pm:32 +#: lib/SVK/Notify.pm:33 msgid "%1 - skipped\n" msgstr "%1 - 略過\n" #. ($target->{report}) -#: lib/SVK/Command/Mirror.pm:183 +#: lib/SVK/Command/Mirror.pm:226 msgid "%1 added back to the list of mirrored paths.\n" msgstr "已將 %1 加回映射路徑列表中。\n" @@ -282,17 +317,17 @@ msgstr "已經準備加入 %1。\n" #. ($target->path) -#: lib/SVK/Command/Mirror.pm:100 +#: lib/SVK/Command/Mirror.pm:37 msgid "%1 already exists.\n" msgstr "路徑 %1 已存在。\n" #. ($path) -#: lib/SVK/XD.pm:219 +#: lib/SVK/XD.pm:214 msgid "%1 already locked, use 'svk cleanup' if lock is stalled\n" msgstr "%1 已被鎖定，若卡住時請用「svk cleanup」解除\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:102 +#: lib/SVK/Command/Mirror.pm:41 msgid "%1 already mirrored, use 'svk mirror --detach' to remove it first.\n" msgstr "%1 已經是映射路徑，請先用「svk mirror --detach」移除原本的映射設定。\n" @@ -302,28 +337,28 @@ msgstr "%1 已納入版本控制。\n" #. ($dst->{report}) -#: lib/SVK/Command/Merge.pm:92 +#: lib/SVK/Command/Merge.pm:93 msgid "" "%1 can not be used as merge target, because it contains mirrored path:\n" msgstr "%1 不能作為合併的目標，因為它包含了下列映射路徑：\n" #. ($report) -#: lib/SVK/XD.pm:631 +#: lib/SVK/XD.pm:629 msgid "%1 changed" msgstr "%1 已更動" #. (abs2rel ($_[1], $target->{copath} => $target->{report}) -#: lib/SVK/Command/Commit.pm:383 +#: lib/SVK/Command/Commit.pm:397 msgid "%1 is a mirrored path, please commit separately.\n" msgstr "%1 不是一個映射路徑，請另行送交更動。\n" #. ($arg{copath}) -#: lib/SVK/XD.pm:693 +#: lib/SVK/XD.pm:691 msgid "%1 is already scheduled for delete" msgstr "%1 已被排程納入下次要刪除的項目" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:72 +#: lib/SVK/Command/Mirror.pm:77 msgid "%1 is inside a mirrored path.\n" msgstr "%1 位於映射路徑之下。\n" @@ -338,7 +373,7 @@ msgstr "%1 已修改。\n" #. ($depotpath) -#: lib/SVK/XD.pm:318 +#: lib/SVK/XD.pm:313 msgid "%1 is not a depot path.\n" msgstr "%1 不是檔案庫路徑。\n" @@ -348,7 +383,7 @@ msgstr "路徑 %1 不是一個目錄。\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:71 +#: lib/SVK/Command/Mirror.pm:76 msgid "%1 is not a mirrored path.\n" msgstr "%1 不是一個映射路徑。\n" @@ -358,17 +393,17 @@ msgstr "%1 不是一個數字。\n" #. ($arg) -#: lib/SVK/Command.pm:358 +#: lib/SVK/Command.pm:373 msgid "%1 is not a valid URI.\n" msgstr "%1 不是一個網址。\n" #. ($cotarget->{report}, $target->{report}) -#: lib/SVK/Command/Switch.pm:42 +#: lib/SVK/Command/Switch.pm:44 msgid "%1 is not related to %2.\n" msgstr "找不到 %1 和 %2 的共同來源。\n" #. ($_[0]) -#: lib/SVK/XD.pm:641 +#: lib/SVK/XD.pm:639 msgid "%1 is not under version control" msgstr "%1 未受版本控制" @@ -378,27 +413,28 @@ msgstr "%1 無版本資訊；略過。\n" #. ($report) -#: lib/SVK/XD.pm:637 -msgid "%1 is scheduled, use 'svk revert'" +#: lib/SVK/XD.pm:634 +#, fuzzy +msgid "%1 is scheduled, use 'svk revert'.\n" msgstr "%1 已排程，請用「svk revert」" #. ($target->{depotpath}) -#: lib/SVK/Command/Commit.pm:49 +#: lib/SVK/Command/Commit.pm:51 msgid "%1 is under mirrored path.\n" msgstr "%1 位於映射路徑之下。\n" #. ($entry) -#: lib/SVK/XD.pm:1239 +#: lib/SVK/XD.pm:1253 msgid "%1 marked as resolved.\n" msgstr "%1 已標記為已解決。\n" #. (ucfirst($what) -#: lib/SVK/Util.pm:198 +#: lib/SVK/Util.pm:218 msgid "%1 not modified: a)bort, e)dit, c)ommit?" msgstr "%1並未修改：a)取消，e)編輯，c)送交？" #. ($arg{copath}, $source_path) -#: lib/SVK/XD.pm:688 +#: lib/SVK/XD.pm:686 msgid "%1(%2) is not under version control" msgstr "%1（%2）未受版本控制" @@ -408,12 +444,12 @@ msgstr "「%1」裡沒有檔案庫名稱。\n" #. ($path) -#: lib/SVK/Command/Checkout.pm:68 lib/SVK/Command/Checkout.pm:93 +#: lib/SVK/Command/Checkout.pm:131 lib/SVK/Command/Checkout.pm:179 msgid "'%1' is not a checkout path.\n" msgstr "「%1」不是取出的路徑。\n" #. ($path) -#: lib/SVK/Command/Checkout.pm:95 +#: lib/SVK/Command/Checkout.pm:133 msgid "'%1' maps to multiple checkout paths.\n" msgstr "「%1」對映到兩項以上的取出路徑。\n" @@ -422,11 +458,11 @@ msgstr "（目前此選項在「pull 路徑」時自動生效）" #. ($copyfrom_path, $copyfrom_rev) -#: lib/SVK/Command/Log.pm:150 +#: lib/SVK/Command/Log.pm:154 msgid "(from %1:%2)" msgstr "（來自 %1:%2）" -#: lib/SVK/Command/Log.pm:136 +#: lib/SVK/Command/Log.pm:137 msgid "(no author)" msgstr "(no author)" @@ -449,38 +485,42 @@ msgstr "--direct: 即使路徑是映射目錄，還是直接送交更動" #: lib/SVK/Command.pod:57 +msgid "--encoding ENC: treat value as being in charset encoding ENC" +msgstr "--encoding ENC: 視為字元集 ENC 的編碼" + +#: lib/SVK/Command.pod:58 msgid "--export: export mode; checkout a detached copy" msgstr "--export: 匯出模式：解除路徑的取出狀態" -#: lib/SVK/Command.pod:58 +#: lib/SVK/Command.pod:59 msgid "--host arg: use ARG as the hostname shown in merge log" msgstr "--host arg: 指定顯示在合併紀錄裡的電腦名稱" -#: lib/SVK/Command.pod:59 +#: lib/SVK/Command.pod:60 msgid "--import: import mode; automatically add and delete nodes" msgstr "--import: 匯入模式；自動進行新增及刪除" -#: lib/SVK/Command.pod:60 +#: lib/SVK/Command.pod:61 msgid "--no-ticket: do not record this merge point" msgstr "--no-ticket: 不留下此次合併的歷史紀錄" -#: lib/SVK/Command.pod:61 +#: lib/SVK/Command.pod:62 msgid "--recover: recover the state of a mirror path" msgstr "--recover: 修復映射路徑的狀態" -#: lib/SVK/Command.pod:62 +#: lib/SVK/Command.pod:63 msgid "--relocate: relocate the checkout to another path" msgstr "--relocate: 將取出路徑指向另一個路徑" -#: lib/SVK/Command.pod:63 +#: lib/SVK/Command.pod:64 msgid "--relocate: relocate the depot to another path" msgstr "--relocate: 將檔案庫指向另一個路徑" -#: lib/SVK/Command.pod:64 +#: lib/SVK/Command.pod:65 msgid "--relocate: relocate the mirror to another URI" msgstr "--relocate: 將映射路徑指向另一個網址" -#: lib/SVK/Command.pod:65 +#: lib/SVK/Command.pod:66 msgid "--remoterev: use remote revision numbers in merge log" msgstr "--remoterev: 在合併紀錄裡，使用遠端的更動編號" @@ -488,247 +528,247 @@ msgid "--revision cannot be used in conjunction with --sync or --merge.\n" msgstr "--revision 不能與 --sync 或 --merge 合併使用。\n" -#: lib/SVK/Command.pod:66 +#: lib/SVK/Command.pod:67 msgid "--revprop: operate on a revision property (use with -r)" msgstr "--revprop: 操作修訂版屬性（需與 -r 一同使用）" -#: lib/SVK/Command.pod:67 +#: lib/SVK/Command.pod:68 msgid "--strict: do not print an extra newline at the end of the" msgstr "--strict: 不要在顯示的屬性值後面加上換列符號；" -#: lib/SVK/Command.pod:68 +#: lib/SVK/Command.pod:69 msgid "--track-rename: track changes made to renamed node" msgstr "--track-rename: 對於改名過的項目，一併追蹤改名前的更動" -#: lib/SVK/Command.pod:69 +#: lib/SVK/Command.pod:70 msgid "--upgrade: upgrade mirror state to the latest version" msgstr "--upgrade: 更新映射狀態資訊的儲存格式" -#: lib/SVK/Command.pod:70 +#: lib/SVK/Command.pod:71 msgid "--verbatim: verbatim merge log without indents and header" msgstr "--verbatim: 保留原先的送交紀錄，不要加上縮排和標頭" -#: lib/SVK/Command.pod:71 +#: lib/SVK/Command.pod:72 msgid "-B [--baseless]: use the earliest revision as the merge point" msgstr "-B [--baseless]: 使用最早的更動當作合併點" -#: lib/SVK/Command.pod:72 +#: lib/SVK/Command.pod:73 msgid "-C [--check-only]: try operation but make no changes" msgstr "-C [--check-only]: 不真的執行寫入，只做檢查" -#: lib/SVK/Command.pod:73 +#: lib/SVK/Command.pod:74 msgid "-I [--incremental]: apply each change individually" msgstr "-I [--incremental]: 漸進式合併；逐一套用每項更動" -#: lib/SVK/Command.pod:74 +#: lib/SVK/Command.pod:75 msgid "-K [--keep-local]: do not remove the local file" msgstr "-K [--keep-local]: 不要刪除本地端的檔案" -#: lib/SVK/Command.pod:75 +#: lib/SVK/Command.pod:76 msgid "-N [--non-recursive]: do not descend recursively" msgstr "-N [--non-recursive]: 不要遞迴處理子目錄" -#: lib/SVK/Command.pod:76 +#: lib/SVK/Command.pod:77 msgid "-P [--patch] arg: instead of commit, save this change as a patch" msgstr "-P [--patch] arg: 將更動儲存為補綴，但不送交更動" -#: lib/SVK/Command.pod:77 +#: lib/SVK/Command.pod:78 msgid "-R [--recursive]: descend recursively" msgstr "-R [--recursive]: 遞迴處理子目錄" -#: lib/SVK/Command.pod:78 +#: lib/SVK/Command.pod:79 msgid "-S [--sign]: sign this change" msgstr "-S [--sign]: 簽署送交更動" -#: lib/SVK/Command.pod:79 +#: lib/SVK/Command.pod:80 msgid "-a [--all]: pull into all checkout paths" msgstr "-a [--all]: 拉取所有的取出路徑" -#: lib/SVK/Command.pod:80 +#: lib/SVK/Command.pod:81 msgid "-a [--all]: remove all stalled locks" msgstr "-a [--all]: 移除所有卡住的鎖定" -#: lib/SVK/Command.pod:81 +#: lib/SVK/Command.pod:82 msgid "-a [--all]: synchronize all mirrored paths" msgstr "-a [--all]: 同步化所有的映射路徑" -#: lib/SVK/Command.pod:82 +#: lib/SVK/Command.pod:83 msgid "-a [--auto]: merge from the previous merge point" msgstr "-a [--auto]: 使用上次的合併點" -#: lib/SVK/Command.pod:83 +#: lib/SVK/Command.pod:84 msgid "-b [--base] arg: use revision ARG as the merge point" msgstr "-b [--base] arg: 使用指定的更動當作合併點" -#: lib/SVK/Command.pod:84 +#: lib/SVK/Command.pod:85 msgid "-c [--change] arg: act on comma-separated revisions ARG" msgstr "-c [--change] arg: 指定一系列要處理的更動，編號之間用逗號隔開" -#: lib/SVK/Command.pod:85 +#: lib/SVK/Command.pod:86 msgid "-d [--depth] arg: recurse at most ARG levels deep; use with -R" msgstr "-d [--depth] arg: 指定遞迴層數的上限；僅在指定 -R 時適用" -#: lib/SVK/Command.pod:86 +#: lib/SVK/Command.pod:87 msgid "-d [--detach]: mark a depotpath as no longer mirrored" msgstr "-d [--detach]: 解除檔案庫路徑的映射狀態" -#: lib/SVK/Command.pod:87 +#: lib/SVK/Command.pod:88 msgid "-d [--detach]: mark a path as no longer checked out" msgstr "-d [--detach]: 解除路徑的取出狀態" -#: lib/SVK/Command.pod:88 +#: lib/SVK/Command.pod:89 msgid "-d [--detach]: remove a depot from the mapping" msgstr "-d [--detach]: 將檔案庫從對映表中移除" -#: lib/SVK/Command.pod:89 +#: lib/SVK/Command.pod:90 msgid "-f [--from-checkout]: import from a checkout path" msgstr "-f [--from-checkout]: 使用取出路徑作為匯入來源" -#: lib/SVK/Command.pod:90 +#: lib/SVK/Command.pod:91 msgid "-f [--from] arg: push from the specified path" msgstr "-f [--from] arg: 從指定的路徑推送更動" -#: lib/SVK/Command.pod:91 +#: lib/SVK/Command.pod:92 msgid "-f [--from]: merge from the specified path" msgstr "-f [--from]: 從指定的路徑合併到它的複製來源" -#: lib/SVK/Command.pod:92 +#: lib/SVK/Command.pod:93 msgid "-f [--full-path]: show pathname for each entry, instead of a tree" msgstr "-f [--full-path]: 顯示每個項目的完整路徑，而不是樹狀結構" -#: lib/SVK/Command.pod:93 +#: lib/SVK/Command.pod:94 msgid "-i [--init]: initialize a default depot" msgstr "-i [--init]: 初始化預設的檔案庫" -#: lib/SVK/Command.pod:94 +#: lib/SVK/Command.pod:95 msgid "-l [--limit] arg: stop after displaying ARG revisions" msgstr "-l [--limit] arg: 指定顯示更動數的上限" -#: lib/SVK/Command.pod:95 +#: lib/SVK/Command.pod:96 msgid "-l [--list]: list checkout paths" msgstr "-l [--list]: 列出所有的取出路徑" -#: lib/SVK/Command.pod:96 +#: lib/SVK/Command.pod:97 msgid "-l [--list]: list current depot mappings" msgstr "-l [--list]: 列出現有的檔案庫對映" -#: lib/SVK/Command.pod:97 +#: lib/SVK/Command.pod:98 msgid "-l [--list]: list mirrored paths" msgstr "-l [--list]: 列出所有的映射路徑" -#: lib/SVK/Command.pod:98 +#: lib/SVK/Command.pod:99 msgid "-l [--log]: use logs of merged revisions as commit message" msgstr "-l [--log]: 採用各更動的紀錄做為合併紀錄" -#: lib/SVK/Command.pod:99 +#: lib/SVK/Command.pod:100 msgid "-l [--lump]: merge everything into a single commit log" msgstr "-l [--lump]: 將所有更動合併為一項送交紀錄" -#: lib/SVK/Command.pod:100 +#: lib/SVK/Command.pod:101 msgid "-m [--merge]: smerge from copied sources before update" msgstr "-m [--merge]: 在更新之前，先從複製來源執行 smerge" -#: lib/SVK/Command.pod:101 +#: lib/SVK/Command.pod:102 msgid "-m [--message] arg: specify commit message ARG" msgstr "-m [--message] arg: 指定送交更動的描述" -#: lib/SVK/Command/Merge.pm:146 +#: lib/SVK/Command/Merge.pm:147 msgid "-m ignored in incremental merge\n" msgstr "漸進式合併；已忽略 -m 選項\n" -#: lib/SVK/Command.pod:102 +#: lib/SVK/Command.pod:103 msgid "-p [--parent]: create intermediate directories as required" msgstr "-p [--parent]: 依需要而建立中間的目錄" -#: lib/SVK/Command.pod:103 +#: lib/SVK/Command.pod:104 msgid "-q [--quiet]: do not display changed nodes" msgstr "-q [--quiet]: 不要顯示更動的項目" -#: lib/SVK/Command.pod:104 +#: lib/SVK/Command.pod:105 msgid "-q [--quiet]: do not display files not under version control" msgstr "-q [--quiet]: 不要顯示未加入版本控制的項目" -#: lib/SVK/Command.pod:105 +#: lib/SVK/Command.pod:106 msgid "-q [--quiet]: quiet mode" msgstr "-q [--quiet]: 極簡輸出" -#: lib/SVK/Command.pod:106 +#: lib/SVK/Command.pod:107 msgid "-r [--revision] N:M: act on revisions between N and M" msgstr "-r [--revision] N:M: 指定要處理的更動編號範圍" -#: lib/SVK/Command.pod:107 +#: lib/SVK/Command.pod:108 msgid "-r [--revision] REV: annotate up to revision" msgstr "-r [--revision] REV: 指定要處理的更動編號範圍" -#: lib/SVK/Command.pod:108 +#: lib/SVK/Command.pod:109 msgid "-r [--revision] arg: act on revision ARG instead of the head revision" msgstr "-r [--revision] arg: 指定要處理的更動編號；預設為最新版本" -#: lib/SVK/Command.pod:109 +#: lib/SVK/Command.pod:110 msgid "-s [--skipto] arg: start synchronization at revision ARG" msgstr "-s [--skipto] arg: 指定開始同步的更動編號" -#: lib/SVK/Command.pod:110 +#: lib/SVK/Command.pod:111 msgid "-s [--summarize]: show summary only" msgstr "-s [--summarize]: 僅顯示摘要資訊" -#: lib/SVK/Command.pod:111 +#: lib/SVK/Command.pod:112 msgid "-s [--sync]: synchronize mirrored sources before update" msgstr "-s [--sync]: 在更新前，先同步化來源映射路徑" -#: lib/SVK/Command.pod:112 +#: lib/SVK/Command.pod:113 msgid "-t [--to-checkout]: turn the source into a checkout path" msgstr "-t [--to-checkout]: 將匯入來源設為取出路徑" -#: lib/SVK/Command.pod:113 +#: lib/SVK/Command.pod:114 msgid "-t [--to]: merge to the specified path" msgstr "-t [--to]: 從指定路徑的複製來源，合併到指定的路徑" -#: lib/SVK/Command.pod:114 +#: lib/SVK/Command.pod:115 msgid "-t [--torev] arg: stop synchronization at revision ARG" msgstr "-t [--torev] arg: 指定結束同步的更動編號" -#: lib/SVK/Command.pod:115 +#: lib/SVK/Command.pod:116 msgid "-v [--verbose]: print extra information" msgstr "-v [--verbose]: 印出額外的資訊" -#: lib/SVK/Command.pod:116 +#: lib/SVK/Command.pod:117 msgid "-x [--cross]: track revisions copied from elsewhere" msgstr "-x [--cross]: 追蹤從別處複製來的版本" -#: lib/SVK/Command.pod:117 +#: lib/SVK/Command.pod:118 msgid "/depotname/path/inside/repos" msgstr "/檔案庫名稱/內部的/路徑" # as-is -#: lib/SVK/Command/Commit.pm:38 +#: lib/SVK/Command/Commit.pm:40 msgid "=== Please enter your commit message above this line ===" msgstr "=== Please enter your commit message above this line ===" # as-is -#: lib/SVK/Command/Commit.pm:34 +#: lib/SVK/Command/Commit.pm:36 msgid "=== Targets to commit (you may delete items from it) ===" msgstr "=== Targets to commit (you may delete items from it) ===" -#: lib/SVK/Command.pod:118 +#: lib/SVK/Command.pod:119 msgid "A Added" msgstr "A 新增" -#: lib/SVK/Command/Mirror.pm:150 lib/SVK/Util.pm:202 +#: lib/SVK/Command/Mirror.pm:193 lib/SVK/Util.pm:222 msgid "Aborted.\n" msgstr "取消。\n" #. ($!) -#: lib/SVK/Util.pm:190 +#: lib/SVK/Util.pm:210 msgid "Aborted: %1\n" msgstr "已中止：%1\n" -#: lib/SVK/Command.pod:119 +#: lib/SVK/Command.pod:120 msgid "Accept:" msgstr "接受：" #. ($rev) -#: lib/SVK/Command/Mirror.pm:120 +#: lib/SVK/Command/Mirror.pm:163 msgid "Analyzing revision %1...\n" msgstr "正在分析編號 %1 的更動...\n" @@ -742,11 +782,11 @@ msgid "Auto-merging (%1, %2) %3 to %4 (base %5:%6).\n" msgstr "自動合併（%1, %2）%3 到 %4（源頭為 %5:%6）\n" -#: lib/SVK/Command/Help.pm:20 +#: lib/SVK/Command/Help.pm:21 msgid "Available commands:\n" msgstr "可用的命令：\n" -#: lib/SVK/Command.pod:120 +#: lib/SVK/Command.pod:121 msgid "C Conflict" msgstr "C 衝突" @@ -754,22 +794,40 @@ msgid "Can only switch checkout root.\n" msgstr "只能切換取出路徑的根目錄。\n" -#: lib/SVK/Command.pm:573 +#: lib/SVK/Command.pm:603 msgid "Can't assign --revision and --change at the same time.\n" msgstr "無法同時指定 --revision 與 --change。\n" #. ($anchor, $!) -#: lib/SVK/Command/Checkout.pm:137 +#: lib/SVK/Command/Checkout.pm:51 msgid "Can't create checkout path %1: %2\n" msgstr "無法建立取出路徑 %1：%2\n" +#. ($cotarget->{report}, $!) +#: lib/SVK/Command/Update.pm:114 +#, fuzzy +msgid "Can't create directory %1 for checkout: %2.\n" +msgstr "無法建立取出路徑 %1：%2\n" + +#. ($_[1], $enc->name) +#: lib/SVK/Util.pm:282 +#, fuzzy +msgid "Can't decode %1 as %2.\n" +msgstr "無法找到 %1 和 %2 的合併源頭\n" + +#. ($_[1], $enc->name) +#: lib/SVK/Util.pm:296 +#, fuzzy +msgid "Can't encode %1 as %2.\n" +msgstr "無法找到 %1 和 %2 的合併源頭\n" + #. ($src->path, $dst->path) #: lib/SVK/Merge.pm:130 msgid "Can't find merge base for %1 and %2\n" msgstr "無法找到 %1 和 %2 的合併源頭\n" #. ("$self->{statefile}.backup") -#: lib/SVK/XD.pm:125 +#: lib/SVK/XD.pm:120 msgid "Can't load statefile, old statefile saved as %1\n" msgstr "無法載入狀態檔；舊版狀態檔已存為 %1\n" @@ -777,16 +835,21 @@ msgid "Can't merge across depots.\n" msgstr "無法跨檔案庫進行合併。\n" -#: lib/SVK/Command/Commit.pm:58 +#: lib/SVK/Command/Propset.pm:100 +#, fuzzy +msgid "Can't set svn:eol-style on depotpath.\n" +msgstr "%1 不是檔案庫路徑。\n" + +#: lib/SVK/Command/Commit.pm:60 msgid "Can't use -F with -m.\n" msgstr "無法同時指定 -F 及 -m。\n" #. ($self->{svkpath}, $!) -#: lib/SVK/XD.pm:92 +#: lib/SVK/XD.pm:87 msgid "Cannot create svk-config-directory at '%1': %2" msgstr "無法於「%1」建立 SVK 的設定目錄：%2" -#: lib/SVK/Editor/Diff.pm:66 +#: lib/SVK/Editor/Diff.pm:69 msgid "Cannot display: file marked as a binary type.\n" msgstr "無法顯示二進制檔案的差異。\n" @@ -796,11 +859,11 @@ msgstr "在 %1 裡找不到補綴區段。\n" #. ($topic) -#: lib/SVK/Command/Help.pm:44 +#: lib/SVK/Command/Help.pm:45 msgid "Cannot find help topic '%1'.\n" msgstr "找不到說明主題「%1」。\n" -#: lib/SVK/Util.pm:211 +#: lib/SVK/Util.pm:231 msgid "Cannot find separator; aborted.\n" msgstr "找不到分隔線，放棄編輯。\n" @@ -820,7 +883,7 @@ msgstr "無法啟動外部合併工具來編輯 %1。\n" #. (catfile($source) -#: lib/SVK/Util.pm:668 +#: lib/SVK/Util.pm:740 msgid "Cannot rename %1 to %2; please move it manually.\n" msgstr "無法將 %1 改名為 %2；請自行移動此路徑。\n" @@ -834,21 +897,21 @@ msgstr "不能同時指定「to」及「from」。\n" #. ($_) -#: lib/SVK/Command.pm:586 +#: lib/SVK/Command.pm:616 msgid "Change spec %1 not recognized.\n" msgstr "無法辨識的更動語法 %1。\n" -#: lib/SVK/Command/Log.pm:138 +#: lib/SVK/Command/Log.pm:139 msgid "Changed paths:\n" msgstr "已修改路徑：\n" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:126 +#: lib/SVK/Command/Commit.pm:136 msgid "Checking locally against mirror source %1.\n" msgstr "正在本地端檢查映射來源 %1。\n" #. ($path, $target) -#: lib/SVK/Command/Checkout.pm:119 +#: lib/SVK/Command/Checkout.pm:157 msgid "Checkout '%1' relocated to '%2'.\n" msgstr "取出路徑「%1」已改為指向「%2」。\n" @@ -857,22 +920,27 @@ msgid "Checkout Path: %1\n" msgstr "取出路徑：%1\n" -#: lib/SVK/Command.pod:121 +#: lib/SVK/Command.pod:122 msgid "Checkout Path: /Users/gugod/dev/svk" msgstr "取出路徑：/Users/gugod/dev/svk" +#. ($update_target->{depotpath}, $cotarget->{report}) +#: lib/SVK/Command/Update.pm:111 +msgid "Checkout directory gone. Use 'checkout %1 %2' instead.\n" +msgstr "取出目錄沒有了。請改用 'checkout %1 %2'。\n" + #. ($report) -#: lib/SVK/Command/Checkout.pm:128 +#: lib/SVK/Command/Checkout.pm:42 msgid "Checkout path %1 already exists.\n" msgstr "指定的取出路徑 %1 已存在。\n" #. ($copath) -#: lib/SVK/Command/Checkout.pm:73 +#: lib/SVK/Command/Checkout.pm:184 msgid "Checkout path '%1' detached.\n" msgstr "成功解除路徑「%1」的取出狀態。\n" #. ($uri) -#: lib/SVK/Command.pm:388 +#: lib/SVK/Command.pm:403 msgid "Choose a base URI to mirror from (press enter to use the full URI): " msgstr "要映射的基底網址（如果與上列完整網址相同，請直接按 Enter）：" @@ -885,12 +953,12 @@ msgid "Cleaned up stalled lock on %1.\n" msgstr "己清除 %1 上卡住的鎖定。\n" -#: lib/SVK/Command/Commit.pm:347 +#: lib/SVK/Command/Commit.pm:361 msgid "Commit into mirrored path: merging back directly.\n" msgstr "送交進映射路徑：正在直接合併回去。\n" #. ($_[0]) -#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:176 +#: lib/SVK/Command/Cmerge.pm:67 lib/SVK/Command/Commit.pm:186 msgid "Committed revision %1.\n" msgstr "已送交編號 %1 的更動。\n" @@ -912,7 +980,7 @@ msgid "Copied From: %1, Rev. %2\n" msgstr "複製來源：%1，更動編號 %2\n" -#: lib/SVK/Command.pod:122 +#: lib/SVK/Command.pod:123 msgid "Copied From: /svk/trunk, Rev. 434" msgstr "複製來源：/svk/trunk，更動編號 434" @@ -921,48 +989,54 @@ msgid "Copying more than one source requires %1 to be directory.\n" msgstr "複製超過一項來源時，%1 必須是目錄。\n" +#. ($cmd, $!) +#. ($self->{external}, $?) #. ('svnadmin', $?) -#. ($self->{external}, $?) -#. ($cmd, $!) -#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:108 +#: lib/SVK/Command/Admin.pm:41 lib/SVK/Editor/Diff.pm:111 #: lib/SVK/Resolve/Emacs.pm:66 msgid "Could not run %1: %2" msgstr "無法執行 %1：%2" -#: lib/SVK/Command.pod:123 +#: lib/SVK/Command.pod:124 msgid "D Deleted" msgstr "D 刪除" -#: lib/SVK/Command.pod:124 +#: lib/SVK/Command.pod:125 msgid "DESCRIPTION" msgstr "說明" -#: lib/SVK/Command/Depotmap.pm:68 +#: lib/SVK/Command/Depotmap.pm:125 msgid "Depot" msgstr "檔案庫" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:96 +#: lib/SVK/Command/Depotmap.pm:76 msgid "" "Depot '%1' already exists; use 'svk depotmap --detach' to remove it first.\n" msgstr "檔案庫「%1」已經存在；請先用「svk depotmap --detach」將它移除。\n" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:123 +#: lib/SVK/Command/Depotmap.pm:110 msgid "Depot '%1' detached.\n" msgstr "檔案庫「%1」已成功解除。\n" #. ($depot) -#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:121 +#: lib/SVK/Command/Depotmap.pm:108 lib/SVK/Command/Depotmap.pm:92 msgid "Depot '%1' does not exist in the depot map.\n" msgstr "檔案庫「%1」不存在於對映表中。\n" #. ($depot, $path) -#: lib/SVK/Command/Depotmap.pm:113 +#: lib/SVK/Command/Depotmap.pm:97 msgid "Depot '%1' relocated to '%2'.\n" msgstr "檔案庫「%1」已改為指向「%2」。\n" -#: lib/SVK/Command/Checkout.pm:84 +#. ($depot) +#: lib/SVK/Command/Mirror.pm:115 +#, fuzzy +msgid "Depot /%1/ not loadable.\n" +msgstr "檔案庫「%1」已成功解除。\n" + +#: lib/SVK/Command/Checkout.pm:108 msgid "Depot Path" msgstr "檔案庫路徑" @@ -971,20 +1045,20 @@ msgid "Depot Path: %1\n" msgstr "檔案庫路徑：%1\n" -#: lib/SVK/Command.pod:125 +#: lib/SVK/Command.pod:126 msgid "Depot Path: //svk/local" msgstr "檔案庫路徑：//svk/local" -#: lib/SVK/Command.pod:126 +#: lib/SVK/Command.pod:127 msgid "Depot Path: //svk/trunk" msgstr "檔案庫路徑：//svk/trunk" #. ($default) -#: lib/SVK/Command.pm:418 +#: lib/SVK/Command.pm:446 msgid "Depot path: [//mirror/%1] " msgstr "檔案庫路徑：[//mirror/%1] " -#: lib/SVK/Command.pod:127 +#: lib/SVK/Command.pod:128 msgid "Diff:" msgstr "差異：" @@ -997,11 +1071,16 @@ msgid "Directory %1 imported to depotpath %2 as revision %3.\n" msgstr "目錄 %1 已匯入檔案庫路徑 %2，更動編號為 %3。\n" -#: lib/SVK/Command.pod:128 +#. ($arg[0]) +#: lib/SVK/Command/Checkout.pm:120 +msgid "Do you mean svk switch %1?\n" +msgstr "你是要 svk 變更 %1 嗎？\n" + +#: lib/SVK/Command.pod:129 msgid "EDITOR: Editor to use for 'e'." msgstr "EDITOR: 要在 'e' 時採用的編輯器。" -#: lib/SVK/Command.pod:129 +#: lib/SVK/Command.pod:130 msgid "Edit:" msgstr "編輯：" @@ -1009,39 +1088,44 @@ msgid "Emerge %1 done.\n" msgstr "Emerge %1 執行完畢。\n" -#: lib/SVK/Command/Merge.pm:133 lib/SVK/Editor/Merge.pm:696 +#: lib/SVK/Command/Merge.pm:134 lib/SVK/Editor/Merge.pm:742 msgid "Empty merge.\n" msgstr "合併後無任何更動。\n" #. (loc($action) -#: lib/SVK/Command.pm:821 +#: lib/SVK/Command.pm:860 msgid "Enter a depot path to %1 into (under // if no leading '/'): " msgstr "要%1到的檔案庫路徑名稱（若不以「/」開頭，則置於 // 之下）：" #. (loc($action) -#: lib/SVK/Command.pm:814 +#: lib/SVK/Command.pm:855 msgid "Enter a depot path to %1 into: [%2] " msgstr "要%1到的檔案庫路徑名稱：[%2]" -#: lib/SVK/Command.pod:130 +#: lib/SVK/Command.pod:131 msgid "Environment variables:" msgstr "環境變數：" +#. ($target->{report}) +#: lib/SVK/Command/Propset.pm:85 +msgid "File %1 has inconsistent newlines.\n" +msgstr "檔案 %1 有不一致的換行符號。\n" + #: lib/SVK/Command/Patch.pm:26 msgid "Filename required.\n" msgstr "需要指定檔名。\n" #. ($rev, $rrev) -#: lib/SVK/Command/Mirror.pm:131 +#: lib/SVK/Command/Mirror.pm:174 msgid "Found merge ticket at revision %1 (remote %2); use it? (y/n) " msgstr "在更動編號 %1 發現了合併歷史紀錄（遠端為 %2）；要採用嗎？(y/n) " -#: lib/SVK/Command.pod:131 +#: lib/SVK/Command.pod:132 msgid "G Merged" msgstr "G 合併" #. ($self->{patch}) -#: lib/SVK/Command/Commit.pm:155 +#: lib/SVK/Command/Commit.pm:165 msgid "Illegal patch name: %1.\n" msgstr "%1 不是合理的補綴名稱。\n" @@ -1060,15 +1144,15 @@ msgid "Import source (%1) is a checkout path; use --from-checkout.\n" msgstr "匯入來源（%1）是取出路徑；請使用 --from-checkout 選項。\n" -#: lib/SVK/Command/Merge.pm:180 +#: lib/SVK/Command/Merge.pm:181 msgid "Incremental merge not guaranteed even if check is successful\n" msgstr "即使檢查成功，也不保證漸進式合併能順利完成\n" -#: lib/SVK/Command/Merge.pm:122 +#: lib/SVK/Command/Merge.pm:123 msgid "Incremental merge not supported\n" msgstr "不支援漸進式合併\n" -#: bin/svk:84 lib/SVK/Util.pm:128 lib/SVK/XD.pm:1225 +#: bin/svk:77 lib/SVK/Util.pm:146 lib/SVK/XD.pm:1239 msgid "Interrupted.\n" msgstr "已中斷。\n" @@ -1082,20 +1166,20 @@ msgid "Last Changed Rev.: %1\n" msgstr "前次改變的更動編號：%1\n" -#: lib/SVK/Command.pod:132 +#: lib/SVK/Command.pod:133 msgid "Last Changed Rev.: 445" msgstr "前次改變的更動編號：445" -#: lib/SVK/Command.pod:133 +#: lib/SVK/Command.pod:134 msgid "Last Changed Rev.: 447" msgstr "前次改變的更動編號：447" -#: lib/SVK/Command.pod:134 +#: lib/SVK/Command.pod:135 msgid "Merge From: /svk/trunk, Rev. 445" msgstr "合併來源：/svk/trunk，更動編號 445" #. ($_[0]) -#: lib/SVK/Command/Commit.pm:134 +#: lib/SVK/Command/Commit.pm:144 msgid "Merge back committed as revision %1.\n" msgstr "合併已送交為更動編號 %1。\n" @@ -1118,7 +1202,7 @@ msgstr "合併後的檔案" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:129 +#: lib/SVK/Command/Commit.pm:139 msgid "Merging back to mirror source %1.\n" msgstr "正在合併至映射來源 %1。\n" @@ -1128,11 +1212,11 @@ msgstr "與 %1 %2 合併：正在套用 %3 %4:%5。\n" #. ($target->{depotpath}) -#: lib/SVK/Command/Mirror.pm:75 +#: lib/SVK/Command/Mirror.pm:80 msgid "Mirror path '%1' detached.\n" msgstr "成功解除路徑「%1」的映射狀態。\n" -#: lib/SVK/Command/Mirror.pm:167 +#: lib/SVK/Command/Mirror.pm:210 msgid "Mirror state successfully recovered.\n" msgstr "成功修復路徑的映射狀態。\n" @@ -1141,11 +1225,11 @@ msgid "Mirrored From: %1, Rev. %2\n" msgstr "映射來源：%1，更動編號 %2\n" -#: lib/SVK/Command.pod:135 +#: lib/SVK/Command.pod:136 msgid "Mirrored From: svn://svn.clkao.org/svk, Rev. 1744" msgstr "映射來源：svn://svn.clkao.org/svk，更動編號 1744" -#: lib/SVK/Command.pod:136 +#: lib/SVK/Command.pod:137 msgid "Misc:" msgstr "其他：" @@ -1153,33 +1237,33 @@ msgid "Multiple merge tools found, choose one:\n" msgstr "找到幾項合併工具，請選擇一種：\n" -#: lib/SVK/Command.pod:137 +#: lib/SVK/Command.pod:138 msgid "NAME" msgstr "名稱" -#: lib/SVK/Command.pod:138 +#: lib/SVK/Command.pod:139 msgid "NOTES" msgstr "備註" #. ($_) -#: lib/SVK/Editor/Diff.pm:166 +#: lib/SVK/Editor/Diff.pm:169 msgid "Name: %1\n" msgstr "名稱：%1\n" -#: lib/SVK/Command/Depotmap.pm:26 +#: lib/SVK/Command/Depotmap.pm:28 msgid "Need to specify a depot name" msgstr "請先指定檔案庫名稱" -#: lib/SVK/Command/Depotmap.pm:29 +#: lib/SVK/Command/Depotmap.pm:31 msgid "Need to specify a path name" msgstr "請先指定路徑名稱" #. ($uri) -#: lib/SVK/Command.pm:380 +#: lib/SVK/Command.pm:395 msgid "New URI encountered: %1\n" msgstr "新出現的網址：%1\n" -#: lib/SVK/Command/Depotmap.pm:101 lib/SVK/Command/Depotmap.pm:86 +#: lib/SVK/Command/Depotmap.pm:62 lib/SVK/Command/Depotmap.pm:81 msgid "New depot map saved.\n" msgstr "已儲存新的檔案庫對映表。\n" @@ -1188,41 +1272,41 @@ msgid "New merge ticket: %1:%2\n" msgstr "新的合併歷史紀錄：%1:%2\n" -#: lib/SVK/Command/Mirror.pm:139 +#: lib/SVK/Command/Mirror.pm:182 msgid "No mirror history found; cannot recover.\n" msgstr "找不到映射紀錄；無法回復。\n" -#: lib/SVK/Command/Mirror.pm:143 +#: lib/SVK/Command/Mirror.pm:186 msgid "No need to revert; it is already the head revision.\n" msgstr "這已經是最新的版本；毋須回復。\n" -#: lib/SVK/Command/Merge.pm:111 +#: lib/SVK/Command/Merge.pm:112 msgid "No need to track rename for smerge\n" msgstr "smerge 時不需要追蹤改名\n" #. ($depot) -#: lib/SVK/XD.pm:320 +#: lib/SVK/XD.pm:315 msgid "No such depot: %1.\n" msgstr "無此檔案庫：%1。\n" -#: lib/SVK/Command/Commit.pm:255 lib/SVK/Command/Commit.pm:268 +#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:280 msgid "No targets to commit.\n" msgstr "沒有送交更動的目標。\n" -#: lib/SVK/Command.pod:139 +#: lib/SVK/Command.pod:140 msgid "None" msgstr "無" -#: lib/SVK/Command/Merge.pm:144 +#: lib/SVK/Command/Merge.pm:145 msgid "Not possible to do incremental merge without a merge ticket.\n" msgstr "沒有合併的歷史紀錄，無法執行漸進式合併。\n" -#: lib/SVK/Command.pod:140 +#: lib/SVK/Command.pod:141 msgid "OPTIONS" msgstr "選項" #. ($where[0]) -#: lib/SVK/Command/Checkout.pm:100 lib/SVK/Command/Checkout.pm:144 +#: lib/SVK/Command/Checkout.pm:138 lib/SVK/Command/Checkout.pm:58 msgid "" "Overlapping checkout path is not supported (%1); use 'svk checkout --detach' " "to remove it first.\n" @@ -1234,18 +1318,20 @@ msgstr "補綴 %1 建立成功。\n" #. ($m->{source}) -#: lib/SVK/Command/Commit.pm:122 +#: lib/SVK/Command/Commit.pm:132 msgid "Patching locally against mirror source %1.\n" msgstr "正在本地端補綴映射來源 %1。\n" -#: lib/SVK/Command/Checkout.pm:84 lib/SVK/Command/Depotmap.pm:68 -#: lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Checkout.pm:108 lib/SVK/Command/Depotmap.pm:125 +#: lib/SVK/Command/Mirror.pm:109 msgid "Path" msgstr "路徑" +#. ($path) #. ($dst->{copath}) #. ($cpdst->{report}) -#: lib/SVK/Command/Copy.pm:145 lib/SVK/Command/Copy.pm:62 +#: lib/SVK/Command.pm:872 lib/SVK/Command/Copy.pm:145 +#: lib/SVK/Command/Copy.pm:62 msgid "Path %1 already exists.\n" msgstr "路徑 %1 已存在。\n" @@ -1255,7 +1341,7 @@ msgstr "路徑 %1 不存在。\n" #. ($target->{path}) -#: lib/SVK/Command/List.pm:36 +#: lib/SVK/Command/List.pm:37 msgid "Path %1 is not a versioned directory\n" msgstr "路徑 %1 並未納入版本控制\n" @@ -1279,7 +1365,7 @@ msgstr "%1 的屬性列表：\n" #. ($propname, $path) -#: lib/SVK/Editor/Merge.pm:625 +#: lib/SVK/Editor/Merge.pm:670 msgid "Property %1 of %2" msgstr "%2 的 %1 屬性" @@ -1289,17 +1375,17 @@ msgstr "已設定更動編號 %2 的屬性 '%1'。\n" #. ($rpath) -#: lib/SVK/Editor/Diff.pm:164 +#: lib/SVK/Editor/Diff.pm:167 msgid "Property changes on: %1\n" msgstr "%1 的屬性更動：\n" #. ($path) -#: lib/SVK/XD.pm:152 +#: lib/SVK/XD.pm:147 msgid "Repository %1 does not exist, create? (y/n)" msgstr "檔案庫 %1 不存在。要建立嗎？(y/n)" #. ($rev, $skipped) -#: lib/SVK/Command/Mirror.pm:149 +#: lib/SVK/Command/Mirror.pm:192 msgid "Revert to revision %1 and discard %*(%2,revision)? (y/n) " msgstr "確定要回復到更動編號 %1，並取消 %2 份之後的更動？(y/n) " @@ -1308,11 +1394,11 @@ msgid "Reverted %1\n" msgstr "已復原 %1\n" -#: lib/SVK/Command.pm:572 lib/SVK/Command/Proplist.pm:26 +#: lib/SVK/Command.pm:602 lib/SVK/Command/Proplist.pm:26 msgid "Revision required.\n" msgstr "需要指定更動編號。\n" -#: lib/SVK/Command.pm:598 +#: lib/SVK/Command.pm:628 msgid "Revision spec must be N:M.\n" msgstr "更動編號的格式必需為 N:M。\n" @@ -1326,23 +1412,23 @@ msgid "Revision: %1\n" msgstr "更動編號：%1\n" -#: lib/SVK/Command.pod:141 +#: lib/SVK/Command.pod:142 msgid "Revision: 447" msgstr "更動編號：447" -#: lib/SVK/Command/Help.pm:72 +#: lib/SVK/Command/Help.pm:61 msgid "SVK::Help" msgstr "SVK::Help::zh_tw" -#: lib/SVK/Command.pod:142 +#: lib/SVK/Command.pod:143 msgid "SVKMERGE: External merge tool to always use for 'm'." msgstr "SVKMERGE: 要在 'm' 時採用的外部合併工具。" -#: lib/SVK/Command.pod:143 +#: lib/SVK/Command.pod:144 msgid "SVKRESOLVE: The resolve action to take, instead of asking." msgstr "SVKRESOLVE: 在解決衝突時，要自動採取的動作。" -#: lib/SVK/Command.pod:144 +#: lib/SVK/Command.pod:145 msgid "SYNOPSIS" msgstr "用法" @@ -1350,7 +1436,7 @@ msgid "Signature verification failed.\n" msgstr "簽章檢查失敗。" -#: lib/SVK/Command/Mirror.pm:46 +#: lib/SVK/Command/Mirror.pm:109 msgid "Source" msgstr "來源" @@ -1369,7 +1455,7 @@ msgid "Starting to synchronize %1\n" msgstr "開始同步 %1\n" -#: lib/SVK/Command.pm:426 +#: lib/SVK/Command.pm:454 msgid "Synchronizing the mirror for the first time:\n" msgstr "初次同步化映射路徑：\n" @@ -1395,20 +1481,20 @@ msgstr "目標不是本地或映射路徑，無法檢視補綴。\n" #. ($VERSION) -#: bin/svk:64 +#: bin/svk:57 msgid "This is svk, version %1.\n" msgstr "這是 svk，第 %1 版。\n" -#: lib/SVK/Command.pod:145 +#: lib/SVK/Command.pod:146 msgid "U Updated" msgstr "U 更新" -#: lib/SVK/Command.pm:199 +#: lib/SVK/Command.pm:214 msgid "Unknown options.\n" msgstr "未知的選項。\n" #. ($_) -#: lib/SVK/XD.pm:1193 +#: lib/SVK/XD.pm:1206 msgid "Unknown target: %1.\n" msgstr "未知的目標：%1。\n" @@ -1417,112 +1503,112 @@ msgid "Unversioned properties on revision %1:\n" msgstr "更動編號 %1 上未納入版本控制的屬性：\n" -#: lib/SVK/Command.pod:146 +#: lib/SVK/Command.pod:147 msgid "Update your local branch and checkout path from the remote" msgstr "從遠端檔案庫拉取更動，更新本地端的分支版本及取出路徑。" -#: lib/SVK/Command.pod:147 +#: lib/SVK/Command.pod:148 msgid "Update your local branch from the remote master repository." msgstr "從遠端檔案庫拉取更動，更新本地端的分支版本。" -#: lib/SVK/Util.pm:187 +#: lib/SVK/Util.pm:207 msgid "Waiting for editor...\n" msgstr "呼叫編輯器…\n" -#: lib/SVK/Command.pm:434 +#: lib/SVK/Command.pm:462 msgid "a)ll, h)ead, -count, revision? [a] " msgstr "a)全部，h)最新，-個數，更動編號？[a] " -#: lib/SVK/Command.pod:148 +#: lib/SVK/Command.pod:149 msgid "a: Accept the merged/edited file." msgstr "a: 接受合併/編輯過的檔案。" -#: lib/SVK/Command.pod:149 +#: lib/SVK/Command.pod:150 msgid "add - Put files and directories under version control" msgstr "add - 將檔案及目錄納入版本控制" -#: lib/SVK/Command.pod:150 +#: lib/SVK/Command.pod:151 msgid "add [PATH...]" msgstr "add [路徑...]" -#: lib/SVK/Command.pod:151 +#: lib/SVK/Command.pod:152 msgid "admin - Administration tools" msgstr "admin - 管理工具" -#: lib/SVK/Command.pod:152 +#: lib/SVK/Command.pod:153 msgid "admin deltify [DEPOTNAME]" msgstr "admin deltify [檔案庫名稱]" -#: lib/SVK/Command.pod:153 +#: lib/SVK/Command.pod:154 msgid "admin dump [DEPOTNAME]" msgstr "admin dump [檔案庫名稱]" -#: lib/SVK/Command.pod:154 +#: lib/SVK/Command.pod:155 msgid "admin help [COMMAND]" msgstr "admin help [命令]" -#: lib/SVK/Command.pod:155 +#: lib/SVK/Command.pod:156 msgid "admin hotcopy /path/to/repository [DEPOTNAME]" msgstr "admin hotcopy /磁碟上的/檔案庫/路徑 [檔案庫名稱]" -#: lib/SVK/Command.pod:156 +#: lib/SVK/Command.pod:157 msgid "admin list-dblogs [DEPOTNAME]" msgstr "admin list-dblogs [檔案庫名稱]" -#: lib/SVK/Command.pod:157 +#: lib/SVK/Command.pod:158 msgid "admin list-unused-dblogs [DEPOTNAME]" msgstr "admin list-unused-dblogs [檔案庫名稱]" -#: lib/SVK/Command.pod:158 +#: lib/SVK/Command.pod:159 msgid "admin load [DEPOTNAME]" msgstr "admin load [檔案庫名稱]" -#: lib/SVK/Command.pod:159 +#: lib/SVK/Command.pod:160 msgid "admin lstxns [DEPOTNAME]" msgstr "admin lstxns [檔案庫名稱]" -#: lib/SVK/Command.pod:160 +#: lib/SVK/Command.pod:161 msgid "admin recover [DEPOTNAME]" msgstr "admin recover [檔案庫名稱]" -#: lib/SVK/Command.pod:161 +#: lib/SVK/Command.pod:162 msgid "admin rmcache" msgstr "admin rmcache" -#: lib/SVK/Command.pod:162 +#: lib/SVK/Command.pod:163 msgid "admin rmtxns [DEPOTNAME]" msgstr "admin rmtxns [檔案庫名稱]" -#: lib/SVK/Command.pod:163 +#: lib/SVK/Command.pod:164 msgid "admin setlog -r REVISION FILE [DEPOTNAME]" msgstr "admin setlog -r 更動編號 檔案 [檔案庫名稱]" -#: lib/SVK/Command.pod:164 +#: lib/SVK/Command.pod:165 msgid "admin verify [DEPOTNAME]" msgstr "admin verify [檔案庫名稱]" -#: lib/SVK/Command.pod:165 +#: lib/SVK/Command.pod:166 msgid "annotate - Display per-line revision and author info" msgstr "annotate - 顯示檔案裡每一列的更動編號與作者資訊" -#: lib/SVK/Command.pod:166 +#: lib/SVK/Command.pod:167 msgid "annotate DEPOTPATH[@REV]" msgstr "annotate 檔案庫路徑[@更動編號]" -#: lib/SVK/Command.pod:167 +#: lib/SVK/Command.pod:168 msgid "annotate [-r REV] DEPOTPATH" msgstr "annotate [-r 更動編號] 檔案庫路徑" -#: lib/SVK/Command.pod:168 +#: lib/SVK/Command.pod:169 msgid "annotate [-r REV] [PATH]" msgstr "annotate [-r 更動編號] [路徑]" -#: lib/SVK/Command.pod:169 +#: lib/SVK/Command.pod:170 msgid "annotate [PATH][@REV]" msgstr "annotate [路徑][@更動編號]" #. ($self->{giantlock}) -#: lib/SVK/XD.pm:262 +#: lib/SVK/XD.pm:257 msgid "another svk might be running; remove %1 if not" msgstr "可能另有 svk 執行中。若無則請刪除 %1" @@ -1530,12 +1616,12 @@ msgid "argument skipto not allowed when multiple target specified" msgstr "指定多個目標時不可加上 skipto 參數" -#: lib/SVK/XD.pm:266 +#: lib/SVK/XD.pm:261 msgid "cannot acquire giant lock" msgstr "無法取得主控鎖定" #. ($sigfile) -#: lib/SVK/Editor/Sign.pm:46 +#: lib/SVK/Editor/Sign.pm:48 msgid "cannot find %1, signing aborted" msgstr "找不到 %1，放棄簽署" @@ -1543,164 +1629,166 @@ msgid "cannot find a path for temporary branch" msgstr "找不到可用於暫存分支的路徑" -#: lib/SVK/Command.pm:354 lib/SVK/Command/Mirror.pm:38 -#: lib/SVK/Command/Sync.pm:31 lib/SVK/Command/Update.pm:60 +#: lib/SVK/Command.pm:369 lib/SVK/Command/Mirror.pm:102 +#: lib/SVK/Command/Mirror.pm:21 lib/SVK/Command/Sync.pm:31 +#: lib/SVK/Command/Update.pm:60 msgid "cannot load SVN::Mirror" msgstr "無法載入 SVN::Mirror" #. ($file, $!) +#. ($sigfile, $!) #. ($dir, $!) -#. ($sigfile, $!) -#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:49 lib/SVK/Patch.pm:80 +#: lib/SVK/Command/Admin.pm:30 lib/SVK/Editor/Sign.pm:51 lib/SVK/Patch.pm:80 msgid "cannot open %1: %2" msgstr "無法開啟 %1：%2" -#: lib/SVK/Command.pod:170 +#: lib/SVK/Command.pod:171 msgid "cat - Output the file from depot" msgstr "cat - 由檔案庫輸出檔案" -#: lib/SVK/Command.pod:171 +#: lib/SVK/Command.pod:172 msgid "cat [DEPOTPATH | PATH...]" msgstr "cat [檔案庫路徑 | 路徑...]" -#: lib/SVK/Command.pod:172 +#: lib/SVK/Command.pod:173 msgid "checkout - Checkout the depotpath" msgstr "checkout - 取出檔案庫指定路徑的內容" -#: lib/SVK/Command.pod:173 +#: lib/SVK/Command.pod:174 msgid "checkout --detach [DEPOTPATH | PATH]" msgstr "checkout --detach [檔案庫路徑 | 路徑]" -#: lib/SVK/Command.pod:174 +#: lib/SVK/Command.pod:175 msgid "checkout --list" msgstr "checkout --list" -#: lib/SVK/Command.pod:175 -msgid "checkout --relocate [DEPOTPATH | PATH] PATH" +#: lib/SVK/Command.pod:176 +#, fuzzy +msgid "checkout --relocate DEPOTPATH|PATH PATH" msgstr "checkout --relocate [檔案庫路徑 | 路徑] 路徑" -#: lib/SVK/Command.pod:176 +#: lib/SVK/Command.pod:177 msgid "checkout DEPOTPATH [PATH]" msgstr "checkout 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:177 +#: lib/SVK/Command.pod:178 msgid "cleanup - Remove stalled locks" msgstr "cleanup - 移除卡住的鎖定" -#: lib/SVK/Command.pod:178 +#: lib/SVK/Command.pod:179 msgid "cleanup [PATH...]" msgstr "cleanup [路徑...]" -#: lib/SVK/Command.pod:179 +#: lib/SVK/Command.pod:180 msgid "cmerge - Merge specific changes" msgstr "cmerge - 合併指定的更動" -#: lib/SVK/Command.pod:180 +#: lib/SVK/Command.pod:181 msgid "cmerge -c CHGSPEC DEPOTPATH [PATH]" msgstr "cmerge -c 合併方式 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:181 +#: lib/SVK/Command.pod:182 msgid "cmerge -c CHGSPEC DEPOTPATH1 DEPOTPATH2" msgstr "cmerge -c 合併方式 檔案庫路徑1 檔案庫路徑2" -#: lib/SVK/Command.pod:182 +#: lib/SVK/Command.pod:183 msgid "commit - Commit changes to depot" msgstr "commit - 送交更動至檔案庫" -#: lib/SVK/Command.pod:183 +#: lib/SVK/Command.pod:184 msgid "commit [PATH...]" msgstr "commit [路徑...]" -#: lib/SVK/Command.pod:184 +#: lib/SVK/Command.pod:185 msgid "copy - Make a versioned copy" msgstr "copy - 複製一份版本" -#: lib/SVK/Command.pod:185 +#: lib/SVK/Command.pod:186 msgid "copy DEPOTPATH [PATH]" msgstr "copy 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:186 +#: lib/SVK/Command.pod:187 msgid "copy DEPOTPATH1 DEPOTPATH2" msgstr "copy 檔案庫路徑1 檔案庫路徑2" #. ($!) -#: lib/SVK/Editor/Sign.pm:40 +#: lib/SVK/Editor/Sign.pm:42 msgid "could not call gpg: %1" msgstr "無法呼叫 gpg：%1" -#: lib/SVK/Command.pod:187 +#: lib/SVK/Command.pod:188 msgid "d: Diff your file against merged file." msgstr "d: 檢視已方與合併後的差異。" -#: lib/SVK/Command.pod:188 +#: lib/SVK/Command.pod:189 msgid "delete - Remove versioned item" msgstr "delete - 移除納入版本控制的項目" -#: lib/SVK/Command.pod:189 +#: lib/SVK/Command.pod:190 msgid "delete [DEPOTPATH...]" msgstr "delete [路徑...]" -#: lib/SVK/Command.pod:190 +#: lib/SVK/Command.pod:191 msgid "delete [PATH...]" msgstr "delete [路徑...]" -#: lib/SVK/Command/Depotmap.pm:82 +#: lib/SVK/Command/Depotmap.pm:58 msgid "depot map" msgstr "檔案庫對映表" -#: lib/SVK/Command.pod:191 +#: lib/SVK/Command.pod:192 msgid "depotmap - Create or edit the depot mapping configuration" msgstr "depotmap - 建立或編輯檔案庫對映表" -#: lib/SVK/Command.pod:192 +#: lib/SVK/Command.pod:193 msgid "depotmap --detach [DEPOTNAME | PATH]" msgstr "depotmap --detach [檔案庫名稱 | 路徑]" -#: lib/SVK/Command.pod:193 +#: lib/SVK/Command.pod:194 msgid "depotmap --list" msgstr "depotmap --list" -#: lib/SVK/Command.pod:194 +#: lib/SVK/Command.pod:195 msgid "depotmap --relocate [DEPOTNAME | PATH] PATH" msgstr "depotmap --relocate [檔案庫名稱 | 路徑] 路徑" -#: lib/SVK/Command.pod:195 +#: lib/SVK/Command.pod:196 msgid "depotmap DEPOTNAME /path/to/repository" msgstr "depotmap 檔案庫名稱 /磁碟上的/檔案庫/路徑" -#: lib/SVK/Command.pod:196 +#: lib/SVK/Command.pod:197 msgid "depotmap [OPTIONS]" msgstr "depotmap [選項]" -#: lib/SVK/Command.pod:197 +#: lib/SVK/Command.pod:198 msgid "depotname: '/path/to/repos'" msgstr "檔案庫名稱: '/磁碟上的/檔案庫/路徑'" -#: lib/SVK/Command.pod:198 +#: lib/SVK/Command.pod:199 msgid "describe - Describe a change" msgstr "describe - 描述更動內容" -#: lib/SVK/Command.pod:199 +#: lib/SVK/Command.pod:200 msgid "describe REV [DEPOTPATH | PATH]" msgstr "describe 更動編號 [檔案庫路徑 | 路徑]" -#: lib/SVK/Command.pod:200 +#: lib/SVK/Command.pod:201 msgid "diff - Display diff between revisions or checkout copies" msgstr "diff - 顯示兩次更動之間或與工作複本的差異處" -#: lib/SVK/Command.pod:201 +#: lib/SVK/Command.pod:202 msgid "diff -r N[:M] DEPOTPATH" msgstr "diff -r N[:M] 檔案庫路徑" -#: lib/SVK/Command.pod:202 +#: lib/SVK/Command.pod:203 msgid "diff DEPOTPATH PATH" msgstr "diff 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:203 +#: lib/SVK/Command.pod:204 msgid "diff DEPOTPATH1 DEPOTPATH2" msgstr "diff 檔案庫路徑1 檔案庫路徑2" -#: lib/SVK/Command.pod:204 +#: lib/SVK/Command.pod:205 msgid "diff [-r REV] [PATH...]" msgstr "diff [-r 更動編號] [路徑...]" @@ -1708,57 +1796,57 @@ msgid "different depot" msgstr "不同的檔案庫" -#: lib/SVK/Command.pod:205 +#: lib/SVK/Command.pod:206 msgid "dm: See merged changes." msgstr "dm: 檢視源頭與合併後的差異。" #. ($arg[0]) -#: lib/SVK/Command/Checkout.pm:27 +#: lib/SVK/Command/Checkout.pm:23 msgid "don't know where to checkout %1\n" msgstr "不知道要將 %1 取出到哪裡\n" -#: lib/SVK/Command.pod:206 +#: lib/SVK/Command.pod:207 msgid "dt: See their changes alone." msgstr "dt: 檢視對方的更動。" -#: lib/SVK/Command.pod:207 +#: lib/SVK/Command.pod:208 msgid "dy: See your changes alone." msgstr "dy: 檢視已方的更動。" -#: lib/SVK/Command.pod:208 +#: lib/SVK/Command.pod:209 msgid "e: Edit merged file with an editor." msgstr "e: 用編輯器來編輯合併的檔案。" #. ($fname) -#: lib/SVK/Command/Commit.pm:164 +#: lib/SVK/Command/Commit.pm:174 msgid "file %1 already exists.\n" msgstr "檔案 %1 已存在。\n" -#: lib/SVK/Command.pod:209 +#: lib/SVK/Command.pod:210 msgid "g Merged without actual change" msgstr "g 合併但毋須更新" -#: lib/SVK/Command.pod:210 +#: lib/SVK/Command.pod:211 msgid "h: Print this help message." msgstr "h: 顯示這份說明訊息。" -#: lib/SVK/Command.pod:211 +#: lib/SVK/Command.pod:212 msgid "help - Show help" msgstr "help - 顯示說明" -#: lib/SVK/Command.pod:212 +#: lib/SVK/Command.pod:213 msgid "help COMMAND" msgstr "help 命令" -#: lib/SVK/Command.pod:213 +#: lib/SVK/Command.pod:214 msgid "import - Import directory into depot" msgstr "import - 把已有目錄匯入檔案庫" -#: lib/SVK/Command.pod:214 +#: lib/SVK/Command.pod:215 msgid "import DEPOTPATH [PATH]" msgstr "import 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:215 +#: lib/SVK/Command.pod:216 msgid "import [PATH] DEPOTPATH" msgstr "import [路徑] 檔案庫路徑" @@ -1766,208 +1854,216 @@ msgid "import destination cannot be a file" msgstr "不能用檔案作為匯入的目的地" -#: lib/SVK/Command.pod:216 +#: lib/SVK/Command.pod:217 msgid "info - Display information about a file or directory" msgstr "info - 顯示檔案或目錄的資訊" -#: lib/SVK/Command.pod:217 +#: lib/SVK/Command.pod:218 msgid "info [PATH | DEPOTPATH]" msgstr "info [路徑 | 檔案庫路徑]" -#: lib/SVK/Command/Diff.pm:36 lib/SVK/Command/Diff.pm:41 +#: lib/SVK/Command/Diff.pm:34 lib/SVK/Command/Diff.pm:39 msgid "invalid arguments" msgstr "錯誤的參數" -#: lib/SVK/Command.pod:218 +#: lib/SVK/Command.pod:219 msgid "involved, do not prefix path names before values" -msgstr " " +msgstr "混亂了，請勿將路徑名稱置於值前面" -#: lib/SVK/Command.pod:219 +#: lib/SVK/Command.pod:220 msgid "list - List entries in a directory from depot" msgstr "list - 列出檔案庫目錄內的項目" -#: lib/SVK/Command.pod:220 +#: lib/SVK/Command.pod:221 msgid "list [DEPOTPATH | PATH...]" msgstr "list [檔案庫路徑 | 路徑...]" -#: lib/SVK/Command.pod:221 +#: lib/SVK/Command.pod:222 msgid "log - Show log messages for revisions" msgstr "log - 顯示各項更動的記錄訊息" -#: lib/SVK/Command.pod:222 +#: lib/SVK/Command.pod:223 msgid "log DEPOTPATH" msgstr "log 檔案庫路徑" -#: lib/SVK/Command.pod:223 +#: lib/SVK/Command.pod:224 msgid "log PATH" msgstr "log 路徑" -#: lib/SVK/Command/Commit.pm:267 lib/SVK/Command/Commit.pm:70 +#: lib/SVK/Command/Commit.pm:279 lib/SVK/Command/Commit.pm:71 msgid "log message" msgstr "紀錄訊息" -#: lib/SVK/Command.pod:224 +#: lib/SVK/Command.pod:225 msgid "m: Run an external merge tool to edit merged file." msgstr "m: 執行外部合併工具，來編輯合併的檔案。" -#: lib/SVK/Command.pod:225 +#: lib/SVK/Command.pod:226 msgid "master repository." -msgstr " " +msgstr "主檔案庫." -#: lib/SVK/Command.pod:226 +#: lib/SVK/Command.pod:227 msgid "merge - Apply differences between two sources" msgstr "merge - 合併兩份來源之間的差異" -#: lib/SVK/Command.pod:227 +#: lib/SVK/Command.pod:228 msgid "merge -r N:M DEPOTPATH [PATH]" msgstr "merge -r N:M 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:228 +#: lib/SVK/Command.pod:229 msgid "merge -r N:M DEPOTPATH1 DEPOTPATH2" msgstr "merge -r N:M 檔案庫路徑1 檔案庫路徑2" -#: lib/SVK/Command.pod:229 +#: lib/SVK/Command.pod:230 msgid "merge -r N:M [--to|--from] [PATH]" msgstr "merge -r N:M [--to|--from] [路徑]" -#: lib/SVK/Command.pod:230 +#: lib/SVK/Command.pod:231 msgid "mirror - Initialize a mirrored depotpath" msgstr "mirror - 初始化映射的檔案庫路徑" -#: lib/SVK/Command.pod:231 +#: lib/SVK/Command.pod:232 msgid "mirror --detach DEPOTPATH" msgstr "mirror --detach 檔案庫路徑" -#: lib/SVK/Command.pod:232 +#: lib/SVK/Command.pod:233 msgid "mirror --list [DEPOTNAME...]" msgstr "mirror --list [檔案庫名稱...]" -#: lib/SVK/Command.pod:233 +#: lib/SVK/Command.pod:234 msgid "mirror --recover DEPOTPATH" msgstr "mirror --recover 檔案庫路徑" -#: lib/SVK/Command.pod:234 +#: lib/SVK/Command.pod:235 msgid "mirror --relocate DEPOTPATH [http|svn]://host/path " msgstr "mirror --relocate 檔案庫路徑 [http|svn]://伺服器/路徑" -#: lib/SVK/Command.pod:235 +#: lib/SVK/Command.pod:236 msgid "mirror --upgrade //" msgstr "mirror --upgrade //" -#: lib/SVK/Command.pod:236 +#: lib/SVK/Command.pod:237 msgid "mirror --upgrade /DEPOTNAME/" msgstr "mirror --upgrade /檔案庫名稱/" -#: lib/SVK/Command.pod:237 +#: lib/SVK/Command.pod:238 msgid "mirror DEPOTPATH [http|svn]://host/path" msgstr "mirror 檔案庫路徑 [http|svn]://伺服器/路徑" -#: lib/SVK/Command.pod:238 +#: lib/SVK/Command.pod:239 msgid "mirror [http|svn]://host/path DEPOTPATH" msgstr "mirror [http|svn]://伺服器/路徑 檔案庫路徑" -#: lib/SVK/Command.pod:239 +#: lib/SVK/Command.pod:240 msgid "mirror cvs::pserver:user@host:/cvsroot:module/... DEPOTPATH" msgstr "mirror cvs::pserver:使用者@伺服器:/cvsroot:module/... 檔案庫路徑" -#: lib/SVK/Command.pod:240 +#: lib/SVK/Command.pod:241 msgid "mirror p4:user@host:1666://path/... DEPOTPATH" msgstr "mirror p4:使用者@伺服器:1666://路徑/... 檔案庫路徑" -#: lib/SVK/Command.pod:241 +#: lib/SVK/Command.pod:242 msgid "mkdir - Create a versioned directory" msgstr "mkdir - 建立納入版本控制的目錄" -#: lib/SVK/Command.pod:242 +#: lib/SVK/Command.pod:243 msgid "mkdir DEPOTPATH" msgstr "mkdir 檔案庫路徑" -#: lib/SVK/Command.pod:243 +#: lib/SVK/Command.pod:244 +#, fuzzy +msgid "mkdir PATH" +msgstr "mkdir 檔案庫路徑" + +#: lib/SVK/Command.pod:245 msgid "move - Move a file or directory" msgstr "move - 移動檔案或目錄" -#: lib/SVK/Command.pod:244 +#: lib/SVK/Command.pod:246 msgid "move DEPOTPATH1 DEPOTPATH2" msgstr "move 檔案庫路徑1 檔案庫路徑2" -#: lib/SVK/XD.pm:317 +#: lib/SVK/XD.pm:312 msgid "no depot spec" msgstr "未指定檔案庫" -#: lib/SVK/Command.pod:245 +#: lib/SVK/Command.pod:247 msgid "patch - Manage patches" msgstr "patch - 管理補綴檔" -#: lib/SVK/Command.pod:246 +#: lib/SVK/Command.pod:248 msgid "patch apply PATCHNAME [DEPOTPATH | PATH] [-- MERGEOPTIONS]" msgstr "patch apply 補綴名稱 [檔案庫路徑 | 路徑] [-- 合併選項]" -#: lib/SVK/Command.pod:247 +#: lib/SVK/Command.pod:249 msgid "patch delete PATCHNAME" msgstr "patch delete 補綴名稱" -#: lib/SVK/Command.pod:248 +#: lib/SVK/Command.pod:250 msgid "patch list" msgstr "patch list" -#: lib/SVK/Command.pod:249 +#: lib/SVK/Command.pod:251 msgid "patch regen PATCHNAME" msgstr "patch regen 補綴名稱" -#: lib/SVK/Command.pod:250 +#: lib/SVK/Command.pod:252 msgid "patch send PATCHNAME" msgstr "patch send 補綴名稱" -#: lib/SVK/Command.pod:251 +#: lib/SVK/Command.pod:253 msgid "patch update PATCHNAME" msgstr "patch update 補綴名稱" -#: lib/SVK/Command.pod:252 +#: lib/SVK/Command.pod:254 msgid "patch view PATCHNAME" msgstr "patch view 補綴名稱" #. ($path) #. ($copath) -#: lib/SVK/Editor/XD.pm:174 lib/SVK/Editor/XD.pm:98 +#: lib/SVK/Editor/XD.pm:181 lib/SVK/Editor/XD.pm:99 msgid "path %1 already exists" msgstr "路徑 %1 已存在" #. ($path) -#: lib/SVK/Editor/XD.pm:107 +#: lib/SVK/Editor/XD.pm:108 msgid "path %1 does not exist" msgstr "路徑 %1 不存在。" +#. ($target->{report}) +#. ($update_target->{path}) #. ($target->path) -#. ($update_target->{path}) -#: lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Update.pm:94 +#: lib/SVK/Command/Diff.pm:120 lib/SVK/Command/Diff.pm:42 +#: lib/SVK/Command/Propset.pm:43 lib/SVK/Command/Switch.pm:40 +#: lib/SVK/Command/Update.pm:94 msgid "path %1 does not exist.\n" msgstr "路徑 %1 不存在。\n" #. ($report) #. ($copath) #. ($path) -#: lib/SVK/XD.pm:338 lib/SVK/XD.pm:341 lib/SVK/XD.pm:394 +#: lib/SVK/XD.pm:333 lib/SVK/XD.pm:336 lib/SVK/XD.pm:389 msgid "path %1 is not a checkout path.\n" msgstr "路徑 %1 不是已取出的路徑。\n" #. ($path) -#: lib/SVK/XD.pm:1432 +#: lib/SVK/XD.pm:1448 msgid "path %1 not found" msgstr "找不到路徑 %1" -#: lib/SVK/Command.pod:253 +#: lib/SVK/Command.pod:255 msgid "propdel - Delete a property on files or dirs" msgstr "propdel - 刪除檔案或目錄的屬性" -#: lib/SVK/Command.pod:254 +#: lib/SVK/Command.pod:256 msgid "propdel PROPNAME [DEPOTPATH | PATH...]" msgstr "propdel 屬性名稱 [檔案庫路徑 | 路徑...]" -#: lib/SVK/Command.pod:255 +#: lib/SVK/Command.pod:257 msgid "propedit - Edit a property on path" msgstr "propedit - 編輯某路徑的屬性" -#: lib/SVK/Command.pod:256 +#: lib/SVK/Command.pod:258 msgid "propedit PROPNAME [DEPOTPATH | PATH...]" msgstr "propedit 屬性名稱 [檔案庫路徑 | 路徑...]" @@ -1976,51 +2072,51 @@ msgid "property %1" msgstr "屬性 %1" -#: lib/SVK/Command.pod:257 +#: lib/SVK/Command.pod:259 msgid "property values; when there are multiple paths" msgstr "即使指定的路徑不止一個，也不要在每項之前顯示路徑名稱" -#: lib/SVK/Command.pod:258 +#: lib/SVK/Command.pod:260 msgid "propget - Display a property on path" msgstr "propget - 顯示某路徑的屬性" -#: lib/SVK/Command.pod:259 +#: lib/SVK/Command.pod:261 msgid "propget PROPNAME [DEPOTPATH | PATH...]" msgstr "propget 屬性名稱 [檔案庫路徑 | 路徑...]" -#: lib/SVK/Command.pod:260 +#: lib/SVK/Command.pod:262 msgid "proplist - List all properties on files or dirs" msgstr "proplist - 列出檔案或目錄的所有屬性" -#: lib/SVK/Command.pod:261 +#: lib/SVK/Command.pod:263 msgid "proplist PATH..." msgstr "proplist 路徑..." -#: lib/SVK/Command.pod:262 +#: lib/SVK/Command.pod:264 msgid "propset - Set a property on path" msgstr "propset - 設定路徑的某項屬性" -#: lib/SVK/Command.pod:263 +#: lib/SVK/Command.pod:265 msgid "propset PROPNAME PROPVAL [DEPOTPATH | PATH...]" msgstr "propset 屬性名稱 屬性值 [檔案庫路徑 | 路徑...]" -#: lib/SVK/Command.pod:264 +#: lib/SVK/Command.pod:266 msgid "pull - Bring changes from another repository" msgstr "pull - 拉取遠端檔案庫裡的更動" -#: lib/SVK/Command.pod:265 +#: lib/SVK/Command.pod:267 msgid "pull DEPOTPATH" msgstr "pull 檔案庫路徑" -#: lib/SVK/Command.pod:266 +#: lib/SVK/Command.pod:268 msgid "pull [PATH...]" msgstr "pull [路徑...]" -#: lib/SVK/Command.pod:267 +#: lib/SVK/Command.pod:269 msgid "push - Move changes into another repository" msgstr "push - 推送更動到遠端檔案庫裡" -#: lib/SVK/Command.pod:268 +#: lib/SVK/Command.pod:270 msgid "push [DEPOTPATH | PATH]" msgstr "push [檔案庫路徑 | 路徑]" @@ -2029,107 +2125,145 @@ msgstr "q)離開？" #. ($copath, $basename, $!) -#: lib/SVK/Editor/XD.pm:123 +#: lib/SVK/Editor/XD.pm:124 msgid "rename %1 to %2 failed: %3" msgstr "無法將 %1 改名成 %2：%3" -#: lib/SVK/Command.pod:269 +#: lib/SVK/Command.pod:271 msgid "resolved - Remove conflict mark from checkout items" msgstr "resolved - 移除已取出項目上的衝突標記" -#: lib/SVK/Command.pod:270 +#: lib/SVK/Command.pod:272 msgid "resolved PATH..." msgstr "resolved 路徑..." -#: lib/SVK/Command.pod:271 +#: lib/SVK/Command.pod:273 msgid "revert - Revert changes made in checkout copies" msgstr "revert - 復原對已取出的複本所作過的更動" -#: lib/SVK/Command.pod:272 +#: lib/SVK/Command.pod:274 msgid "revert PATH..." msgstr "revert 路徑..." -#: lib/SVK/Command.pod:273 +#: lib/SVK/Command.pod:275 msgid "s: Skip this file." msgstr "s: 略過這個檔案。" -#: lib/SVK/Command.pod:274 +#: lib/SVK/Command.pod:276 msgid "smerge - Automatically merge all changes between branches" msgstr "smerge - 自動合併不同分支的所有差異" -#: lib/SVK/Command.pod:275 +#: lib/SVK/Command.pod:277 msgid "smerge DEPOTPATH [PATH]" msgstr "smerge 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:276 +#: lib/SVK/Command.pod:278 msgid "smerge DEPOTPATH1 DEPOTPATH2" msgstr "smerge 檔案庫路徑1 檔案庫路徑2" -#: lib/SVK/Command.pod:277 +#: lib/SVK/Command.pod:279 msgid "smerge [--to|--from] [PATH]" msgstr "smerge [--to|--from] [路徑]" -#: lib/SVK/Editor/XD.pm:128 +#: lib/SVK/Editor/XD.pm:129 msgid "source checksum mismatch" msgstr "來源的檢查值不符" -#: lib/SVK/Command.pod:278 +#: lib/SVK/Command.pod:280 msgid "status - Display the status of items in the checkout copy" msgstr "status - 顯示已取出複本的狀態" -#: lib/SVK/Command.pod:279 +#: lib/SVK/Command.pod:281 msgid "status [PATH..]" msgstr "status [路徑..]" -#: lib/SVK/Command.pod:280 +#: lib/SVK/Command.pod:282 msgid "switch - Switch to another branch and keep local changes" msgstr "switch - 切換到另一個分支，並保留本地版本" -#: lib/SVK/Command.pod:281 +#: lib/SVK/Command.pod:283 msgid "switch DEPOTPATH [PATH]" msgstr "switch 檔案庫路徑 [路徑]" -#: lib/SVK/Command.pod:282 +#: lib/SVK/Command.pod:284 msgid "sync - Synchronize a mirrored depotpath" msgstr "sync - 同步化映射的檔案庫路徑" -#: lib/SVK/Command.pod:283 +#: lib/SVK/Command.pod:285 msgid "sync --all [DEPOTNAME...]" msgstr "sync --all [檔案庫名稱...]" -#: lib/SVK/Command.pod:284 +#: lib/SVK/Command.pod:286 msgid "sync DEPOTPATH" msgstr "sync 檔案庫路徑" -#: lib/SVK/Command.pod:285 +#: lib/SVK/Command.pod:287 msgid "t: Keep only changes to their file." msgstr "t: 僅保留對方更動，捨棄已方的更動。" -#: lib/SVK/Command/Commit.pm:365 +#: lib/SVK/Command/Commit.pm:79 +msgid "try --encoding.\n" +msgstr "用 --encoding.\n" + +#: lib/SVK/Command/Commit.pm:379 msgid "unexpected error: commit to mirrored path but no mirror object" msgstr "未預期的錯誤：送交更動至映射的路徑，但找不到映射物件" -#: lib/SVK/Command.pod:286 +#: lib/SVK/Command.pod:288 msgid "update - Bring changes from repository to checkout copies" msgstr "update - 將檔案庫裡的更動更新到取出的工作複本上" -#: lib/SVK/Command.pod:287 +#: lib/SVK/Command.pod:289 msgid "update [PATH...]" msgstr "update [路徑...]" #. ($self->{patch}) -#: lib/SVK/Command/Commit.pm:165 +#: lib/SVK/Command/Commit.pm:175 msgid "use 'svk patch regen %1' instead.\n" msgstr "請改用「svk patch regen %1」。\n" -#: lib/SVK/Command.pod:288 +#: lib/SVK/Command.pod:290 msgid "verify - Verify change signatures" msgstr "verify - 檢驗更動的簽章" -#: lib/SVK/Command.pod:289 +#: lib/SVK/Command.pod:291 msgid "verify CHANGE [DEPOTNAME]" msgstr "verify 更動 檔案庫名稱" -#: lib/SVK/Command.pod:290 +#: lib/SVK/Command.pod:292 msgid "y: Keep only changes to your file." msgstr "y: 僅保留已方更動，捨棄對方的更動。" + +#~ msgid "" +#~ "\n" +#~ "First, you need to choose a depot path to store this mirrored " +#~ "repository,\n" +#~ "usually something like //mirror/your_project/. Enter a suitable name " +#~ "below\n" +#~ "to place it under //mirror/; you may also press enter and accept the " +#~ "default.\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "首先，請為這個遠端網址取一個名稱（例如 //mirror/your_project/），作為\n" +#~ "本地端的映射檔案庫路徑。請鍵入路徑名稱（預設將置於 //mirror/ 之下），或\n" +#~ "直接按 enter 鍵，採用系統建議的路徑。\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "Next, please choose another depot path to serve as your private branch,\n" +#~ "usually something like %1your_project/. SVK will copy the mirrored path\n" +#~ "into this new path, so you can commit into it without affecting the " +#~ "remote\n" +#~ "repository. Enter a suitable name below to place it under %1; you may " +#~ "also\n" +#~ "press enter and accept the default.\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "接下來，請為你個人使用的分支取一個名稱（例如 %1your_project）。系統會\n" +#~ "將上面的映射路徑複製到新的檔案庫路徑下；如此一來，送交到這個路徑的更動就\n" +#~ "不會直接影響遠端的檔案庫。請鍵入路徑名稱（預設將置於 %1 之下），或直接\n" +#~ "按 enter 鍵，採用系統建議的路徑。\n" +#~ "\n" ==== BEGIN SVK PATCH BLOCK ==== Version: svk 0.29 (freebsd) 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 ==== END SVK PATCH BLOCK ====