Show More
| This diff has been collapsed as it changes many lines, (2012 lines changed) Show them Hide them | |||||
| @@ -5,8 +5,6 b'' | |||||
| 5 | # Copyright (C) 2009 the Mercurial team |
|
5 | # Copyright (C) 2009 the Mercurial team | |
| 6 | # Dongsheng Song <dongsheng.song@gmail.com>, 2009 |
|
6 | # Dongsheng Song <dongsheng.song@gmail.com>, 2009 | |
| 7 | # |
|
7 | # | |
| 8 | # $Id: zh_CN.po 1313 2009-06-24 02:08:02Z songdongsheng@live.cn $ |
|
|||
| 9 | # |
|
|||
| 10 | # Update with pot file: |
|
8 | # Update with pot file: | |
| 11 | # msgmerge --update zh_CN.po hg.pot |
|
9 | # msgmerge --update zh_CN.po hg.pot | |
| 12 | # msgfmt --statistics -c zh_CN.po |
|
10 | # msgfmt --statistics -c zh_CN.po | |
| @@ -50,8 +48,8 b' msgid ""' | |||||
| 50 | msgstr "" |
|
48 | msgstr "" | |
| 51 | "Project-Id-Version: Mercurial 1.3\n" |
|
49 | "Project-Id-Version: Mercurial 1.3\n" | |
| 52 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
50 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
| 53 |
"POT-Creation-Date: 2009-10- |
|
51 | "POT-Creation-Date: 2009-10-19 11:47+0800\n" | |
| 54 |
"PO-Revision-Date: 2009- |
|
52 | "PO-Revision-Date: 2009-03-31 20:38+0200\n" | |
| 55 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" |
|
53 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" | |
| 56 | "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" |
|
54 | "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" | |
| 57 | "MIME-Version: 1.0\n" |
|
55 | "MIME-Version: 1.0\n" | |
| @@ -71,11 +69,12 b' msgstr "\xe9\x80\x89\xe9\xa1\xb9"' | |||||
| 71 | msgid "COMMANDS" |
|
69 | msgid "COMMANDS" | |
| 72 | msgstr "命令" |
|
70 | msgstr "命令" | |
| 73 |
|
71 | |||
| 74 | #, fuzzy |
|
|||
| 75 | msgid "" |
|
72 | msgid "" | |
| 76 | " options:\n" |
|
73 | " options:\n" | |
| 77 | "\n" |
|
74 | "\n" | |
| 78 |
msgstr " |
|
75 | msgstr "" | |
|
|
76 | " 选项:\n" | |||
|
|
77 | "\n" | |||
| 79 |
|
78 | |||
| 80 | #, python-format |
|
79 | #, python-format | |
| 81 | msgid "" |
|
80 | msgid "" | |
| @@ -86,634 +85,6 b' msgstr ""' | |||||
| 86 | "\n" |
|
85 | "\n" | |
| 87 |
|
86 | |||
| 88 | msgid "" |
|
87 | msgid "" | |
| 89 | "Some commands allow the user to specify a date, e.g.:\n" |
|
|||
| 90 | "\n" |
|
|||
| 91 | "- backout, commit, import, tag: Specify the commit date.\n" |
|
|||
| 92 | "- log, revert, update: Select revision(s) by date.\n" |
|
|||
| 93 | "\n" |
|
|||
| 94 | "Many date formats are valid. Here are some examples::\n" |
|
|||
| 95 | "\n" |
|
|||
| 96 | " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" |
|
|||
| 97 | " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" |
|
|||
| 98 | " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" |
|
|||
| 99 | " \"Dec 6\" (midnight)\n" |
|
|||
| 100 | " \"13:18\" (today assumed)\n" |
|
|||
| 101 | " \"3:39\" (3:39AM assumed)\n" |
|
|||
| 102 | " \"3:39pm\" (15:39)\n" |
|
|||
| 103 | " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" |
|
|||
| 104 | " \"2006-12-6 13:18\"\n" |
|
|||
| 105 | " \"2006-12-6\"\n" |
|
|||
| 106 | " \"12-6\"\n" |
|
|||
| 107 | " \"12/6\"\n" |
|
|||
| 108 | " \"12/6/6\" (Dec 6 2006)\n" |
|
|||
| 109 | "\n" |
|
|||
| 110 | "Lastly, there is Mercurial's internal format::\n" |
|
|||
| 111 | "\n" |
|
|||
| 112 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" |
|
|||
| 113 | "\n" |
|
|||
| 114 | "This is the internal representation format for dates. unixtime is the\n" |
|
|||
| 115 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" |
|
|||
| 116 | "the offset of the local timezone, in seconds west of UTC (negative if\n" |
|
|||
| 117 | "the timezone is east of UTC).\n" |
|
|||
| 118 | "\n" |
|
|||
| 119 | "The log command also accepts date ranges::\n" |
|
|||
| 120 | "\n" |
|
|||
| 121 | " \"<{datetime}\" - at or before a given date/time\n" |
|
|||
| 122 | " \">{datetime}\" - on or after a given date/time\n" |
|
|||
| 123 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" |
|
|||
| 124 | " \"-{days}\" - within a given number of days of today\n" |
|
|||
| 125 | msgstr "" |
|
|||
| 126 |
|
||||
| 127 | #, fuzzy |
|
|||
| 128 | msgid "" |
|
|||
| 129 | "Mercurial's default format for showing changes between two versions of\n" |
|
|||
| 130 | "a file is compatible with the unified format of GNU diff, which can be\n" |
|
|||
| 131 | "used by GNU patch and many other standard tools.\n" |
|
|||
| 132 | "\n" |
|
|||
| 133 | "While this standard format is often enough, it does not encode the\n" |
|
|||
| 134 | "following information:\n" |
|
|||
| 135 | "\n" |
|
|||
| 136 | "- executable status and other permission bits\n" |
|
|||
| 137 | "- copy or rename information\n" |
|
|||
| 138 | "- changes in binary files\n" |
|
|||
| 139 | "- creation or deletion of empty files\n" |
|
|||
| 140 | "\n" |
|
|||
| 141 | "Mercurial also supports the extended diff format from the git VCS\n" |
|
|||
| 142 | "which addresses these limitations. The git diff format is not produced\n" |
|
|||
| 143 | "by default because a few widespread tools still do not understand this\n" |
|
|||
| 144 | "format.\n" |
|
|||
| 145 | "\n" |
|
|||
| 146 | "This means that when generating diffs from a Mercurial repository\n" |
|
|||
| 147 | "(e.g. with \"hg export\"), you should be careful about things like file\n" |
|
|||
| 148 | "copies and renames or other things mentioned above, because when\n" |
|
|||
| 149 | "applying a standard diff to a different repository, this extra\n" |
|
|||
| 150 | "information is lost. Mercurial's internal operations (like push and\n" |
|
|||
| 151 | "pull) are not affected by this, because they use an internal binary\n" |
|
|||
| 152 | "format for communicating changes.\n" |
|
|||
| 153 | "\n" |
|
|||
| 154 | "To make Mercurial produce the git extended diff format, use the --git\n" |
|
|||
| 155 | "option available for many commands, or set 'git = True' in the [diff]\n" |
|
|||
| 156 | "section of your hgrc. You do not need to set this option when\n" |
|
|||
| 157 | "importing diffs in this format or using them in the mq extension.\n" |
|
|||
| 158 | msgstr "" |
|
|||
| 159 | "\n" |
|
|||
| 160 | " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" |
|
|||
| 161 | " GNU patch 和许多标准工具。\n" |
|
|||
| 162 | "\n" |
|
|||
| 163 | " 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" |
|
|||
| 164 | "\n" |
|
|||
| 165 | " - 可执行状态和其它权限位\n" |
|
|||
| 166 | " - 复制或改名信息\n" |
|
|||
| 167 | " - 二进制文件的修改\n" |
|
|||
| 168 | " - 创建或删除空文件\n" |
|
|||
| 169 | "\n" |
|
|||
| 170 | " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" |
|
|||
| 171 | " 此格式，所以它不是默认格式。\n" |
|
|||
| 172 | "\n" |
|
|||
| 173 | " 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用" |
|
|||
| 174 | "标\n" |
|
|||
| 175 | " 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" |
|
|||
| 176 | " 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" |
|
|||
| 177 | " 响。\n" |
|
|||
| 178 | "\n" |
|
|||
| 179 | " 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" |
|
|||
| 180 | " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" |
|
|||
| 181 | " 或在 mq 扩展中使用时，不需要设置此选项。\n" |
|
|||
| 182 | " " |
|
|||
| 183 |
|
||||
| 184 | msgid "" |
|
|||
| 185 | "HG\n" |
|
|||
| 186 | " Path to the 'hg' executable, automatically passed when running\n" |
|
|||
| 187 | " hooks, extensions or external tools. If unset or empty, this is\n" |
|
|||
| 188 | " the hg executable's name if it's frozen, or an executable named\n" |
|
|||
| 189 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" |
|
|||
| 190 | " Windows) is searched.\n" |
|
|||
| 191 | "\n" |
|
|||
| 192 | "HGEDITOR\n" |
|
|||
| 193 | " This is the name of the editor to run when committing. See EDITOR.\n" |
|
|||
| 194 | "\n" |
|
|||
| 195 | " (deprecated, use .hgrc)\n" |
|
|||
| 196 | "\n" |
|
|||
| 197 | "HGENCODING\n" |
|
|||
| 198 | " This overrides the default locale setting detected by Mercurial.\n" |
|
|||
| 199 | " This setting is used to convert data including usernames,\n" |
|
|||
| 200 | " changeset descriptions, tag names, and branches. This setting can\n" |
|
|||
| 201 | " be overridden with the --encoding command-line option.\n" |
|
|||
| 202 | "\n" |
|
|||
| 203 | "HGENCODINGMODE\n" |
|
|||
| 204 | " This sets Mercurial's behavior for handling unknown characters\n" |
|
|||
| 205 | " while transcoding user input. The default is \"strict\", which\n" |
|
|||
| 206 | " causes Mercurial to abort if it can't map a character. Other\n" |
|
|||
| 207 | " settings include \"replace\", which replaces unknown characters, and\n" |
|
|||
| 208 | " \"ignore\", which drops them. This setting can be overridden with\n" |
|
|||
| 209 | " the --encodingmode command-line option.\n" |
|
|||
| 210 | "\n" |
|
|||
| 211 | "HGMERGE\n" |
|
|||
| 212 | " An executable to use for resolving merge conflicts. The program\n" |
|
|||
| 213 | " will be executed with three arguments: local file, remote file,\n" |
|
|||
| 214 | " ancestor file.\n" |
|
|||
| 215 | "\n" |
|
|||
| 216 | " (deprecated, use .hgrc)\n" |
|
|||
| 217 | "\n" |
|
|||
| 218 | "HGRCPATH\n" |
|
|||
| 219 | " A list of files or directories to search for hgrc files. Item\n" |
|
|||
| 220 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" |
|
|||
| 221 | " platform default search path is used. If empty, only the .hg/hgrc\n" |
|
|||
| 222 | " from the current repository is read.\n" |
|
|||
| 223 | "\n" |
|
|||
| 224 | " For each element in HGRCPATH:\n" |
|
|||
| 225 | "\n" |
|
|||
| 226 | " - if it's a directory, all files ending with .rc are added\n" |
|
|||
| 227 | " - otherwise, the file itself will be added\n" |
|
|||
| 228 | "\n" |
|
|||
| 229 | "HGUSER\n" |
|
|||
| 230 | " This is the string used as the author of a commit. If not set,\n" |
|
|||
| 231 | " available values will be considered in this order:\n" |
|
|||
| 232 | "\n" |
|
|||
| 233 | " - HGUSER (deprecated)\n" |
|
|||
| 234 | " - hgrc files from the HGRCPATH\n" |
|
|||
| 235 | " - EMAIL\n" |
|
|||
| 236 | " - interactive prompt\n" |
|
|||
| 237 | " - LOGNAME (with '@hostname' appended)\n" |
|
|||
| 238 | "\n" |
|
|||
| 239 | " (deprecated, use .hgrc)\n" |
|
|||
| 240 | "\n" |
|
|||
| 241 | "EMAIL\n" |
|
|||
| 242 | " May be used as the author of a commit; see HGUSER.\n" |
|
|||
| 243 | "\n" |
|
|||
| 244 | "LOGNAME\n" |
|
|||
| 245 | " May be used as the author of a commit; see HGUSER.\n" |
|
|||
| 246 | "\n" |
|
|||
| 247 | "VISUAL\n" |
|
|||
| 248 | " This is the name of the editor to use when committing. See EDITOR.\n" |
|
|||
| 249 | "\n" |
|
|||
| 250 | "EDITOR\n" |
|
|||
| 251 | " Sometimes Mercurial needs to open a text file in an editor for a\n" |
|
|||
| 252 | " user to modify, for example when writing commit messages. The\n" |
|
|||
| 253 | " editor it uses is determined by looking at the environment\n" |
|
|||
| 254 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" |
|
|||
| 255 | " non-empty one is chosen. If all of them are empty, the editor\n" |
|
|||
| 256 | " defaults to 'vi'.\n" |
|
|||
| 257 | "\n" |
|
|||
| 258 | "PYTHONPATH\n" |
|
|||
| 259 | " This is used by Python to find imported modules and may need to be\n" |
|
|||
| 260 | " set appropriately if this Mercurial is not installed system-wide.\n" |
|
|||
| 261 | msgstr "" |
|
|||
| 262 |
|
||||
| 263 | msgid "" |
|
|||
| 264 | "Mercurial has the ability to add new features through the use of\n" |
|
|||
| 265 | "extensions. Extensions may add new commands, add options to\n" |
|
|||
| 266 | "existing commands, change the default behavior of commands, or\n" |
|
|||
| 267 | "implement hooks.\n" |
|
|||
| 268 | "\n" |
|
|||
| 269 | "Extensions are not loaded by default for a variety of reasons:\n" |
|
|||
| 270 | "they can increase startup overhead; they may be meant for advanced\n" |
|
|||
| 271 | "usage only; they may provide potentially dangerous abilities (such\n" |
|
|||
| 272 | "as letting you destroy or modify history); they might not be ready\n" |
|
|||
| 273 | "for prime time; or they may alter some usual behaviors of stock\n" |
|
|||
| 274 | "Mercurial. It is thus up to the user to activate extensions as\n" |
|
|||
| 275 | "needed.\n" |
|
|||
| 276 | "\n" |
|
|||
| 277 | "To enable the \"foo\" extension, either shipped with Mercurial or in\n" |
|
|||
| 278 | "the Python search path, create an entry for it in your hgrc, like\n" |
|
|||
| 279 | "this::\n" |
|
|||
| 280 | "\n" |
|
|||
| 281 | " [extensions]\n" |
|
|||
| 282 | " foo =\n" |
|
|||
| 283 | "\n" |
|
|||
| 284 | "You may also specify the full path to an extension::\n" |
|
|||
| 285 | "\n" |
|
|||
| 286 | " [extensions]\n" |
|
|||
| 287 | " myfeature = ~/.hgext/myfeature.py\n" |
|
|||
| 288 | "\n" |
|
|||
| 289 | "To explicitly disable an extension enabled in an hgrc of broader\n" |
|
|||
| 290 | "scope, prepend its path with !::\n" |
|
|||
| 291 | "\n" |
|
|||
| 292 | " [extensions]\n" |
|
|||
| 293 | " # disabling extension bar residing in /path/to/extension/bar.py\n" |
|
|||
| 294 | " hgext.bar = !/path/to/extension/bar.py\n" |
|
|||
| 295 | " # ditto, but no path was supplied for extension baz\n" |
|
|||
| 296 | " hgext.baz = !\n" |
|
|||
| 297 | msgstr "" |
|
|||
| 298 |
|
||||
| 299 | #, fuzzy |
|
|||
| 300 | msgid "" |
|
|||
| 301 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
|||
| 302 | "individually, or provided as a topologically continuous range,\n" |
|
|||
| 303 | "separated by the \":\" character.\n" |
|
|||
| 304 | "\n" |
|
|||
| 305 | "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" |
|
|||
| 306 | "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" |
|
|||
| 307 | "specified, it defaults to revision number 0. If END is not specified,\n" |
|
|||
| 308 | "it defaults to the tip. The range \":\" thus means \"all revisions\".\n" |
|
|||
| 309 | "\n" |
|
|||
| 310 | "If BEGIN is greater than END, revisions are treated in reverse order.\n" |
|
|||
| 311 | "\n" |
|
|||
| 312 | "A range acts as a closed interval. This means that a range of 3:5\n" |
|
|||
| 313 | "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" |
|
|||
| 314 | msgstr "" |
|
|||
| 315 | "\n" |
|
|||
| 316 | " 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" |
|
|||
| 317 | " 范围格式提供。\n" |
|
|||
| 318 | "\n" |
|
|||
| 319 | " 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" |
|
|||
| 320 | " 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" |
|
|||
| 321 | "\"\n" |
|
|||
| 322 | " 意味着全部版本。\n" |
|
|||
| 323 | "\n" |
|
|||
| 324 | " 如果 'BEGIN' 大于 'END'，版本视为反序。\n" |
|
|||
| 325 | "\n" |
|
|||
| 326 | " 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n" |
|
|||
| 327 | " '8'，'7' 和 '6'。\n" |
|
|||
| 328 | " " |
|
|||
| 329 |
|
||||
| 330 | msgid "" |
|
|||
| 331 | "Mercurial accepts several notations for identifying one or more files\n" |
|
|||
| 332 | "at a time.\n" |
|
|||
| 333 | "\n" |
|
|||
| 334 | "By default, Mercurial treats filenames as shell-style extended glob\n" |
|
|||
| 335 | "patterns.\n" |
|
|||
| 336 | "\n" |
|
|||
| 337 | "Alternate pattern notations must be specified explicitly.\n" |
|
|||
| 338 | "\n" |
|
|||
| 339 | "To use a plain path name without any pattern matching, start it with\n" |
|
|||
| 340 | "``path:``. These path names must completely match starting at the\n" |
|
|||
| 341 | "current repository root.\n" |
|
|||
| 342 | "\n" |
|
|||
| 343 | "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" |
|
|||
| 344 | "at the current directory; a glob such as ``*.c`` will only match files\n" |
|
|||
| 345 | "in the current directory ending with ``.c``.\n" |
|
|||
| 346 | "\n" |
|
|||
| 347 | "The supported glob syntax extensions are ``**`` to match any string\n" |
|
|||
| 348 | "across path separators and ``{a,b}`` to mean \"a or b\".\n" |
|
|||
| 349 | "\n" |
|
|||
| 350 | "To use a Perl/Python regular expression, start a name with ``re:``.\n" |
|
|||
| 351 | "Regexp pattern matching is anchored at the root of the repository.\n" |
|
|||
| 352 | "\n" |
|
|||
| 353 | "Plain examples::\n" |
|
|||
| 354 | "\n" |
|
|||
| 355 | " path:foo/bar a name bar in a directory named foo in the root\n" |
|
|||
| 356 | " of the repository\n" |
|
|||
| 357 | " path:path:name a file or directory named \"path:name\"\n" |
|
|||
| 358 | "\n" |
|
|||
| 359 | "Glob examples::\n" |
|
|||
| 360 | "\n" |
|
|||
| 361 | " glob:*.c any name ending in \".c\" in the current directory\n" |
|
|||
| 362 | " *.c any name ending in \".c\" in the current directory\n" |
|
|||
| 363 | " **.c any name ending in \".c\" in any subdirectory of the\n" |
|
|||
| 364 | " current directory including itself.\n" |
|
|||
| 365 | " foo/*.c any name ending in \".c\" in the directory foo\n" |
|
|||
| 366 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" |
|
|||
| 367 | " including itself.\n" |
|
|||
| 368 | "\n" |
|
|||
| 369 | "Regexp examples::\n" |
|
|||
| 370 | "\n" |
|
|||
| 371 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" |
|
|||
| 372 | msgstr "" |
|
|||
| 373 |
|
||||
| 374 | msgid "" |
|
|||
| 375 | "Mercurial supports several ways to specify individual revisions.\n" |
|
|||
| 376 | "\n" |
|
|||
| 377 | "A plain integer is treated as a revision number. Negative integers are\n" |
|
|||
| 378 | "treated as sequential offsets from the tip, with -1 denoting the tip,\n" |
|
|||
| 379 | "-2 denoting the revision prior to the tip, and so forth.\n" |
|
|||
| 380 | "\n" |
|
|||
| 381 | "A 40-digit hexadecimal string is treated as a unique revision\n" |
|
|||
| 382 | "identifier.\n" |
|
|||
| 383 | "\n" |
|
|||
| 384 | "A hexadecimal string less than 40 characters long is treated as a\n" |
|
|||
| 385 | "unique revision identifier and is referred to as a short-form\n" |
|
|||
| 386 | "identifier. A short-form identifier is only valid if it is the prefix\n" |
|
|||
| 387 | "of exactly one full-length identifier.\n" |
|
|||
| 388 | "\n" |
|
|||
| 389 | "Any other string is treated as a tag or branch name. A tag name is a\n" |
|
|||
| 390 | "symbolic name associated with a revision identifier. A branch name\n" |
|
|||
| 391 | "denotes the tipmost revision of that branch. Tag and branch names must\n" |
|
|||
| 392 | "not contain the \":\" character.\n" |
|
|||
| 393 | "\n" |
|
|||
| 394 | "The reserved name \"tip\" is a special tag that always identifies the\n" |
|
|||
| 395 | "most recent revision.\n" |
|
|||
| 396 | "\n" |
|
|||
| 397 | "The reserved name \"null\" indicates the null revision. This is the\n" |
|
|||
| 398 | "revision of an empty repository, and the parent of revision 0.\n" |
|
|||
| 399 | "\n" |
|
|||
| 400 | "The reserved name \".\" indicates the working directory parent. If no\n" |
|
|||
| 401 | "working directory is checked out, it is equivalent to null. If an\n" |
|
|||
| 402 | "uncommitted merge is in progress, \".\" is the revision of the first\n" |
|
|||
| 403 | "parent.\n" |
|
|||
| 404 | msgstr "" |
|
|||
| 405 |
|
||||
| 406 | #, fuzzy |
|
|||
| 407 | msgid "" |
|
|||
| 408 | "Mercurial allows you to customize output of commands through\n" |
|
|||
| 409 | "templates. You can either pass in a template from the command\n" |
|
|||
| 410 | "line, via the --template option, or select an existing\n" |
|
|||
| 411 | "template-style (--style).\n" |
|
|||
| 412 | "\n" |
|
|||
| 413 | "You can customize output for any \"log-like\" command: log,\n" |
|
|||
| 414 | "outgoing, incoming, tip, parents, heads and glog.\n" |
|
|||
| 415 | "\n" |
|
|||
| 416 | "Three styles are packaged with Mercurial: default (the style used\n" |
|
|||
| 417 | "when no explicit preference is passed), compact and changelog.\n" |
|
|||
| 418 | "Usage::\n" |
|
|||
| 419 | "\n" |
|
|||
| 420 | " $ hg log -r1 --style changelog\n" |
|
|||
| 421 | "\n" |
|
|||
| 422 | "A template is a piece of text, with markup to invoke variable\n" |
|
|||
| 423 | "expansion::\n" |
|
|||
| 424 | "\n" |
|
|||
| 425 | " $ hg log -r1 --template \"{node}\\n\"\n" |
|
|||
| 426 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
|
|||
| 427 | "\n" |
|
|||
| 428 | "Strings in curly braces are called keywords. The availability of\n" |
|
|||
| 429 | "keywords depends on the exact context of the templater. These\n" |
|
|||
| 430 | "keywords are usually available for templating a log-like command:\n" |
|
|||
| 431 | "\n" |
|
|||
| 432 | ":author: String. The unmodified author of the changeset.\n" |
|
|||
| 433 | ":branches: String. The name of the branch on which the changeset\n" |
|
|||
| 434 | " was committed. Will be empty if the branch name was\n" |
|
|||
| 435 | " default.\n" |
|
|||
| 436 | ":date: Date information. The date when the changeset was\n" |
|
|||
| 437 | " committed.\n" |
|
|||
| 438 | ":desc: String. The text of the changeset description.\n" |
|
|||
| 439 | ":diffstat: String. Statistics of changes with the following\n" |
|
|||
| 440 | " format: \"modified files: +added/-removed lines\"\n" |
|
|||
| 441 | ":files: List of strings. All files modified, added, or removed\n" |
|
|||
| 442 | " by this changeset.\n" |
|
|||
| 443 | ":file_adds: List of strings. Files added by this changeset.\n" |
|
|||
| 444 | ":file_mods: List of strings. Files modified by this changeset.\n" |
|
|||
| 445 | ":file_dels: List of strings. Files removed by this changeset.\n" |
|
|||
| 446 | ":node: String. The changeset identification hash, as a\n" |
|
|||
| 447 | " 40-character hexadecimal string.\n" |
|
|||
| 448 | ":parents: List of strings. The parents of the changeset.\n" |
|
|||
| 449 | ":rev: Integer. The repository-local changeset revision\n" |
|
|||
| 450 | " number.\n" |
|
|||
| 451 | ":tags: List of strings. Any tags associated with the\n" |
|
|||
| 452 | " changeset.\n" |
|
|||
| 453 | ":latesttag: String. Most recent global tag in the ancestors of this\n" |
|
|||
| 454 | " changeset.\n" |
|
|||
| 455 | ":latesttagdistance: Integer. Longest path to the latest tag.\n" |
|
|||
| 456 | "\n" |
|
|||
| 457 | "The \"date\" keyword does not produce human-readable output. If you\n" |
|
|||
| 458 | "want to use a date in your output, you can use a filter to process\n" |
|
|||
| 459 | "it. Filters are functions which return a string based on the input\n" |
|
|||
| 460 | "variable. You can also use a chain of filters to get the desired\n" |
|
|||
| 461 | "output::\n" |
|
|||
| 462 | "\n" |
|
|||
| 463 | " $ hg tip --template \"{date|isodate}\\n\"\n" |
|
|||
| 464 | " 2008-08-21 18:22 +0000\n" |
|
|||
| 465 | "\n" |
|
|||
| 466 | "List of filters:\n" |
|
|||
| 467 | "\n" |
|
|||
| 468 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" |
|
|||
| 469 | " every line except the last.\n" |
|
|||
| 470 | ":age: Date. Returns a human-readable date/time difference\n" |
|
|||
| 471 | " between the given date/time and the current\n" |
|
|||
| 472 | " date/time.\n" |
|
|||
| 473 | ":basename: Any text. Treats the text as a path, and returns the\n" |
|
|||
| 474 | " last component of the path after splitting by the\n" |
|
|||
| 475 | " path separator (ignoring trailing separators). For\n" |
|
|||
| 476 | " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" |
|
|||
| 477 | " becomes \"bar\".\n" |
|
|||
| 478 | ":stripdir: Treat the text as path and strip a directory level,\n" |
|
|||
| 479 | " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" |
|
|||
| 480 | " \"foo\".\n" |
|
|||
| 481 | ":date: Date. Returns a date in a Unix date format, including\n" |
|
|||
| 482 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
|
|||
| 483 | ":domain: Any text. Finds the first string that looks like an\n" |
|
|||
| 484 | " email address, and extracts just the domain\n" |
|
|||
| 485 | " component. Example: 'User <user@example.com>' becomes\n" |
|
|||
| 486 | " 'example.com'.\n" |
|
|||
| 487 | ":email: Any text. Extracts the first string that looks like\n" |
|
|||
| 488 | " an email address. Example: 'User <user@example.com>'\n" |
|
|||
| 489 | " becomes 'user@example.com'.\n" |
|
|||
| 490 | ":escape: Any text. Replaces the special XML/XHTML characters\n" |
|
|||
| 491 | " \"&\", \"<\" and \">\" with XML entities.\n" |
|
|||
| 492 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" |
|
|||
| 493 | ":fill76: Any text. Wraps the text to fit in 76 columns.\n" |
|
|||
| 494 | ":firstline: Any text. Returns the first line of text.\n" |
|
|||
| 495 | ":nonempty: Any text. Returns '(none)' if the string is empty.\n" |
|
|||
| 496 | ":hgdate: Date. Returns the date as a pair of numbers:\n" |
|
|||
| 497 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" |
|
|||
| 498 | ":isodate: Date. Returns the date in ISO 8601 format:\n" |
|
|||
| 499 | " \"2009-08-18 13:00 +0200\".\n" |
|
|||
| 500 | ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" |
|
|||
| 501 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" |
|
|||
| 502 | " rfc3339date filter.\n" |
|
|||
| 503 | ":localdate: Date. Converts a date to local date.\n" |
|
|||
| 504 | ":obfuscate: Any text. Returns the input text rendered as a\n" |
|
|||
| 505 | " sequence of XML entities.\n" |
|
|||
| 506 | ":person: Any text. Returns the text before an email address.\n" |
|
|||
| 507 | ":rfc822date: Date. Returns a date using the same format used in\n" |
|
|||
| 508 | " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" |
|
|||
| 509 | ":rfc3339date: Date. Returns a date using the Internet date format\n" |
|
|||
| 510 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" |
|
|||
| 511 | ":short: Changeset hash. Returns the short form of a changeset\n" |
|
|||
| 512 | " hash, i.e. a 12-byte hexadecimal string.\n" |
|
|||
| 513 | ":shortdate: Date. Returns a date like \"2006-09-18\".\n" |
|
|||
| 514 | ":strip: Any text. Strips all leading and trailing whitespace.\n" |
|
|||
| 515 | ":tabindent: Any text. Returns the text, with every line except\n" |
|
|||
| 516 | " the first starting with a tab character.\n" |
|
|||
| 517 | ":urlescape: Any text. Escapes all \"special\" characters. For\n" |
|
|||
| 518 | " example, \"foo bar\" becomes \"foo%20bar\".\n" |
|
|||
| 519 | ":user: Any text. Returns the user portion of an email\n" |
|
|||
| 520 | " address.\n" |
|
|||
| 521 | msgstr "" |
|
|||
| 522 | "\n" |
|
|||
| 523 | " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" |
|
|||
| 524 | " 来使用模版，或者选择已有的模版样式(--style)。\n" |
|
|||
| 525 | "\n" |
|
|||
| 526 | " 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" |
|
|||
| 527 | " tip，parents，heads 和 glog。\n" |
|
|||
| 528 | "\n" |
|
|||
| 529 | " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" |
|
|||
| 530 | "\n" |
|
|||
| 531 | " $ hg log -r1 --style changelog\n" |
|
|||
| 532 | "\n" |
|
|||
| 533 | " 模版是文本片断，其中的标记用于变量扩展:\n" |
|
|||
| 534 | "\n" |
|
|||
| 535 | " $ hg log -r1 --template \"{node}\\n\"\n" |
|
|||
| 536 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
|
|||
| 537 | "\n" |
|
|||
| 538 | " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" |
|
|||
| 539 | " 可用于输出与日志信息类似的命令:\n" |
|
|||
| 540 | "\n" |
|
|||
| 541 | " - author: 字符串。修改集的作者。\n" |
|
|||
| 542 | " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" |
|
|||
| 543 | " - date: 日期信息。修改集的日期。\n" |
|
|||
| 544 | " - desc: 字符串。修改集的描述。\n" |
|
|||
| 545 | " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" |
|
|||
| 546 | " - file_adds: 字符串列表。修改集中被增加的文件。\n" |
|
|||
| 547 | " - file_mods: 字符串列表。修改集中被修改的文件\n" |
|
|||
| 548 | " - file_dels: 字符串列表。修改集中被删除的文件\n" |
|
|||
| 549 | " - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" |
|
|||
| 550 | " - parents: 字符串列表。修改集的父亲。\n" |
|
|||
| 551 | " - rev: 整数。本地版本库的修改集的版本号。\n" |
|
|||
| 552 | " - tags: 字符串列表。修改集的标签。\n" |
|
|||
| 553 | "\n" |
|
|||
| 554 | " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使" |
|
|||
| 555 | "用\n" |
|
|||
| 556 | " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" |
|
|||
| 557 | " 链来产生理想的输出:\n" |
|
|||
| 558 | "\n" |
|
|||
| 559 | " $ hg tip --template \"{date|isodate}\\n\"\n" |
|
|||
| 560 | " 2008-08-21 18:22 +0000\n" |
|
|||
| 561 | "\n" |
|
|||
| 562 | " 过滤器列表:\n" |
|
|||
| 563 | "\n" |
|
|||
| 564 | " - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" |
|
|||
| 565 | " \"<br />\"。\n" |
|
|||
| 566 | " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n" |
|
|||
| 567 | " - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n" |
|
|||
| 568 | " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz" |
|
|||
| 569 | "\"，\n" |
|
|||
| 570 | " \"foo/bar//\" 成为 \"bar\"。\n" |
|
|||
| 571 | " - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n" |
|
|||
| 572 | " \"Mon Sep 04 15:13:13 2006 0700\"。\n" |
|
|||
| 573 | " - domain: 输入任意文本。找到第一个 email 地址，返回其域名。例如: \n" |
|
|||
| 574 | " 'User <user@example.com>' 成为 'example.com'。\n" |
|
|||
| 575 | " - email: 输入任意文本。返回第一个 email 地址。例如: \n" |
|
|||
| 576 | " 'User <user@example.com>' 成为 'user@example.com'。\n" |
|
|||
| 577 | " - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n" |
|
|||
| 578 | " \"<\" 和 \">\"。\n" |
|
|||
| 579 | " - fill68: 输入任意文本。格式化为 68 列文本。\n" |
|
|||
| 580 | " - fill76: 输入任意文本。格式化为 76 列文本。\n" |
|
|||
| 581 | " - firstline: 输入任意文本。返回首行。\n" |
|
|||
| 582 | " - hgdate: 输入日期。返回一对数字:\n" |
|
|||
| 583 | " \"1157407993 25200\" (Unix 时戳，时区偏移)。\n" |
|
|||
| 584 | " - isodate: 输入日期。返回 ISO 8601 格式的日期。\n" |
|
|||
| 585 | " - obfuscate: 输入任意文本。返回其 XML 实体序列。\n" |
|
|||
| 586 | " - person: 输入任意文本。返回 email 地址前的文本。\n" |
|
|||
| 587 | " - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n" |
|
|||
| 588 | " - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n" |
|
|||
| 589 | " 字符串。\n" |
|
|||
| 590 | " - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n" |
|
|||
| 591 | " - strip: 输入任意文本。删除全部行首与行尾空白。\n" |
|
|||
| 592 | " - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n" |
|
|||
| 593 | " - urlescape: 输入任意文本。封装全部特殊字符。例如\n" |
|
|||
| 594 | " \"foo bar\" 成为 \"foo%20bar\"。\n" |
|
|||
| 595 | " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" |
|
|||
| 596 | " " |
|
|||
| 597 |
|
||||
| 598 | #, fuzzy |
|
|||
| 599 | msgid "" |
|
|||
| 600 | "Valid URLs are of the form::\n" |
|
|||
| 601 | "\n" |
|
|||
| 602 | " local/filesystem/path[#revision]\n" |
|
|||
| 603 | " file://local/filesystem/path[#revision]\n" |
|
|||
| 604 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
|||
| 605 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
|||
| 606 | " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" |
|
|||
| 607 | "\n" |
|
|||
| 608 | "Paths in the local filesystem can either point to Mercurial\n" |
|
|||
| 609 | "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" |
|
|||
| 610 | "incoming --bundle').\n" |
|
|||
| 611 | "\n" |
|
|||
| 612 | "An optional identifier after # indicates a particular branch, tag, or\n" |
|
|||
| 613 | "changeset to use from the remote repository. See also 'hg help\n" |
|
|||
| 614 | "revisions'.\n" |
|
|||
| 615 | "\n" |
|
|||
| 616 | "Some features, such as pushing to http:// and https:// URLs are only\n" |
|
|||
| 617 | "possible if the feature is explicitly enabled on the remote Mercurial\n" |
|
|||
| 618 | "server.\n" |
|
|||
| 619 | "\n" |
|
|||
| 620 | "Some notes about using SSH with Mercurial:\n" |
|
|||
| 621 | "\n" |
|
|||
| 622 | "- SSH requires an accessible shell account on the destination machine\n" |
|
|||
| 623 | " and a copy of hg in the remote path or specified with as remotecmd.\n" |
|
|||
| 624 | "- path is relative to the remote user's home directory by default. Use\n" |
|
|||
| 625 | " an extra slash at the start of a path to specify an absolute path::\n" |
|
|||
| 626 | "\n" |
|
|||
| 627 | " ssh://example.com//tmp/repository\n" |
|
|||
| 628 | "\n" |
|
|||
| 629 | "- Mercurial doesn't use its own compression via SSH; the right thing\n" |
|
|||
| 630 | " to do is to configure it in your ~/.ssh/config, e.g.::\n" |
|
|||
| 631 | "\n" |
|
|||
| 632 | " Host *.mylocalnetwork.example.com\n" |
|
|||
| 633 | " Compression no\n" |
|
|||
| 634 | " Host *\n" |
|
|||
| 635 | " Compression yes\n" |
|
|||
| 636 | "\n" |
|
|||
| 637 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" |
|
|||
| 638 | " with the --ssh command line option.\n" |
|
|||
| 639 | "\n" |
|
|||
| 640 | "These URLs can all be stored in your hgrc with path aliases under the\n" |
|
|||
| 641 | "[paths] section like so::\n" |
|
|||
| 642 | "\n" |
|
|||
| 643 | " [paths]\n" |
|
|||
| 644 | " alias1 = URL1\n" |
|
|||
| 645 | " alias2 = URL2\n" |
|
|||
| 646 | " ...\n" |
|
|||
| 647 | "\n" |
|
|||
| 648 | "You can then use the alias for any command that uses a URL (for\n" |
|
|||
| 649 | "example 'hg pull alias1' would pull from the 'alias1' path).\n" |
|
|||
| 650 | "\n" |
|
|||
| 651 | "Two path aliases are special because they are used as defaults when\n" |
|
|||
| 652 | "you do not provide the URL to a command:\n" |
|
|||
| 653 | "\n" |
|
|||
| 654 | "default:\n" |
|
|||
| 655 | " When you create a repository with hg clone, the clone command saves\n" |
|
|||
| 656 | " the location of the source repository as the new repository's\n" |
|
|||
| 657 | " 'default' path. This is then used when you omit path from push- and\n" |
|
|||
| 658 | " pull-like commands (including incoming and outgoing).\n" |
|
|||
| 659 | "\n" |
|
|||
| 660 | "default-push:\n" |
|
|||
| 661 | " The push command will look for a path named 'default-push', and\n" |
|
|||
| 662 | " prefer it over 'default' if both are defined.\n" |
|
|||
| 663 | msgstr "" |
|
|||
| 664 | "\n" |
|
|||
| 665 | " 有效的位置格式:\n" |
|
|||
| 666 | "\n" |
|
|||
| 667 | " local/filesystem/path (or file://local/filesystem/path)\n" |
|
|||
| 668 | " http://[user[:pass]@]host[:port]/[path]\n" |
|
|||
| 669 | " https://[user[:pass]@]host[:port]/[path]\n" |
|
|||
| 670 | " ssh://[user[:pass]@]host[:port]/[path]\n" |
|
|||
| 671 | "\n" |
|
|||
| 672 | " 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" |
|
|||
| 673 | " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" |
|
|||
| 674 | "\n" |
|
|||
| 675 | " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" |
|
|||
| 676 | " 修改集。\n" |
|
|||
| 677 | "\n" |
|
|||
| 678 | " 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" |
|
|||
| 679 | "\n" |
|
|||
| 680 | " 在水银中使用 SSH 的一些提示:\n" |
|
|||
| 681 | " - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" |
|
|||
| 682 | " hg，或者有指定的远程命令。\n" |
|
|||
| 683 | " - 默认 'path' 是相对于远程主机上的用户家目录。\n" |
|
|||
| 684 | " 可以在路径前增加一个斜线指定绝对路径:\n" |
|
|||
| 685 | " ssh://example.com//tmp/repository\n" |
|
|||
| 686 | " - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" |
|
|||
| 687 | " SSH 执行压缩，例如:\n" |
|
|||
| 688 | " Host *.mylocalnetwork.example.com\n" |
|
|||
| 689 | " Compression no\n" |
|
|||
| 690 | " Host *\n" |
|
|||
| 691 | " Compression yes\n" |
|
|||
| 692 | " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" |
|
|||
| 693 | " 用于命令行参数 '--ssh' 中。\n" |
|
|||
| 694 | "\n" |
|
|||
| 695 | " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" |
|
|||
| 696 | " [paths]\n" |
|
|||
| 697 | " alias1 = URL1\n" |
|
|||
| 698 | " alias2 = URL2\n" |
|
|||
| 699 | " ...\n" |
|
|||
| 700 | "\n" |
|
|||
| 701 | " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" |
|
|||
| 702 | " 会从 'alias1' 定义的路径取得指定版本)。\n" |
|
|||
| 703 | "\n" |
|
|||
| 704 | " 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" |
|
|||
| 705 | "\n" |
|
|||
| 706 | " default:\n" |
|
|||
| 707 | " 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" |
|
|||
| 708 | " 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" |
|
|||
| 709 | " 的命令省略路径(包含进和出)。\n" |
|
|||
| 710 | "\n" |
|
|||
| 711 | " default-push:\n" |
|
|||
| 712 | " 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 " |
|
|||
| 713 | "'default'。\n" |
|
|||
| 714 | " " |
|
|||
| 715 |
|
||||
| 716 | msgid "" |
|
|||
| 717 | "hooks for controlling repository access\n" |
|
88 | "hooks for controlling repository access\n" | |
| 718 | "\n" |
|
89 | "\n" | |
| 719 | "This hook makes it possible to allow or deny write access to portions\n" |
|
90 | "This hook makes it possible to allow or deny write access to portions\n" | |
| @@ -762,13 +133,37 b' msgid ""' | |||||
| 762 | msgstr "" |
|
133 | msgstr "" | |
| 763 |
|
134 | |||
| 764 | #, python-format |
|
135 | #, python-format | |
|
|
136 | msgid "acl: %s not enabled\n" | |||
|
|
137 | msgstr "acl: 未启用 %s\n" | |||
|
|
138 | ||||
|
|
139 | #, python-format | |||
|
|
140 | msgid "acl: %s enabled, %d entries for user %s\n" | |||
|
|
141 | msgstr "acl: 已启用 %s, %d 项，用户 %s\n" | |||
|
|
142 | ||||
|
|
143 | #, python-format | |||
| 765 | msgid "config error - hook type \"%s\" cannot stop incoming changesets" |
|
144 | msgid "config error - hook type \"%s\" cannot stop incoming changesets" | |
| 766 | msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集" |
|
145 | msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集" | |
| 767 |
|
146 | |||
| 768 | #, python-format |
|
147 | #, python-format | |
|
|
148 | msgid "acl: changes have source \"%s\" - skipping\n" | |||
|
|
149 | msgstr "acl: 改变源 \"%s\" - 跳过\n" | |||
|
|
150 | ||||
|
|
151 | #, python-format | |||
|
|
152 | msgid "acl: user %s denied on %s\n" | |||
|
|
153 | msgstr "acl: 用户 %s 被拒绝访问 %s\n" | |||
|
|
154 | ||||
|
|
155 | #, python-format | |||
| 769 | msgid "acl: access denied for changeset %s" |
|
156 | msgid "acl: access denied for changeset %s" | |
| 770 | msgstr "acl: 拒绝访问修改集 %s" |
|
157 | msgstr "acl: 拒绝访问修改集 %s" | |
| 771 |
|
158 | |||
|
|
159 | #, python-format | |||
|
|
160 | msgid "acl: user %s not allowed on %s\n" | |||
|
|
161 | msgstr "acl: 用户 %s 被拒绝访问 %s\n" | |||
|
|
162 | ||||
|
|
163 | #, python-format | |||
|
|
164 | msgid "acl: allowing changeset %s\n" | |||
|
|
165 | msgstr "acl: 允许修改集 %s\n" | |||
|
|
166 | ||||
| 772 | msgid "" |
|
167 | msgid "" | |
| 773 | "track a line of development with movable markers\n" |
|
168 | "track a line of development with movable markers\n" | |
| 774 | "\n" |
|
169 | "\n" | |
| @@ -1048,9 +443,8 b' msgstr ""' | |||||
| 1048 | msgid "database error: %s" |
|
443 | msgid "database error: %s" | |
| 1049 | msgstr "" |
|
444 | msgstr "" | |
| 1050 |
|
445 | |||
| 1051 | #, fuzzy |
|
|||
| 1052 | msgid "command to display child changesets" |
|
446 | msgid "command to display child changesets" | |
| 1053 | msgstr "列出修改集" |
|
447 | msgstr "列出子修改集的命令" | |
| 1054 |
|
448 | |||
| 1055 | #, fuzzy |
|
449 | #, fuzzy | |
| 1056 | msgid "" |
|
450 | msgid "" | |
| @@ -1070,9 +464,8 b' msgstr ""' | |||||
| 1070 | " 版本，或 '--rev' 指定的版本)。\n" |
|
464 | " 版本，或 '--rev' 指定的版本)。\n" | |
| 1071 | " " |
|
465 | " " | |
| 1072 |
|
466 | |||
| 1073 | #, fuzzy |
|
|||
| 1074 | msgid "show children of the specified revision" |
|
467 | msgid "show children of the specified revision" | |
| 1075 |
msgstr " |
|
468 | msgstr "显示指定版本的子孙" | |
| 1076 |
|
469 | |||
| 1077 | msgid "hg children [-r REV] [FILE]" |
|
470 | msgid "hg children [-r REV] [FILE]" | |
| 1078 | msgstr "" |
|
471 | msgstr "" | |
| @@ -1125,6 +518,10 b' msgid ""' | |||||
| 1125 | " " |
|
518 | " " | |
| 1126 | msgstr "" |
|
519 | msgstr "" | |
| 1127 |
|
520 | |||
|
|
521 | #, python-format | |||
|
|
522 | msgid "assuming %i character terminal\n" | |||
|
|
523 | msgstr "" | |||
|
|
524 | ||||
| 1128 | msgid "count rate for the specified revision or range" |
|
525 | msgid "count rate for the specified revision or range" | |
| 1129 | msgstr "" |
|
526 | msgstr "" | |
| 1130 |
|
527 | |||
| @@ -1199,9 +596,8 b' msgstr ""' | |||||
| 1199 | msgid "when to colorize (always, auto, or never)" |
|
596 | msgid "when to colorize (always, auto, or never)" | |
| 1200 | msgstr "" |
|
597 | msgstr "" | |
| 1201 |
|
598 | |||
| 1202 | #, fuzzy |
|
599 | msgid "don't colorize output" | |
| 1203 | msgid "don't colorize output (DEPRECATED)" |
|
600 | msgstr "" | |
| 1204 | msgstr "编辑提交日志(不赞成)" |
|
|||
| 1205 |
|
601 | |||
| 1206 | #, python-format |
|
602 | #, python-format | |
| 1207 | msgid "ignoring unknown color/effect %r (configured in color.%s)\n" |
|
603 | msgid "ignoring unknown color/effect %r (configured in color.%s)\n" | |
| @@ -1337,8 +733,23 b' msgid ""' | |||||
| 1337 | " converted, and that any directory reorganization in the CVS\n" |
|
733 | " converted, and that any directory reorganization in the CVS\n" | |
| 1338 | " sandbox is ignored.\n" |
|
734 | " sandbox is ignored.\n" | |
| 1339 | "\n" |
|
735 | "\n" | |
|
|
736 | " Because CVS does not have changesets, it is necessary to collect\n" | |||
|
|
737 | " individual commits to CVS and merge them into changesets. CVS\n" | |||
|
|
738 | " source uses its internal changeset merging code by default but can\n" | |||
|
|
739 | " be configured to call the external 'cvsps' program by setting::\n" | |||
|
|
740 | "\n" | |||
|
|
741 | " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" | |||
|
|
742 | "\n" | |||
|
|
743 | " This option is deprecated and will be removed in Mercurial 1.4.\n" | |||
|
|
744 | "\n" | |||
| 1340 | " The options shown are the defaults.\n" |
|
745 | " The options shown are the defaults.\n" | |
| 1341 | "\n" |
|
746 | "\n" | |
|
|
747 | " Internal cvsps is selected by setting ::\n" | |||
|
|
748 | "\n" | |||
|
|
749 | " --config convert.cvsps=builtin\n" | |||
|
|
750 | "\n" | |||
|
|
751 | " and has a few more configurable options:\n" | |||
|
|
752 | "\n" | |||
| 1342 | " --config convert.cvsps.cache=True (boolean)\n" |
|
753 | " --config convert.cvsps.cache=True (boolean)\n" | |
| 1343 | " Set to False to disable remote log caching, for testing and\n" |
|
754 | " Set to False to disable remote log caching, for testing and\n" | |
| 1344 | " debugging purposes.\n" |
|
755 | " debugging purposes.\n" | |
| @@ -1358,10 +769,9 b' msgid ""' | |||||
| 1358 | " add the most recent revision on the branch indicated in the\n" |
|
769 | " add the most recent revision on the branch indicated in the\n" | |
| 1359 | " regex as the second parent of the changeset.\n" |
|
770 | " regex as the second parent of the changeset.\n" | |
| 1360 | "\n" |
|
771 | "\n" | |
| 1361 |
" |
|
772 | " The hgext/convert/cvsps wrapper script allows the builtin\n" | |
| 1362 | " changeset merging code to be run without doing a conversion. Its\n" |
|
773 | " changeset merging code to be run without doing a conversion. Its\n" | |
| 1363 |
" parameters and output are similar to that of cvsps 2.1. |
|
774 | " parameters and output are similar to that of cvsps 2.1.\n" | |
| 1364 | " the command help for more details.\n" |
|
|||
| 1365 | "\n" |
|
775 | "\n" | |
| 1366 | " Subversion Source\n" |
|
776 | " Subversion Source\n" | |
| 1367 | " -----------------\n" |
|
777 | " -----------------\n" | |
| @@ -1524,6 +934,10 b' msgid "cannot find required \\"%s\\" tool"' | |||||
| 1524 | msgstr "" |
|
934 | msgstr "" | |
| 1525 |
|
935 | |||
| 1526 | #, python-format |
|
936 | #, python-format | |
|
|
937 | msgid "running: %s\n" | |||
|
|
938 | msgstr "" | |||
|
|
939 | ||||
|
|
940 | #, python-format | |||
| 1527 | msgid "%s error:\n" |
|
941 | msgid "%s error:\n" | |
| 1528 | msgstr "" |
|
942 | msgstr "" | |
| 1529 |
|
943 | |||
| @@ -1547,9 +961,9 b' msgstr ""' | |||||
| 1547 | msgid "%s: unknown repository type" |
|
961 | msgid "%s: unknown repository type" | |
| 1548 | msgstr "" |
|
962 | msgstr "" | |
| 1549 |
|
963 | |||
| 1550 |
#, |
|
964 | #, python-format | |
| 1551 | msgid "unknown sort mode: %s" |
|
965 | msgid "unknown sort mode: %s" | |
| 1552 |
msgstr " |
|
966 | msgstr "未知排序方式: %s" | |
| 1553 |
|
967 | |||
| 1554 | #, python-format |
|
968 | #, python-format | |
| 1555 | msgid "cycle detected between %s and %s" |
|
969 | msgid "cycle detected between %s and %s" | |
| @@ -1601,9 +1015,17 b' msgstr ""' | |||||
| 1601 | msgid "--sourcesort is not supported by this data source" |
|
1015 | msgid "--sourcesort is not supported by this data source" | |
| 1602 | msgstr "" |
|
1016 | msgstr "" | |
| 1603 |
|
1017 | |||
| 1604 | #, fuzzy, python-format |
|
1018 | msgid "" | |
| 1605 | msgid "revision %s is not a patchset number" |
|
1019 | "warning: support for external cvsps is deprecated and will be removed in " | |
| 1606 | msgstr "svn: 版本 %s 不是整数" |
|
1020 | "Mercurial 1.4\n" | |
|
|
1021 | msgstr "" | |||
|
|
1022 | ||||
|
|
1023 | #, python-format | |||
|
|
1024 | msgid "revision %s is not a patchset number or date" | |||
|
|
1025 | msgstr "" | |||
|
|
1026 | ||||
|
|
1027 | msgid "using builtin cvsps\n" | |||
|
|
1028 | msgstr "" | |||
| 1607 |
|
1029 | |||
| 1608 | #, python-format |
|
1030 | #, python-format | |
| 1609 | msgid "connecting to %s\n" |
|
1031 | msgid "connecting to %s\n" | |
| @@ -1648,6 +1070,10 b' msgstr ""' | |||||
| 1648 | msgid "running %s\n" |
|
1070 | msgid "running %s\n" | |
| 1649 | msgstr "" |
|
1071 | msgstr "" | |
| 1650 |
|
1072 | |||
|
|
1073 | #, python-format | |||
|
|
1074 | msgid "prefix=%r directory=%r root=%r\n" | |||
|
|
1075 | msgstr "" | |||
|
|
1076 | ||||
| 1651 | msgid "RCS file must be followed by working file" |
|
1077 | msgid "RCS file must be followed by working file" | |
| 1652 | msgstr "" |
|
1078 | msgstr "" | |
| 1653 |
|
1079 | |||
| @@ -1661,6 +1087,10 b' msgid "revision must be followed by date' | |||||
| 1661 | msgstr "" |
|
1087 | msgstr "" | |
| 1662 |
|
1088 | |||
| 1663 | #, python-format |
|
1089 | #, python-format | |
|
|
1090 | msgid "found synthetic revision in %s: %r\n" | |||
|
|
1091 | msgstr "%s 有伪造版本: %r\n" | |||
|
|
1092 | ||||
|
|
1093 | #, python-format | |||
| 1664 | msgid "writing cvs log cache %s\n" |
|
1094 | msgid "writing cvs log cache %s\n" | |
| 1665 | msgstr "" |
|
1095 | msgstr "" | |
| 1666 |
|
1096 | |||
| @@ -1691,6 +1121,10 b' msgstr ""' | |||||
| 1691 | msgid "Python ElementTree module is not available" |
|
1121 | msgid "Python ElementTree module is not available" | |
| 1692 | msgstr "" |
|
1122 | msgstr "" | |
| 1693 |
|
1123 | |||
|
|
1124 | #, python-format | |||
|
|
1125 | msgid "cleaning up %s\n" | |||
|
|
1126 | msgstr "" | |||
|
|
1127 | ||||
| 1694 | msgid "internal calling inconsistency" |
|
1128 | msgid "internal calling inconsistency" | |
| 1695 | msgstr "" |
|
1129 | msgstr "" | |
| 1696 |
|
1130 | |||
| @@ -1725,6 +1159,22 b' msgid ""' | |||||
| 1725 | msgstr "" |
|
1159 | msgstr "" | |
| 1726 |
|
1160 | |||
| 1727 | #, python-format |
|
1161 | #, python-format | |
|
|
1162 | msgid "applying revision %s...\n" | |||
|
|
1163 | msgstr "" | |||
|
|
1164 | ||||
|
|
1165 | #, python-format | |||
|
|
1166 | msgid "computing changeset between %s and %s...\n" | |||
|
|
1167 | msgstr "" | |||
|
|
1168 | ||||
|
|
1169 | #, python-format | |||
|
|
1170 | msgid "obtaining revision %s...\n" | |||
|
|
1171 | msgstr "" | |||
|
|
1172 | ||||
|
|
1173 | #, python-format | |||
|
|
1174 | msgid "analyzing revision %s...\n" | |||
|
|
1175 | msgstr "" | |||
|
|
1176 | ||||
|
|
1177 | #, python-format | |||
| 1728 | msgid "could not parse cat-log of %s" |
|
1178 | msgid "could not parse cat-log of %s" | |
| 1729 | msgstr "" |
|
1179 | msgstr "" | |
| 1730 |
|
1180 | |||
| @@ -1736,6 +1186,12 b' msgstr "%s \xe4\xb8\x8d\xe6\x98\xaf\xe6\x9c\xac\xe5\x9c\xb0\xe7\x9a\x84\xe6\xb0\xb4\xe9\x93\xb6\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"' | |||||
| 1736 | msgid "initializing destination %s repository\n" |
|
1186 | msgid "initializing destination %s repository\n" | |
| 1737 | msgstr "初始化目标版本库 %s\n" |
|
1187 | msgstr "初始化目标版本库 %s\n" | |
| 1738 |
|
1188 | |||
|
|
1189 | msgid "run hg sink pre-conversion action\n" | |||
|
|
1190 | msgstr "执行动作 hg sink pre-conversion\n" | |||
|
|
1191 | ||||
|
|
1192 | msgid "run hg sink post-conversion action\n" | |||
|
|
1193 | msgstr "执行动作 hg sink post-conversion action\n" | |||
|
|
1194 | ||||
| 1739 | #, python-format |
|
1195 | #, python-format | |
| 1740 | msgid "pulling from %s into %s\n" |
|
1196 | msgid "pulling from %s into %s\n" | |
| 1741 | msgstr "自 %s 拉到 %s\n" |
|
1197 | msgstr "自 %s 拉到 %s\n" | |
| @@ -1754,11 +1210,17 b' msgstr "%s \xe4\xb8\x8d\xe6\x98\xaf\xe6\x9c\x89\xe6\x95\x88\xe7\x9a\x84\xe5\xbc\x80\xe5\xa7\x8b\xe7\x89\x88\xe6\x9c\xac"' | |||||
| 1754 | msgid "ignoring: %s\n" |
|
1210 | msgid "ignoring: %s\n" | |
| 1755 | msgstr "忽略: %s\n" |
|
1211 | msgstr "忽略: %s\n" | |
| 1756 |
|
1212 | |||
|
|
1213 | msgid "run hg source pre-conversion action\n" | |||
|
|
1214 | msgstr "执行动作 hg source pre-conversion\n" | |||
|
|
1215 | ||||
|
|
1216 | msgid "run hg source post-conversion action\n" | |||
|
|
1217 | msgstr "执行动作 hg source post-conversion\n" | |||
|
|
1218 | ||||
| 1757 | #, python-format |
|
1219 | #, python-format | |
| 1758 | msgid "%s does not look like a monotone repo" |
|
1220 | msgid "%s does not look like a monotone repo" | |
| 1759 | msgstr "%s 不像是单纯的 monotone 版本库" |
|
1221 | msgstr "%s 不像是单纯的 monotone 版本库" | |
| 1760 |
|
1222 | |||
| 1761 |
#, |
|
1223 | #, python-format | |
| 1762 | msgid "copying file in renamed directory from '%s' to '%s'" |
|
1224 | msgid "copying file in renamed directory from '%s' to '%s'" | |
| 1763 | msgstr "从已改名的目录 '%s' 复制文件到 '%s'" |
|
1225 | msgstr "从已改名的目录 '%s' 复制文件到 '%s'" | |
| 1764 |
|
1226 | |||
| @@ -1768,9 +1230,6 b' msgstr ""' | |||||
| 1768 | msgid "collecting p4 changelists\n" |
|
1230 | msgid "collecting p4 changelists\n" | |
| 1769 | msgstr "正在搜索 p4 修改集\n" |
|
1231 | msgstr "正在搜索 p4 修改集\n" | |
| 1770 |
|
1232 | |||
| 1771 | msgid "Mercurial failed to run itself, check hg executable is in PATH" |
|
|||
| 1772 | msgstr "" |
|
|||
| 1773 |
|
||||
| 1774 | msgid "Subversion python bindings could not be loaded" |
|
1233 | msgid "Subversion python bindings could not be loaded" | |
| 1775 | msgstr "不能加载 svn 的 python 绑定" |
|
1234 | msgstr "不能加载 svn 的 python 绑定" | |
| 1776 |
|
1235 | |||
| @@ -1809,7 +1268,6 b' msgstr "\xe5\xbf\xbd\xe7\x95\xa5\xe7\xa9\xba\xe7\x9a\x84\xe5\x88\x86\xe6\x94\xaf %s\\n"' | |||||
| 1809 | msgid "found branch %s at %d\n" |
|
1268 | msgid "found branch %s at %d\n" | |
| 1810 | msgstr "发现分支 %s 位于 %d\n" |
|
1269 | msgstr "发现分支 %s 位于 %d\n" | |
| 1811 |
|
1270 | |||
| 1812 | #, fuzzy |
|
|||
| 1813 | msgid "svn: start revision is not supported with more than one branch" |
|
1271 | msgid "svn: start revision is not supported with more than one branch" | |
| 1814 | msgstr "svn: 在给出多于一个分支时不支持开始版本" |
|
1272 | msgstr "svn: 在给出多于一个分支时不支持开始版本" | |
| 1815 |
|
1273 | |||
| @@ -1822,22 +1280,69 b' msgid "no tags found at revision %d\\n"' | |||||
| 1822 | msgstr "在版本 %d 没有发现标签\n" |
|
1280 | msgstr "在版本 %d 没有发现标签\n" | |
| 1823 |
|
1281 | |||
| 1824 | #, python-format |
|
1282 | #, python-format | |
|
|
1283 | msgid "ignoring foreign branch %r\n" | |||
|
|
1284 | msgstr "忽略外部分支 %r\n" | |||
|
|
1285 | ||||
|
|
1286 | #, python-format | |||
| 1825 | msgid "%s not found up to revision %d" |
|
1287 | msgid "%s not found up to revision %d" | |
| 1826 | msgstr "没有发现 %s，一直到版本 %d" |
|
1288 | msgstr "没有发现 %s，一直到版本 %d" | |
| 1827 |
|
1289 | |||
| 1828 | #, python-format |
|
1290 | #, python-format | |
|
|
1291 | msgid "branch renamed from %s to %s at %d\n" | |||
|
|
1292 | msgstr "分支从 %s 改名为 %s，在 %d\n" | |||
|
|
1293 | ||||
|
|
1294 | #, python-format | |||
|
|
1295 | msgid "reparent to %s\n" | |||
|
|
1296 | msgstr "" | |||
|
|
1297 | ||||
|
|
1298 | #, python-format | |||
|
|
1299 | msgid "copied to %s from %s@%s\n" | |||
|
|
1300 | msgstr "复制到 %s，自 %s@%s\n" | |||
|
|
1301 | ||||
|
|
1302 | #, python-format | |||
|
|
1303 | msgid "gone from %s\n" | |||
|
|
1304 | msgstr "离开 %s\n" | |||
|
|
1305 | ||||
|
|
1306 | #, python-format | |||
|
|
1307 | msgid "entry %s\n" | |||
|
|
1308 | msgstr "入口 %s\n" | |||
|
|
1309 | ||||
|
|
1310 | #, python-format | |||
|
|
1311 | msgid "unknown path in revision %d: %s\n" | |||
|
|
1312 | msgstr "版本 %d 有未知路径: %s\n" | |||
|
|
1313 | ||||
|
|
1314 | #, python-format | |||
|
|
1315 | msgid "mark %s came from %s:%d\n" | |||
|
|
1316 | msgstr "标记 %s 来自 %s:%d\n" | |||
|
|
1317 | ||||
|
|
1318 | #, python-format | |||
|
|
1319 | msgid "parsing revision %d (%d changes)\n" | |||
|
|
1320 | msgstr "解析版本 %d (%d 个改变)\n" | |||
|
|
1321 | ||||
|
|
1322 | #, python-format | |||
| 1829 | msgid "found parent of branch %s at %d: %s\n" |
|
1323 | msgid "found parent of branch %s at %d: %s\n" | |
| 1830 | msgstr "发现分支 %s 的父亲，在 %d: %s\n" |
|
1324 | msgstr "发现分支 %s 的父亲，在 %d: %s\n" | |
| 1831 |
|
1325 | |||
|
|
1326 | msgid "no copyfrom path, don't know what to do.\n" | |||
|
|
1327 | msgstr "没有 copyfrom 路径，不知道该怎么办。\n" | |||
|
|
1328 | ||||
| 1832 | #, python-format |
|
1329 | #, python-format | |
| 1833 | msgid "fetching revision log for \"%s\" from %d to %d\n" |
|
1330 | msgid "fetching revision log for \"%s\" from %d to %d\n" | |
| 1834 | msgstr "为 \"%s\" 获取版本日志，自 %d 到 %d\n" |
|
1331 | msgstr "为 \"%s\" 获取版本日志，自 %d 到 %d\n" | |
| 1835 |
|
1332 | |||
| 1836 | #, python-format |
|
1333 | #, python-format | |
|
|
1334 | msgid "revision %d has no entries\n" | |||
|
|
1335 | msgstr "版本 %d 没有入口\n" | |||
|
|
1336 | ||||
|
|
1337 | #, python-format | |||
| 1837 | msgid "svn: branch has no revision %s" |
|
1338 | msgid "svn: branch has no revision %s" | |
| 1838 | msgstr "svn: 分支没有版本 %s" |
|
1339 | msgstr "svn: 分支没有版本 %s" | |
| 1839 |
|
1340 | |||
| 1840 | #, python-format |
|
1341 | #, python-format | |
|
|
1342 | msgid "%r is not under %r, ignoring\n" | |||
|
|
1343 | msgstr "%r 不在 %r 之下，忽略之\n" | |||
|
|
1344 | ||||
|
|
1345 | #, python-format | |||
| 1841 | msgid "initializing svn repo %r\n" |
|
1346 | msgid "initializing svn repo %r\n" | |
| 1842 | msgstr "初始化 svn 版本库 %r\n" |
|
1347 | msgstr "初始化 svn 版本库 %r\n" | |
| 1843 |
|
1348 | |||
| @@ -1902,6 +1407,14 b' msgstr ""' | |||||
| 1902 | msgid "cannot specify --rev and --change at the same time" |
|
1407 | msgid "cannot specify --rev and --change at the same time" | |
| 1903 | msgstr "不能同时指定 '--rev' 和 '--change'" |
|
1408 | msgstr "不能同时指定 '--rev' 和 '--change'" | |
| 1904 |
|
1409 | |||
|
|
1410 | #, python-format | |||
|
|
1411 | msgid "running %r in %s\n" | |||
|
|
1412 | msgstr "" | |||
|
|
1413 | ||||
|
|
1414 | #, python-format | |||
|
|
1415 | msgid "file changed while diffing. Overwriting: %s (src: %s)\n" | |||
|
|
1416 | msgstr "" | |||
|
|
1417 | ||||
| 1905 | msgid "cleaning up temp directory\n" |
|
1418 | msgid "cleaning up temp directory\n" | |
| 1906 | msgstr "" |
|
1419 | msgstr "" | |
| 1907 |
|
1420 | |||
| @@ -1944,10 +1457,8 b' msgid ""' | |||||
| 1944 | " %(path)s program.\n" |
|
1457 | " %(path)s program.\n" | |
| 1945 | "\n" |
|
1458 | "\n" | |
| 1946 | " When two revision arguments are given, then changes are shown between\n" |
|
1459 | " When two revision arguments are given, then changes are shown between\n" | |
| 1947 | " those revisions. If only one revision is specified then that revision " |
|
1460 | " those revisions. If only one revision is specified then that revision is\n" | |
| 1948 | "is\n" |
|
1461 | " compared to the working directory, and, when no revisions are specified,\n" | |
| 1949 | " compared to the working directory, and, when no revisions are " |
|
|||
| 1950 | "specified,\n" |
|
|||
| 1951 | " the working directory files are compared to its parent." |
|
1462 | " the working directory files are compared to its parent." | |
| 1952 | msgstr "" |
|
1463 | msgstr "" | |
| 1953 |
|
1464 | |||
| @@ -2035,11 +1546,10 b' msgid "switch parents when merging"' | |||||
| 2035 | msgstr "当合并时切换父亲" |
|
1546 | msgstr "当合并时切换父亲" | |
| 2036 |
|
1547 | |||
| 2037 | msgid "hg fetch [SOURCE]" |
|
1548 | msgid "hg fetch [SOURCE]" | |
| 2038 | msgstr "" |
|
1549 | msgstr "hg fetch [SOURCE]" | |
| 2039 |
|
1550 | |||
| 2040 | #, fuzzy |
|
|||
| 2041 | msgid "commands to sign and verify changesets" |
|
1551 | msgid "commands to sign and verify changesets" | |
| 2042 |
msgstr " |
|
1552 | msgstr "签署和校验修改集的命令" | |
| 2043 |
|
1553 | |||
| 2044 | msgid "error while verifying signature" |
|
1554 | msgid "error while verifying signature" | |
| 2045 | msgstr "" |
|
1555 | msgstr "" | |
| @@ -2207,6 +1717,12 b' msgstr ""' | |||||
| 2207 | msgid "email.from must be defined when sending by email" |
|
1717 | msgid "email.from must be defined when sending by email" | |
| 2208 | msgstr "" |
|
1718 | msgstr "" | |
| 2209 |
|
1719 | |||
|
|
1720 | msgid "cia: no user specified" | |||
|
|
1721 | msgstr "" | |||
|
|
1722 | ||||
|
|
1723 | msgid "cia: no project specified" | |||
|
|
1724 | msgstr "" | |||
|
|
1725 | ||||
| 2210 | msgid "" |
|
1726 | msgid "" | |
| 2211 | "browse the repository in a graphical way\n" |
|
1727 | "browse the repository in a graphical way\n" | |
| 2212 | "\n" |
|
1728 | "\n" | |
| @@ -2366,6 +1882,9 b' msgstr ""' | |||||
| 2366 | msgid "(found dead inotify server socket; removing it)\n" |
|
1882 | msgid "(found dead inotify server socket; removing it)\n" | |
| 2367 | msgstr "" |
|
1883 | msgstr "" | |
| 2368 |
|
1884 | |||
|
|
1885 | msgid "(starting inotify server)\n" | |||
|
|
1886 | msgstr "" | |||
|
|
1887 | ||||
| 2369 | #, python-format |
|
1888 | #, python-format | |
| 2370 | msgid "could not start inotify server: %s\n" |
|
1889 | msgid "could not start inotify server: %s\n" | |
| 2371 | msgstr "" |
|
1890 | msgstr "" | |
| @@ -2374,6 +1893,9 b' msgstr ""' | |||||
| 2374 | msgid "could not talk to new inotify server: %s\n" |
|
1893 | msgid "could not talk to new inotify server: %s\n" | |
| 2375 | msgstr "" |
|
1894 | msgstr "" | |
| 2376 |
|
1895 | |||
|
|
1896 | msgid "(inotify server not running)\n" | |||
|
|
1897 | msgstr "" | |||
|
|
1898 | ||||
| 2377 | #, python-format |
|
1899 | #, python-format | |
| 2378 | msgid "failed to contact inotify server: %s\n" |
|
1900 | msgid "failed to contact inotify server: %s\n" | |
| 2379 | msgstr "" |
|
1901 | msgstr "" | |
| @@ -2601,11 +2123,9 b' msgid ""' | |||||
| 2601 | " " |
|
2123 | " " | |
| 2602 | msgstr "" |
|
2124 | msgstr "" | |
| 2603 |
|
2125 | |||
| 2604 |
#, |
|
2126 | #, python-format | |
| 2605 | msgid "creating temporary repository at %s\n" |
|
2127 | msgid "creating temporary repository at %s\n" | |
| 2606 | msgstr "" |
|
2128 | msgstr "正在创建临时版本库 %s\n" | |
| 2607 | "\n" |
|
|||
| 2608 | "正在删除临时版本库 %s\n" |
|
|||
| 2609 |
|
2129 | |||
| 2610 | msgid "" |
|
2130 | msgid "" | |
| 2611 | "\n" |
|
2131 | "\n" | |
| @@ -2623,9 +2143,8 b' msgid ""' | |||||
| 2623 | "\tconfiguration using default keyword template maps\n" |
|
2143 | "\tconfiguration using default keyword template maps\n" | |
| 2624 | msgstr "" |
|
2144 | msgstr "" | |
| 2625 |
|
2145 | |||
| 2626 | #, fuzzy |
|
|||
| 2627 | msgid "\tdisabling current template maps\n" |
|
2146 | msgid "\tdisabling current template maps\n" | |
| 2628 | msgstr "使用指定的样式显示" |
|
2147 | msgstr "\t禁用当前模版映射\n" | |
| 2629 |
|
2148 | |||
| 2630 | msgid "" |
|
2149 | msgid "" | |
| 2631 | "\n" |
|
2150 | "\n" | |
| @@ -2646,6 +2165,14 b' msgid ""' | |||||
| 2646 | "\tkeywords expanded\n" |
|
2165 | "\tkeywords expanded\n" | |
| 2647 | msgstr "" |
|
2166 | msgstr "" | |
| 2648 |
|
2167 | |||
|
|
2168 | #, python-format | |||
|
|
2169 | msgid "" | |||
|
|
2170 | "\n" | |||
|
|
2171 | "removing temporary repository %s\n" | |||
|
|
2172 | msgstr "" | |||
|
|
2173 | "\n" | |||
|
|
2174 | "正在删除临时版本库 %s\n" | |||
|
|
2175 | ||||
| 2649 | msgid "" |
|
2176 | msgid "" | |
| 2650 | "expand keywords in the working directory\n" |
|
2177 | "expand keywords in the working directory\n" | |
| 2651 | "\n" |
|
2178 | "\n" | |
| @@ -2668,13 +2195,15 b' msgid ""' | |||||
| 2668 | " See \"hg help keyword\" on how to construct patterns both for\n" |
|
2195 | " See \"hg help keyword\" on how to construct patterns both for\n" | |
| 2669 | " inclusion and exclusion of files.\n" |
|
2196 | " inclusion and exclusion of files.\n" | |
| 2670 | "\n" |
|
2197 | "\n" | |
| 2671 | " With -A/--all and -v/--verbose the codes used to show the status\n" |
|
2198 | " Use -u/--untracked to list untracked files as well.\n" | |
|
|
2199 | "\n" | |||
|
|
2200 | " With -a/--all and -v/--verbose the codes used to show the status\n" | |||
| 2672 | " of files are::\n" |
|
2201 | " of files are::\n" | |
| 2673 | "\n" |
|
2202 | "\n" | |
| 2674 | " K = keyword expansion candidate\n" |
|
2203 | " K = keyword expansion candidate\n" | |
| 2675 |
" k = keyword expansion candidate (n |
|
2204 | " k = keyword expansion candidate (untracked)\n" | |
| 2676 | " I = ignored\n" |
|
2205 | " I = ignored\n" | |
| 2677 |
" i = ignored (n |
|
2206 | " i = ignored (untracked)\n" | |
| 2678 | " " |
|
2207 | " " | |
| 2679 | msgstr "" |
|
2208 | msgstr "" | |
| 2680 |
|
2209 | |||
| @@ -2706,15 +2235,7 b' msgstr ""' | |||||
| 2706 | msgid "show files excluded from expansion" |
|
2235 | msgid "show files excluded from expansion" | |
| 2707 | msgstr "" |
|
2236 | msgstr "" | |
| 2708 |
|
2237 | |||
| 2709 | #, fuzzy |
|
2238 | msgid "additionally show untracked files" | |
| 2710 | msgid "only show unknown (not tracked) files" |
|
|||
| 2711 | msgstr "只显示未知(未被跟踪)文件的状态" |
|
|||
| 2712 |
|
||||
| 2713 | #, fuzzy |
|
|||
| 2714 | msgid "show keyword status flags of all files (DEPRECATED)" |
|
|||
| 2715 | msgstr "显示全部文件的状态" |
|
|||
| 2716 |
|
||||
| 2717 | msgid "only show untracked files (DEPRECATED)" |
|
|||
| 2718 | msgstr "" |
|
2239 | msgstr "" | |
| 2719 |
|
2240 | |||
| 2720 | msgid "hg kwfiles [OPTION]... [FILE]..." |
|
2241 | msgid "hg kwfiles [OPTION]... [FILE]..." | |
| @@ -2763,6 +2284,10 b' msgid "invalid character in guard %r: %r' | |||||
| 2763 | msgstr "" |
|
2284 | msgstr "" | |
| 2764 |
|
2285 | |||
| 2765 | #, python-format |
|
2286 | #, python-format | |
|
|
2287 | msgid "active guards: %s\n" | |||
|
|
2288 | msgstr "" | |||
|
|
2289 | ||||
|
|
2290 | #, python-format | |||
| 2766 | msgid "guard %r too short" |
|
2291 | msgid "guard %r too short" | |
| 2767 | msgstr "" |
|
2292 | msgstr "" | |
| 2768 |
|
2293 | |||
| @@ -2828,11 +2353,9 b' msgstr ""' | |||||
| 2828 | msgid "applying %s\n" |
|
2353 | msgid "applying %s\n" | |
| 2829 | msgstr "" |
|
2354 | msgstr "" | |
| 2830 |
|
2355 | |||
| 2831 |
#, |
|
2356 | #, python-format | |
| 2832 | msgid "unable to read %s\n" |
|
2357 | msgid "unable to read %s\n" | |
| 2833 | msgstr "" |
|
2358 | msgstr "读取 %s 失败\n" | |
| 2834 | "解析 '%s' 失败\n" |
|
|||
| 2835 | "%s" |
|
|||
| 2836 |
|
2359 | |||
| 2837 | #, python-format |
|
2360 | #, python-format | |
| 2838 | msgid "imported patch %s\n" |
|
2361 | msgid "imported patch %s\n" | |
| @@ -2862,9 +2385,9 b' msgstr ""' | |||||
| 2862 | msgid "cannot delete revision %d above applied patches" |
|
2385 | msgid "cannot delete revision %d above applied patches" | |
| 2863 | msgstr "" |
|
2386 | msgstr "" | |
| 2864 |
|
2387 | |||
| 2865 |
#, |
|
2388 | #, python-format | |
| 2866 | msgid "patch %s finalized without changeset message\n" |
|
2389 | msgid "patch %s finalized without changeset message\n" | |
| 2867 |
msgstr " |
|
2390 | msgstr "" | |
| 2868 |
|
2391 | |||
| 2869 | msgid "qdelete requires at least one revision or patch name" |
|
2392 | msgid "qdelete requires at least one revision or patch name" | |
| 2870 | msgstr "" |
|
2393 | msgstr "" | |
| @@ -2975,9 +2498,9 b' msgstr ""' | |||||
| 2975 | msgid "deletions found between repo revs" |
|
2498 | msgid "deletions found between repo revs" | |
| 2976 | msgstr "" |
|
2499 | msgstr "" | |
| 2977 |
|
2500 | |||
| 2978 |
#, |
|
2501 | #, python-format | |
| 2979 | msgid "popping %s\n" |
|
2502 | msgid "popping %s\n" | |
| 2980 |
msgstr " |
|
2503 | msgstr "" | |
| 2981 |
|
2504 | |||
| 2982 | msgid "patch queue now empty\n" |
|
2505 | msgid "patch queue now empty\n" | |
| 2983 | msgstr "" |
|
2506 | msgstr "" | |
| @@ -2986,8 +2509,7 b' msgid "cannot refresh a revision with ch' | |||||
| 2986 | msgstr "" |
|
2509 | msgstr "" | |
| 2987 |
|
2510 | |||
| 2988 | msgid "" |
|
2511 | msgid "" | |
| 2989 | "refresh interrupted while patch was popped! (revert --all, qpush to " |
|
2512 | "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" | |
| 2990 | "recover)\n" |
|
|||
| 2991 | msgstr "" |
|
2513 | msgstr "" | |
| 2992 |
|
2514 | |||
| 2993 | msgid "patch queue directory already exists" |
|
2515 | msgid "patch queue directory already exists" | |
| @@ -3678,8 +3200,7 b' msgstr "\xe5\xbc\xb9\xe5\x87\xba\xe5\x85\xa8\xe9\x83\xa8\xe8\xa1\xa5\xe4\xb8\x81"' | |||||
| 3678 | msgid "queue name to pop" |
|
3200 | msgid "queue name to pop" | |
| 3679 | msgstr "操作的队列名称" |
|
3201 | msgstr "操作的队列名称" | |
| 3680 |
|
3202 | |||
| 3681 | #, fuzzy |
|
3203 | msgid "forget any local changes" | |
| 3682 | msgid "forget any local changes to patched files" |
|
|||
| 3683 | msgstr "丢弃本地修改" |
|
3204 | msgstr "丢弃本地修改" | |
| 3684 |
|
3205 | |||
| 3685 | msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" |
|
3206 | msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" | |
| @@ -3837,10 +3358,8 b' msgid ""' | |||||
| 3837 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" |
|
3358 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" | |
| 3838 | " maxsubject = 67 # truncate subject line longer than this\n" |
|
3359 | " maxsubject = 67 # truncate subject line longer than this\n" | |
| 3839 | " diffstat = True # add a diffstat before the diff content\n" |
|
3360 | " diffstat = True # add a diffstat before the diff content\n" | |
| 3840 | " sources = serve # notify if source of incoming changes in this " |
|
3361 | " sources = serve # notify if source of incoming changes in this list\n" | |
| 3841 | "list\n" |
|
|||
| 3842 | " # (serve == ssh or http, push, pull, bundle)\n" |
|
3362 | " # (serve == ssh or http, push, pull, bundle)\n" | |
| 3843 | " merge = False # send notification for merges (default True)\n" |
|
|||
| 3844 | " [email]\n" |
|
3363 | " [email]\n" | |
| 3845 | " from = user@host.com # email address to send as if none given\n" |
|
3364 | " from = user@host.com # email address to send as if none given\n" | |
| 3846 | " [web]\n" |
|
3365 | " [web]\n" | |
| @@ -3889,7 +3408,11 b' msgid ""' | |||||
| 3889 | msgstr "" |
|
3408 | msgstr "" | |
| 3890 |
|
3409 | |||
| 3891 | #, python-format |
|
3410 | #, python-format | |
| 3892 | msgid "notify: suppressing notification for merge %d:%s\n" |
|
3411 | msgid "notify: no subscribers to repository %s\n" | |
|
|
3412 | msgstr "" | |||
|
|
3413 | ||||
|
|
3414 | #, python-format | |||
|
|
3415 | msgid "notify: changes have source \"%s\" - skipping\n" | |||
| 3893 | msgstr "" |
|
3416 | msgstr "" | |
| 3894 |
|
3417 | |||
| 3895 | msgid "" |
|
3418 | msgid "" | |
| @@ -4012,10 +3535,6 b' msgid ""' | |||||
| 4012 | "hgrc(5) for details.\n" |
|
3535 | "hgrc(5) for details.\n" | |
| 4013 | msgstr "" |
|
3536 | msgstr "" | |
| 4014 |
|
3537 | |||
| 4015 | #, python-format |
|
|||
| 4016 | msgid "%sPlease enter a valid value" |
|
|||
| 4017 | msgstr "" |
|
|||
| 4018 |
|
||||
| 4019 | msgid "Please enter a valid value.\n" |
|
3538 | msgid "Please enter a valid value.\n" | |
| 4020 | msgstr "" |
|
3539 | msgstr "" | |
| 4021 |
|
3540 | |||
| @@ -4256,6 +3775,9 b' msgid ""' | |||||
| 4256 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" |
|
3775 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" | |
| 4257 | msgstr "" |
|
3776 | msgstr "" | |
| 4258 |
|
3777 | |||
|
|
3778 | msgid "first revision, do not change ancestor\n" | |||
|
|
3779 | msgstr "" | |||
|
|
3780 | ||||
| 4259 | msgid "" |
|
3781 | msgid "" | |
| 4260 | "move changeset (and descendants) to a different branch\n" |
|
3782 | "move changeset (and descendants) to a different branch\n" | |
| 4261 | "\n" |
|
3783 | "\n" | |
| @@ -4299,17 +3821,60 b' msgstr ""' | |||||
| 4299 | msgid "%d revisions have been skipped\n" |
|
3821 | msgid "%d revisions have been skipped\n" | |
| 4300 | msgstr "" |
|
3822 | msgstr "" | |
| 4301 |
|
3823 | |||
|
|
3824 | msgid " set parents\n" | |||
|
|
3825 | msgstr "" | |||
|
|
3826 | ||||
|
|
3827 | #, python-format | |||
|
|
3828 | msgid "rebasing %d:%s\n" | |||
|
|
3829 | msgstr "" | |||
|
|
3830 | ||||
|
|
3831 | #, python-format | |||
|
|
3832 | msgid " future parents are %d and %d\n" | |||
|
|
3833 | msgstr "" | |||
|
|
3834 | ||||
|
|
3835 | #, python-format | |||
|
|
3836 | msgid " update to %d:%s\n" | |||
|
|
3837 | msgstr "" | |||
|
|
3838 | ||||
|
|
3839 | msgid " already in target\n" | |||
|
|
3840 | msgstr "" | |||
|
|
3841 | ||||
|
|
3842 | #, python-format | |||
|
|
3843 | msgid " merge against %d:%s\n" | |||
|
|
3844 | msgstr "" | |||
|
|
3845 | ||||
| 4302 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
|
3846 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | |
| 4303 | msgstr "" |
|
3847 | msgstr "" | |
| 4304 |
|
3848 | |||
|
|
3849 | msgid "resuming interrupted rebase\n" | |||
|
|
3850 | msgstr "" | |||
|
|
3851 | ||||
| 4305 | #, python-format |
|
3852 | #, python-format | |
| 4306 | msgid "no changes, revision %d skipped\n" |
|
3853 | msgid "no changes, revision %d skipped\n" | |
| 4307 | msgstr "" |
|
3854 | msgstr "" | |
| 4308 |
|
3855 | |||
| 4309 | #, python-format |
|
3856 | #, python-format | |
|
|
3857 | msgid "next revision set to %s\n" | |||
|
|
3858 | msgstr "" | |||
|
|
3859 | ||||
|
|
3860 | #, python-format | |||
| 4310 | msgid "cannot use revision %d as base, result would have 3 parents" |
|
3861 | msgid "cannot use revision %d as base, result would have 3 parents" | |
| 4311 | msgstr "" |
|
3862 | msgstr "" | |
| 4312 |
|
3863 | |||
|
|
3864 | #, python-format | |||
|
|
3865 | msgid "revision %d is an mq patch (%s), finalize it.\n" | |||
|
|
3866 | msgstr "" | |||
|
|
3867 | ||||
|
|
3868 | #, python-format | |||
|
|
3869 | msgid "import mq patch %d (%s)\n" | |||
|
|
3870 | msgstr "" | |||
|
|
3871 | ||||
|
|
3872 | msgid "rebase status stored\n" | |||
|
|
3873 | msgstr "" | |||
|
|
3874 | ||||
|
|
3875 | msgid "rebase status resumed\n" | |||
|
|
3876 | msgstr "" | |||
|
|
3877 | ||||
| 4313 | msgid "no rebase in progress" |
|
3878 | msgid "no rebase in progress" | |
| 4314 | msgstr "" |
|
3879 | msgstr "" | |
| 4315 |
|
3880 | |||
| @@ -4322,15 +3887,28 b' msgstr ""' | |||||
| 4322 | msgid "cannot rebase onto an applied mq patch" |
|
3887 | msgid "cannot rebase onto an applied mq patch" | |
| 4323 | msgstr "" |
|
3888 | msgstr "" | |
| 4324 |
|
3889 | |||
| 4325 | msgid "source is ancestor of destination" |
|
3890 | msgid "cannot rebase an ancestor" | |
| 4326 | msgstr "" |
|
3891 | msgstr "" | |
| 4327 |
|
3892 | |||
| 4328 | msgid "source is descendant of destination" |
|
3893 | msgid "cannot rebase a descendant" | |
|
|
3894 | msgstr "" | |||
|
|
3895 | ||||
|
|
3896 | msgid "already working on current\n" | |||
|
|
3897 | msgstr "" | |||
|
|
3898 | ||||
|
|
3899 | msgid "already working on the current branch\n" | |||
|
|
3900 | msgstr "" | |||
|
|
3901 | ||||
|
|
3902 | #, python-format | |||
|
|
3903 | msgid "rebase onto %d starting from %d\n" | |||
| 4329 | msgstr "" |
|
3904 | msgstr "" | |
| 4330 |
|
3905 | |||
| 4331 | msgid "unable to collapse, there is more than one external parent" |
|
3906 | msgid "unable to collapse, there is more than one external parent" | |
| 4332 | msgstr "" |
|
3907 | msgstr "" | |
| 4333 |
|
3908 | |||
|
|
3909 | msgid "--update and --rebase are not compatible, ignoring the update flag\n" | |||
|
|
3910 | msgstr "" | |||
|
|
3911 | ||||
| 4334 | msgid "rebase working directory to branch head" |
|
3912 | msgid "rebase working directory to branch head" | |
| 4335 | msgstr "" |
|
3913 | msgstr "" | |
| 4336 |
|
3914 | |||
| @@ -4343,15 +3921,13 b' msgstr ""' | |||||
| 4343 | msgid "rebase onto a given revision" |
|
3921 | msgid "rebase onto a given revision" | |
| 4344 | msgstr "" |
|
3922 | msgstr "" | |
| 4345 |
|
3923 | |||
| 4346 | #, fuzzy |
|
3924 | msgid "collapse the rebased revisions" | |
| 4347 | msgid "collapse the rebased changesets" |
|
3925 | msgstr "" | |
| 4348 | msgstr "打包不相关的修改集" |
|
3926 | ||
| 4349 |
|
3927 | msgid "keep original revisions" | ||
| 4350 | #, fuzzy |
|
3928 | msgstr "" | |
| 4351 | msgid "keep original changesets" |
|
3929 | ||
| 4352 | msgstr "列出修改集" |
|
3930 | msgid "keep original branches" | |
| 4353 |
|
||||
| 4354 | msgid "keep original branch names" |
|
|||
| 4355 | msgstr "" |
|
3931 | msgstr "" | |
| 4356 |
|
3932 | |||
| 4357 | msgid "continue an interrupted rebase" |
|
3933 | msgid "continue an interrupted rebase" | |
| @@ -4361,8 +3937,8 b' msgid "abort an interrupted rebase"' | |||||
| 4361 | msgstr "" |
|
3937 | msgstr "" | |
| 4362 |
|
3938 | |||
| 4363 | msgid "" |
|
3939 | msgid "" | |
| 4364 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " |
|
3940 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | " | |
| 4365 |
" |
|
3941 | "[-c] | [-a]" | |
| 4366 | msgstr "" |
|
3942 | msgstr "" | |
| 4367 |
|
3943 | |||
| 4368 | msgid "commands to interactively select changes for commit/qrefresh" |
|
3944 | msgid "commands to interactively select changes for commit/qrefresh" | |
| @@ -4466,9 +4042,20 b' msgstr ""' | |||||
| 4466 | msgid "no changes to record\n" |
|
4042 | msgid "no changes to record\n" | |
| 4467 | msgstr "" |
|
4043 | msgstr "" | |
| 4468 |
|
4044 | |||
|
|
4045 | #, python-format | |||
|
|
4046 | msgid "backup %r as %r\n" | |||
|
|
4047 | msgstr "" | |||
|
|
4048 | ||||
|
|
4049 | msgid "applying patch\n" | |||
|
|
4050 | msgstr "" | |||
|
|
4051 | ||||
| 4469 | msgid "patch failed to apply" |
|
4052 | msgid "patch failed to apply" | |
| 4470 | msgstr "" |
|
4053 | msgstr "" | |
| 4471 |
|
4054 | |||
|
|
4055 | #, python-format | |||
|
|
4056 | msgid "restoring %r to %r\n" | |||
|
|
4057 | msgstr "" | |||
|
|
4058 | ||||
| 4472 | msgid "hg record [OPTION]... [FILE]..." |
|
4059 | msgid "hg record [OPTION]... [FILE]..." | |
| 4473 | msgstr "" |
|
4060 | msgstr "" | |
| 4474 |
|
4061 | |||
| @@ -4681,6 +4268,10 b' msgstr ""' | |||||
| 4681 | msgid "[win32mbcs] cannot activate on this platform.\n" |
|
4268 | msgid "[win32mbcs] cannot activate on this platform.\n" | |
| 4682 | msgstr "" |
|
4269 | msgstr "" | |
| 4683 |
|
4270 | |||
|
|
4271 | #, python-format | |||
|
|
4272 | msgid "[win32mbcs] activated with encoding: %s\n" | |||
|
|
4273 | msgstr "" | |||
|
|
4274 | ||||
| 4684 | msgid "" |
|
4275 | msgid "" | |
| 4685 | "perform automatic newline conversion\n" |
|
4276 | "perform automatic newline conversion\n" | |
| 4686 | "\n" |
|
4277 | "\n" | |
| @@ -5242,6 +4833,10 b' msgid "incompatible arguments"' | |||||
| 5242 | msgstr "" |
|
4833 | msgstr "" | |
| 5243 |
|
4834 | |||
| 5244 | #, python-format |
|
4835 | #, python-format | |
|
|
4836 | msgid "cannot find executable: %s" | |||
|
|
4837 | msgstr "" | |||
|
|
4838 | ||||
|
|
4839 | #, python-format | |||
| 5245 | msgid "failed to execute %s" |
|
4840 | msgid "failed to execute %s" | |
| 5246 | msgstr "" |
|
4841 | msgstr "" | |
| 5247 |
|
4842 | |||
| @@ -5583,8 +5178,8 b' msgid " patch test failed!\\n"' | |||||
| 5583 | msgstr "" |
|
5178 | msgstr "" | |
| 5584 |
|
5179 | |||
| 5585 | msgid "" |
|
5180 | msgid "" | |
| 5586 | " (Current patch tool may be incompatible with patch, or misconfigured. " |
|
5181 | " (Current patch tool may be incompatible with patch, or misconfigured. Please " | |
| 5587 |
" |
|
5182 | "check your .hgrc file)\n" | |
| 5588 | msgstr "" |
|
5183 | msgstr "" | |
| 5589 |
|
5184 | |||
| 5590 | msgid "" |
|
5185 | msgid "" | |
| @@ -5980,6 +5575,12 b' msgstr ""' | |||||
| 5980 | msgid "no diffs found" |
|
5575 | msgid "no diffs found" | |
| 5981 | msgstr "" |
|
5576 | msgstr "" | |
| 5982 |
|
5577 | |||
|
|
5578 | #, python-format | |||
|
|
5579 | msgid "" | |||
|
|
5580 | "message:\n" | |||
|
|
5581 | "%s\n" | |||
|
|
5582 | msgstr "" | |||
|
|
5583 | ||||
| 5983 | #, fuzzy |
|
5584 | #, fuzzy | |
| 5984 | msgid "not a Mercurial patch" |
|
5585 | msgid "not a Mercurial patch" | |
| 5985 | msgstr "%s 不是本地的水银版本库" |
|
5586 | msgstr "%s 不是本地的水银版本库" | |
| @@ -6605,103 +6206,6 b' msgstr ""' | |||||
| 6605 | " " |
|
6206 | " " | |
| 6606 |
|
6207 | |||
| 6607 | msgid "" |
|
6208 | msgid "" | |
| 6608 | "summarize working directory state\n" |
|
|||
| 6609 | "\n" |
|
|||
| 6610 | " This generates a brief summary of the working directory state,\n" |
|
|||
| 6611 | " including parents, branch, commit status, and available updates.\n" |
|
|||
| 6612 | "\n" |
|
|||
| 6613 | " With the --remote option, this will check the default paths for\n" |
|
|||
| 6614 | " incoming and outgoing changes. This can be time-consuming.\n" |
|
|||
| 6615 | " " |
|
|||
| 6616 | msgstr "" |
|
|||
| 6617 |
|
||||
| 6618 | #, fuzzy |
|
|||
| 6619 | msgid " (empty repository)" |
|
|||
| 6620 | msgstr "创建队列版本库" |
|
|||
| 6621 |
|
||||
| 6622 | #, fuzzy |
|
|||
| 6623 | msgid " (no revision checked out)" |
|
|||
| 6624 | msgstr "要合并的版本" |
|
|||
| 6625 |
|
||||
| 6626 | #, fuzzy, python-format |
|
|||
| 6627 | msgid "parent: %d:%s %s\n" |
|
|||
| 6628 | msgstr "父亲: %d:%s\n" |
|
|||
| 6629 |
|
||||
| 6630 | #, fuzzy, python-format |
|
|||
| 6631 | msgid "branch: %s\n" |
|
|||
| 6632 | msgstr "分支: %s\n" |
|
|||
| 6633 |
|
||||
| 6634 | #, python-format |
|
|||
| 6635 | msgid "%d added" |
|
|||
| 6636 | msgstr "" |
|
|||
| 6637 |
|
||||
| 6638 | #, python-format |
|
|||
| 6639 | msgid "%d modified" |
|
|||
| 6640 | msgstr "" |
|
|||
| 6641 |
|
||||
| 6642 | #, fuzzy, python-format |
|
|||
| 6643 | msgid "%d removed" |
|
|||
| 6644 | msgstr "已删除" |
|
|||
| 6645 |
|
||||
| 6646 | #, python-format |
|
|||
| 6647 | msgid "%d deleted" |
|
|||
| 6648 | msgstr "" |
|
|||
| 6649 |
|
||||
| 6650 | #, python-format |
|
|||
| 6651 | msgid "%d ignored" |
|
|||
| 6652 | msgstr "" |
|
|||
| 6653 |
|
||||
| 6654 | #, python-format |
|
|||
| 6655 | msgid "%d unknown" |
|
|||
| 6656 | msgstr "" |
|
|||
| 6657 |
|
||||
| 6658 | #, fuzzy, python-format |
|
|||
| 6659 | msgid "%d unresolved" |
|
|||
| 6660 | msgstr "未解决" |
|
|||
| 6661 |
|
||||
| 6662 | #, fuzzy |
|
|||
| 6663 | msgid " (merge)" |
|
|||
| 6664 | msgstr "已合并" |
|
|||
| 6665 |
|
||||
| 6666 | msgid " (new branch)" |
|
|||
| 6667 | msgstr "" |
|
|||
| 6668 |
|
||||
| 6669 | msgid " (clean)" |
|
|||
| 6670 | msgstr "" |
|
|||
| 6671 |
|
||||
| 6672 | msgid " (new branch head)" |
|
|||
| 6673 | msgstr "" |
|
|||
| 6674 |
|
||||
| 6675 | #, fuzzy, python-format |
|
|||
| 6676 | msgid "commit: %s\n" |
|
|||
| 6677 | msgstr "中止: %s\n" |
|
|||
| 6678 |
|
||||
| 6679 | msgid "update: (current)\n" |
|
|||
| 6680 | msgstr "" |
|
|||
| 6681 |
|
||||
| 6682 | #, fuzzy, python-format |
|
|||
| 6683 | msgid "update: %d new changesets (update)\n" |
|
|||
| 6684 | msgstr "如果有新的修改集，就更新到最新版本" |
|
|||
| 6685 |
|
||||
| 6686 | #, python-format |
|
|||
| 6687 | msgid "update: %d new changesets, %d branch heads (merge)\n" |
|
|||
| 6688 | msgstr "" |
|
|||
| 6689 |
|
||||
| 6690 | msgid "1 or more incoming" |
|
|||
| 6691 | msgstr "" |
|
|||
| 6692 |
|
||||
| 6693 | #, python-format |
|
|||
| 6694 | msgid "%d outgoing" |
|
|||
| 6695 | msgstr "" |
|
|||
| 6696 |
|
||||
| 6697 | #, fuzzy, python-format |
|
|||
| 6698 | msgid "remote: %s\n" |
|
|||
| 6699 | msgstr "领域: %s\n" |
|
|||
| 6700 |
|
||||
| 6701 | msgid "remote: (synced)\n" |
|
|||
| 6702 | msgstr "" |
|
|||
| 6703 |
|
||||
| 6704 | msgid "" |
|
|||
| 6705 | "add one or more tags for the current or given revision\n" |
|
6209 | "add one or more tags for the current or given revision\n" | |
| 6706 | "\n" |
|
6210 | "\n" | |
| 6707 | " Name a particular revision using <name>.\n" |
|
6211 | " Name a particular revision using <name>.\n" | |
| @@ -6869,8 +6373,7 b' msgstr ""' | |||||
| 6869 | "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n" |
|
6373 | "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n" | |
| 6870 | "特定目的的隐含的担保。\n" |
|
6374 | "特定目的的隐含的担保。\n" | |
| 6871 |
|
6375 | |||
| 6872 | #, fuzzy |
|
6376 | msgid "repository root directory or symbolic path name" | |
| 6873 | msgid "repository root directory or name of overlay bundle file" |
|
|||
| 6874 | msgstr "版本库的根目录或符号路径名称" |
|
6377 | msgstr "版本库的根目录或符号路径名称" | |
| 6875 |
|
6378 | |||
| 6876 | msgid "change working directory" |
|
6379 | msgid "change working directory" | |
| @@ -7458,9 +6961,6 b' msgstr "\xe6\x98\xbe\xe7\xa4\xba\xe4\xb8\x8d\xe8\x83\xbd\xe4\xbf\xa1\xe8\xb5\x96\xe7\x9a\x84\xe9\x85\x8d\xe7\xbd\xae\xe9\x80\x89\xe9\xa1\xb9"' | |||||
| 7458 | msgid "[-u] [NAME]..." |
|
6961 | msgid "[-u] [NAME]..." | |
| 7459 | msgstr "" |
|
6962 | msgstr "" | |
| 7460 |
|
6963 | |||
| 7461 | msgid "check for push and pull" |
|
|||
| 7462 | msgstr "" |
|
|||
| 7463 |
|
||||
| 7464 | msgid "show status of all files" |
|
6964 | msgid "show status of all files" | |
| 7465 | msgstr "显示全部文件的状态" |
|
6965 | msgstr "显示全部文件的状态" | |
| 7466 |
|
6966 | |||
| @@ -7538,6 +7038,36 b' msgstr ""' | |||||
| 7538 | msgid "branch name not in UTF-8!" |
|
7038 | msgid "branch name not in UTF-8!" | |
| 7539 | msgstr "" |
|
7039 | msgstr "" | |
| 7540 |
|
7040 | |||
|
|
7041 | #, python-format | |||
|
|
7042 | msgid " searching for copies back to rev %d\n" | |||
|
|
7043 | msgstr "" | |||
|
|
7044 | ||||
|
|
7045 | #, python-format | |||
|
|
7046 | msgid "" | |||
|
|
7047 | " unmatched files in local:\n" | |||
|
|
7048 | " %s\n" | |||
|
|
7049 | msgstr "" | |||
|
|
7050 | ||||
|
|
7051 | #, python-format | |||
|
|
7052 | msgid "" | |||
|
|
7053 | " unmatched files in other:\n" | |||
|
|
7054 | " %s\n" | |||
|
|
7055 | msgstr "" | |||
|
|
7056 | ||||
|
|
7057 | msgid " all copies found (* = to merge, ! = divergent):\n" | |||
|
|
7058 | msgstr "" | |||
|
|
7059 | ||||
|
|
7060 | msgid " checking for directory renames\n" | |||
|
|
7061 | msgstr "" | |||
|
|
7062 | ||||
|
|
7063 | #, python-format | |||
|
|
7064 | msgid " dir %s -> %s\n" | |||
|
|
7065 | msgstr "" | |||
|
|
7066 | ||||
|
|
7067 | #, python-format | |||
|
|
7068 | msgid " file %s -> %s\n" | |||
|
|
7069 | msgstr "" | |||
|
|
7070 | ||||
| 7541 | msgid "working directory state appears damaged!" |
|
7071 | msgid "working directory state appears damaged!" | |
| 7542 | msgstr "" |
|
7072 | msgstr "" | |
| 7543 |
|
7073 | |||
| @@ -7691,6 +7221,12 b' msgstr "hg: \xe6\x9c\xaa\xe7\x9f\xa5\xe5\x91\xbd\xe4\xbb\xa4 \'%s\'\\n"' | |||||
| 7691 | msgid "alias '%s' resolves to ambiguous command '%s'\n" |
|
7221 | msgid "alias '%s' resolves to ambiguous command '%s'\n" | |
| 7692 | msgstr "" |
|
7222 | msgstr "" | |
| 7693 |
|
7223 | |||
|
|
7224 | #, fuzzy, python-format | |||
|
|
7225 | msgid "alias '%s' shadows command\n" | |||
|
|
7226 | msgstr "" | |||
|
|
7227 | "命令列表:\n" | |||
|
|
7228 | "\n" | |||
|
|
7229 | ||||
| 7694 | #, python-format |
|
7230 | #, python-format | |
| 7695 | msgid "malformed --config option: %s" |
|
7231 | msgid "malformed --config option: %s" | |
| 7696 | msgstr "非法 '--config' 选项: %s" |
|
7232 | msgstr "非法 '--config' 选项: %s" | |
| @@ -7758,6 +7294,10 b' msgid "tool %s requires a GUI\\n"' | |||||
| 7758 | msgstr "工具 '%s' 需要 GUI\n" |
|
7294 | msgstr "工具 '%s' 需要 GUI\n" | |
| 7759 |
|
7295 | |||
| 7760 | #, python-format |
|
7296 | #, python-format | |
|
|
7297 | msgid "picked tool '%s' for %s (binary %s symlink %s)\n" | |||
|
|
7298 | msgstr "选择工具 '%s'，用于 %s(二进制 %s 符号链接 %s)\n" | |||
|
|
7299 | ||||
|
|
7300 | #, python-format | |||
| 7761 | msgid "" |
|
7301 | msgid "" | |
| 7762 | " no tool found to merge %s\n" |
|
7302 | " no tool found to merge %s\n" | |
| 7763 | "keep (l)ocal or take (o)ther?" |
|
7303 | "keep (l)ocal or take (o)ther?" | |
| @@ -7780,6 +7320,13 b' msgid "merging %s\\n"' | |||||
| 7780 | msgstr "" |
|
7320 | msgstr "" | |
| 7781 |
|
7321 | |||
| 7782 | #, python-format |
|
7322 | #, python-format | |
|
|
7323 | msgid "my %s other %s ancestor %s\n" | |||
|
|
7324 | msgstr "" | |||
|
|
7325 | ||||
|
|
7326 | msgid " premerge successful\n" | |||
|
|
7327 | msgstr "" | |||
|
|
7328 | ||||
|
|
7329 | #, python-format | |||
| 7783 | msgid "" |
|
7330 | msgid "" | |
| 7784 | " output file %s appears unchanged\n" |
|
7331 | " output file %s appears unchanged\n" | |
| 7785 | "was merge successful (yn)?" |
|
7332 | "was merge successful (yn)?" | |
| @@ -7803,6 +7350,44 b' msgstr ""' | |||||
| 7803 | msgid "unknown bisect kind %s" |
|
7350 | msgid "unknown bisect kind %s" | |
| 7804 | msgstr "" |
|
7351 | msgstr "" | |
| 7805 |
|
7352 | |||
|
|
7353 | msgid "" | |||
|
|
7354 | "\n" | |||
|
|
7355 | " Mercurial has the ability to add new features through the use of\n" | |||
|
|
7356 | " extensions. Extensions may add new commands, add options to\n" | |||
|
|
7357 | " existing commands, change the default behavior of commands, or\n" | |||
|
|
7358 | " implement hooks.\n" | |||
|
|
7359 | "\n" | |||
|
|
7360 | " Extensions are not loaded by default for a variety of reasons:\n" | |||
|
|
7361 | " they can increase startup overhead; they may be meant for advanced\n" | |||
|
|
7362 | " usage only; they may provide potentially dangerous abilities (such\n" | |||
|
|
7363 | " as letting you destroy or modify history); they might not be ready\n" | |||
|
|
7364 | " for prime time; or they may alter some usual behaviors of stock\n" | |||
|
|
7365 | " Mercurial. It is thus up to the user to activate extensions as\n" | |||
|
|
7366 | " needed.\n" | |||
|
|
7367 | "\n" | |||
|
|
7368 | " To enable the \"foo\" extension, either shipped with Mercurial or in\n" | |||
|
|
7369 | " the Python search path, create an entry for it in your hgrc, like\n" | |||
|
|
7370 | " this::\n" | |||
|
|
7371 | "\n" | |||
|
|
7372 | " [extensions]\n" | |||
|
|
7373 | " foo =\n" | |||
|
|
7374 | "\n" | |||
|
|
7375 | " You may also specify the full path to an extension::\n" | |||
|
|
7376 | "\n" | |||
|
|
7377 | " [extensions]\n" | |||
|
|
7378 | " myfeature = ~/.hgext/myfeature.py\n" | |||
|
|
7379 | "\n" | |||
|
|
7380 | " To explicitly disable an extension enabled in an hgrc of broader\n" | |||
|
|
7381 | " scope, prepend its path with !::\n" | |||
|
|
7382 | "\n" | |||
|
|
7383 | " [extensions]\n" | |||
|
|
7384 | " # disabling extension bar residing in /path/to/extension/bar.py\n" | |||
|
|
7385 | " hgext.bar = !/path/to/extension/bar.py\n" | |||
|
|
7386 | " # ditto, but no path was supplied for extension baz\n" | |||
|
|
7387 | " hgext.baz = !\n" | |||
|
|
7388 | " " | |||
|
|
7389 | msgstr "" | |||
|
|
7390 | ||||
| 7806 | #, fuzzy |
|
7391 | #, fuzzy | |
| 7807 | msgid "disabled extensions:" |
|
7392 | msgid "disabled extensions:" | |
| 7808 | msgstr "" |
|
7393 | msgstr "" | |
| @@ -7813,29 +7398,639 b' msgstr ""' | |||||
| 7813 | msgid "Date Formats" |
|
7398 | msgid "Date Formats" | |
| 7814 | msgstr "" |
|
7399 | msgstr "" | |
| 7815 |
|
7400 | |||
|
|
7401 | msgid "" | |||
|
|
7402 | "\n" | |||
|
|
7403 | " Some commands allow the user to specify a date, e.g.:\n" | |||
|
|
7404 | "\n" | |||
|
|
7405 | " - backout, commit, import, tag: Specify the commit date.\n" | |||
|
|
7406 | " - log, revert, update: Select revision(s) by date.\n" | |||
|
|
7407 | "\n" | |||
|
|
7408 | " Many date formats are valid. Here are some examples::\n" | |||
|
|
7409 | "\n" | |||
|
|
7410 | " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |||
|
|
7411 | " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |||
|
|
7412 | " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |||
|
|
7413 | " \"Dec 6\" (midnight)\n" | |||
|
|
7414 | " \"13:18\" (today assumed)\n" | |||
|
|
7415 | " \"3:39\" (3:39AM assumed)\n" | |||
|
|
7416 | " \"3:39pm\" (15:39)\n" | |||
|
|
7417 | " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |||
|
|
7418 | " \"2006-12-6 13:18\"\n" | |||
|
|
7419 | " \"2006-12-6\"\n" | |||
|
|
7420 | " \"12-6\"\n" | |||
|
|
7421 | " \"12/6\"\n" | |||
|
|
7422 | " \"12/6/6\" (Dec 6 2006)\n" | |||
|
|
7423 | "\n" | |||
|
|
7424 | " Lastly, there is Mercurial's internal format::\n" | |||
|
|
7425 | "\n" | |||
|
|
7426 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" | |||
|
|
7427 | "\n" | |||
|
|
7428 | " This is the internal representation format for dates. unixtime is\n" | |||
|
|
7429 | " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" | |||
|
|
7430 | " offset is the offset of the local timezone, in seconds west of UTC\n" | |||
|
|
7431 | " (negative if the timezone is east of UTC).\n" | |||
|
|
7432 | "\n" | |||
|
|
7433 | " The log command also accepts date ranges::\n" | |||
|
|
7434 | "\n" | |||
|
|
7435 | " \"<{datetime}\" - at or before a given date/time\n" | |||
|
|
7436 | " \">{datetime}\" - on or after a given date/time\n" | |||
|
|
7437 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |||
|
|
7438 | " \"-{days}\" - within a given number of days of today\n" | |||
|
|
7439 | " " | |||
|
|
7440 | msgstr "" | |||
|
|
7441 | ||||
| 7816 | msgid "File Name Patterns" |
|
7442 | msgid "File Name Patterns" | |
| 7817 | msgstr "" |
|
7443 | msgstr "" | |
| 7818 |
|
7444 | |||
|
|
7445 | msgid "" | |||
|
|
7446 | "\n" | |||
|
|
7447 | " Mercurial accepts several notations for identifying one or more\n" | |||
|
|
7448 | " files at a time.\n" | |||
|
|
7449 | "\n" | |||
|
|
7450 | " By default, Mercurial treats filenames as shell-style extended\n" | |||
|
|
7451 | " glob patterns.\n" | |||
|
|
7452 | "\n" | |||
|
|
7453 | " Alternate pattern notations must be specified explicitly.\n" | |||
|
|
7454 | "\n" | |||
|
|
7455 | " To use a plain path name without any pattern matching, start it\n" | |||
|
|
7456 | " with \"path:\". These path names must completely match starting at\n" | |||
|
|
7457 | " the current repository root.\n" | |||
|
|
7458 | "\n" | |||
|
|
7459 | " To use an extended glob, start a name with \"glob:\". Globs are\n" | |||
|
|
7460 | " rooted at the current directory; a glob such as \"``*.c``\" will\n" | |||
|
|
7461 | " only match files in the current directory ending with \".c\".\n" | |||
|
|
7462 | "\n" | |||
|
|
7463 | " The supported glob syntax extensions are \"``**``\" to match any\n" | |||
|
|
7464 | " string across path separators and \"{a,b}\" to mean \"a or b\".\n" | |||
|
|
7465 | "\n" | |||
|
|
7466 | " To use a Perl/Python regular expression, start a name with \"re:\".\n" | |||
|
|
7467 | " Regexp pattern matching is anchored at the root of the repository.\n" | |||
|
|
7468 | "\n" | |||
|
|
7469 | " Plain examples::\n" | |||
|
|
7470 | "\n" | |||
|
|
7471 | " path:foo/bar a name bar in a directory named foo in the root\n" | |||
|
|
7472 | " of the repository\n" | |||
|
|
7473 | " path:path:name a file or directory named \"path:name\"\n" | |||
|
|
7474 | "\n" | |||
|
|
7475 | " Glob examples::\n" | |||
|
|
7476 | "\n" | |||
|
|
7477 | " glob:*.c any name ending in \".c\" in the current directory\n" | |||
|
|
7478 | " *.c any name ending in \".c\" in the current directory\n" | |||
|
|
7479 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |||
|
|
7480 | " current directory including itself.\n" | |||
|
|
7481 | " foo/*.c any name ending in \".c\" in the directory foo\n" | |||
|
|
7482 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |||
|
|
7483 | " including itself.\n" | |||
|
|
7484 | "\n" | |||
|
|
7485 | " Regexp examples::\n" | |||
|
|
7486 | "\n" | |||
|
|
7487 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |||
|
|
7488 | "\n" | |||
|
|
7489 | " " | |||
|
|
7490 | msgstr "" | |||
|
|
7491 | ||||
| 7819 | msgid "Environment Variables" |
|
7492 | msgid "Environment Variables" | |
| 7820 | msgstr "" |
|
7493 | msgstr "" | |
| 7821 |
|
7494 | |||
|
|
7495 | msgid "" | |||
|
|
7496 | "\n" | |||
|
|
7497 | "HG\n" | |||
|
|
7498 | " Path to the 'hg' executable, automatically passed when running\n" | |||
|
|
7499 | " hooks, extensions or external tools. If unset or empty, this is\n" | |||
|
|
7500 | " the hg executable's name if it's frozen, or an executable named\n" | |||
|
|
7501 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |||
|
|
7502 | " Windows) is searched.\n" | |||
|
|
7503 | "\n" | |||
|
|
7504 | "HGEDITOR\n" | |||
|
|
7505 | " This is the name of the editor to run when committing. See EDITOR.\n" | |||
|
|
7506 | "\n" | |||
|
|
7507 | " (deprecated, use .hgrc)\n" | |||
|
|
7508 | "\n" | |||
|
|
7509 | "HGENCODING\n" | |||
|
|
7510 | " This overrides the default locale setting detected by Mercurial.\n" | |||
|
|
7511 | " This setting is used to convert data including usernames,\n" | |||
|
|
7512 | " changeset descriptions, tag names, and branches. This setting can\n" | |||
|
|
7513 | " be overridden with the --encoding command-line option.\n" | |||
|
|
7514 | "\n" | |||
|
|
7515 | "HGENCODINGMODE\n" | |||
|
|
7516 | " This sets Mercurial's behavior for handling unknown characters\n" | |||
|
|
7517 | " while transcoding user input. The default is \"strict\", which\n" | |||
|
|
7518 | " causes Mercurial to abort if it can't map a character. Other\n" | |||
|
|
7519 | " settings include \"replace\", which replaces unknown characters, and\n" | |||
|
|
7520 | " \"ignore\", which drops them. This setting can be overridden with\n" | |||
|
|
7521 | " the --encodingmode command-line option.\n" | |||
|
|
7522 | "\n" | |||
|
|
7523 | "HGMERGE\n" | |||
|
|
7524 | " An executable to use for resolving merge conflicts. The program\n" | |||
|
|
7525 | " will be executed with three arguments: local file, remote file,\n" | |||
|
|
7526 | " ancestor file.\n" | |||
|
|
7527 | "\n" | |||
|
|
7528 | " (deprecated, use .hgrc)\n" | |||
|
|
7529 | "\n" | |||
|
|
7530 | "HGRCPATH\n" | |||
|
|
7531 | " A list of files or directories to search for hgrc files. Item\n" | |||
|
|
7532 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |||
|
|
7533 | " platform default search path is used. If empty, only the .hg/hgrc\n" | |||
|
|
7534 | " from the current repository is read.\n" | |||
|
|
7535 | "\n" | |||
|
|
7536 | " For each element in HGRCPATH:\n" | |||
|
|
7537 | "\n" | |||
|
|
7538 | " - if it's a directory, all files ending with .rc are added\n" | |||
|
|
7539 | " - otherwise, the file itself will be added\n" | |||
|
|
7540 | "\n" | |||
|
|
7541 | "HGUSER\n" | |||
|
|
7542 | " This is the string used as the author of a commit. If not set,\n" | |||
|
|
7543 | " available values will be considered in this order:\n" | |||
|
|
7544 | "\n" | |||
|
|
7545 | " - HGUSER (deprecated)\n" | |||
|
|
7546 | " - hgrc files from the HGRCPATH\n" | |||
|
|
7547 | " - EMAIL\n" | |||
|
|
7548 | " - interactive prompt\n" | |||
|
|
7549 | " - LOGNAME (with '@hostname' appended)\n" | |||
|
|
7550 | "\n" | |||
|
|
7551 | " (deprecated, use .hgrc)\n" | |||
|
|
7552 | "\n" | |||
|
|
7553 | "EMAIL\n" | |||
|
|
7554 | " May be used as the author of a commit; see HGUSER.\n" | |||
|
|
7555 | "\n" | |||
|
|
7556 | "LOGNAME\n" | |||
|
|
7557 | " May be used as the author of a commit; see HGUSER.\n" | |||
|
|
7558 | "\n" | |||
|
|
7559 | "VISUAL\n" | |||
|
|
7560 | " This is the name of the editor to use when committing. See EDITOR.\n" | |||
|
|
7561 | "\n" | |||
|
|
7562 | "EDITOR\n" | |||
|
|
7563 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |||
|
|
7564 | " user to modify, for example when writing commit messages. The\n" | |||
|
|
7565 | " editor it uses is determined by looking at the environment\n" | |||
|
|
7566 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |||
|
|
7567 | " non-empty one is chosen. If all of them are empty, the editor\n" | |||
|
|
7568 | " defaults to 'vi'.\n" | |||
|
|
7569 | "\n" | |||
|
|
7570 | "PYTHONPATH\n" | |||
|
|
7571 | " This is used by Python to find imported modules and may need to be\n" | |||
|
|
7572 | " set appropriately if this Mercurial is not installed system-wide.\n" | |||
|
|
7573 | " " | |||
|
|
7574 | msgstr "" | |||
|
|
7575 | ||||
| 7822 | msgid "Specifying Single Revisions" |
|
7576 | msgid "Specifying Single Revisions" | |
| 7823 | msgstr "" |
|
7577 | msgstr "" | |
| 7824 |
|
7578 | |||
|
|
7579 | msgid "" | |||
|
|
7580 | "\n" | |||
|
|
7581 | " Mercurial supports several ways to specify individual revisions.\n" | |||
|
|
7582 | "\n" | |||
|
|
7583 | " A plain integer is treated as a revision number. Negative integers\n" | |||
|
|
7584 | " are treated as sequential offsets from the tip, with -1 denoting\n" | |||
|
|
7585 | " the tip, -2 denoting the revision prior to the tip, and so forth.\n" | |||
|
|
7586 | "\n" | |||
|
|
7587 | " A 40-digit hexadecimal string is treated as a unique revision\n" | |||
|
|
7588 | " identifier.\n" | |||
|
|
7589 | "\n" | |||
|
|
7590 | " A hexadecimal string less than 40 characters long is treated as a\n" | |||
|
|
7591 | " unique revision identifier and is referred to as a short-form\n" | |||
|
|
7592 | " identifier. A short-form identifier is only valid if it is the\n" | |||
|
|
7593 | " prefix of exactly one full-length identifier.\n" | |||
|
|
7594 | "\n" | |||
|
|
7595 | " Any other string is treated as a tag or branch name. A tag name is\n" | |||
|
|
7596 | " a symbolic name associated with a revision identifier. A branch\n" | |||
|
|
7597 | " name denotes the tipmost revision of that branch. Tag and branch\n" | |||
|
|
7598 | " names must not contain the \":\" character.\n" | |||
|
|
7599 | "\n" | |||
|
|
7600 | " The reserved name \"tip\" is a special tag that always identifies\n" | |||
|
|
7601 | " the most recent revision.\n" | |||
|
|
7602 | "\n" | |||
|
|
7603 | " The reserved name \"null\" indicates the null revision. This is the\n" | |||
|
|
7604 | " revision of an empty repository, and the parent of revision 0.\n" | |||
|
|
7605 | "\n" | |||
|
|
7606 | " The reserved name \".\" indicates the working directory parent. If\n" | |||
|
|
7607 | " no working directory is checked out, it is equivalent to null. If\n" | |||
|
|
7608 | " an uncommitted merge is in progress, \".\" is the revision of the\n" | |||
|
|
7609 | " first parent.\n" | |||
|
|
7610 | " " | |||
|
|
7611 | msgstr "" | |||
|
|
7612 | ||||
| 7825 | msgid "Specifying Multiple Revisions" |
|
7613 | msgid "Specifying Multiple Revisions" | |
| 7826 | msgstr "指定多个版本" |
|
7614 | msgstr "指定多个版本" | |
| 7827 |
|
7615 | |||
|
|
7616 | #, fuzzy | |||
|
|
7617 | msgid "" | |||
|
|
7618 | "\n" | |||
|
|
7619 | " When Mercurial accepts more than one revision, they may be\n" | |||
|
|
7620 | " specified individually, or provided as a topologically continuous\n" | |||
|
|
7621 | " range, separated by the \":\" character.\n" | |||
|
|
7622 | "\n" | |||
|
|
7623 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" | |||
|
|
7624 | " are revision identifiers. Both BEGIN and END are optional. If\n" | |||
|
|
7625 | " BEGIN is not specified, it defaults to revision number 0. If END\n" | |||
|
|
7626 | " is not specified, it defaults to the tip. The range \":\" thus means\n" | |||
|
|
7627 | " \"all revisions\".\n" | |||
|
|
7628 | "\n" | |||
|
|
7629 | " If BEGIN is greater than END, revisions are treated in reverse\n" | |||
|
|
7630 | " order.\n" | |||
|
|
7631 | "\n" | |||
|
|
7632 | " A range acts as a closed interval. This means that a range of 3:5\n" | |||
|
|
7633 | " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |||
|
|
7634 | " " | |||
|
|
7635 | msgstr "" | |||
|
|
7636 | "\n" | |||
|
|
7637 | " 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" | |||
|
|
7638 | " 范围格式提供。\n" | |||
|
|
7639 | "\n" | |||
|
|
7640 | " 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" | |||
|
|
7641 | " 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" | |||
|
|
7642 | "\"\n" | |||
|
|
7643 | " 意味着全部版本。\n" | |||
|
|
7644 | "\n" | |||
|
|
7645 | " 如果 'BEGIN' 大于 'END'，版本视为反序。\n" | |||
|
|
7646 | "\n" | |||
|
|
7647 | " 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n" | |||
|
|
7648 | " '8'，'7' 和 '6'。\n" | |||
|
|
7649 | " " | |||
|
|
7650 | ||||
| 7828 | msgid "Diff Formats" |
|
7651 | msgid "Diff Formats" | |
| 7829 | msgstr "差异格式" |
|
7652 | msgstr "差异格式" | |
| 7830 |
|
7653 | |||
|
|
7654 | #, fuzzy | |||
|
|
7655 | msgid "" | |||
|
|
7656 | "\n" | |||
|
|
7657 | " Mercurial's default format for showing changes between two\n" | |||
|
|
7658 | " versions of a file is compatible with the unified format of GNU\n" | |||
|
|
7659 | " diff, which can be used by GNU patch and many other standard\n" | |||
|
|
7660 | " tools.\n" | |||
|
|
7661 | "\n" | |||
|
|
7662 | " While this standard format is often enough, it does not encode the\n" | |||
|
|
7663 | " following information:\n" | |||
|
|
7664 | "\n" | |||
|
|
7665 | " - executable status and other permission bits\n" | |||
|
|
7666 | " - copy or rename information\n" | |||
|
|
7667 | " - changes in binary files\n" | |||
|
|
7668 | " - creation or deletion of empty files\n" | |||
|
|
7669 | "\n" | |||
|
|
7670 | " Mercurial also supports the extended diff format from the git VCS\n" | |||
|
|
7671 | " which addresses these limitations. The git diff format is not\n" | |||
|
|
7672 | " produced by default because a few widespread tools still do not\n" | |||
|
|
7673 | " understand this format.\n" | |||
|
|
7674 | "\n" | |||
|
|
7675 | " This means that when generating diffs from a Mercurial repository\n" | |||
|
|
7676 | " (e.g. with \"hg export\"), you should be careful about things like\n" | |||
|
|
7677 | " file copies and renames or other things mentioned above, because\n" | |||
|
|
7678 | " when applying a standard diff to a different repository, this\n" | |||
|
|
7679 | " extra information is lost. Mercurial's internal operations (like\n" | |||
|
|
7680 | " push and pull) are not affected by this, because they use an\n" | |||
|
|
7681 | " internal binary format for communicating changes.\n" | |||
|
|
7682 | "\n" | |||
|
|
7683 | " To make Mercurial produce the git extended diff format, use the\n" | |||
|
|
7684 | " --git option available for many commands, or set 'git = True' in\n" | |||
|
|
7685 | " the [diff] section of your hgrc. You do not need to set this\n" | |||
|
|
7686 | " option when importing diffs in this format or using them in the mq\n" | |||
|
|
7687 | " extension.\n" | |||
|
|
7688 | " " | |||
|
|
7689 | msgstr "" | |||
|
|
7690 | "\n" | |||
|
|
7691 | " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" | |||
|
|
7692 | " GNU patch 和许多标准工具。\n" | |||
|
|
7693 | "\n" | |||
|
|
7694 | " 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" | |||
|
|
7695 | "\n" | |||
|
|
7696 | " - 可执行状态和其它权限位\n" | |||
|
|
7697 | " - 复制或改名信息\n" | |||
|
|
7698 | " - 二进制文件的修改\n" | |||
|
|
7699 | " - 创建或删除空文件\n" | |||
|
|
7700 | "\n" | |||
|
|
7701 | " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" | |||
|
|
7702 | " 此格式，所以它不是默认格式。\n" | |||
|
|
7703 | "\n" | |||
|
|
7704 | " 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n" | |||
|
|
7705 | " 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" | |||
|
|
7706 | " 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" | |||
|
|
7707 | " 响。\n" | |||
|
|
7708 | "\n" | |||
|
|
7709 | " 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" | |||
|
|
7710 | " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" | |||
|
|
7711 | " 或在 mq 扩展中使用时，不需要设置此选项。\n" | |||
|
|
7712 | " " | |||
|
|
7713 | ||||
| 7831 | msgid "Template Usage" |
|
7714 | msgid "Template Usage" | |
| 7832 | msgstr "模版用法" |
|
7715 | msgstr "模版用法" | |
| 7833 |
|
7716 | |||
| 7834 | #, fuzzy |
|
7717 | #, fuzzy | |
|
|
7718 | msgid "" | |||
|
|
7719 | "\n" | |||
|
|
7720 | " Mercurial allows you to customize output of commands through\n" | |||
|
|
7721 | " templates. You can either pass in a template from the command\n" | |||
|
|
7722 | " line, via the --template option, or select an existing\n" | |||
|
|
7723 | " template-style (--style).\n" | |||
|
|
7724 | "\n" | |||
|
|
7725 | " You can customize output for any \"log-like\" command: log,\n" | |||
|
|
7726 | " outgoing, incoming, tip, parents, heads and glog.\n" | |||
|
|
7727 | "\n" | |||
|
|
7728 | " Three styles are packaged with Mercurial: default (the style used\n" | |||
|
|
7729 | " when no explicit preference is passed), compact and changelog.\n" | |||
|
|
7730 | " Usage::\n" | |||
|
|
7731 | "\n" | |||
|
|
7732 | " $ hg log -r1 --style changelog\n" | |||
|
|
7733 | "\n" | |||
|
|
7734 | " A template is a piece of text, with markup to invoke variable\n" | |||
|
|
7735 | " expansion::\n" | |||
|
|
7736 | "\n" | |||
|
|
7737 | " $ hg log -r1 --template \"{node}\\n\"\n" | |||
|
|
7738 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |||
|
|
7739 | "\n" | |||
|
|
7740 | " Strings in curly braces are called keywords. The availability of\n" | |||
|
|
7741 | " keywords depends on the exact context of the templater. These\n" | |||
|
|
7742 | " keywords are usually available for templating a log-like command:\n" | |||
|
|
7743 | "\n" | |||
|
|
7744 | " :author: String. The unmodified author of the changeset.\n" | |||
|
|
7745 | " :branches: String. The name of the branch on which the changeset\n" | |||
|
|
7746 | " was committed. Will be empty if the branch name was\n" | |||
|
|
7747 | " default.\n" | |||
|
|
7748 | " :date: Date information. The date when the changeset was\n" | |||
|
|
7749 | " committed.\n" | |||
|
|
7750 | " :desc: String. The text of the changeset description.\n" | |||
|
|
7751 | " :diffstat: String. Statistics of changes with the following\n" | |||
|
|
7752 | " format: \"modified files: +added/-removed lines\"\n" | |||
|
|
7753 | " :files: List of strings. All files modified, added, or removed\n" | |||
|
|
7754 | " by this changeset.\n" | |||
|
|
7755 | " :file_adds: List of strings. Files added by this changeset.\n" | |||
|
|
7756 | " :file_mods: List of strings. Files modified by this changeset.\n" | |||
|
|
7757 | " :file_dels: List of strings. Files removed by this changeset.\n" | |||
|
|
7758 | " :node: String. The changeset identification hash, as a\n" | |||
|
|
7759 | " 40-character hexadecimal string.\n" | |||
|
|
7760 | " :parents: List of strings. The parents of the changeset.\n" | |||
|
|
7761 | " :rev: Integer. The repository-local changeset revision\n" | |||
|
|
7762 | " number.\n" | |||
|
|
7763 | " :tags: List of strings. Any tags associated with the\n" | |||
|
|
7764 | " changeset.\n" | |||
|
|
7765 | "\n" | |||
|
|
7766 | " The \"date\" keyword does not produce human-readable output. If you\n" | |||
|
|
7767 | " want to use a date in your output, you can use a filter to process\n" | |||
|
|
7768 | " it. Filters are functions which return a string based on the input\n" | |||
|
|
7769 | " variable. You can also use a chain of filters to get the desired\n" | |||
|
|
7770 | " output::\n" | |||
|
|
7771 | "\n" | |||
|
|
7772 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |||
|
|
7773 | " 2008-08-21 18:22 +0000\n" | |||
|
|
7774 | "\n" | |||
|
|
7775 | " List of filters:\n" | |||
|
|
7776 | "\n" | |||
|
|
7777 | " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |||
|
|
7778 | " every line except the last.\n" | |||
|
|
7779 | " :age: Date. Returns a human-readable date/time difference\n" | |||
|
|
7780 | " between the given date/time and the current\n" | |||
|
|
7781 | " date/time.\n" | |||
|
|
7782 | " :basename: Any text. Treats the text as a path, and returns the\n" | |||
|
|
7783 | " last component of the path after splitting by the\n" | |||
|
|
7784 | " path separator (ignoring trailing separators). For\n" | |||
|
|
7785 | " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" | |||
|
|
7786 | " becomes \"bar\".\n" | |||
|
|
7787 | " :stripdir: Treat the text as path and strip a directory level,\n" | |||
|
|
7788 | " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" | |||
|
|
7789 | " \"foo\".\n" | |||
|
|
7790 | " :date: Date. Returns a date in a Unix date format, including\n" | |||
|
|
7791 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |||
|
|
7792 | " :domain: Any text. Finds the first string that looks like an\n" | |||
|
|
7793 | " email address, and extracts just the domain\n" | |||
|
|
7794 | " component. Example: 'User <user@example.com>' becomes\n" | |||
|
|
7795 | " 'example.com'.\n" | |||
|
|
7796 | " :email: Any text. Extracts the first string that looks like\n" | |||
|
|
7797 | " an email address. Example: 'User <user@example.com>'\n" | |||
|
|
7798 | " becomes 'user@example.com'.\n" | |||
|
|
7799 | " :escape: Any text. Replaces the special XML/XHTML characters\n" | |||
|
|
7800 | " \"&\", \"<\" and \">\" with XML entities.\n" | |||
|
|
7801 | " :fill68: Any text. Wraps the text to fit in 68 columns.\n" | |||
|
|
7802 | " :fill76: Any text. Wraps the text to fit in 76 columns.\n" | |||
|
|
7803 | " :firstline: Any text. Returns the first line of text.\n" | |||
|
|
7804 | " :nonempty: Any text. Returns '(none)' if the string is empty.\n" | |||
|
|
7805 | " :hgdate: Date. Returns the date as a pair of numbers:\n" | |||
|
|
7806 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |||
|
|
7807 | " :isodate: Date. Returns the date in ISO 8601 format:\n" | |||
|
|
7808 | " \"2009-08-18 13:00 +0200\".\n" | |||
|
|
7809 | " :isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |||
|
|
7810 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" | |||
|
|
7811 | " rfc3339date filter.\n" | |||
|
|
7812 | " :localdate: Date. Converts a date to local date.\n" | |||
|
|
7813 | " :obfuscate: Any text. Returns the input text rendered as a\n" | |||
|
|
7814 | " sequence of XML entities.\n" | |||
|
|
7815 | " :person: Any text. Returns the text before an email address.\n" | |||
|
|
7816 | " :rfc822date: Date. Returns a date using the same format used in\n" | |||
|
|
7817 | " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |||
|
|
7818 | " :rfc3339date: Date. Returns a date using the Internet date format\n" | |||
|
|
7819 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" | |||
|
|
7820 | " :short: Changeset hash. Returns the short form of a changeset\n" | |||
|
|
7821 | " hash, i.e. a 12-byte hexadecimal string.\n" | |||
|
|
7822 | " :shortdate: Date. Returns a date like \"2006-09-18\".\n" | |||
|
|
7823 | " :strip: Any text. Strips all leading and trailing whitespace.\n" | |||
|
|
7824 | " :tabindent: Any text. Returns the text, with every line except\n" | |||
|
|
7825 | " the first starting with a tab character.\n" | |||
|
|
7826 | " :urlescape: Any text. Escapes all \"special\" characters. For\n" | |||
|
|
7827 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |||
|
|
7828 | " :user: Any text. Returns the user portion of an email\n" | |||
|
|
7829 | " address.\n" | |||
|
|
7830 | " " | |||
|
|
7831 | msgstr "" | |||
|
|
7832 | "\n" | |||
|
|
7833 | " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" | |||
|
|
7834 | " 来使用模版，或者选择已有的模版样式(--style)。\n" | |||
|
|
7835 | "\n" | |||
|
|
7836 | " 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" | |||
|
|
7837 | " tip，parents，heads 和 glog。\n" | |||
|
|
7838 | "\n" | |||
|
|
7839 | " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" | |||
|
|
7840 | "\n" | |||
|
|
7841 | " $ hg log -r1 --style changelog\n" | |||
|
|
7842 | "\n" | |||
|
|
7843 | " 模版是文本片断，其中的标记用于变量扩展:\n" | |||
|
|
7844 | "\n" | |||
|
|
7845 | " $ hg log -r1 --template \"{node}\\n\"\n" | |||
|
|
7846 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |||
|
|
7847 | "\n" | |||
|
|
7848 | " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" | |||
|
|
7849 | " 可用于输出与日志信息类似的命令:\n" | |||
|
|
7850 | "\n" | |||
|
|
7851 | " - author: 字符串。修改集的作者。\n" | |||
|
|
7852 | " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" | |||
|
|
7853 | " - date: 日期信息。修改集的日期。\n" | |||
|
|
7854 | " - desc: 字符串。修改集的描述。\n" | |||
|
|
7855 | " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" | |||
|
|
7856 | " - file_adds: 字符串列表。修改集中被增加的文件。\n" | |||
|
|
7857 | " - file_mods: 字符串列表。修改集中被修改的文件\n" | |||
|
|
7858 | " - file_dels: 字符串列表。修改集中被删除的文件\n" | |||
|
|
7859 | " - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" | |||
|
|
7860 | " - parents: 字符串列表。修改集的父亲。\n" | |||
|
|
7861 | " - rev: 整数。本地版本库的修改集的版本号。\n" | |||
|
|
7862 | " - tags: 字符串列表。修改集的标签。\n" | |||
|
|
7863 | "\n" | |||
|
|
7864 | " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使用\n" | |||
|
|
7865 | " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" | |||
|
|
7866 | " 链来产生理想的输出:\n" | |||
|
|
7867 | "\n" | |||
|
|
7868 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |||
|
|
7869 | " 2008-08-21 18:22 +0000\n" | |||
|
|
7870 | "\n" | |||
|
|
7871 | " 过滤器列表:\n" | |||
|
|
7872 | "\n" | |||
|
|
7873 | " - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" | |||
|
|
7874 | " \"<br />\"。\n" | |||
|
|
7875 | " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n" | |||
|
|
7876 | " - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n" | |||
|
|
7877 | " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz" | |||
|
|
7878 | "\"，\n" | |||
|
|
7879 | " \"foo/bar//\" 成为 \"bar\"。\n" | |||
|
|
7880 | " - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n" | |||
|
|
7881 | " \"Mon Sep 04 15:13:13 2006 0700\"。\n" | |||
|
|
7882 | " - domain: 输入任意文本。找到第一个 email 地址，返回其域名。例如: \n" | |||
|
|
7883 | " 'User <user@example.com>' 成为 'example.com'。\n" | |||
|
|
7884 | " - email: 输入任意文本。返回第一个 email 地址。例如: \n" | |||
|
|
7885 | " 'User <user@example.com>' 成为 'user@example.com'。\n" | |||
|
|
7886 | " - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n" | |||
|
|
7887 | " \"<\" 和 \">\"。\n" | |||
|
|
7888 | " - fill68: 输入任意文本。格式化为 68 列文本。\n" | |||
|
|
7889 | " - fill76: 输入任意文本。格式化为 76 列文本。\n" | |||
|
|
7890 | " - firstline: 输入任意文本。返回首行。\n" | |||
|
|
7891 | " - hgdate: 输入日期。返回一对数字:\n" | |||
|
|
7892 | " \"1157407993 25200\" (Unix 时戳，时区偏移)。\n" | |||
|
|
7893 | " - isodate: 输入日期。返回 ISO 8601 格式的日期。\n" | |||
|
|
7894 | " - obfuscate: 输入任意文本。返回其 XML 实体序列。\n" | |||
|
|
7895 | " - person: 输入任意文本。返回 email 地址前的文本。\n" | |||
|
|
7896 | " - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n" | |||
|
|
7897 | " - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n" | |||
|
|
7898 | " 字符串。\n" | |||
|
|
7899 | " - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n" | |||
|
|
7900 | " - strip: 输入任意文本。删除全部行首与行尾空白。\n" | |||
|
|
7901 | " - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n" | |||
|
|
7902 | " - urlescape: 输入任意文本。封装全部特殊字符。例如\n" | |||
|
|
7903 | " \"foo bar\" 成为 \"foo%20bar\"。\n" | |||
|
|
7904 | " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" | |||
|
|
7905 | " " | |||
|
|
7906 | ||||
|
|
7907 | #, fuzzy | |||
| 7835 | msgid "URL Paths" |
|
7908 | msgid "URL Paths" | |
| 7836 | msgstr "统一资源定位路径" |
|
7909 | msgstr "统一资源定位路径" | |
| 7837 |
|
7910 | |||
| 7838 | #, fuzzy |
|
7911 | #, fuzzy | |
|
|
7912 | msgid "" | |||
|
|
7913 | "\n" | |||
|
|
7914 | " Valid URLs are of the form::\n" | |||
|
|
7915 | "\n" | |||
|
|
7916 | " local/filesystem/path[#revision]\n" | |||
|
|
7917 | " file://local/filesystem/path[#revision]\n" | |||
|
|
7918 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |||
|
|
7919 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |||
|
|
7920 | " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" | |||
|
|
7921 | "\n" | |||
|
|
7922 | " Paths in the local filesystem can either point to Mercurial\n" | |||
|
|
7923 | " repositories or to bundle files (as created by 'hg bundle' or 'hg\n" | |||
|
|
7924 | " incoming --bundle').\n" | |||
|
|
7925 | "\n" | |||
|
|
7926 | " An optional identifier after # indicates a particular branch, tag,\n" | |||
|
|
7927 | " or changeset to use from the remote repository. See also 'hg help\n" | |||
|
|
7928 | " revisions'.\n" | |||
|
|
7929 | "\n" | |||
|
|
7930 | " Some features, such as pushing to http:// and https:// URLs are\n" | |||
|
|
7931 | " only possible if the feature is explicitly enabled on the remote\n" | |||
|
|
7932 | " Mercurial server.\n" | |||
|
|
7933 | "\n" | |||
|
|
7934 | " Some notes about using SSH with Mercurial:\n" | |||
|
|
7935 | "\n" | |||
|
|
7936 | " - SSH requires an accessible shell account on the destination\n" | |||
|
|
7937 | " machine and a copy of hg in the remote path or specified with as\n" | |||
|
|
7938 | " remotecmd.\n" | |||
|
|
7939 | " - path is relative to the remote user's home directory by default.\n" | |||
|
|
7940 | " Use an extra slash at the start of a path to specify an absolute\n" | |||
|
|
7941 | " path::\n" | |||
|
|
7942 | "\n" | |||
|
|
7943 | " ssh://example.com//tmp/repository\n" | |||
|
|
7944 | "\n" | |||
|
|
7945 | " - Mercurial doesn't use its own compression via SSH; the right\n" | |||
|
|
7946 | " thing to do is to configure it in your ~/.ssh/config, e.g.::\n" | |||
|
|
7947 | "\n" | |||
|
|
7948 | " Host *.mylocalnetwork.example.com\n" | |||
|
|
7949 | " Compression no\n" | |||
|
|
7950 | " Host *\n" | |||
|
|
7951 | " Compression yes\n" | |||
|
|
7952 | "\n" | |||
|
|
7953 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" | |||
|
|
7954 | " or with the --ssh command line option.\n" | |||
|
|
7955 | "\n" | |||
|
|
7956 | " These URLs can all be stored in your hgrc with path aliases under\n" | |||
|
|
7957 | " the [paths] section like so::\n" | |||
|
|
7958 | "\n" | |||
|
|
7959 | " [paths]\n" | |||
|
|
7960 | " alias1 = URL1\n" | |||
|
|
7961 | " alias2 = URL2\n" | |||
|
|
7962 | " ...\n" | |||
|
|
7963 | "\n" | |||
|
|
7964 | " You can then use the alias for any command that uses a URL (for\n" | |||
|
|
7965 | " example 'hg pull alias1' would pull from the 'alias1' path).\n" | |||
|
|
7966 | "\n" | |||
|
|
7967 | " Two path aliases are special because they are used as defaults\n" | |||
|
|
7968 | " when you do not provide the URL to a command:\n" | |||
|
|
7969 | "\n" | |||
|
|
7970 | " default:\n" | |||
|
|
7971 | " When you create a repository with hg clone, the clone command\n" | |||
|
|
7972 | " saves the location of the source repository as the new\n" | |||
|
|
7973 | " repository's 'default' path. This is then used when you omit\n" | |||
|
|
7974 | " path from push- and pull-like commands (including incoming and\n" | |||
|
|
7975 | " outgoing).\n" | |||
|
|
7976 | "\n" | |||
|
|
7977 | " default-push:\n" | |||
|
|
7978 | " The push command will look for a path named 'default-push', and\n" | |||
|
|
7979 | " prefer it over 'default' if both are defined.\n" | |||
|
|
7980 | " " | |||
|
|
7981 | msgstr "" | |||
|
|
7982 | "\n" | |||
|
|
7983 | " 有效的位置格式:\n" | |||
|
|
7984 | "\n" | |||
|
|
7985 | " local/filesystem/path (or file://local/filesystem/path)\n" | |||
|
|
7986 | " http://[user[:pass]@]host[:port]/[path]\n" | |||
|
|
7987 | " https://[user[:pass]@]host[:port]/[path]\n" | |||
|
|
7988 | " ssh://[user[:pass]@]host[:port]/[path]\n" | |||
|
|
7989 | "\n" | |||
|
|
7990 | " 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" | |||
|
|
7991 | " 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" | |||
|
|
7992 | "\n" | |||
|
|
7993 | " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" | |||
|
|
7994 | " 修改集。\n" | |||
|
|
7995 | "\n" | |||
|
|
7996 | " 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" | |||
|
|
7997 | "\n" | |||
|
|
7998 | " 在水银中使用 SSH 的一些提示:\n" | |||
|
|
7999 | " - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" | |||
|
|
8000 | " hg，或者有指定的远程命令。\n" | |||
|
|
8001 | " - 默认 'path' 是相对于远程主机上的用户家目录。\n" | |||
|
|
8002 | " 可以在路径前增加一个斜线指定绝对路径:\n" | |||
|
|
8003 | " ssh://example.com//tmp/repository\n" | |||
|
|
8004 | " - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" | |||
|
|
8005 | " SSH 执行压缩，例如:\n" | |||
|
|
8006 | " Host *.mylocalnetwork.example.com\n" | |||
|
|
8007 | " Compression no\n" | |||
|
|
8008 | " Host *\n" | |||
|
|
8009 | " Compression yes\n" | |||
|
|
8010 | " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" | |||
|
|
8011 | " 用于命令行参数 '--ssh' 中。\n" | |||
|
|
8012 | "\n" | |||
|
|
8013 | " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" | |||
|
|
8014 | " [paths]\n" | |||
|
|
8015 | " alias1 = URL1\n" | |||
|
|
8016 | " alias2 = URL2\n" | |||
|
|
8017 | " ...\n" | |||
|
|
8018 | "\n" | |||
|
|
8019 | " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" | |||
|
|
8020 | " 会从 'alias1' 定义的路径取得指定版本)。\n" | |||
|
|
8021 | "\n" | |||
|
|
8022 | " 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" | |||
|
|
8023 | "\n" | |||
|
|
8024 | " default:\n" | |||
|
|
8025 | " 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" | |||
|
|
8026 | " 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" | |||
|
|
8027 | " 的命令省略路径(包含进和出)。\n" | |||
|
|
8028 | "\n" | |||
|
|
8029 | " default-push:\n" | |||
|
|
8030 | " 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" | |||
|
|
8031 | " " | |||
|
|
8032 | ||||
|
|
8033 | #, fuzzy | |||
| 7839 | msgid "Using additional features" |
|
8034 | msgid "Using additional features" | |
| 7840 | msgstr "启用额外的输出" |
|
8035 | msgstr "启用额外的输出" | |
| 7841 |
|
8036 | |||
| @@ -7870,20 +8065,27 b' msgstr ""' | |||||
| 7870 | msgid "clone from remote to remote not supported" |
|
8065 | msgid "clone from remote to remote not supported" | |
| 7871 | msgstr "" |
|
8066 | msgstr "" | |
| 7872 |
|
8067 | |||
| 7873 | #, fuzzy, python-format |
|
8068 | msgid "updated" | |
| 7874 | msgid "updating to branch %s\n" |
|
8069 | msgstr "已更新" | |
| 7875 | msgstr "正在更新标签\n" |
|
8070 | ||
| 7876 |
|
8071 | msgid "merged" | ||
| 7877 | #, python-format |
|
8072 | msgstr "已合并" | |
| 7878 | msgid "" |
|
8073 | ||
| 7879 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" |
|
8074 | msgid "removed" | |
| 7880 | msgstr "" |
|
8075 | msgstr "已删除" | |
|
|
8076 | ||||
|
|
8077 | msgid "unresolved" | |||
|
|
8078 | msgstr "未解决" | |||
|
|
8079 | ||||
|
|
8080 | #, python-format | |||
|
|
8081 | msgid "%d files %s" | |||
|
|
8082 | msgstr "%d 个文件%s" | |||
| 7881 |
|
8083 | |||
| 7882 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
8084 | msgid "use 'hg resolve' to retry unresolved file merges\n" | |
| 7883 | msgstr "" |
|
8085 | msgstr "" | |
| 7884 |
|
8086 | |||
| 7885 | msgid "" |
|
8087 | msgid "" | |
| 7886 |
"use 'hg resolve' to retry unresolved file merges or 'hg up |
|
8088 | "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " | |
| 7887 | "abandon\n" |
|
8089 | "abandon\n" | |
| 7888 | msgstr "" |
|
8090 | msgstr "" | |
| 7889 |
|
8091 | |||
| @@ -7959,12 +8161,32 b' msgstr ""' | |||||
| 7959 | msgid "unsupported URL component: \"%s\"" |
|
8161 | msgid "unsupported URL component: \"%s\"" | |
| 7960 | msgstr "" |
|
8162 | msgstr "" | |
| 7961 |
|
8163 | |||
|
|
8164 | #, python-format | |||
|
|
8165 | msgid "using %s\n" | |||
|
|
8166 | msgstr "使用 %s\n" | |||
|
|
8167 | ||||
|
|
8168 | #, python-format | |||
|
|
8169 | msgid "capabilities: %s\n" | |||
|
|
8170 | msgstr "" | |||
|
|
8171 | ||||
| 7962 | msgid "operation not supported over http" |
|
8172 | msgid "operation not supported over http" | |
| 7963 | msgstr "" |
|
8173 | msgstr "" | |
| 7964 |
|
8174 | |||
|
|
8175 | #, python-format | |||
|
|
8176 | msgid "sending %s command\n" | |||
|
|
8177 | msgstr "发送命令 '%s'\n" | |||
|
|
8178 | ||||
|
|
8179 | #, python-format | |||
|
|
8180 | msgid "sending %s bytes\n" | |||
|
|
8181 | msgstr "发送 %s 字节\n" | |||
|
|
8182 | ||||
| 7965 | msgid "authorization failed" |
|
8183 | msgid "authorization failed" | |
| 7966 | msgstr "授权失败" |
|
8184 | msgstr "授权失败" | |
| 7967 |
|
8185 | |||
|
|
8186 | #, python-format | |||
|
|
8187 | msgid "http error while sending %s command\n" | |||
|
|
8188 | msgstr "" | |||
|
|
8189 | ||||
| 7968 | msgid "http error, possibly caused by proxy setting" |
|
8190 | msgid "http error, possibly caused by proxy setting" | |
| 7969 | msgstr "" |
|
8191 | msgstr "" | |
| 7970 |
|
8192 | |||
| @@ -7972,6 +8194,10 b' msgstr ""' | |||||
| 7972 | msgid "real URL is %s\n" |
|
8194 | msgid "real URL is %s\n" | |
| 7973 | msgstr "实际 URL 是 '%s'\n" |
|
8195 | msgstr "实际 URL 是 '%s'\n" | |
| 7974 |
|
8196 | |||
|
|
8197 | #, fuzzy, python-format | |||
|
|
8198 | msgid "requested URL: '%s'\n" | |||
|
|
8199 | msgstr "请求的 URL: '%s'\n" | |||
|
|
8200 | ||||
| 7975 | #, python-format |
|
8201 | #, python-format | |
| 7976 | msgid "'%s' does not appear to be an hg repository" |
|
8202 | msgid "'%s' does not appear to be an hg repository" | |
| 7977 | msgstr "'%s' 似乎不是水银版本库" |
|
8203 | msgstr "'%s' 似乎不是水银版本库" | |
| @@ -8045,6 +8271,10 b' msgstr ""' | |||||
| 8045 | msgid "unknown revision '%s'" |
|
8271 | msgid "unknown revision '%s'" | |
| 8046 | msgstr "" |
|
8272 | msgstr "" | |
| 8047 |
|
8273 | |||
|
|
8274 | #, python-format | |||
|
|
8275 | msgid "filtering %s through %s\n" | |||
|
|
8276 | msgstr "" | |||
|
|
8277 | ||||
| 8048 | msgid "journal already exists - run hg recover" |
|
8278 | msgid "journal already exists - run hg recover" | |
| 8049 | msgstr "" |
|
8279 | msgstr "" | |
| 8050 |
|
8280 | |||
| @@ -8076,6 +8306,14 b' msgstr ""' | |||||
| 8076 | msgid "working directory of %s" |
|
8306 | msgid "working directory of %s" | |
| 8077 | msgstr "" |
|
8307 | msgstr "" | |
| 8078 |
|
8308 | |||
|
|
8309 | #, python-format | |||
|
|
8310 | msgid " %s: searching for copy revision for %s\n" | |||
|
|
8311 | msgstr "" | |||
|
|
8312 | ||||
|
|
8313 | #, python-format | |||
|
|
8314 | msgid " %s: copy %s:%s\n" | |||
|
|
8315 | msgstr "" | |||
|
|
8316 | ||||
| 8079 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
8317 | msgid "cannot partially commit a merge (do not specify files or patterns)" | |
| 8080 | msgstr "" |
|
8318 | msgstr "" | |
| 8081 |
|
8319 | |||
| @@ -8143,6 +8381,41 b' msgstr ""' | |||||
| 8143 | msgid "searching for changes\n" |
|
8381 | msgid "searching for changes\n" | |
| 8144 | msgstr "正在搜索修改\n" |
|
8382 | msgstr "正在搜索修改\n" | |
| 8145 |
|
8383 | |||
|
|
8384 | #, python-format | |||
|
|
8385 | msgid "examining %s:%s\n" | |||
|
|
8386 | msgstr "" | |||
|
|
8387 | ||||
|
|
8388 | msgid "branch already found\n" | |||
|
|
8389 | msgstr "" | |||
|
|
8390 | ||||
|
|
8391 | #, python-format | |||
|
|
8392 | msgid "found incomplete branch %s:%s\n" | |||
|
|
8393 | msgstr "" | |||
|
|
8394 | ||||
|
|
8395 | #, python-format | |||
|
|
8396 | msgid "found new changeset %s\n" | |||
|
|
8397 | msgstr "" | |||
|
|
8398 | ||||
|
|
8399 | #, python-format | |||
|
|
8400 | msgid "request %d: %s\n" | |||
|
|
8401 | msgstr "" | |||
|
|
8402 | ||||
|
|
8403 | #, python-format | |||
|
|
8404 | msgid "received %s:%s\n" | |||
|
|
8405 | msgstr "" | |||
|
|
8406 | ||||
|
|
8407 | #, python-format | |||
|
|
8408 | msgid "narrowing %d:%d %s\n" | |||
|
|
8409 | msgstr "" | |||
|
|
8410 | ||||
|
|
8411 | #, python-format | |||
|
|
8412 | msgid "found new branch changeset %s\n" | |||
|
|
8413 | msgstr "" | |||
|
|
8414 | ||||
|
|
8415 | #, python-format | |||
|
|
8416 | msgid "narrowed branch search to %s:%s\n" | |||
|
|
8417 | msgstr "" | |||
|
|
8418 | ||||
| 8146 | msgid "already have changeset " |
|
8419 | msgid "already have changeset " | |
| 8147 | msgstr "" |
|
8420 | msgstr "" | |
| 8148 |
|
8421 | |||
| @@ -8152,6 +8425,16 b' msgstr ""' | |||||
| 8152 | msgid "repository is unrelated" |
|
8425 | msgid "repository is unrelated" | |
| 8153 | msgstr "" |
|
8426 | msgstr "" | |
| 8154 |
|
8427 | |||
|
|
8428 | msgid "found new changesets starting at " | |||
|
|
8429 | msgstr "" | |||
|
|
8430 | ||||
|
|
8431 | #, python-format | |||
|
|
8432 | msgid "%d total queries\n" | |||
|
|
8433 | msgstr "" | |||
|
|
8434 | ||||
|
|
8435 | msgid "common changesets up to " | |||
|
|
8436 | msgstr "" | |||
|
|
8437 | ||||
| 8155 | msgid "requesting all changes\n" |
|
8438 | msgid "requesting all changes\n" | |
| 8156 | msgstr "正在请求全部修改\n" |
|
8439 | msgstr "正在请求全部修改\n" | |
| 8157 |
|
8440 | |||
| @@ -8177,10 +8460,17 b' msgstr ""' | |||||
| 8177 | msgid "%d changesets found\n" |
|
8460 | msgid "%d changesets found\n" | |
| 8178 | msgstr "已发现 %d 个修改集\n" |
|
8461 | msgstr "已发现 %d 个修改集\n" | |
| 8179 |
|
8462 | |||
|
|
8463 | msgid "list of changesets:\n" | |||
|
|
8464 | msgstr "" | |||
|
|
8465 | ||||
| 8180 | #, python-format |
|
8466 | #, python-format | |
| 8181 | msgid "empty or missing revlog for %s" |
|
8467 | msgid "empty or missing revlog for %s" | |
| 8182 | msgstr "" |
|
8468 | msgstr "" | |
| 8183 |
|
8469 | |||
|
|
8470 | #, python-format | |||
|
|
8471 | msgid "add changeset %s\n" | |||
|
|
8472 | msgstr "" | |||
|
|
8473 | ||||
| 8184 | msgid "adding changesets\n" |
|
8474 | msgid "adding changesets\n" | |
| 8185 | msgstr "正在增加修改集\n" |
|
8475 | msgstr "正在增加修改集\n" | |
| 8186 |
|
8476 | |||
| @@ -8193,6 +8483,10 b' msgstr "\xe6\xad\xa3\xe5\x9c\xa8\xe5\xa2\x9e\xe5\x8a\xa0\xe6\xb8\x85\xe5\x8d\x95\\n"' | |||||
| 8193 | msgid "adding file changes\n" |
|
8483 | msgid "adding file changes\n" | |
| 8194 | msgstr "正在增加文件改变\n" |
|
8484 | msgstr "正在增加文件改变\n" | |
| 8195 |
|
8485 | |||
|
|
8486 | #, python-format | |||
|
|
8487 | msgid "adding %s revisions\n" | |||
|
|
8488 | msgstr "" | |||
|
|
8489 | ||||
| 8196 | msgid "received file revlog group is empty" |
|
8490 | msgid "received file revlog group is empty" | |
| 8197 | msgstr "" |
|
8491 | msgstr "" | |
| 8198 |
|
8492 | |||
| @@ -8204,6 +8498,9 b' msgstr ""' | |||||
| 8204 | msgid "added %d changesets with %d changes to %d files%s\n" |
|
8498 | msgid "added %d changesets with %d changes to %d files%s\n" | |
| 8205 | msgstr "已增加 %d 个修改集，包含 %d 个改变，修改了 %d 个文件%s\n" |
|
8499 | msgstr "已增加 %d 个修改集，包含 %d 个改变，修改了 %d 个文件%s\n" | |
| 8206 |
|
8500 | |||
|
|
8501 | msgid "updating the branch cache\n" | |||
|
|
8502 | msgstr "" | |||
|
|
8503 | ||||
| 8207 | msgid "Unexpected response from remote server:" |
|
8504 | msgid "Unexpected response from remote server:" | |
| 8208 | msgstr "" |
|
8505 | msgstr "" | |
| 8209 |
|
8506 | |||
| @@ -8224,6 +8521,10 b' msgid "%d files to transfer, %s of data\\' | |||||
| 8224 | msgstr "" |
|
8521 | msgstr "" | |
| 8225 |
|
8522 | |||
| 8226 | #, python-format |
|
8523 | #, python-format | |
|
|
8524 | msgid "adding %s (%s)\n" | |||
|
|
8525 | msgstr "" | |||
|
|
8526 | ||||
|
|
8527 | #, python-format | |||
| 8227 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
8528 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
| 8228 | msgstr "" |
|
8529 | msgstr "" | |
| 8229 |
|
8530 | |||
| @@ -8305,6 +8606,14 b' msgid "resolving manifests\\n"' | |||||
| 8305 | msgstr "正在解析清单\n" |
|
8606 | msgstr "正在解析清单\n" | |
| 8306 |
|
8607 | |||
| 8307 | #, python-format |
|
8608 | #, python-format | |
|
|
8609 | msgid " overwrite %s partial %s\n" | |||
|
|
8610 | msgstr "" | |||
|
|
8611 | ||||
|
|
8612 | #, python-format | |||
|
|
8613 | msgid " ancestor %s local %s remote %s\n" | |||
|
|
8614 | msgstr "" | |||
|
|
8615 | ||||
|
|
8616 | #, python-format | |||
| 8308 | msgid "" |
|
8617 | msgid "" | |
| 8309 | " local changed %s which remote deleted\n" |
|
8618 | " local changed %s which remote deleted\n" | |
| 8310 | "use (c)hanged version or (d)elete?" |
|
8619 | "use (c)hanged version or (d)elete?" | |
| @@ -8326,6 +8635,10 b' msgid "&Deleted"' | |||||
| 8326 | msgstr "" |
|
8635 | msgstr "" | |
| 8327 |
|
8636 | |||
| 8328 | #, python-format |
|
8637 | #, python-format | |
|
|
8638 | msgid "preserving %s for resolve of %s\n" | |||
|
|
8639 | msgstr "" | |||
|
|
8640 | ||||
|
|
8641 | #, python-format | |||
| 8329 | msgid "update failed to remove %s: %s!\n" |
|
8642 | msgid "update failed to remove %s: %s!\n" | |
| 8330 | msgstr "" |
|
8643 | msgstr "" | |
| 8331 |
|
8644 | |||
| @@ -8372,6 +8685,13 b' msgid "cannot create %s: unable to creat' | |||||
| 8372 | msgstr "" |
|
8685 | msgstr "" | |
| 8373 |
|
8686 | |||
| 8374 | #, python-format |
|
8687 | #, python-format | |
|
|
8688 | msgid "found patch at byte %d\n" | |||
|
|
8689 | msgstr "" | |||
|
|
8690 | ||||
|
|
8691 | msgid "patch generated by hg export\n" | |||
|
|
8692 | msgstr "" | |||
|
|
8693 | ||||
|
|
8694 | #, python-format | |||
| 8375 | msgid "unable to find '%s' for patching\n" |
|
8695 | msgid "unable to find '%s' for patching\n" | |
| 8376 | msgstr "" |
|
8696 | msgstr "" | |
| 8377 |
|
8697 | |||
| @@ -8442,6 +8762,10 b' msgid "Unsupported line endings type: %s' | |||||
| 8442 | msgstr "" |
|
8762 | msgstr "" | |
| 8443 |
|
8763 | |||
| 8444 | #, python-format |
|
8764 | #, python-format | |
|
|
8765 | msgid "no valid hunks found; trying with %r instead\n" | |||
|
|
8766 | msgstr "" | |||
|
|
8767 | ||||
|
|
8768 | #, python-format | |||
| 8445 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
|
8769 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
| 8446 | msgstr "" |
|
8770 | msgstr "" | |
| 8447 |
|
8771 | |||
| @@ -8454,6 +8778,13 b' msgid "killed by signal %d"' | |||||
| 8454 | msgstr "" |
|
8778 | msgstr "" | |
| 8455 |
|
8779 | |||
| 8456 | #, python-format |
|
8780 | #, python-format | |
|
|
8781 | msgid "stopped by signal %d" | |||
|
|
8782 | msgstr "" | |||
|
|
8783 | ||||
|
|
8784 | msgid "invalid exit code" | |||
|
|
8785 | msgstr "" | |||
|
|
8786 | ||||
|
|
8787 | #, python-format | |||
| 8457 | msgid "saving bundle to %s\n" |
|
8788 | msgid "saving bundle to %s\n" | |
| 8458 | msgstr "" |
|
8789 | msgstr "" | |
| 8459 |
|
8790 | |||
| @@ -8524,12 +8855,12 b' msgstr ""' | |||||
| 8524 | msgid "could not create remote repo" |
|
8855 | msgid "could not create remote repo" | |
| 8525 | msgstr "" |
|
8856 | msgstr "" | |
| 8526 |
|
8857 | |||
|
|
8858 | msgid "remote: " | |||
|
|
8859 | msgstr "" | |||
|
|
8860 | ||||
| 8527 | msgid "no suitable response from remote hg" |
|
8861 | msgid "no suitable response from remote hg" | |
| 8528 | msgstr "" |
|
8862 | msgstr "" | |
| 8529 |
|
8863 | |||
| 8530 | msgid "remote: " |
|
|||
| 8531 | msgstr "" |
|
|||
| 8532 |
|
||||
| 8533 | #, python-format |
|
8864 | #, python-format | |
| 8534 | msgid "push refused: %s" |
|
8865 | msgid "push refused: %s" | |
| 8535 | msgstr "" |
|
8866 | msgstr "" | |
| @@ -8547,6 +8878,17 b' msgstr ""' | |||||
| 8547 | msgid "invalid entry in fncache, line %s" |
|
8878 | msgid "invalid entry in fncache, line %s" | |
| 8548 | msgstr "" |
|
8879 | msgstr "" | |
| 8549 |
|
8880 | |||
|
|
8881 | msgid "scanning\n" | |||
|
|
8882 | msgstr "正在扫描\n" | |||
|
|
8883 | ||||
|
|
8884 | #, python-format | |||
|
|
8885 | msgid "%d files, %d bytes to transfer\n" | |||
|
|
8886 | msgstr "需要传输 %d 个文件，%d 字节\n" | |||
|
|
8887 | ||||
|
|
8888 | #, python-format | |||
|
|
8889 | msgid "sending %s (%d bytes)\n" | |||
|
|
8890 | msgstr "正在发送 %s (%d 字节)\n" | |||
|
|
8891 | ||||
| 8550 | #, python-format |
|
8892 | #, python-format | |
| 8551 | msgid "" |
|
8893 | msgid "" | |
| 8552 | " subrepository sources for %s differ\n" |
|
8894 | " subrepository sources for %s differ\n" | |
| @@ -8690,6 +9032,10 b' msgid "http auth: user %s, password %s\\n' | |||||
| 8690 | msgstr "" |
|
9032 | msgstr "" | |
| 8691 |
|
9033 | |||
| 8692 | #, python-format |
|
9034 | #, python-format | |
|
|
9035 | msgid "proxying through http://%s:%s\n" | |||
|
|
9036 | msgstr "" | |||
|
|
9037 | ||||
|
|
9038 | #, python-format | |||
| 8693 | msgid "command '%s' failed: %s" |
|
9039 | msgid "command '%s' failed: %s" | |
| 8694 | msgstr "" |
|
9040 | msgstr "" | |
| 8695 |
|
9041 | |||
| @@ -8887,10 +9233,6 b' msgid "unpacking %s"' | |||||
| 8887 | msgstr "" |
|
9233 | msgstr "" | |
| 8888 |
|
9234 | |||
| 8889 | #, python-format |
|
9235 | #, python-format | |
| 8890 | msgid "warning: copy source of '%s' not in parents of %s" |
|
|||
| 8891 | msgstr "" |
|
|||
| 8892 |
|
||||
| 8893 | #, python-format |
|
|||
| 8894 | msgid "empty or missing copy source revlog %s:%s" |
|
9236 | msgid "empty or missing copy source revlog %s:%s" | |
| 8895 | msgstr "" |
|
9237 | msgstr "" | |
| 8896 |
|
9238 | |||
General Comments 0
You need to be logged in to leave comments.
Login now