# Chinese translations for Git package # Git 软件包的简体中文翻译. # Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> # - Riku <lu.riku AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # - Lian Cheng <rhythm.mail AT gmail.com> # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2012-09-15 10:21+0800\n" "PO-Revision-Date: 2012-09-07 17:56+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: advice.c:40 #, c-format msgid "hint: %.*s\n" msgstr "提示:%.*s\n" #. #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. #: advice.c:70 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" "appropriate to mark resolution and make a commit,\n" "or use 'git commit -a'." msgstr "" "请先在工作区改正文件,然后酌情使用\n" "'git add/rm <file>' 标记解决方案,\n" "或使用 'git commit -a'。" #: archive.c:10 #, fuzzy msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git apply [选项] [<补丁>...]" #: archive.c:11 #, fuzzy msgid "git archive --list" msgstr "git archive:NACK %s" #: archive.c:12 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" #: archive.c:13 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" #: archive.c:322 msgid "fmt" msgstr "" #: archive.c:322 msgid "archive format" msgstr "" #: archive.c:323 builtin/log.c:1079 msgid "prefix" msgstr "" #: archive.c:324 msgid "prepend prefix to each pathname in the archive" msgstr "" #: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332 #: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642 #: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537 #: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "文件" #: archive.c:326 builtin/archive.c:92 msgid "write the archive to this file" msgstr "" #: archive.c:328 #, fuzzy msgid "read .gitattributes in working directory" msgstr "%s:已经存在于工作区中" #: archive.c:329 msgid "report archived files on stderr" msgstr "" #: archive.c:330 msgid "store only" msgstr "" #: archive.c:331 msgid "compress faster" msgstr "" #: archive.c:339 msgid "compress better" msgstr "" #: archive.c:342 msgid "list supported archive formats" msgstr "" #: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" msgstr "" #: archive.c:345 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" msgstr "" #: archive.c:346 builtin/archive.c:95 builtin/notes.c:616 #, fuzzy msgid "command" msgstr "运行 $command" #: archive.c:347 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" msgstr "" #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' 不像是一个 v2 版本的包文件" #: bundle.c:63 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" #: bundle.c:89 builtin/commit.c:714 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交:" #: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "版本遍历设置失败" #: bundle.c:186 #, c-format msgid "The bundle contains %d ref" msgid_plural "The bundle contains %d refs" msgstr[0] "这个包中含有 %d 个引用" msgstr[1] "这个包中含有 %d 个引用" #: bundle.c:192 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历史。" #: bundle.c:195 #, c-format msgid "The bundle requires this ref" msgid_plural "The bundle requires these %d refs" msgstr[0] "这个包需要这个引用" msgstr[1] "这个包需要 %d 个这些引用" #: bundle.c:294 msgid "rev-list died" msgstr "rev-list 终止" #: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数:%s" #: bundle.c:335 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:380 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" #: bundle.c:398 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" #: bundle.c:416 msgid "pack-objects died" msgstr "pack-objects 终止" #: bundle.c:419 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" #: bundle.c:441 msgid "index-pack died" msgstr "index-pack 终止" #: commit.c:48 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" #: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" #: connected.c:39 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" #: connected.c:48 #, c-format msgid "failed write to rev-list: %s" msgstr "无法写入 rev-list:%s" #: connected.c:56 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入:%s" #: date.c:95 msgid "in the future" msgstr "在将来" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "%lu 秒钟之前" msgstr[1] "%lu 秒钟之前" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "%lu 分钟之前" msgstr[1] "%lu 分钟之前" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "%lu 小时之前" msgstr[1] "%lu 小时之前" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "%lu 天之前" msgstr[1] "%lu 天之前" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "%lu 周之前" msgstr[1] "%lu 周之前" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "%lu 个月之前" msgstr[1] "%lu 个月之前" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "%lu 年" msgstr[1] "%lu 年" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "%s,%lu 个月之前" msgstr[1] "%s,%lu 个月之前" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "%lu 年前" msgstr[1] "%lu 年前" # 译者:注意保持前导空格 #: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" msgstr " 无法解析 dirstat 阈值 '%.*s'\n" # 译者:注意保持前导空格 #: diff.c:110 #, c-format msgid " Unknown dirstat parameter '%.*s'\n" msgstr " 未知 dirstat 参数 '%.*s'\n" #: diff.c:210 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "发现配置变量 'diff.dirstat' 中的错误:\n" "%s" #: diff.c:1401 msgid " 0 files changed" msgstr " 0 个文件被修改" #: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" msgstr[1] " %d 个文件被修改" #: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ",插入 %d 行(+)" msgstr[1] ",插入 %d 行(+)" #: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] ",删除 %d 行(-)" msgstr[1] ",删除 %d 行(-)" #: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "无法解析 --dirstat/-X 选项的参数:\n" "%s" #: gpg-interface.c:59 msgid "could not run gpg." msgstr "不能执行 gpg。" #: gpg-interface.c:71 msgid "gpg did not accept the data" msgstr "gpg 没有接受数据" #: gpg-interface.c:82 msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" #: grep.c:1320 #, c-format msgid "'%s': unable to read %s" msgstr "'%s':无法读取 %s" #: grep.c:1337 #, c-format msgid "'%s': %s" msgstr "'%s':%s" #: grep.c:1348 #, c-format msgid "'%s': short read %s" msgstr "'%s':读取不完整 %s" #: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" #: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" #: help.c:275 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" "'%s' 像是一个 git 命令,但却无法运行。\n" "可能是 git-%s 受损?" #: help.c:332 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统中未发现 Git 命令。" #: help.c:354 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" #: help.c:359 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." #: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" #: help.c:370 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这其中的某一个么?" #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" msgstr "(坏提交)\n" #: merge-recursive.c:206 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" #: merge-recursive.c:268 msgid "error building trees" msgstr "无法创建树" #: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" #: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" #. something else exists #. .. but not some other error (who really cares what?) #: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ":可能是一个目录/文件冲突?" #: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" #: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为二进制对象(blob)" #: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" #: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" #: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" #: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" #: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" #: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" #: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" #: merge-recursive.c:1081 msgid "rename" msgstr "重命名" #: merge-recursive.c:1081 msgid "renamed" msgstr "重命名" #: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" #: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" #: merge-recursive.c:1164 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1218 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" "%5$s" #: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" #: merge-recursive.c:1447 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" #: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" #: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" #: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" #: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个二进制对象(blob)" #: merge-recursive.c:1564 msgid "modify" msgstr "修改" #: merge-recursive.c:1564 msgid "modified" msgstr "修改" #: merge-recursive.c:1574 msgid "content" msgstr "内容" #: merge-recursive.c:1581 msgid "add/add" msgstr "添加/添加" #: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已经做过相同合并)" #: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" #: merge-recursive.c:1633 git-submodule.sh:869 msgid "submodule" msgstr "子模组" #: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突(%s):合并冲突于 %s" #: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "删除 %s" #: merge-recursive.c:1749 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:1755 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:1760 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" #: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "添加 %s" #: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误,不应发生。" #: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "已经是最新的!" #: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" #: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" #: merge-recursive.c:1890 msgid "Merging:" msgstr "合并:" #: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先:" msgstr[1] "发现 %u 个共同祖先:" #: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "合并未返回提交" #: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" #: merge-recursive.c:2009 builtin/merge.c:696 msgid "Unable to write index." msgstr "不能写入索引。" #: parse-options.c:494 msgid "..." msgstr "..." #: parse-options.c:512 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:516 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为保证在输出中对齐,注意调整句中空格! #: parse-options.c:519 #, c-format msgid " %s" msgstr " %s" #: remote.c:1632 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" #: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" #: remote.c:1646 #, c-format msgid "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" msgid_plural "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "您的分支和 '%s' 出现了偏离,\n" "并且分别有 %d 和 %d 处不同的提交。\n" msgstr[1] "" "您的分支和 '%s' 出现了偏离,\n" "并且分别有 %d 和 %d 处不同的提交。\n" #: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 #: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 #: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" #: sequencer.c:144 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" #: sequencer.c:147 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记,然后用 'git commit' 提交" #: sequencer.c:160 sequencer.c:765 sequencer.c:848 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" #: sequencer.c:163 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" #: sequencer.c:178 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" #: sequencer.c:180 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" #: sequencer.c:183 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:233 #, c-format msgid "%s: Unable to write new index file" msgstr "%s:无法写入新索引文件" #: sequencer.c:261 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" #: sequencer.c:282 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" #: sequencer.c:327 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" #: sequencer.c:332 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" #: sequencer.c:398 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" #: sequencer.c:401 msgid "You do not have a valid HEAD" msgstr "您没有一个有效的 HEAD" #: sequencer.c:416 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" #: sequencer.c:424 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" #: sequencer.c:428 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 #: sequencer.c:439 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:不能解析父提交 %s" #: sequencer.c:443 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #: sequencer.c:527 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" #: sequencer.c:528 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" #: sequencer.c:560 msgid "empty commit set passed" msgstr "提供了空的提交集" #: sequencer.c:568 #, c-format msgid "git %s: failed to read the index" msgstr "git %s:无法读取索引" #: sequencer.c:573 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s:无法刷新索引" #: sequencer.c:631 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" #: sequencer.c:653 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" #: sequencer.c:658 msgid "No commits parsed." msgstr "没有提交被解析。" #: sequencer.c:671 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" #: sequencer.c:675 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" #: sequencer.c:682 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单:%s" #: sequencer.c:710 #, c-format msgid "Invalid key: %s" msgstr "无效键名:%s" #: sequencer.c:713 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效:%s" #: sequencer.c:725 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单:%s" #: sequencer.c:746 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" #: sequencer.c:747 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:751 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" #: sequencer.c:767 sequencer.c:852 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" #: sequencer.c:786 sequencer.c:920 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" #: sequencer.c:788 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" #: sequencer.c:790 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" #: sequencer.c:812 builtin/apply.c:4005 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s:%s" #: sequencer.c:815 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s:%s" #: sequencer.c:816 msgid "unexpected end of file" msgstr "意外的文件结束" #: sequencer.c:822 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" #: sequencer.c:845 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" #: sequencer.c:1007 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" #: sequencer.c:1008 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" #: sha1_name.c:1044 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" #: sha1_name.c:1047 #, c-format msgid "No such branch: '%s'" msgstr "没有此分支:'%s'" #: sha1_name.c:1049 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" #: wrapper.c:408 #, fuzzy, c-format msgid "unable to access '%s': %s" msgstr "不能创建 '%s'" #: wrapper.c:426 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "无法在 passwd 文件中查询到该用户:%s" #: wrapper.c:427 msgid "no such user" msgstr "无此用户" #: wt-status.c:140 msgid "Unmerged paths:" msgstr "未合并的路径:" # 译者:注意保持前导空格 #: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)" # 译者:注意保持前导空格 #: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" # 译者:注意保持前导空格 #: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <file>...\" 标记解决方案)" # 译者:注意保持前导空格 #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" # 译者:注意保持前导空格 #: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <file>...\" 标记解决方案)" #: wt-status.c:188 msgid "Changes to be committed:" msgstr "要提交的变更:" #: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更:" # 译者:注意保持前导空格 #: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <file>...\" 更新要提交的内容)" # 译者:注意保持前导空格 #: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" # 译者:注意保持前导空格 #: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" # 译者:注意保持前导空格 #: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" # 译者:注意保持前导空格 #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)" #: wt-status.c:244 msgid "bug" msgstr "bug" #: wt-status.c:249 msgid "both deleted:" msgstr "双方删除:" #: wt-status.c:250 msgid "added by us:" msgstr "由我们添加:" #: wt-status.c:251 msgid "deleted by them:" msgstr "由他们删除:" #: wt-status.c:252 msgid "added by them:" msgstr "由他们添加:" #: wt-status.c:253 msgid "deleted by us:" msgstr "由我们删除:" #: wt-status.c:254 msgid "both added:" msgstr "双方添加:" #: wt-status.c:255 msgid "both modified:" msgstr "双方修改:" # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 #: wt-status.c:285 msgid "new commits, " msgstr "新提交, " # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 #: wt-status.c:287 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 #: wt-status.c:289 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:303 #, c-format msgid "new file: %s" msgstr "新文件: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:306 #, c-format msgid "copied: %s -> %s" msgstr "拷贝: %s -> %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:309 #, c-format msgid "deleted: %s" msgstr "删除: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:312 #, c-format msgid "modified: %s" msgstr "修改: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:315 #, c-format msgid "renamed: %s -> %s" msgstr "重命名: %s -> %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:318 #, c-format msgid "typechange: %s" msgstr "类型变更: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:321 #, c-format msgid "unknown: %s" msgstr "未知: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: wt-status.c:324 #, c-format msgid "unmerged: %s" msgstr "未合并: %s" #: wt-status.c:327 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug:未处理的差异状态 %c" #: wt-status.c:785 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者:注意保持前导空格 #: wt-status.c:788 wt-status.c:912 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲突并运行 \"git commit\")" #: wt-status.c:791 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者:注意保持前导空格 #: wt-status.c:794 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结束合并)" #: wt-status.c:804 msgid "You are in the middle of an am session." msgstr "您正处于一个 am 过程中。" #: wt-status.c:807 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者:注意保持前导空格 #: wt-status.c:811 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (解决冲突,然后运行 \"git am --resolved\")" # 译者:注意保持前导空格 #: wt-status.c:813 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过此补丁)" # 译者:注意保持前导空格 #: wt-status.c:815 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" 恢复原有分支)" #: wt-status.c:873 wt-status.c:883 msgid "You are currently rebasing." msgstr "您正在变基。" # 译者:注意保持前导空格 #: wt-status.c:876 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲突,然后运行 \"git rebase --continue\")" # 译者:注意保持前导空格 #: wt-status.c:878 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" # 译者:注意保持前导空格 #: wt-status.c:880 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注意保持前导空格 #: wt-status.c:886 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" #: wt-status.c:888 msgid "You are currently splitting a commit during a rebase." msgstr "您正在变基过程中拆分一个提交。" # 译者:注意保持前导空格 #: wt-status.c:891 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" #: wt-status.c:893 msgid "You are currently editing a commit during a rebase." msgstr "您正在变基过程中编辑一个提交。" # 译者:注意保持前导空格 #: wt-status.c:896 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当前提交)" # 译者:注意保持前导空格 #: wt-status.c:898 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" #: wt-status.c:908 msgid "You are currently cherry-picking." msgstr "您正在做拣选操作。" # 译者:注意保持前导空格 #: wt-status.c:915 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (解决所有冲突后,执行 \"git commit\")" #: wt-status.c:924 msgid "You are currently bisecting." msgstr "您正在做二分查找。" # 译者:注意保持前导空格 #: wt-status.c:927 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" #: wt-status.c:978 msgid "On branch " msgstr "位于分支 " #: wt-status.c:985 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" #: wt-status.c:997 msgid "Initial commit" msgstr "初始提交" #: wt-status.c:1011 #, fuzzy msgid "Untracked files" msgstr "未跟踪的" #: wt-status.c:1013 #, fuzzy msgid "Ignored files" msgstr "忽略的" #: wt-status.c:1015 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1017 msgid " (use -u option to show untracked files)" msgstr "(使用 -u 参数显示未跟踪的文件)" #: wt-status.c:1023 msgid "No changes" msgstr "没有修改" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1028 #, fuzzy, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "(使用 \"git add\" 和/或 \"git commit -a\")" #: wt-status.c:1031 #, fuzzy, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交%s\n" #: wt-status.c:1034 #, fuzzy, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "空提交但存在未跟踪文件%s\n" #: wt-status.c:1037 #, fuzzy, c-format msgid "nothing added to commit but untracked files present\n" msgstr "空提交但存在未跟踪文件%s\n" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1040 #, fuzzy, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)" #: wt-status.c:1043 wt-status.c:1048 #, fuzzy, c-format msgid "nothing to commit\n" msgstr "无须提交%s\n" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1046 #, fuzzy, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "(使用 -u 显示未跟踪文件)" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1050 #, fuzzy, c-format msgid "nothing to commit, working directory clean\n" msgstr "(干净的工作区)" #: wt-status.c:1158 msgid "HEAD (no branch)" msgstr "HEAD(非分支)" # 译者:注意保持句尾空格 #: wt-status.c:1164 msgid "Initial commit on " msgstr "初始提交于 " # 译者:注意保持句尾空格 #: wt-status.c:1179 msgid "behind " msgstr "落后 " # 译者:注意保持句尾空格 #: wt-status.c:1182 wt-status.c:1185 msgid "ahead " msgstr "领先 " # 译者:注意保持句尾空格 #: wt-status.c:1187 msgid ", behind " msgstr ",落后 " #: compat/precompose_utf8.c:58 builtin/clone.c:341 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" #: builtin/add.c:19 #, fuzzy msgid "git add [options] [--] <filepattern>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" #: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c:77 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" #: builtin/add.c:176 #, c-format msgid "Path '%s' is in submodule '%.*s'" msgstr "路径 '%s' 属于模组 '%.*s'" #: builtin/add.c:192 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更:" #: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹配任何文件" #: builtin/add.c:209 #, c-format msgid "'%s' is beyond a symbolic link" msgstr "'%s' 位于符号链接中" #: builtin/add.c:276 msgid "Could not read the index" msgstr "不能读取索引" #: builtin/add.c:286 #, c-format msgid "Could not open '%s' for writing." msgstr "不能打开 '%s' 以写入。" #: builtin/add.c:290 msgid "Could not write patch" msgstr "不能生成补丁" #: builtin/add.c:295 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" #: builtin/add.c:297 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" #: builtin/add.c:303 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" #: builtin/add.c:313 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 #: builtin/rm.c:133 msgid "dry run" msgstr "" #: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 #: builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "冗长输出" #: builtin/add.c:322 #, fuzzy msgid "interactive picking" msgstr "交互式添加失败" #: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 msgid "select hunks interactively" msgstr "" #: builtin/add.c:324 msgid "edit current diff and apply" msgstr "" #: builtin/add.c:325 msgid "allow adding otherwise ignored files" msgstr "" #: builtin/add.c:326 #, fuzzy msgid "update tracked files" msgstr "无法存储包文件" #: builtin/add.c:327 msgid "record only the fact that the path will be added later" msgstr "" #: builtin/add.c:328 msgid "add changes from all tracked and untracked files" msgstr "" #: builtin/add.c:329 #, fuzzy msgid "don't add, only refresh the index" msgstr "git %s:无法刷新索引" #: builtin/add.c:330 msgid "just skip files which cannot be added because of errors" msgstr "" #: builtin/add.c:331 msgid "check if - even missing - files are ignored in dry run" msgstr "" #: builtin/add.c:353 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" #: builtin/add.c:354 msgid "no files added" msgstr "没有文件被添加" #: builtin/add.c:360 msgid "adding files failed" msgstr "添加文件失败" #: builtin/add.c:392 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" #: builtin/add.c:394 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" #: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件,也没有文件被添加。\n" #: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'?\n" #: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "索引文件损坏" #: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" #: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" #: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: builtin/apply.c:1420 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:意外的行:%.*s" #: builtin/apply.c:1477 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息:%.*s" #: builtin/apply.c:1494 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" #: builtin/apply.c:1654 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: builtin/apply.c:1656 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: builtin/apply.c:1682 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" #: builtin/apply.c:1718 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: builtin/apply.c:1720 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: builtin/apply.c:1723 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告:文件 %s 成为空文件但并未删除" #: builtin/apply.c:1869 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏:%.*s" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1898 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: builtin/apply.c:1984 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: builtin/apply.c:2074 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: builtin/apply.c:2078 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: builtin/apply.c:2149 msgid "oops" msgstr "哎哟" #: builtin/apply.c:2671 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" #: builtin/apply.c:2789 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行)" msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)" #: builtin/apply.c:2801 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" #: builtin/apply.c:2807 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: builtin/apply.c:2826 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: builtin/apply.c:2929 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: builtin/apply.c:2935 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" #: builtin/apply.c:2956 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" #: builtin/apply.c:3078 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" #: builtin/apply.c:3156 builtin/apply.c:3378 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: builtin/apply.c:3237 builtin/apply.c:3392 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" #: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 #, c-format msgid "%s: %s" msgstr "%s:%s" #: builtin/apply.c:3246 builtin/apply.c:3400 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" #: builtin/apply.c:3348 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: builtin/apply.c:3417 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: builtin/apply.c:3419 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: builtin/apply.c:3520 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" #: builtin/apply.c:3523 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" #: builtin/apply.c:3543 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" #: builtin/apply.c:3548 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" #: builtin/apply.c:3556 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" #: builtin/apply.c:3569 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." #: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: builtin/apply.c:3767 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: builtin/apply.c:3795 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" #: builtin/apply.c:3799 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" #: builtin/apply.c:3804 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: builtin/apply.c:3807 builtin/apply.c:3915 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: builtin/apply.c:3840 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: builtin/apply.c:3889 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: builtin/apply.c:3976 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: builtin/apply.c:3984 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose #: builtin/apply.c:3987 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." #: builtin/apply.c:3997 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: builtin/apply.c:4018 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: builtin/apply.c:4021 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: builtin/apply.c:4171 msgid "unrecognized input" msgstr "未能识别的输入" #: builtin/apply.c:4182 msgid "unable to read index file" msgstr "无法读取索引文件" #: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "路径" #: builtin/apply.c:4302 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: builtin/apply.c:4305 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: builtin/apply.c:4307 msgid "num" msgstr "数字" #: builtin/apply.c:4308 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" #: builtin/apply.c:4311 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: builtin/apply.c:4313 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" #: builtin/apply.c:4317 #, fuzzy msgid "show number of added and deleted lines in decimal notation" msgstr "以数字方式显示添加或删除行的数量" #: builtin/apply.c:4319 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" #: builtin/apply.c:4321 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" #: builtin/apply.c:4323 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: builtin/apply.c:4325 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: builtin/apply.c:4327 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" #: builtin/apply.c:4329 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" #: builtin/apply.c:4331 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: builtin/apply.c:4336 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" #: builtin/apply.c:4337 msgid "action" msgstr "动作" #: builtin/apply.c:4338 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: builtin/apply.c:4341 builtin/apply.c:4344 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: builtin/apply.c:4347 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: builtin/apply.c:4349 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: builtin/apply.c:4351 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: builtin/apply.c:4353 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: builtin/apply.c:4356 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: builtin/apply.c:4359 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: builtin/apply.c:4361 msgid "root" msgstr "根目录" #: builtin/apply.c:4362 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" #: builtin/apply.c:4384 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" #: builtin/apply.c:4392 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" #: builtin/apply.c:4395 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" #: builtin/apply.c:4411 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" #: builtin/apply.c:4425 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: builtin/apply.c:4431 builtin/apply.c:4441 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行有空白字符误用。" msgstr[1] "%d 行有空白字符误用。" #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" msgstr "不能创建归档文件 '%s'" #: builtin/archive.c:20 msgid "could not redirect output" msgstr "不能重定向输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "git archive:未提供远程URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" msgstr "git archive:应为ACK/NACK,却得到EOF" #: builtin/archive.c:63 #, c-format msgid "git archive: NACK %s" msgstr "git archive:NACK %s" #: builtin/archive.c:65 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" #: builtin/archive.c:66 msgid "git archive: protocol error" msgstr "git archive:协议错误" #: builtin/archive.c:71 msgid "git archive: expected a flush" msgstr "git archive:应为刷新" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" msgstr "" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" #: builtin/blame.c:25 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" #: builtin/blame.c:30 builtin/shortlog.c:15 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" #: builtin/blame.c:2316 msgid "Show blame entries as we find them, incrementally" msgstr "" #: builtin/blame.c:2317 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" #: builtin/blame.c:2318 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" #: builtin/blame.c:2319 #, fuzzy msgid "Show work cost statistics" msgstr "显示工作区状态" #: builtin/blame.c:2320 msgid "Show output score for blame entries" msgstr "" #: builtin/blame.c:2321 msgid "Show original filename (Default: auto)" msgstr "" #: builtin/blame.c:2322 msgid "Show original linenumber (Default: off)" msgstr "" #: builtin/blame.c:2323 msgid "Show in a format designed for machine consumption" msgstr "" #: builtin/blame.c:2324 msgid "Show porcelain format with per-line commit information" msgstr "" #: builtin/blame.c:2325 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" #: builtin/blame.c:2326 msgid "Show raw timestamp (Default: off)" msgstr "" #: builtin/blame.c:2327 msgid "Show long commit SHA1 (Default: off)" msgstr "" #: builtin/blame.c:2328 msgid "Suppress author name and timestamp (Default: off)" msgstr "" #: builtin/blame.c:2329 msgid "Show author email instead of name (Default: off)" msgstr "" #: builtin/blame.c:2330 msgid "Ignore whitespace differences" msgstr "" #: builtin/blame.c:2331 msgid "Spend extra cycles to find better match" msgstr "" #: builtin/blame.c:2332 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" #: builtin/blame.c:2333 #, fuzzy msgid "Use <file>'s contents as the final image" msgstr "添加文件内容至索引" #: builtin/blame.c:2334 builtin/blame.c:2335 msgid "score" msgstr "" #: builtin/blame.c:2334 msgid "Find line copies within and across files" msgstr "" #: builtin/blame.c:2335 msgid "Find line movements within and across files" msgstr "" #: builtin/blame.c:2336 #, fuzzy msgid "n,m" msgstr "数字" #: builtin/blame.c:2336 msgid "Process only line range n,m, counting from 1" msgstr "" #: builtin/branch.c:23 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" #: builtin/branch.c:24 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "" #: builtin/branch.c:25 #, fuzzy msgid "git branch [options] [-r] (-d | -D) <branchname>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/branch.c:26 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "" # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "将要删除的分支 '%s' 已经被合并到\n" " '%s',但未合并到 HEAD。" # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" " 然而却尚未被合并到分支 '%s' 。" #: builtin/branch.c:181 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c:187 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" #: builtin/branch.c:192 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" #: builtin/branch.c:203 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" #: builtin/branch.c:204 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" #: builtin/branch.c:211 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c:217 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它,执行 'git branch -D %s'。" #: builtin/branch.c:226 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" #: builtin/branch.c:227 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" #: builtin/branch.c:234 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s(曾为 %s)。\n" #: builtin/branch.c:235 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s(曾为 %s)。\n" #: builtin/branch.c:240 msgid "Update of config-file failed" msgstr "无法更新 config 文件" #: builtin/branch.c:338 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" #: builtin/branch.c:410 #, c-format msgid "[%s: behind %d]" msgstr "[%s:落后 %d]" #: builtin/branch.c:412 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" #: builtin/branch.c:416 #, c-format msgid "[%s: ahead %d]" msgstr "[%s:领先 %d]" #: builtin/branch.c:418 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" #: builtin/branch.c:421 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s:领先 %d,落后 %d]" #: builtin/branch.c:424 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d,落后 %d]" #: builtin/branch.c:537 msgid "(no branch)" msgstr "(非分支)" #: builtin/branch.c:602 msgid "some refs could not be read" msgstr "一些引用不能读取" #: builtin/branch.c:615 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" #: builtin/branch.c:625 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名:'%s'" #: builtin/branch.c:640 msgid "Branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c:644 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" #: builtin/branch.c:648 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s,但 HEAD 没有更新!" #: builtin/branch.c:655 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名,但更新 config 文件失败" #: builtin/branch.c:670 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" #: builtin/branch.c:694 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版:%s" #: builtin/branch.c:724 #, fuzzy msgid "Generic options" msgstr "无效选项:%s" #: builtin/branch.c:726 msgid "show hash and subject, give twice for upstream branch" msgstr "" #: builtin/branch.c:727 msgid "suppress informational messages" msgstr "" #: builtin/branch.c:728 msgid "set up tracking mode (see git-pull(1))" msgstr "" #: builtin/branch.c:730 msgid "change upstream info" msgstr "" #: builtin/branch.c:734 #, fuzzy msgid "use colored output" msgstr "不能输出重定向" #: builtin/branch.c:735 #, fuzzy msgid "act on remote-tracking branches" msgstr "%s 没有来自 %s 的远程跟踪分支" #: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 #: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396 #: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470 #, fuzzy msgid "commit" msgstr "(坏提交)\n" #: builtin/branch.c:739 builtin/branch.c:745 msgid "print only branches that contain the commit" msgstr "" #: builtin/branch.c:751 msgid "Specific git-branch actions:" msgstr "" #: builtin/branch.c:752 msgid "list both remote-tracking and local branches" msgstr "" #: builtin/branch.c:754 msgid "delete fully merged branch" msgstr "" #: builtin/branch.c:755 msgid "delete branch (even if not merged)" msgstr "" #: builtin/branch.c:756 msgid "move/rename a branch and its reflog" msgstr "" #: builtin/branch.c:757 msgid "move/rename a branch, even if target exists" msgstr "" #: builtin/branch.c:758 #, fuzzy msgid "list branch names" msgstr "无效的分支名:'%s'" #: builtin/branch.c:759 msgid "create the branch's reflog" msgstr "" #: builtin/branch.c:761 msgid "edit the description for the branch" msgstr "" #: builtin/branch.c:762 #, fuzzy msgid "force creation (when already exists)" msgstr "远程 %s 已经存在。" #: builtin/branch.c:765 #, fuzzy msgid "print only not merged branches" msgstr "无法移除分支 %s" #: builtin/branch.c:771 msgid "print only merged branches" msgstr "" #: builtin/branch.c:775 msgid "list branches in columns" msgstr "" #: builtin/branch.c:788 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" #: builtin/branch.c:793 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下!" #: builtin/branch.c:813 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" #: builtin/branch.c:864 #, fuzzy, c-format msgid "branch '%s' does not exist" msgstr "版本库 '%s' 不存在" #: builtin/branch.c:876 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" #: builtin/branch.c:891 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" #: builtin/branch.c:894 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" #: builtin/branch.c:911 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" #: builtin/branch.c:912 #, fuzzy, c-format msgid " git branch -d %s\n" msgstr " HEAD分支:%s" #: builtin/branch.c:913 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" #: builtin/bundle.c:56 msgid "Need a repository to create a bundle." msgstr "需要一个版本库来创建包。" #: builtin/bundle.c:60 msgid "Need a repository to unbundle." msgstr "需要一个版本库来解包。" #: builtin/cat-file.c:247 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" #: builtin/cat-file.c:248 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" #: builtin/cat-file.c:266 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" #: builtin/cat-file.c:267 #, fuzzy msgid "show object type" msgstr "坏的对象类型。" #: builtin/cat-file.c:268 #, fuzzy msgid "show object size" msgstr "坏对象 %s" #: builtin/cat-file.c:270 msgid "exit with zero when there's no error" msgstr "" #: builtin/cat-file.c:271 msgid "pretty-print object's content" msgstr "" #: builtin/cat-file.c:273 msgid "for blob objects, run textconv on object's content" msgstr "" #: builtin/cat-file.c:275 msgid "show info and content of objects fed from the standard input" msgstr "" #: builtin/cat-file.c:278 #, fuzzy msgid "show info about objects fed from the standard input" msgstr "不能从标准输入中读取日志信息" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." msgstr "" #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>" msgstr "" #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "" #: builtin/check-attr.c:21 builtin/hash-object.c:75 #, fuzzy msgid "read file names from stdin" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/check-attr.c:23 #, fuzzy msgid "input paths are terminated by a null character" msgstr "路径以 NUL 字符分隔" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "" #: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" #: builtin/checkout-index.c:192 #, fuzzy msgid "don't checkout new files" msgstr "不能检出 %s" #: builtin/checkout-index.c:194 #, fuzzy msgid "update stat information in the index file" msgstr "无法写新的索引文件" #: builtin/checkout-index.c:200 #, fuzzy msgid "read list of paths from the standard input" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" msgstr "" #: builtin/checkout-index.c:204 msgid "when creating files, prepend <string>" msgstr "" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" msgstr "" #: builtin/checkout.c:25 #, fuzzy msgid "git checkout [options] <branch>" msgstr "git apply [选项] [<补丁>...]" #: builtin/checkout.c:26 #, fuzzy msgid "git checkout [options] [<branch>] -- <file>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:134 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:178 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s':无法合并" #: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 #: builtin/checkout.c:245 #, fuzzy, c-format msgid "'%s' cannot be used with updating paths" msgstr "%s:%s 不能和 %s 同时使用" #: builtin/checkout.c:248 builtin/checkout.c:251 #, fuzzy, c-format msgid "'%s' cannot be used with %s" msgstr "%s:%s 不能和 %s 同时使用" #: builtin/checkout.c:254 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" #: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "损坏的索引文件" #: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" #: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 #: builtin/merge.c:811 msgid "unable to write new index file" msgstr "无法写新的索引文件" #: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" #: builtin/checkout.c:569 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" #: builtin/checkout.c:602 msgid "HEAD is now at" msgstr "HEAD 目前位于" #: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" #: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" #: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" #: builtin/checkout.c:618 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" #: builtin/checkout.c:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者:注意保持前导空格 #: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version #: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgid_plural "" "Warning: you are leaving %d commits behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgstr[0] "" "警告:您正丢下 %d 个提交,未和任何分支关联:\n" "\n" "%s\n" msgstr[1] "" "警告:您正丢下 %d 个提交,未和任何分支关联:\n" "\n" "%s\n" #: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch new_branch_name %s\n" "\n" msgstr "" "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" "如下操作:\n" "\n" " git branch new_branch_name %s\n" "\n" #: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" #: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" #: builtin/checkout.c:761 builtin/checkout.c:950 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) #: builtin/checkout.c:886 #, c-format msgid "invalid reference: %s" msgstr "无效引用:%s" #. case (1): want a tree #: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树:%s" #: builtin/checkout.c:961 #, fuzzy msgid "paths cannot be used with switching branches" msgstr "--ours/--theirs 和切换分支不兼容。" #: builtin/checkout.c:964 builtin/checkout.c:968 #, fuzzy, c-format msgid "'%s' cannot be used with switching branches" msgstr "%s:%s 不能和 %s 同时使用" #: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 #: builtin/checkout.c:983 #, fuzzy, c-format msgid "'%s' cannot be used with '%s'" msgstr "%s:%s 不能和 %s 同时使用" #: builtin/checkout.c:988 #, fuzzy, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "无法切换分支到一个非提交。" #: builtin/checkout.c:1009 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "" #: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 #, fuzzy msgid "branch" msgstr "位于分支 " #: builtin/checkout.c:1011 msgid "create and checkout a new branch" msgstr "" #: builtin/checkout.c:1013 msgid "create/reset and checkout a branch" msgstr "" #: builtin/checkout.c:1014 #, fuzzy msgid "create reflog for new branch" msgstr "列出、创建或删除分支" #: builtin/checkout.c:1015 msgid "detach the HEAD at named commit" msgstr "" #: builtin/checkout.c:1016 #, fuzzy msgid "set upstream info for new branch" msgstr "尚未给分支 '%s' 设置上游" #: builtin/checkout.c:1018 #, fuzzy msgid "new branch" msgstr "[新分支]" #: builtin/checkout.c:1018 #, fuzzy msgid "new unparented branch" msgstr "没有当前分支。" #: builtin/checkout.c:1019 msgid "checkout our version for unmerged files" msgstr "" #: builtin/checkout.c:1021 msgid "checkout their version for unmerged files" msgstr "" #: builtin/checkout.c:1023 msgid "force checkout (throw away local modifications)" msgstr "" #: builtin/checkout.c:1024 msgid "perform a 3-way merge with the new branch" msgstr "" #: builtin/checkout.c:1025 builtin/merge.c:215 #, fuzzy msgid "update ignored files (default)" msgstr "更新文件失败" #: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 msgid "style" msgstr "" #: builtin/checkout.c:1027 msgid "conflict style (merge or diff3)" msgstr "" #: builtin/checkout.c:1030 msgid "second guess 'git checkout no-such-branch'" msgstr "" #: builtin/checkout.c:1054 #, fuzzy msgid "-b, -B and --orphan are mutually exclusive" msgstr "-n 和 -k 互斥。" #: builtin/checkout.c:1071 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" #: builtin/checkout.c:1078 msgid "Missing branch name; try -b" msgstr "缺少分支名;尝试 -b" #: builtin/checkout.c:1113 msgid "invalid path specification" msgstr "无效的路径规格" #: builtin/checkout.c:1120 #, fuzzy, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" "git checkout:更新路径和切换分支不兼容。\n" "您是想要检出 '%s' 但未能将其解析为提交么?" #: builtin/checkout.c:1125 #, fuzzy, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout:--detach 不跟路径参数" #: builtin/checkout.c:1129 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" #: builtin/clean.c:19 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" #: builtin/clean.c:51 msgid "do not print names of files removed" msgstr "" #: builtin/clean.c:53 msgid "force" msgstr "" #: builtin/clean.c:55 #, fuzzy msgid "remove whole directories" msgstr "两个输出目录?" #: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 msgid "pattern" msgstr "" #: builtin/clean.c:57 msgid "add <pattern> to ignore rules" msgstr "" #: builtin/clean.c:58 msgid "remove ignored files, too" msgstr "" #: builtin/clean.c:60 msgid "remove only ignored files" msgstr "" #: builtin/clean.c:78 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" #: builtin/clean.c:82 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" #: builtin/clean.c:85 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作" #: builtin/clean.c:155 builtin/clean.c:176 #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" #: builtin/clean.c:159 builtin/clean.c:179 #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" #: builtin/clean.c:162 builtin/clean.c:182 #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" #: builtin/clean.c:166 #, c-format msgid "Would not remove %s\n" msgstr "不会删除 %s\n" #: builtin/clean.c:168 #, c-format msgid "Not removing %s\n" msgstr "未删除 %s\n" #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 #: builtin/push.c:399 msgid "force progress reporting" msgstr "" #: builtin/clone.c:66 msgid "don't create a checkout" msgstr "" #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 #, fuzzy msgid "create a bare repository" msgstr "不是一个 git 版本库" #: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "" #: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "" #: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "" #: builtin/clone.c:78 #, fuzzy msgid "setup as shared repository" msgstr "不是一个 git 版本库" #: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "" #: builtin/clone.c:83 builtin/init-db.c:485 #, fuzzy msgid "template-directory" msgstr "文件/目录" #: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" #: builtin/clone.c:86 msgid "reference repository" msgstr "" #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 #, fuzzy msgid "name" msgstr "重命名" #: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" msgstr "" #: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" #: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "" #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747 msgid "depth" msgstr "" #: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "" #: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "" #: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "" #: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" #: builtin/clone.c:99 msgid "key=value" msgstr "" #: builtin/clone.c:100 #, fuzzy msgid "set config inside the new repository" msgstr "记录变更到版本库" #: builtin/clone.c:243 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "引用版本库 '%s' 不是一个本地目录。" #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" #: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" #: builtin/clone.c:310 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" #: builtin/clone.c:324 #, c-format msgid "failed to stat %s\n" msgstr "无法枚举 %s 状态\n" #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" #: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" #: builtin/clone.c:373 #, c-format msgid "done.\n" msgstr "完成。\n" #: builtin/clone.c:443 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" #: builtin/clone.c:552 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" #: builtin/clone.c:642 msgid "Too many arguments." msgstr "太多参数。" #: builtin/clone.c:646 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" #: builtin/clone.c:657 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" #: builtin/clone.c:671 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" #: builtin/clone.c:676 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" #: builtin/clone.c:686 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" #: builtin/clone.c:696 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c:709 builtin/clone.c:723 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" #: builtin/clone.c:712 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" #: builtin/clone.c:731 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" #: builtin/clone.c:733 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" #: builtin/clone.c:789 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" #: builtin/clone.c:838 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" #: builtin/clone.c:845 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:9 msgid "git column [options]" msgstr "" #: builtin/column.c:26 msgid "lookup config vars" msgstr "" #: builtin/column.c:27 builtin/column.c:28 #, fuzzy msgid "layout to use" msgstr "本地已过时" #: builtin/column.c:29 msgid "Maximum width" msgstr "" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" #: builtin/commit.c:33 #, fuzzy msgid "git commit [options] [--] <filepattern>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/commit.c:38 #, fuzzy msgid "git status [options] [--] <filepattern>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/commit.c:43 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" "\n" " git commit --amend --reset-author\n" #: builtin/commit.c:55 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" #: builtin/commit.c:60 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" "Otherwise, please use 'git reset'\n" msgstr "" "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" "也要提交,使用命令:\n" "\n" " git commit --allow-empty\n" "\n" "否则,请使用命令 'git reset'\n" #: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" #: builtin/commit.c:298 msgid "unable to create temporary index" msgstr "不能创建临时索引" #: builtin/commit.c:304 msgid "interactive add failed" msgstr "交互式添加失败" #: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" #: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" #: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" #: builtin/commit.c:401 msgid "cannot read the index" msgstr "无法读取索引" #: builtin/commit.c:421 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" #: builtin/commit.c:510 builtin/commit.c:516 #, c-format msgid "invalid commit: %s" msgstr "无效的提交:%s" #: builtin/commit.c:539 msgid "malformed --author parameter" msgstr "非法的 --author 参数" #: builtin/commit.c:600 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串:'%s'" #: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" #: builtin/commit.c:650 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/commit.c:652 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" #: builtin/commit.c:656 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" #: builtin/commit.c:662 msgid "commit has empty message" msgstr "提交说明为空" #: builtin/commit.c:678 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" #: builtin/commit.c:682 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" #: builtin/commit.c:686 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" #: builtin/commit.c:738 msgid "could not write commit template" msgstr "不能写提交模版" #: builtin/commit.c:749 #, c-format msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个合并提交。如果不对,请删除文件\n" "\t%s\n" "然后重试。\n" #: builtin/commit.c:754 #, c-format msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个拣选提交。如果不对,请删除文件\n" "\t%s\n" "然后重试。\n" #: builtin/commit.c:766 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n" "说明将会终止提交。\n" #: builtin/commit.c:771 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n" "如果您想这样做的话。而一个空的提交说明将会终止提交。\n" # 译者:为保证在输出中对齐,注意调整句中空格! #: builtin/commit.c:784 #, c-format msgid "%sAuthor: %s" msgstr "%s作者: %s" # 译者:为保证在输出中对齐,注意调整句中空格! #: builtin/commit.c:791 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者: %s" #: builtin/commit.c:811 msgid "Cannot read index" msgstr "无法读取索引" #: builtin/commit.c:848 msgid "Error building trees" msgstr "无法创建树对象" #: builtin/commit.c:863 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" #: builtin/commit.c:960 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" #: builtin/commit.c:975 builtin/commit.c:1175 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" #: builtin/commit.c:1015 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" #: builtin/commit.c:1026 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" #: builtin/commit.c:1029 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" #: builtin/commit.c:1031 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" #: builtin/commit.c:1034 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" #: builtin/commit.c:1044 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1046 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" #: builtin/commit.c:1054 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" #: builtin/commit.c:1071 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1073 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" #: builtin/commit.c:1075 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" #: builtin/commit.c:1077 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." #: builtin/commit.c:1087 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" #: builtin/commit.c:1092 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" #: builtin/commit.c:1189 builtin/commit.c:1417 msgid "show status concisely" msgstr "" #: builtin/commit.c:1191 builtin/commit.c:1419 msgid "show branch information" msgstr "" #: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389 msgid "machine-readable output" msgstr "" #: builtin/commit.c:1196 builtin/commit.c:1423 msgid "terminate entries with NUL" msgstr "" #: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636 #: builtin/fast-export.c:639 builtin/tag.c:461 msgid "mode" msgstr "" #: builtin/commit.c:1199 builtin/commit.c:1426 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" #: builtin/commit.c:1202 msgid "show ignored files" msgstr "" #: builtin/commit.c:1203 parse-options.h:151 msgid "when" msgstr "何时" #: builtin/commit.c:1204 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" #: builtin/commit.c:1206 #, fuzzy msgid "list untracked files in columns" msgstr "无效的未追踪文件参数 '%s'" #: builtin/commit.c:1275 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" #: builtin/commit.c:1277 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" #: builtin/commit.c:1318 msgid "detached HEAD" msgstr "分离头指针" # 译者:中文字符串拼接,可删除前导空格 #: builtin/commit.c:1320 msgid " (root-commit)" msgstr "(根提交)" #: builtin/commit.c:1387 msgid "suppress summary after successful commit" msgstr "" #: builtin/commit.c:1388 msgid "show diff in commit message template" msgstr "" #: builtin/commit.c:1390 #, fuzzy msgid "Commit message options" msgstr "不能得到 %s 的提交说明" #: builtin/commit.c:1391 builtin/tag.c:459 msgid "read message from file" msgstr "" #: builtin/commit.c:1392 msgid "author" msgstr "" #: builtin/commit.c:1392 #, fuzzy msgid "override author for commit" msgstr "合并未返回提交" #: builtin/commit.c:1393 builtin/gc.c:178 msgid "date" msgstr "" #: builtin/commit.c:1393 #, fuzzy msgid "override date for commit" msgstr "合并未返回提交" #: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534 #: builtin/notes.c:691 builtin/tag.c:457 #, fuzzy msgid "message" msgstr "无 tag 说明?" #: builtin/commit.c:1394 #, fuzzy msgid "commit message" msgstr "空提交信息。" #: builtin/commit.c:1395 msgid "reuse and edit message from specified commit" msgstr "" #: builtin/commit.c:1396 msgid "reuse message from specified commit" msgstr "" #: builtin/commit.c:1397 msgid "use autosquash formatted message to fixup specified commit" msgstr "" #: builtin/commit.c:1398 msgid "use autosquash formatted message to squash specified commit" msgstr "" #: builtin/commit.c:1399 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" #: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "" #: builtin/commit.c:1401 msgid "use specified template file" msgstr "" #: builtin/commit.c:1402 #, fuzzy msgid "force edit of commit" msgstr "合并未返回提交" #: builtin/commit.c:1403 msgid "default" msgstr "" #: builtin/commit.c:1403 builtin/tag.c:462 msgid "how to strip spaces and #comments from message" msgstr "" #: builtin/commit.c:1404 #, fuzzy msgid "include status in commit message template" msgstr "不能写提交模版" #: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463 msgid "key id" msgstr "" #: builtin/commit.c:1406 builtin/merge.c:214 msgid "GPG sign commit" msgstr "" #. end commit message options #: builtin/commit.c:1409 msgid "Commit contents options" msgstr "" #: builtin/commit.c:1410 msgid "commit all changed files" msgstr "" #: builtin/commit.c:1411 msgid "add specified files to index for commit" msgstr "" #: builtin/commit.c:1412 #, fuzzy msgid "interactively add files" msgstr "交互式添加失败" #: builtin/commit.c:1413 #, fuzzy msgid "interactively add changes" msgstr "交互式添加失败" #: builtin/commit.c:1414 #, fuzzy msgid "commit only specified files" msgstr "无法还原修改的文件" #: builtin/commit.c:1415 msgid "bypass pre-commit hook" msgstr "" #: builtin/commit.c:1416 #, fuzzy msgid "show what would be committed" msgstr "要提交的变更:" #: builtin/commit.c:1424 msgid "amend previous commit" msgstr "" #: builtin/commit.c:1425 msgid "bypass post-rewrite hook" msgstr "" #: builtin/commit.c:1430 msgid "ok to record an empty change" msgstr "" #: builtin/commit.c:1433 msgid "ok to record a change with an empty message" msgstr "" #: builtin/commit.c:1464 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" #: builtin/commit.c:1502 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" #: builtin/commit.c:1509 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件(%s)" #: builtin/commit.c:1516 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" #: builtin/commit.c:1535 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明:%s" #: builtin/commit.c:1549 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交;您未更改来自模版的提交说明。\n" #: builtin/commit.c:1554 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" #: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "无法写提交对象" #: builtin/commit.c:1590 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" #: builtin/commit.c:1594 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" #: builtin/commit.c:1605 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" #: builtin/config.c:7 msgid "git config [options]" msgstr "" #: builtin/config.c:52 msgid "Config file location" msgstr "" #: builtin/config.c:53 #, fuzzy msgid "use global config file" msgstr "无法更新 config 文件" #: builtin/config.c:54 msgid "use system config file" msgstr "" #: builtin/config.c:55 #, fuzzy msgid "use repository config file" msgstr "需要一个版本库来解包。" #: builtin/config.c:56 #, fuzzy msgid "use given config file" msgstr "未预期的文件结束" #: builtin/config.c:57 #, fuzzy msgid "Action" msgstr "动作" #: builtin/config.c:58 msgid "get value: name [value-regex]" msgstr "" #: builtin/config.c:59 msgid "get all values: key [value-regex]" msgstr "" #: builtin/config.c:60 msgid "get values for regexp: name-regex [value-regex]" msgstr "" #: builtin/config.c:61 msgid "replace all matching variables: name value [value_regex]" msgstr "" #: builtin/config.c:62 msgid "add a new variable: name value" msgstr "" #: builtin/config.c:63 msgid "remove a variable: name [value-regex]" msgstr "" #: builtin/config.c:64 msgid "remove all matches: name [value-regex]" msgstr "" #: builtin/config.c:65 msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:66 msgid "remove a section: name" msgstr "" #: builtin/config.c:67 msgid "list all" msgstr "" #: builtin/config.c:68 msgid "open an editor" msgstr "" #: builtin/config.c:69 builtin/config.c:70 msgid "slot" msgstr "" #: builtin/config.c:69 msgid "find the color configured: [default]" msgstr "" #: builtin/config.c:70 msgid "find the color setting: [stdout-is-tty]" msgstr "" #: builtin/config.c:71 msgid "Type" msgstr "" #: builtin/config.c:72 msgid "value is \"true\" or \"false\"" msgstr "" #: builtin/config.c:73 msgid "value is decimal number" msgstr "" #: builtin/config.c:74 msgid "value is --bool or --int" msgstr "" #: builtin/config.c:75 msgid "value is a path (file or directory name)" msgstr "" #: builtin/config.c:76 msgid "Other" msgstr "" #: builtin/config.c:77 msgid "terminate values with NUL byte" msgstr "" #: builtin/config.c:78 msgid "respect include directives on lookup" msgstr "" #: builtin/count-objects.c:69 msgid "git count-objects [-v]" msgstr "" #: builtin/describe.c:15 msgid "git describe [options] <committish>*" msgstr "" #: builtin/describe.c:16 msgid "git describe [options] --dirty" msgstr "" #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s 无效" #: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入名称" #: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" #: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" #: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" #: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag 准确匹配 '%s'" #: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "搜索描述 %s\n" #: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" #: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" "没有注释 tag 能描述 '%s'。\n" "然而,有非注释 tag:尝试 --tags。" #: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "没有注释 tag 能描述 '%s'。\n" "尝试 --always,或者创建一些 tag。" #: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" #: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" "发现多于 %i 个 tag,列出最近的 %i 个\n" "在 %s 放弃搜索\n" #: builtin/describe.c:403 msgid "find the tag that comes after the commit" msgstr "" #: builtin/describe.c:404 msgid "debug search strategy on stderr" msgstr "" #: builtin/describe.c:405 msgid "use any ref in .git/refs" msgstr "" #: builtin/describe.c:406 msgid "use any tag in .git/refs/tags" msgstr "" #: builtin/describe.c:407 msgid "always use long format" msgstr "" #: builtin/describe.c:410 #, fuzzy msgid "only output exact matches" msgstr "没有 tag 准确匹配 '%s'" #: builtin/describe.c:412 msgid "consider <n> most recent tags (default: 10)" msgstr "" #: builtin/describe.c:414 #, fuzzy msgid "only consider tags matching <pattern>" msgstr "输出和模式匹配的行" #: builtin/describe.c:416 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" msgstr "" #: builtin/describe.c:417 msgid "mark" msgstr "" #: builtin/describe.c:418 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" #: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "没有发现名称,无法描述任何东西。" #: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" msgstr "--dirty 不能与提交同时使用" #: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s':不是一个正规文件或符号链接" #: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "无效选项:%s" #: builtin/diff.c:301 msgid "Not a git repository" msgstr "不是一个 git 版本库" #: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" #: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "提供了超过 %d 个树对象:'%s'" #: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个二进制对象(blob):'%s'" #: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" msgstr "" #: builtin/fast-export.c:635 #, fuzzy msgid "show progress after <n> objects" msgstr "显示各种类型的对象" #: builtin/fast-export.c:637 msgid "select handling of signed tags" msgstr "" #: builtin/fast-export.c:640 msgid "select handling of tags that tag filtered objects" msgstr "" #: builtin/fast-export.c:643 msgid "Dump marks to this file" msgstr "" #: builtin/fast-export.c:645 msgid "Import marks from this file" msgstr "" #: builtin/fast-export.c:647 msgid "Fake a tagger when tags lack one" msgstr "" #: builtin/fast-export.c:649 msgid "Output full tree for each commit" msgstr "" #: builtin/fast-export.c:651 msgid "Use the done feature to terminate the stream" msgstr "" #: builtin/fast-export.c:652 msgid "Skip output of blob data" msgstr "" #: builtin/fetch.c:20 #, fuzzy msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git apply [选项] [<补丁>...]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "" #: builtin/fetch.c:60 msgid "fetch from all remotes" msgstr "" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" #: builtin/fetch.c:64 msgid "path to upload pack on remote end" msgstr "" #: builtin/fetch.c:65 msgid "force overwrite of local branch" msgstr "" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" msgstr "" #: builtin/fetch.c:69 #, fuzzy msgid "fetch all tags and associated objects" msgstr "更新远程引用和相关的对象" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" msgstr "" #: builtin/fetch.c:73 #, fuzzy msgid "prune remote-tracking branches no longer on remote" msgstr "%s 没有来自 %s 的远程跟踪分支" #: builtin/fetch.c:74 msgid "on-demand" msgstr "" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" msgstr "" #: builtin/fetch.c:79 msgid "keep downloaded pack" msgstr "" #: builtin/fetch.c:81 #, fuzzy msgid "allow updating of HEAD ref" msgstr "无法更新 HEAD 引用" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" msgstr "" #: builtin/fetch.c:85 builtin/log.c:1083 msgid "dir" msgstr "" #: builtin/fetch.c:86 #, fuzzy msgid "prepend this to submodule path output" msgstr "无法递归进子模组路径 '$sm_path'" #: builtin/fetch.c:89 msgid "default mode for recursion" msgstr "" #: builtin/fetch.c:201 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" #: builtin/fetch.c:254 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" #: builtin/fetch.c:260 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:274 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" #: builtin/fetch.c:275 builtin/fetch.c:361 msgid "[rejected]" msgstr "[已拒绝]" #: builtin/fetch.c:286 msgid "[tag update]" msgstr "[tag更新]" # 译者:注意保持前导空格 #: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341 msgid " (unable to update local ref)" msgstr " (不能更新本地引用)" #: builtin/fetch.c:306 msgid "[new tag]" msgstr "[新tag]" #: builtin/fetch.c:309 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:312 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:357 msgid "unable to update local ref" msgstr "不能更新本地引用" #: builtin/fetch.c:357 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:363 msgid "(non-fast-forward)" msgstr "(非快进式)" #: builtin/fetch.c:394 builtin/fetch.c:686 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s:%s\n" #: builtin/fetch.c:403 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" #: builtin/fetch.c:489 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" #: builtin/fetch.c:500 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "一些本地引用不能被更新;尝试运行\n" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者:注意保持前导空格 #: builtin/fetch.c:550 #, c-format msgid " (%s will become dangling)" msgstr " (%s 将成为悬空状态)" # 译者:注意保持前导空格 #: builtin/fetch.c:551 #, c-format msgid " (%s has become dangling)" msgstr " (%s 已成为悬空状态)" #: builtin/fetch.c:558 msgid "[deleted]" msgstr "[已删除]" #: builtin/fetch.c:559 builtin/remote.c:1055 msgid "(none)" msgstr "(无)" #: builtin/fetch.c:676 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" #: builtin/fetch.c:710 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" #: builtin/fetch.c:787 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" #: builtin/fetch.c:790 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:892 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" #: builtin/fetch.c:894 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" #: builtin/fetch.c:913 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" #: builtin/fetch.c:933 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" #: builtin/fetch.c:985 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" #: builtin/fetch.c:987 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达式没有任何意义" #: builtin/fetch.c:998 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组:%s" #: builtin/fetch.c:1006 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用表达式没有意义" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" #: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 msgid "n" msgstr "数字" #: builtin/fmt-merge-msg.c:654 msgid "populate log with at most <n> entries from shortlog" msgstr "" #: builtin/fmt-merge-msg.c:657 msgid "alias for --log (deprecated)" msgstr "" #: builtin/fmt-merge-msg.c:660 msgid "text" msgstr "" #: builtin/fmt-merge-msg.c:661 msgid "use <text> as start of message" msgstr "" #: builtin/fmt-merge-msg.c:662 #, fuzzy msgid "file to read from" msgstr "不能读 %s" #: builtin/for-each-ref.c:979 #, fuzzy msgid "git for-each-ref [options] [<pattern>]" msgstr "git apply [选项] [<补丁>...]" #: builtin/for-each-ref.c:994 msgid "quote placeholders suitably for shells" msgstr "" #: builtin/for-each-ref.c:996 msgid "quote placeholders suitably for perl" msgstr "" #: builtin/for-each-ref.c:998 msgid "quote placeholders suitably for python" msgstr "" #: builtin/for-each-ref.c:1000 msgid "quote placeholders suitably for tcl" msgstr "" #: builtin/for-each-ref.c:1003 msgid "show only <n> matched refs" msgstr "" #: builtin/for-each-ref.c:1004 msgid "format" msgstr "" #: builtin/for-each-ref.c:1004 msgid "format to use for the output" msgstr "" #: builtin/for-each-ref.c:1005 msgid "key" msgstr "" #: builtin/for-each-ref.c:1006 msgid "field name to sort on" msgstr "" #: builtin/fsck.c:608 #, fuzzy msgid "git fsck [options] [<object>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/fsck.c:614 msgid "show unreachable objects" msgstr "" #: builtin/fsck.c:615 #, fuzzy msgid "show dangling objects" msgstr "索引对象中" #: builtin/fsck.c:616 msgid "report tags" msgstr "" #: builtin/fsck.c:617 msgid "report root nodes" msgstr "" #: builtin/fsck.c:618 msgid "make index objects head nodes" msgstr "" #: builtin/fsck.c:619 msgid "make reflogs head nodes (default)" msgstr "" #: builtin/fsck.c:620 msgid "also consider packs and alternate objects" msgstr "" #: builtin/fsck.c:621 msgid "enable more strict checking" msgstr "" #: builtin/fsck.c:623 msgid "write dangling objects in .git/lost-found" msgstr "" #: builtin/fsck.c:624 builtin/prune.c:134 msgid "show progress" msgstr "" #: builtin/gc.c:22 msgid "git gc [options]" msgstr "" #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" msgstr "无效的 %s:'%s'" #: builtin/gc.c:90 #, c-format msgid "insanely long object directory %.*s" msgstr "不正常的长对象目录 %.*s" #: builtin/gc.c:179 msgid "prune unreferenced objects" msgstr "" #: builtin/gc.c:181 msgid "be more thorough (increased runtime)" msgstr "" #: builtin/gc.c:182 msgid "enable auto-gc mode" msgstr "" #: builtin/gc.c:221 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包版本库以求最佳性能。\n" #: builtin/gc.c:224 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" "参见 \"git help gc\" 以获取更多信息。\n" #: builtin/gc.c:251 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" #: builtin/grep.c:22 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" #: builtin/grep.c:216 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep:无法创建线程:%s" #: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "无法切换目录:%s" #: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树(%s)" #: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" #: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" #: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" #: builtin/grep.c:728 msgid "search in index instead of in the work tree" msgstr "" #: builtin/grep.c:730 msgid "find in contents not managed by git" msgstr "" # 译者:中文字符串拼接,可删除前导空格 #: builtin/grep.c:732 #, fuzzy msgid "search in both tracked and untracked files" msgstr "(使用 -u 参数显示未跟踪的文件)" #: builtin/grep.c:734 msgid "search also in ignored files" msgstr "" #: builtin/grep.c:737 msgid "show non-matching lines" msgstr "" #: builtin/grep.c:739 msgid "case insensitive matching" msgstr "" #: builtin/grep.c:741 msgid "match patterns only at word boundaries" msgstr "" #: builtin/grep.c:743 msgid "process binary files as text" msgstr "" #: builtin/grep.c:745 msgid "don't match patterns in binary files" msgstr "" #: builtin/grep.c:748 msgid "descend at most <depth> levels" msgstr "" #: builtin/grep.c:752 msgid "use extended POSIX regular expressions" msgstr "" #: builtin/grep.c:755 msgid "use basic POSIX regular expressions (default)" msgstr "" #: builtin/grep.c:758 msgid "interpret patterns as fixed strings" msgstr "" #: builtin/grep.c:761 msgid "use Perl-compatible regular expressions" msgstr "" #: builtin/grep.c:764 msgid "show line numbers" msgstr "" #: builtin/grep.c:765 msgid "don't show filenames" msgstr "" #: builtin/grep.c:766 #, fuzzy msgid "show filenames" msgstr "%s文件:" #: builtin/grep.c:768 msgid "show filenames relative to top directory" msgstr "" #: builtin/grep.c:770 msgid "show only filenames instead of matching lines" msgstr "" #: builtin/grep.c:772 msgid "synonym for --files-with-matches" msgstr "" #: builtin/grep.c:775 msgid "show only the names of files without match" msgstr "" #: builtin/grep.c:777 #, fuzzy msgid "print NUL after filenames" msgstr "为所有文件名前添加 <根目录>" #: builtin/grep.c:779 msgid "show the number of matches instead of matching lines" msgstr "" #: builtin/grep.c:780 msgid "highlight matches" msgstr "" #: builtin/grep.c:782 msgid "print empty line between matches from different files" msgstr "" #: builtin/grep.c:784 msgid "show filename only once above matches from same file" msgstr "" #: builtin/grep.c:787 msgid "show <n> context lines before and after matches" msgstr "" #: builtin/grep.c:790 msgid "show <n> context lines before matches" msgstr "" #: builtin/grep.c:792 msgid "show <n> context lines after matches" msgstr "" #: builtin/grep.c:793 msgid "shortcut for -C NUM" msgstr "" #: builtin/grep.c:796 msgid "show a line with the function name before matches" msgstr "" #: builtin/grep.c:798 msgid "show the surrounding function" msgstr "" #: builtin/grep.c:801 msgid "read patterns from file" msgstr "" #: builtin/grep.c:803 msgid "match <pattern>" msgstr "" #: builtin/grep.c:805 msgid "combine patterns specified with -e" msgstr "" #: builtin/grep.c:817 msgid "indicate hit with exit status without output" msgstr "" #: builtin/grep.c:819 msgid "show only matches from files that match all patterns" msgstr "" #: builtin/grep.c:822 msgid "pager" msgstr "" #: builtin/grep.c:822 msgid "show matching files in the pager" msgstr "" #: builtin/grep.c:825 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" #: builtin/grep.c:826 builtin/show-ref.c:201 msgid "show usage" msgstr "" #: builtin/grep.c:917 msgid "no pattern given." msgstr "未提供模式匹配。" #: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "坏对象 %s" #: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" #: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" #: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" #: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" #: builtin/hash-object.c:60 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "" #: builtin/hash-object.c:72 msgid "type" msgstr "" #: builtin/hash-object.c:72 #, fuzzy msgid "object type" msgstr "坏的对象类型。" #: builtin/hash-object.c:73 msgid "write the object into the object database" msgstr "" #: builtin/hash-object.c:74 msgid "read the object from stdin" msgstr "" #: builtin/hash-object.c:76 msgid "store file as is without filters" msgstr "" #: builtin/hash-object.c:77 msgid "process file as it were from this path" msgstr "" #: builtin/help.c:43 #, fuzzy msgid "print all available commands" msgstr "在 '%s' 下可用的 git 命令" #: builtin/help.c:44 msgid "show man page" msgstr "" #: builtin/help.c:45 msgid "show manual in web browser" msgstr "" #: builtin/help.c:47 msgid "show info page" msgstr "" #: builtin/help.c:53 msgid "git help [--all] [--man|--web|--info] [command]" msgstr "" #: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" #: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" #: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" #: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老 (< 22)。" #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s':%s" #: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s':不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" #: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" #: builtin/help.c:299 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有:" #: builtin/help.c:367 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" #: builtin/help.c:384 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" #: builtin/help.c:392 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" #: builtin/help.c:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" #: builtin/help.c:470 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" #: builtin/index-pack.c:170 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" #: builtin/index-pack.c:190 msgid "object of unexpected type" msgstr "意外的类型的对象" #: builtin/index-pack.c:227 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" #: builtin/index-pack.c:237 msgid "early EOF" msgstr "过早的文件结束符(EOF)" #: builtin/index-pack.c:238 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:250 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" #: builtin/index-pack.c:257 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" #: builtin/index-pack.c:273 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" #: builtin/index-pack.c:278 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" #: builtin/index-pack.c:292 msgid "pack signature mismatch" msgstr "包签名不匹配" #: builtin/index-pack.c:294 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包中有错误的对象位于 %lu:%s" #: builtin/index-pack.c:434 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:483 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" #: builtin/index-pack.c:491 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" #: builtin/index-pack.c:499 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:530 msgid "cannot pread pack file" msgstr "无法读取包文件" #: builtin/index-pack.c:532 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结束,缺少 %lu 字节" msgstr[1] "包文件过早结束,缺少 %lu 字节" #: builtin/index-pack.c:558 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 #: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突!" #: builtin/index-pack.c:652 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "不能读 %s" #: builtin/index-pack.c:718 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" #: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" msgstr "无效的二进制对象(blob)%s" #: builtin/index-pack.c:747 #, c-format msgid "invalid %s" msgstr "无效的 %s" #: builtin/index-pack.c:749 msgid "Error in object" msgstr "对象中出错" #: builtin/index-pack.c:751 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" #: builtin/index-pack.c:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "无法应用 delta" #: builtin/index-pack.c:986 msgid "Receiving objects" msgstr "接收对象中" #: builtin/index-pack.c:986 msgid "Indexing objects" msgstr "索引对象中" #: builtin/index-pack.c:1012 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突(SHA1 不匹配)" #: builtin/index-pack.c:1017 msgid "cannot fstat packfile" msgstr "不能枚举包文件状态" #: builtin/index-pack.c:1020 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" #: builtin/index-pack.c:1031 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" #: builtin/index-pack.c:1054 msgid "Resolving deltas" msgstr "处理 delta 中" #: builtin/index-pack.c:1064 #, fuzzy, c-format msgid "unable to create thread: %s" msgstr "grep:无法创建线程:%s" #: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "不可理喻" #: builtin/index-pack.c:1112 #, c-format msgid "completed with %d local objects" msgstr "" #: builtin/index-pack.c:1121 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" #: builtin/index-pack.c:1125 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能缩小附加对象(%d)" #: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" #: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "关闭包文件时出错" #: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "无法写保留文件 '%s'" #: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "无法关闭保留文件 '%s'" #: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "无法存储包文件" #: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "无法存储索引文件" #: builtin/index-pack.c:1331 #, fuzzy, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的索引版本 '%s'" #: builtin/index-pack.c:1337 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" #: builtin/index-pack.c:1341 builtin/index-pack.c:1514 #, c-format msgid "no threads support, ignoring %s" msgstr "" #: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" #: builtin/index-pack.c:1401 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" #: builtin/index-pack.c:1448 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta:%d 个对象" msgstr[1] "非 delta:%d 个对象" #: builtin/index-pack.c:1455 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" #: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" #: builtin/index-pack.c:1526 builtin/index-pack.c:1529 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" #: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包名 '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包名参数" #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" #: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "太长的模版名 %s" #: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "不能枚举 '%s' 状态" #: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "不能枚举模版 '%s' 状态" #: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" #: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" #: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "太长的符号链接 %s" #: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" #: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" #: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" #: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "太长的模版路径 %s" #: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "不正常的 git 目录 %s" #: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s 已经存在" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" #: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" #: builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "不能创建 git link %s" #. #. * TRANSLATORS: The first '%s' is either "Reinitialized #. * existing" or "Initialized empty", the second " shared" or #. * "", and the last '%s%s' is the verbatim directory name. #. #: builtin/init-db.c:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" #: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "重新初始化现存的" #: builtin/init-db.c:421 msgid "Initialized empty" msgstr "初始化空的" # 译者:中文字符串拼接,可删除前导空格 #: builtin/init-db.c:422 msgid " shared" msgstr "共享" #: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "无法获知当前路径" #: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" "[=<permissions>]] [directory]" msgstr "" #: builtin/init-db.c:490 msgid "permissions" msgstr "" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "" #: builtin/init-db.c:493 builtin/prune-packed.c:77 #, fuzzy msgid "be quiet" msgstr "更加安静" #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" #: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" #: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-" "dir=<directory>)" #: builtin/init-db.c:579 msgid "Cannot access current working directory" msgstr "不能访问当前工作目录" #: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" #: builtin/log.c:37 #, fuzzy msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" msgstr "git apply [选项] [<补丁>...]" #: builtin/log.c:38 #, fuzzy msgid " or: git show [options] <object>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/log.c:100 msgid "suppress diff output" msgstr "" #: builtin/log.c:101 #, fuzzy msgid "show source" msgstr "坏的源" #: builtin/log.c:102 msgid "decorate options" msgstr "" #: builtin/log.c:189 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" #: builtin/log.c:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" #: builtin/log.c:518 #, c-format msgid "Unknown type: %d" msgstr "未知类型:%d" #: builtin/log.c:608 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:682 msgid "name of output directory is too long" msgstr "输出目录名太长" #: builtin/log.c:693 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" #: builtin/log.c:707 msgid "Need exactly one range." msgstr "只需要一个范围。" #: builtin/log.c:715 msgid "Not a range." msgstr "不是一个范围。" #: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" #: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to:%s" #: builtin/log.c:890 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" #: builtin/log.c:935 msgid "Two output directories?" msgstr "两个输出目录?" #: builtin/log.c:1063 msgid "use [PATCH n/m] even with a single patch" msgstr "" #: builtin/log.c:1066 msgid "use [PATCH] even with multiple patches" msgstr "" #: builtin/log.c:1070 msgid "print patches to standard out" msgstr "" #: builtin/log.c:1072 msgid "generate a cover letter" msgstr "" #: builtin/log.c:1074 msgid "use simple number sequence for output file names" msgstr "" #: builtin/log.c:1075 msgid "sfx" msgstr "" #: builtin/log.c:1076 msgid "use <sfx> instead of '.patch'" msgstr "" #: builtin/log.c:1078 msgid "start numbering patches at <n> instead of 1" msgstr "" #: builtin/log.c:1080 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" #: builtin/log.c:1083 msgid "store resulting files in <dir>" msgstr "" #: builtin/log.c:1086 msgid "don't strip/add [PATCH]" msgstr "" #: builtin/log.c:1089 msgid "don't output binary diffs" msgstr "" #: builtin/log.c:1091 msgid "don't include a patch matching a commit upstream" msgstr "" #: builtin/log.c:1093 msgid "show patch format instead of default (patch + stat)" msgstr "" #: builtin/log.c:1095 #, fuzzy msgid "Messaging" msgstr "合并:" # 译者:注意保持句尾空格 #: builtin/log.c:1096 #, fuzzy msgid "header" msgstr "领先 " #: builtin/log.c:1097 msgid "add email header" msgstr "" #: builtin/log.c:1098 builtin/log.c:1100 msgid "email" msgstr "" #: builtin/log.c:1098 msgid "add To: header" msgstr "" #: builtin/log.c:1100 msgid "add Cc: header" msgstr "" #: builtin/log.c:1102 msgid "message-id" msgstr "" #: builtin/log.c:1103 msgid "make first mail a reply to <message-id>" msgstr "" #: builtin/log.c:1104 builtin/log.c:1107 msgid "boundary" msgstr "" #: builtin/log.c:1105 msgid "attach the patch" msgstr "" #: builtin/log.c:1108 #, fuzzy msgid "inline the patch" msgstr "忽略补丁中的添加的文件" #: builtin/log.c:1112 msgid "enable message threading, styles: shallow, deep" msgstr "" #: builtin/log.c:1114 msgid "signature" msgstr "" #: builtin/log.c:1115 msgid "add a signature" msgstr "" #: builtin/log.c:1117 #, fuzzy msgid "don't print the patch filenames" msgstr "无法打开补丁文件 %s" #: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" #: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" #: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" #: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "--name-only 无意义" #: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "--name-status 无意义" #: builtin/log.c:1216 msgid "--check does not make sense" msgstr "--check 无意义" #: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "标准输出或目录,哪一个?" #: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" #: builtin/log.c:1394 msgid "Failed to create output files" msgstr "无法创建输出文件" #: builtin/log.c:1443 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" #: builtin/log.c:1498 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n" #: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" #: builtin/ls-files.c:408 #, fuzzy msgid "git ls-files [options] [<file>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/ls-files.c:463 msgid "identify the file status with tags" msgstr "" #: builtin/ls-files.c:465 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" #: builtin/ls-files.c:467 msgid "show cached files in the output (default)" msgstr "" #: builtin/ls-files.c:469 #, fuzzy msgid "show deleted files in the output" msgstr "删除的文件 %s 仍有内容" #: builtin/ls-files.c:471 msgid "show modified files in the output" msgstr "" #: builtin/ls-files.c:473 msgid "show other files in the output" msgstr "" #: builtin/ls-files.c:475 msgid "show ignored files in the output" msgstr "" #: builtin/ls-files.c:478 msgid "show staged contents' object name in the output" msgstr "" #: builtin/ls-files.c:480 msgid "show files on the filesystem that need to be removed" msgstr "" #: builtin/ls-files.c:482 msgid "show 'other' directories' name only" msgstr "" #: builtin/ls-files.c:485 #, fuzzy msgid "don't show empty directories" msgstr "两个输出目录?" #: builtin/ls-files.c:488 msgid "show unmerged files in the output" msgstr "" #: builtin/ls-files.c:490 msgid "show resolve-undo information" msgstr "" #: builtin/ls-files.c:492 #, fuzzy msgid "skip files matching pattern" msgstr "输出和模式匹配的行" #: builtin/ls-files.c:495 msgid "exclude patterns are read from <file>" msgstr "" #: builtin/ls-files.c:498 msgid "read additional per-directory exclude patterns in <file>" msgstr "" #: builtin/ls-files.c:500 msgid "add the standard git exclusions" msgstr "" #: builtin/ls-files.c:503 msgid "make the output relative to the project top directory" msgstr "" #: builtin/ls-files.c:506 msgid "if any <file> is not in the index, treat this as an error" msgstr "" #: builtin/ls-files.c:507 msgid "tree-ish" msgstr "" #: builtin/ls-files.c:508 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" #: builtin/ls-files.c:510 msgid "show debugging data" msgstr "" #: builtin/ls-tree.c:27 #, fuzzy msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/ls-tree.c:125 msgid "only show trees" msgstr "" #: builtin/ls-tree.c:127 #, fuzzy msgid "recurse into subtrees" msgstr "变基到远程 %s" #: builtin/ls-tree.c:129 msgid "show trees when recursing" msgstr "" #: builtin/ls-tree.c:132 msgid "terminate entries with NUL byte" msgstr "" #: builtin/ls-tree.c:133 #, fuzzy msgid "include object size" msgstr "提供了无效对象 '%s'。" #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 msgid "list only filenames" msgstr "" #: builtin/ls-tree.c:140 msgid "use full path names" msgstr "" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" #: builtin/merge.c:43 #, fuzzy msgid "git merge [options] [<commit>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/merge.c:44 msgid "git merge [options] <msg> HEAD <commit>" msgstr "" #: builtin/merge.c:45 msgid "git merge --abort" msgstr "" #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" #: builtin/merge.c:127 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" #: builtin/merge.c:128 #, c-format msgid "Available strategies are:" msgstr "可用的策略有:" #: builtin/merge.c:133 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有:" #: builtin/merge.c:183 msgid "do not show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:186 msgid "show a diffstat at the end of the merge" msgstr "" #: builtin/merge.c:187 msgid "(synonym to --stat)" msgstr "" #: builtin/merge.c:189 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" #: builtin/merge.c:192 #, fuzzy msgid "create a single commit instead of doing a merge" msgstr "在合并过程中不能做部分提交。" #: builtin/merge.c:194 msgid "perform a commit if the merge succeeds (default)" msgstr "" #: builtin/merge.c:196 #, fuzzy msgid "edit message before committing" msgstr "尚未暂存以备提交的变更:" #: builtin/merge.c:198 #, fuzzy msgid "allow fast-forward (default)" msgstr "可快进" #: builtin/merge.c:200 msgid "abort if fast-forward is not possible" msgstr "" #: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112 msgid "strategy" msgstr "" #: builtin/merge.c:203 #, fuzzy msgid "merge strategy to use" msgstr "尝试合并策略 %s...\n" #: builtin/merge.c:204 msgid "option=value" msgstr "" #: builtin/merge.c:205 msgid "option for selected merge strategy" msgstr "" #: builtin/merge.c:207 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" #: builtin/merge.c:211 #, fuzzy msgid "abort the current in-progress merge" msgstr "无法保存当前索引状态" #: builtin/merge.c:240 msgid "could not run stash." msgstr "不能进行进度保存。" #: builtin/merge.c:245 msgid "stash failed" msgstr "进度保存失败" #: builtin/merge.c:250 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象:%s" #: builtin/merge.c:269 builtin/merge.c:286 msgid "read-tree failed" msgstr "读取树失败" # 译者:注意保持前导空格 #: builtin/merge.c:316 msgid " (nothing to squash)" msgstr " (无可压缩)" #: builtin/merge.c:329 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" #: builtin/merge.c:361 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" #: builtin/merge.c:363 msgid "Finishing SQUASH_MSG" msgstr "完成 SQUASH_MSG" #: builtin/merge.c:386 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" #: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" #: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串:%s" #: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" #: builtin/merge.c:678 msgid "failed to read the cache" msgstr "无法读取缓存" #: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" #: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" #: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "不能写 %s" #: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" #: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" #: builtin/merge.c:891 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" "Lines starting with '#' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" "以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n" #: builtin/merge.c:915 msgid "Empty commit message." msgstr "空提交信息。" #: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" #: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" #: builtin/merge.c:1049 msgid "No current branch." msgstr "没有当前分支。" #: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" #: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" #: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有来自 %s 的远程跟踪分支" #: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" #: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" #: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" "您尚未结束您的合并(存在 MERGE_HEAD)。\n" "请在合并前先提交您的修改。" #: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" #: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" "请在合并前先提交您的修改。" #: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" #: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" #: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" #: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" #: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" #: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" #: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" #: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" #: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "无。\n" #: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "无法快进,终止。" #: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" #: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" #: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" #: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" #: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利,按要求在提交前停止\n" #: builtin/merge-base.c:26 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "" #: builtin/merge-base.c:27 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "" #: builtin/merge-base.c:28 msgid "git merge-base --independent <commit>..." msgstr "" #: builtin/merge-base.c:29 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" #: builtin/merge-base.c:98 #, fuzzy msgid "output all common ancestors" msgstr "发现 %u 个共同祖先:" #: builtin/merge-base.c:99 msgid "find ancestors for a single n-way merge" msgstr "" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" msgstr "" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" msgstr "" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" msgstr "" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" #: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "" #: builtin/mktree.c:154 builtin/write-tree.c:24 #, fuzzy msgid "allow missing objects" msgstr "接收对象中" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "" #: builtin/mv.c:14 msgid "git mv [options] <source>... <destination>" msgstr "" #: builtin/mv.c:64 msgid "force move/rename even if target exists" msgstr "" #: builtin/mv.c:65 #, fuzzy msgid "skip move/rename errors" msgstr "程序错误" #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" #: builtin/mv.c:112 msgid "bad source" msgstr "坏的源" #: builtin/mv.c:115 msgid "can not move directory into itself" msgstr "不能将目录移动到自身" #: builtin/mv.c:118 msgid "cannot move directory over file" msgstr "不能将目录移动到文件" #: builtin/mv.c:128 #, c-format msgid "Huh? %.*s is in index?" msgstr "嗯?%.*s 在索引中?" #: builtin/mv.c:140 msgid "source directory is empty" msgstr "源目录为空" #: builtin/mv.c:171 msgid "not under version control" msgstr "不在版本控制之下" #: builtin/mv.c:173 msgid "destination exists" msgstr "目标已存在" #: builtin/mv.c:181 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" #: builtin/mv.c:184 msgid "Cannot overwrite" msgstr "不能覆盖" #: builtin/mv.c:187 msgid "multiple sources for the same target" msgstr "同一目标具有多个源" #: builtin/mv.c:202 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s,源=%s,目标=%s" #: builtin/mv.c:212 #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" #: builtin/mv.c:215 builtin/remote.c:731 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c:175 #, fuzzy msgid "git name-rev [options] <commit>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/name-rev.c:176 msgid "git name-rev [options] --all" msgstr "" #: builtin/name-rev.c:177 msgid "git name-rev [options] --stdin" msgstr "" #: builtin/name-rev.c:229 msgid "print only names (no SHA-1)" msgstr "" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" msgstr "" #: builtin/name-rev.c:232 #, fuzzy msgid "only use refs matching <pattern>" msgstr "输出和模式匹配的行" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" msgstr "" #: builtin/name-rev.c:235 msgid "read from stdin" msgstr "" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" msgstr "" #: builtin/notes.c:23 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "" #: builtin/notes.c:24 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" #: builtin/notes.c:25 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "" #: builtin/notes.c:26 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" #: builtin/notes.c:27 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "" #: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "" #: builtin/notes.c:29 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "" #: builtin/notes.c:30 msgid "git notes merge --commit [-v | -q]" msgstr "" #: builtin/notes.c:31 msgid "git notes merge --abort [-v | -q]" msgstr "" #: builtin/notes.c:32 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:33 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "" #: builtin/notes.c:34 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "" #: builtin/notes.c:39 msgid "git notes [list [<object>]]" msgstr "" #: builtin/notes.c:44 #, fuzzy msgid "git notes add [<options>] [<object>]" msgstr "git apply [选项] [<补丁>...]" #: builtin/notes.c:49 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" #: builtin/notes.c:50 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" #: builtin/notes.c:55 #, fuzzy msgid "git notes append [<options>] [<object>]" msgstr "git apply [选项] [<补丁>...]" #: builtin/notes.c:60 msgid "git notes edit [<object>]" msgstr "" #: builtin/notes.c:65 msgid "git notes show [<object>]" msgstr "" #: builtin/notes.c:70 msgid "git notes merge [<options>] <notes_ref>" msgstr "" #: builtin/notes.c:71 msgid "git notes merge --commit [<options>]" msgstr "" #: builtin/notes.c:72 msgid "git notes merge --abort [<options>]" msgstr "" #: builtin/notes.c:77 msgid "git notes remove [<object>]" msgstr "" #: builtin/notes.c:82 msgid "git notes prune [<options>]" msgstr "" #: builtin/notes.c:87 msgid "git notes get-ref" msgstr "" #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" #: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "不能打开 'show' 输出文件句柄" #: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "无法为对象 '%s' 的 'show' 关闭管道" #: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" #: builtin/notes.c:175 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" #: builtin/notes.c:210 builtin/notes.c:973 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" #: builtin/notes.c:215 msgid "unable to write note object" msgstr "不能写注解对象" #: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" #: builtin/notes.c:251 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" #: builtin/notes.c:253 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" #: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" #: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值:'%s'" #: builtin/notes.c:350 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value #: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值:'%s'" #: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行:'%s'。" #: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%s' 拷贝注解" #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 #: builtin/notes.c:1033 msgid "too many parameters" msgstr "参数太多" #: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" #: builtin/notes.c:535 builtin/notes.c:692 #, fuzzy msgid "note contents as a string" msgstr "注解内容被留在文件 %s 中" #: builtin/notes.c:538 builtin/notes.c:695 #, fuzzy msgid "note contents in a file" msgstr "无法存储索引文件" #: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697 #: builtin/notes.c:700 builtin/tag.c:476 #, fuzzy msgid "object" msgstr "坏对象 %s" #: builtin/notes.c:541 builtin/notes.c:698 #, fuzzy msgid "reuse and edit specified note object" msgstr "不能写注解对象" #: builtin/notes.c:544 builtin/notes.c:701 #, fuzzy msgid "reuse specified note object" msgstr "不能写注解对象" #: builtin/notes.c:546 builtin/notes.c:614 #, fuzzy msgid "replace existing notes" msgstr "不能读取现存对象 %s" #: builtin/notes.c:580 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" #: builtin/notes.c:615 #, fuzzy msgid "read objects from stdin" msgstr "坏对象 %s" #: builtin/notes.c:617 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" #: builtin/notes.c:635 msgid "too few parameters" msgstr "参数太少" #: builtin/notes.c:656 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" #: builtin/notes.c:717 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" #: builtin/notes.c:864 #, fuzzy msgid "General options" msgstr "无效选项:%s" #: builtin/notes.c:866 msgid "Merge options" msgstr "" #: builtin/notes.c:868 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" #: builtin/notes.c:870 msgid "Committing unmerged notes" msgstr "" #: builtin/notes.c:872 msgid "finalize notes merge by committing unmerged notes" msgstr "" #: builtin/notes.c:874 msgid "Aborting notes merge resolution" msgstr "" #: builtin/notes.c:876 #, fuzzy msgid "abort notes merge" msgstr "path '%s':无法合并" #: builtin/notes.c:971 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c:983 msgid "attempt to remove non-existent note is not an error" msgstr "" #: builtin/notes.c:986 #, fuzzy msgid "read object names from the standard input" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/notes.c:1067 msgid "notes_ref" msgstr "" #: builtin/notes.c:1068 msgid "use notes from <notes_ref>" msgstr "" #: builtin/notes.c:1103 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令:%s" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:2398 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" #: builtin/pack-objects.c:2402 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" #: builtin/pack-objects.c:2425 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" #: builtin/pack-objects.c:2429 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" #: builtin/pack-objects.c:2448 msgid "do not show progress meter" msgstr "" #: builtin/pack-objects.c:2450 msgid "show progress meter" msgstr "" #: builtin/pack-objects.c:2452 msgid "show progress meter during object writing phase" msgstr "" #: builtin/pack-objects.c:2455 msgid "similar to --all-progress when progress meter is shown" msgstr "" #: builtin/pack-objects.c:2456 msgid "version[,offset]" msgstr "" #: builtin/pack-objects.c:2457 msgid "write the pack index file in the specified idx format version" msgstr "" #: builtin/pack-objects.c:2460 #, fuzzy msgid "maximum size of each output pack file" msgstr "无法创建输出文件" #: builtin/pack-objects.c:2462 msgid "ignore borrowed objects from alternate object store" msgstr "" #: builtin/pack-objects.c:2464 #, fuzzy msgid "ignore packed objects" msgstr "不能读取对象 %s" #: builtin/pack-objects.c:2466 msgid "limit pack window by objects" msgstr "" #: builtin/pack-objects.c:2468 msgid "limit pack window by memory in addition to object limit" msgstr "" #: builtin/pack-objects.c:2470 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" #: builtin/pack-objects.c:2472 #, fuzzy msgid "reuse existing deltas" msgstr "处理 delta 中" #: builtin/pack-objects.c:2474 #, fuzzy msgid "reuse existing objects" msgstr "不能读取现存对象 %s" #: builtin/pack-objects.c:2476 msgid "use OFS_DELTA objects" msgstr "" #: builtin/pack-objects.c:2478 msgid "use threads when searching for best delta matches" msgstr "" #: builtin/pack-objects.c:2480 msgid "do not create an empty pack output" msgstr "" #: builtin/pack-objects.c:2482 #, fuzzy msgid "read revision arguments from standard input" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/pack-objects.c:2484 msgid "limit the objects to those that are not yet packed" msgstr "" #: builtin/pack-objects.c:2487 msgid "include objects reachable from any reference" msgstr "" #: builtin/pack-objects.c:2490 msgid "include objects referred by reflog entries" msgstr "" #: builtin/pack-objects.c:2493 msgid "output pack to stdout" msgstr "" #: builtin/pack-objects.c:2495 msgid "include tag objects that refer to objects to be packed" msgstr "" #: builtin/pack-objects.c:2497 msgid "keep unreachable objects" msgstr "" #: builtin/pack-objects.c:2498 parse-options.h:141 msgid "time" msgstr "时间" #: builtin/pack-objects.c:2499 msgid "unpack unreachable objects newer than <time>" msgstr "" #: builtin/pack-objects.c:2502 msgid "create thin packs" msgstr "" #: builtin/pack-objects.c:2504 msgid "ignore packs that have companion .keep file" msgstr "" #: builtin/pack-objects.c:2506 msgid "pack compression level" msgstr "" #: builtin/pack-objects.c:2508 #, fuzzy msgid "do not hide commits by grafts" msgstr "不能写提交模版" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "" #: builtin/pack-refs.c:14 msgid "pack everything" msgstr "" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" msgstr "" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" #: builtin/prune.c:132 #, fuzzy msgid "do not remove, show only" msgstr "不会删除 %s\n" #: builtin/prune.c:133 #, fuzzy msgid "report pruned objects" msgstr "不能读取对象 %s" #: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "" #: builtin/push.c:14 #, fuzzy msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git apply [选项] [<补丁>...]" #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> 参数" #: builtin/push.c:64 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" #: builtin/push.c:99 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" #: builtin/push.c:102 #, c-format msgid "" "The upstream branch of your current branch does not match\n" "the name of your current branch. To push to the upstream branch\n" "on the remote, use\n" "\n" " git push %s HEAD:%s\n" "\n" "To push to the branch of the same name on the remote, use\n" "\n" " git push %s %s\n" "%s" msgstr "" "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" "上游分支,使用\n" "\n" " git push %s HEAD:%s\n" "\n" "为推送至远程同名分支,使用\n" "\n" " git push %s %s\n" "%s" #: builtin/push.c:121 #, c-format msgid "" "You are not currently on a branch.\n" "To push the history leading to the current (detached HEAD)\n" "state now, use\n" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" "您当前不在一个分支上。\n" "现在为推送当前(分离头指针)的历史,使用\n" "\n" " git push %s HEAD:<name-of-remote-branch>\n" #: builtin/push.c:128 #, c-format msgid "" "The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" "\n" " git push --set-upstream %s %s\n" msgstr "" "当前分支 %s 没有对应的上游分支。\n" "为推送当前分支并建立与远程上游的跟踪,使用\n" "\n" " git push --set-upstream %s %s\n" #: builtin/push.c:136 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支,拒绝推送。" #: builtin/push.c:139 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" "而没有告诉我要推送什么、更新哪个远程分支。" # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 #: builtin/push.c:151 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" "and maintain the current behavior after the default changes, use:\n" "\n" " git config --global push.default matching\n" "\n" "To squelch this message and adopt the new behavior now, use:\n" "\n" " git config --global push.default simple\n" "\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" "push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n" "修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n" "进行如下设置:\n" "\n" " git config --global push.default matching\n" "\n" "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" "\n" " git config --global push.default simple\n" "\n" "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" "为保持兼容,请用 'current' 代替 'simple' 模式)" #: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。" #: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" "before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" "再次推送前,先与远程变更合并(如 'git pull')。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" "specify branches to push or set the 'push.default' configuration variable\n" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n" "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" "以便只推送当前分支。" #: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" "(e.g. 'git pull') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" #: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" #: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" #: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" #: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " "repository using\n" "\n" " git remote add <name> <url>\n" "\n" "and then push using the remote name\n" "\n" " git push <name>\n" msgstr "" "没有配置推送目标。\n" "或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n" "\n" " git remote add <name> <url>\n" "\n" "然后使用该远程版本库名执行推送\n" "\n" " git push <name>\n" #: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" #: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用表达式同时使用" #: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" #: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用表达式同时使用" #: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" #: builtin/push.c:382 #, fuzzy msgid "repository" msgstr "坏的版本库 '%s'" #: builtin/push.c:383 msgid "push all refs" msgstr "" #: builtin/push.c:384 msgid "mirror all refs" msgstr "" #: builtin/push.c:386 #, fuzzy msgid "delete refs" msgstr "删除" #: builtin/push.c:387 msgid "push tags (can't be used with --all or --mirror)" msgstr "" #: builtin/push.c:390 #, fuzzy msgid "force updates" msgstr "强制更新" #: builtin/push.c:391 msgid "check" msgstr "" #: builtin/push.c:392 msgid "control recursive pushing of submodules" msgstr "" #: builtin/push.c:394 msgid "use thin pack" msgstr "" #: builtin/push.c:395 builtin/push.c:396 msgid "receive pack program" msgstr "" #: builtin/push.c:397 msgid "set upstream for git pull/status" msgstr "" #: builtin/push.c:400 msgid "prune locally removed refs" msgstr "" #: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" #: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" #: builtin/read-tree.c:36 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" #: builtin/read-tree.c:108 #, fuzzy msgid "write resulting index to <file>" msgstr "损坏的索引文件" #: builtin/read-tree.c:111 #, fuzzy msgid "only empty the index" msgstr "不能读取索引" #: builtin/read-tree.c:113 #, fuzzy msgid "Merging" msgstr "合并:" #: builtin/read-tree.c:115 msgid "perform a merge in addition to a read" msgstr "" #: builtin/read-tree.c:117 msgid "3-way merge if no file level merging required" msgstr "" #: builtin/read-tree.c:119 msgid "3-way merge in presence of adds and removes" msgstr "" #: builtin/read-tree.c:121 msgid "same as -m, but discard unmerged entries" msgstr "" #: builtin/read-tree.c:122 #, fuzzy msgid "<subdirectory>/" msgstr "目录/文件" #: builtin/read-tree.c:123 msgid "read the tree into the index under <subdirectory>/" msgstr "" #: builtin/read-tree.c:126 msgid "update working tree with merge result" msgstr "" #: builtin/read-tree.c:128 #, fuzzy msgid "gitignore" msgstr "忽略的" #: builtin/read-tree.c:129 msgid "allow explicitly ignored files to be overwritten" msgstr "" #: builtin/read-tree.c:132 #, fuzzy msgid "don't check the working tree after merging" msgstr "显示工作区状态" #: builtin/read-tree.c:133 msgid "don't update the index or the work tree" msgstr "" #: builtin/read-tree.c:135 msgid "skip applying sparse checkout filter" msgstr "" #: builtin/read-tree.c:137 msgid "debug unpack-trees" msgstr "" #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "" #: builtin/remote.c:12 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" #: builtin/remote.c:13 builtin/remote.c:32 msgid "git remote rename <old> <new>" msgstr "" #: builtin/remote.c:14 builtin/remote.c:37 msgid "git remote remove <name>" msgstr "" #: builtin/remote.c:15 msgid "git remote set-head <name> (-a | -d | <branch>)" msgstr "" #: builtin/remote.c:16 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" #: builtin/remote.c:17 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" #: builtin/remote.c:18 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" #: builtin/remote.c:19 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" #: builtin/remote.c:20 builtin/remote.c:68 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" #: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url --add <name> <newurl>" msgstr "" #: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --delete <name> <url>" msgstr "" #: builtin/remote.c:27 msgid "git remote add [<options>] <name> <url>" msgstr "" #: builtin/remote.c:42 msgid "git remote set-head <name> (-a | -d | <branch>])" msgstr "" #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." msgstr "" #: builtin/remote.c:48 msgid "git remote set-branches --add <name> <branch>..." msgstr "" #: builtin/remote.c:53 msgid "git remote show [<options>] <name>" msgstr "" #: builtin/remote.c:58 msgid "git remote prune [<options>] <name>" msgstr "" #: builtin/remote.c:63 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" #: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "更新 %s 中" #: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" "--mirror 选项危险且过时,请使用 --mirror=fetch\n" "\t 或 --mirror=push" #: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜像参数:%s" #: builtin/remote.c:163 #, fuzzy msgid "fetch the remote branches" msgstr " 远程分支:%s" #: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "" #: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" #: builtin/remote.c:170 msgid "branch(es) to track" msgstr "" #: builtin/remote.c:171 #, fuzzy msgid "master branch" msgstr " 远程分支:%s" #: builtin/remote.c:172 msgid "push|fetch" msgstr "" #: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" #: builtin/remote.c:195 builtin/remote.c:646 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" #: builtin/remote.c:199 builtin/remote.c:650 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" #: builtin/remote.c:243 #, c-format msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" #: builtin/remote.c:299 #, c-format msgid "more than one %s" msgstr "多于一个 %s" #: builtin/remote.c:339 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "无法得到引用表达式 %s 的获取列表" #: builtin/remote.c:440 builtin/remote.c:448 msgid "(matching)" msgstr "(匹配)" #: builtin/remote.c:452 msgid "(delete)" msgstr "(删除)" #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format msgid "Could not append '%s' to '%s'" msgstr "不能添加 '%s' 至 '%s'" #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 #, c-format msgid "No such remote: %s" msgstr "没有这样的远程:%s" #: builtin/remote.c:656 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" #: builtin/remote.c:662 builtin/remote.c:799 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" #: builtin/remote.c:677 #, c-format msgid "" "Not updating non-default fetch refspec\n" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" "没有更新非默认的获取引用表达式\n" "\t%s\n" "\t如果必要请手动更新配置。" #: builtin/remote.c:683 #, c-format msgid "Could not append '%s'" msgstr "不能追加 '%s'" #: builtin/remote.c:694 #, c-format msgid "Could not set '%s'" msgstr "不能设置 '%s'" #: builtin/remote.c:716 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" #: builtin/remote.c:750 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" #: builtin/remote.c:764 #, c-format msgid "Could not remove branch %s" msgstr "无法移除分支 %s" #: builtin/remote.c:834 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" #: builtin/remote.c:943 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的(下一次获取将存储于 remotes/%s)" #: builtin/remote.c:946 msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c:948 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时(使用 'git remote prune' 来移除)" #: builtin/remote.c:950 msgid " ???" msgstr " ???" #: builtin/remote.c:991 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" #: builtin/remote.c:998 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" #: builtin/remote.c:1001 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" #: builtin/remote.c:1002 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:1004 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" #: builtin/remote.c:1005 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:1051 msgid "create" msgstr "创建" #: builtin/remote.c:1054 msgid "delete" msgstr "删除" #: builtin/remote.c:1058 msgid "up to date" msgstr "最新" #: builtin/remote.c:1061 msgid "fast-forwardable" msgstr "可快进" #: builtin/remote.c:1064 msgid "local out of date" msgstr "本地已过时" #: builtin/remote.c:1071 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" #: builtin/remote.c:1074 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" #: builtin/remote.c:1078 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" #: builtin/remote.c:1081 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" #: builtin/remote.c:1091 #, fuzzy msgid "do not query remotes" msgstr "不会删除 %s\n" #: builtin/remote.c:1118 #, c-format msgid "* remote %s" msgstr "* 远程 %s" #: builtin/remote.c:1119 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址:%s" #: builtin/remote.c:1120 builtin/remote.c:1285 msgid "(no URL)" msgstr "(无 URL)" #: builtin/remote.c:1129 builtin/remote.c:1131 #, c-format msgid " Push URL: %s" msgstr " 推送地址:%s" #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 #, c-format msgid " HEAD branch: %s" msgstr " HEAD分支:%s" #: builtin/remote.c:1139 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" #: builtin/remote.c:1151 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 远程分支:%s" msgstr[1] " 远程分支:%s" # 译者:中文字符串拼接,可删除前导空格 #: builtin/remote.c:1154 builtin/remote.c:1181 msgid " (status not queried)" msgstr "(状态未查询)" #: builtin/remote.c:1163 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支:" msgstr[1] " 为 'git pull' 配置的本地分支:" #: builtin/remote.c:1171 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" #: builtin/remote.c:1178 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s:" msgstr[1] " 为 'git push' 配置的本地引用%s:" #: builtin/remote.c:1199 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" #: builtin/remote.c:1201 msgid "delete refs/remotes/<name>/HEAD" msgstr "" #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" #: builtin/remote.c:1218 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" #: builtin/remote.c:1228 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" #: builtin/remote.c:1236 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用:%s" #: builtin/remote.c:1238 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者:注意保持前导空格 #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为悬空状态!" # 译者:注意保持前导空格 #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为悬空状态!" #: builtin/remote.c:1281 #, c-format msgid "Pruning %s" msgstr "修剪 %s" #: builtin/remote.c:1282 #, c-format msgid "URL: %s" msgstr "URL:%s" #: builtin/remote.c:1295 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" #: builtin/remote.c:1298 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" #: builtin/remote.c:1321 msgid "prune remotes after fetching" msgstr "" #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" #: builtin/remote.c:1407 #, fuzzy msgid "add branch" msgstr "位于分支 " #: builtin/remote.c:1414 msgid "no remote specified" msgstr "未指定远程" #: builtin/remote.c:1436 msgid "manipulate push URLs" msgstr "" #: builtin/remote.c:1438 msgid "add URL" msgstr "" #: builtin/remote.c:1440 #, fuzzy msgid "delete URLs" msgstr "删除" #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" #: builtin/remote.c:1487 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧URL匹配模版:%s" #: builtin/remote.c:1495 #, c-format msgid "No such URL found: %s" msgstr "未找到此URL:%s" #: builtin/remote.c:1497 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送URL地址" #: builtin/remote.c:1569 msgid "be verbose; must be placed before a subcommand" msgstr "" #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" msgstr "" #: builtin/replace.c:18 msgid "git replace -d <object>..." msgstr "" #: builtin/replace.c:19 msgid "git replace -l [<pattern>]" msgstr "" #: builtin/replace.c:118 msgid "list replace refs" msgstr "" #: builtin/replace.c:119 msgid "delete replace refs" msgstr "" #: builtin/replace.c:120 msgid "replace the ref if it exists" msgstr "" #: builtin/rerere.c:11 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "" #: builtin/rerere.c:56 #, fuzzy msgid "register clean resolutions in index" msgstr "%s:已经存在于索引中" #: builtin/reset.c:25 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" #: builtin/reset.c:26 msgid "git reset [-q] <commit> [--] <paths>..." msgstr "" #: builtin/reset.c:27 msgid "git reset --patch [<commit>] [--] [<paths>...]" msgstr "" #: builtin/reset.c:33 msgid "mixed" msgstr "混杂" #: builtin/reset.c:33 msgid "soft" msgstr "软性" #: builtin/reset.c:33 msgid "hard" msgstr "硬性" #: builtin/reset.c:33 msgid "merge" msgstr "合并" #: builtin/reset.c:33 msgid "keep" msgstr "保持" #: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" #: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" #: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" #: builtin/reset.c:96 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" #: builtin/reset.c:106 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" #: builtin/reset.c:130 msgid "Could not read index" msgstr "不能读取索引" #: builtin/reset.c:133 msgid "Unstaged changes after reset:" msgstr "重置后撤出暂存区的变更:" # 译者:汉字之间无空格,故删除%s前后空格 #: builtin/reset.c:223 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" #: builtin/reset.c:238 msgid "be quiet, only report errors" msgstr "" #: builtin/reset.c:240 msgid "reset HEAD and index" msgstr "" #: builtin/reset.c:241 msgid "reset only HEAD" msgstr "" #: builtin/reset.c:243 builtin/reset.c:245 msgid "reset HEAD, index and working tree" msgstr "" #: builtin/reset.c:247 msgid "reset HEAD but keep local changes" msgstr "" #: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" #: builtin/reset.c:308 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard,mixed,soft} 不兼容" #: builtin/reset.c:317 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。" # 译者:汉字之间无空格,故删除%s前后空格 #: builtin/reset.c:319 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者:汉字之间无空格,故删除%s前后空格 #: builtin/reset.c:331 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" #: builtin/reset.c:347 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" #: builtin/rev-parse.c:339 #, fuzzy msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/rev-parse.c:344 msgid "keep the `--` passed as an arg" msgstr "" #: builtin/rev-parse.c:346 msgid "stop parsing after the first non-option argument" msgstr "" #: builtin/rev-parse.c:464 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" " or: git rev-parse [options] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>" msgstr "" #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 msgid "git cherry-pick [options] <commit-ish>" msgstr "" #: builtin/revert.c:29 #, fuzzy msgid "git cherry-pick <subcommand>" msgstr "拣选失败" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s:%s 不能和 %s 同时使用" #: builtin/revert.c:103 msgid "end revert or cherry-pick sequence" msgstr "" #: builtin/revert.c:104 msgid "resume revert or cherry-pick sequence" msgstr "" #: builtin/revert.c:105 msgid "cancel revert or cherry-pick sequence" msgstr "" #: builtin/revert.c:106 #, fuzzy msgid "don't automatically commit" msgstr "不能作为初始提交还原" #: builtin/revert.c:107 #, fuzzy msgid "edit the commit message" msgstr "空提交信息。" #: builtin/revert.c:110 msgid "parent number" msgstr "" #: builtin/revert.c:112 #, fuzzy msgid "merge strategy" msgstr "尝试合并策略 %s...\n" #: builtin/revert.c:113 #, fuzzy msgid "option" msgstr "动作" #: builtin/revert.c:114 #, fuzzy msgid "option for merge strategy" msgstr "尝试合并策略 %s...\n" #: builtin/revert.c:125 msgid "append commit name" msgstr "" #: builtin/revert.c:126 #, fuzzy msgid "allow fast-forward" msgstr "(非快进式)" #: builtin/revert.c:127 #, fuzzy msgid "preserve initially empty commits" msgstr "不能作为初始提交还原" #: builtin/revert.c:128 #, fuzzy msgid "allow commits with empty messages" msgstr "提交说明为空" #: builtin/revert.c:129 #, fuzzy msgid "keep redundant, empty commits" msgstr "合并未返回提交" #: builtin/revert.c:133 msgid "program error" msgstr "程序错误" #: builtin/revert.c:223 msgid "revert failed" msgstr "还原失败" #: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:14 #, fuzzy msgid "git rm [options] [--] <file>..." msgstr "git apply [选项] [<补丁>...]" #: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" "(use -f to force removal)" msgstr "" "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" "(使用 -f 强制删除)" #: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' 有变更已暂存至索引中\n" "(使用 --cached 保存文件,或用 -f 强制删除)" #: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' 有本地修改\n" "(使用 --cached 保存文件,或用 -f 强制删除)" #: builtin/rm.c:134 #, fuzzy msgid "do not list removed files" msgstr "无法还原修改的文件" #: builtin/rm.c:135 #, fuzzy msgid "only remove from the index" msgstr "不能从索引中移除 %s" #: builtin/rm.c:136 msgid "override the up-to-date check" msgstr "" #: builtin/rm.c:137 msgid "allow recursive removal" msgstr "" #: builtin/rm.c:139 msgid "exit with a zero status even if nothing matched" msgstr "" #: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" #: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm:不能删除 %s" #: builtin/shortlog.c:13 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" msgstr "" #: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "缺少作者:%s" #: builtin/shortlog.c:253 msgid "sort output according to the number of commits per author" msgstr "" #: builtin/shortlog.c:255 msgid "Suppress commit descriptions, only provides commit count" msgstr "" #: builtin/shortlog.c:257 msgid "Show the email address of each author" msgstr "" #: builtin/shortlog.c:258 msgid "w[,i1[,i2]]" msgstr "" #: builtin/shortlog.c:259 msgid "Linewrap output" msgstr "" #: builtin/show-branch.c:9 msgid "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" msgstr "" #: builtin/show-branch.c:10 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" #: builtin/show-branch.c:651 #, fuzzy msgid "show remote-tracking and local branches" msgstr "%s 没有来自 %s 的远程跟踪分支" #: builtin/show-branch.c:653 #, fuzzy msgid "show remote-tracking branches" msgstr "%s 没有来自 %s 的远程跟踪分支" #: builtin/show-branch.c:655 msgid "color '*!+-' corresponding to the branch" msgstr "" #: builtin/show-branch.c:657 msgid "show <n> more commits after the common ancestor" msgstr "" #: builtin/show-branch.c:659 msgid "synonym to more=-1" msgstr "" #: builtin/show-branch.c:660 msgid "suppress naming strings" msgstr "" #: builtin/show-branch.c:662 #, fuzzy msgid "include the current branch" msgstr "没有当前分支。" #: builtin/show-branch.c:664 #, fuzzy msgid "name commits with their object names" msgstr "不能写注解对象" #: builtin/show-branch.c:666 msgid "show possible merge bases" msgstr "" #: builtin/show-branch.c:668 msgid "show refs unreachable from any other ref" msgstr "" #: builtin/show-branch.c:670 msgid "show commits in topological order" msgstr "" #: builtin/show-branch.c:672 msgid "show only commits not on the first branch" msgstr "" #: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" msgstr "" #: builtin/show-branch.c:676 msgid "show commits where no parent comes before its children" msgstr "" #: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "" #: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "" #: builtin/show-ref.c:10 msgid "" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "" #: builtin/show-ref.c:182 #, fuzzy msgid "only show tags (can be combined with heads)" msgstr "--all 不能和引用表达式同时使用" #: builtin/show-ref.c:183 #, fuzzy msgid "only show heads (can be combined with tags)" msgstr "--all 不能和引用表达式同时使用" #: builtin/show-ref.c:184 msgid "stricter reference checking, requires exact ref path" msgstr "" #: builtin/show-ref.c:187 builtin/show-ref.c:189 msgid "show the HEAD reference" msgstr "" #: builtin/show-ref.c:191 #, fuzzy msgid "dereference tags into object IDs" msgstr "引用不是一个树:%s" #: builtin/show-ref.c:193 msgid "only show SHA1 hash using <n> digits" msgstr "" #: builtin/show-ref.c:197 msgid "do not print results to stdout (useful with --verify)" msgstr "" #: builtin/show-ref.c:199 msgid "show refs from stdin that aren't in local repository" msgstr "" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" msgstr "" #: builtin/symbolic-ref.c:38 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" #: builtin/symbolic-ref.c:39 msgid "shorten ref output" msgstr "" #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 msgid "reason" msgstr "" #: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 msgid "reason of the update" msgstr "" #: builtin/tag.c:22 msgid "" "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" msgstr "" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." msgstr "" #: builtin/tag.c:24 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" "\t\t[<pattern>...]" msgstr "" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." msgstr "" #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" msgstr "非法的对象于 '%s'" #: builtin/tag.c:207 #, c-format msgid "tag name too long: %.*s..." msgstr "tag 名字太长:%.*s..." #: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' 未发现。" #: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除 tag '%s'(曾为 %s)\n" #: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" #: builtin/tag.c:249 msgid "" "\n" "#\n" "# Write a tag message\n" "# Lines starting with '#' will be ignored.\n" "#\n" msgstr "" "\n" "#\n" "# 输入一个 tag 说明\n" "# 以 '#' 开头的行将被忽略。\n" "#\n" #: builtin/tag.c:256 msgid "" "\n" "#\n" "# Write a tag message\n" "# Lines starting with '#' will be kept; you may remove them yourself if you " "want to.\n" "#\n" msgstr "" "\n" "#\n" "# 输入一个 tag 说明\n" "# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n" "#\n" #: builtin/tag.c:298 msgid "unable to sign the tag" msgstr "无法签署 tag" #: builtin/tag.c:300 msgid "unable to write tag file" msgstr "无法写 tag 文件" #: builtin/tag.c:325 msgid "bad object type." msgstr "坏的对象类型。" #: builtin/tag.c:338 msgid "tag header too big." msgstr "tag 头信息太大。" #: builtin/tag.c:370 msgid "no tag message?" msgstr "无 tag 说明?" #: builtin/tag.c:376 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" #: builtin/tag.c:425 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" #: builtin/tag.c:427 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" #: builtin/tag.c:447 msgid "list tag names" msgstr "" #: builtin/tag.c:449 msgid "print <n> lines of each tag message" msgstr "" #: builtin/tag.c:451 #, fuzzy msgid "delete tags" msgstr "删除" #: builtin/tag.c:452 msgid "verify tags" msgstr "" #: builtin/tag.c:454 msgid "Tag creation options" msgstr "" #: builtin/tag.c:456 #, fuzzy msgid "annotated tag, needs a message" msgstr "注释 tag %s 没有嵌入名称" #: builtin/tag.c:458 #, fuzzy msgid "tag message" msgstr "无 tag 说明?" #: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "" #: builtin/tag.c:464 #, fuzzy msgid "use another key to sign the tag" msgstr "无法签署 tag" #: builtin/tag.c:465 msgid "replace the tag if exists" msgstr "" #: builtin/tag.c:466 msgid "show tag list in columns" msgstr "" #: builtin/tag.c:468 msgid "Tag listing options" msgstr "" #: builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "" #: builtin/tag.c:477 msgid "print only tags of the object" msgstr "" #: builtin/tag.c:506 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" #: builtin/tag.c:523 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" #: builtin/tag.c:525 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" #: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" #: builtin/tag.c:535 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" #: builtin/tag.c:555 msgid "too many params" msgstr "太多参数" #: builtin/tag.c:561 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" #: builtin/tag.c:566 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" #: builtin/tag.c:584 #, c-format msgid "%s: cannot lock the ref" msgstr "%s:不能锁定引用" #: builtin/tag.c:586 #, c-format msgid "%s: cannot update the ref" msgstr "%s:不能更新引用" #: builtin/tag.c:588 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'(曾为 %s)\n" #: builtin/update-index.c:401 #, fuzzy msgid "git update-index [options] [--] [<file>...]" msgstr "git apply [选项] [<补丁>...]" #: builtin/update-index.c:717 msgid "continue refresh even when index needs update" msgstr "" #: builtin/update-index.c:720 msgid "refresh: ignore submodules" msgstr "" #: builtin/update-index.c:723 #, fuzzy msgid "do not ignore new files" msgstr "无法存储索引文件" #: builtin/update-index.c:725 msgid "let files replace directories and vice-versa" msgstr "" #: builtin/update-index.c:727 msgid "notice files missing from worktree" msgstr "" #: builtin/update-index.c:729 msgid "refresh even if index contains unmerged entries" msgstr "" #: builtin/update-index.c:732 msgid "refresh stat information" msgstr "" #: builtin/update-index.c:736 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" #: builtin/update-index.c:740 msgid "<mode> <object> <path>" msgstr "" #: builtin/update-index.c:741 #, fuzzy msgid "add the specified entry to the index" msgstr "添加文件内容至索引" #: builtin/update-index.c:745 msgid "(+/-)x" msgstr "" #: builtin/update-index.c:746 msgid "override the executable bit of the listed files" msgstr "" #: builtin/update-index.c:750 msgid "mark files as \"not changing\"" msgstr "" #: builtin/update-index.c:753 msgid "clear assumed-unchanged bit" msgstr "" #: builtin/update-index.c:756 msgid "mark files as \"index-only\"" msgstr "" #: builtin/update-index.c:759 msgid "clear skip-worktree bit" msgstr "" #: builtin/update-index.c:762 msgid "add to index only; do not add content to object database" msgstr "" #: builtin/update-index.c:764 msgid "remove named paths even if present in worktree" msgstr "" #: builtin/update-index.c:766 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" #: builtin/update-index.c:768 #, fuzzy msgid "read list of paths to be updated from standard input" msgstr "(正从标准输入中读取日志信息)\n" #: builtin/update-index.c:772 #, fuzzy msgid "add entries from standard input to the index" msgstr "不能从标准输入中读取日志信息" #: builtin/update-index.c:776 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" #: builtin/update-index.c:780 msgid "only update entries that differ from HEAD" msgstr "" #: builtin/update-index.c:784 msgid "ignore files missing from worktree" msgstr "" #: builtin/update-index.c:787 msgid "report actions to standard output" msgstr "" #: builtin/update-index.c:789 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" #: builtin/update-index.c:793 msgid "write index in this format" msgstr "" #: builtin/update-ref.c:7 msgid "git update-ref [options] -d <refname> [<oldval>]" msgstr "" #: builtin/update-ref.c:8 msgid "git update-ref [options] <refname> <newval> [<oldval>]" msgstr "" #: builtin/update-ref.c:19 msgid "delete the reference" msgstr "" #: builtin/update-ref.c:21 msgid "update <refname> not the one it points to" msgstr "" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" msgstr "" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" msgstr "" #: builtin/verify-pack.c:56 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "" #: builtin/verify-pack.c:66 #, fuzzy msgid "verbose" msgstr "冗长输出" #: builtin/verify-pack.c:68 msgid "show statistics only" msgstr "" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v|--verbose] <tag>..." msgstr "" #: builtin/verify-tag.c:73 msgid "print tag contents" msgstr "" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" #: builtin/write-tree.c:26 msgid "<prefix>/" msgstr "" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" msgstr "" #: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "" #: git.c:16 msgid "See 'git help <command>' for more information on a specific command." msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "空操作(向后兼容)" #: parse-options.h:228 msgid "be more verbose" msgstr "更加详细" #: parse-options.h:230 msgid "be more quiet" msgstr "更加安静" #: parse-options.h:236 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "添加文件内容至索引" #: common-cmds.h:9 msgid "Find by binary search the change that introduced a bug" msgstr "通过二分查找定位引入 bug 的变更" #: common-cmds.h:10 msgid "List, create, or delete branches" msgstr "列出、创建或删除分支" #: common-cmds.h:11 msgid "Checkout a branch or paths to the working tree" msgstr "检出一个分支或路径到工作区" #: common-cmds.h:12 msgid "Clone a repository into a new directory" msgstr "克隆一个版本库到一个新目录" #: common-cmds.h:13 msgid "Record changes to the repository" msgstr "记录变更到版本库" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示提交之间、提交和工作区之间等的差异" #: common-cmds.h:15 msgid "Download objects and refs from another repository" msgstr "从另外一个版本库下载对象和引用" #: common-cmds.h:16 msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" #: common-cmds.h:17 msgid "Create an empty git repository or reinitialize an existing one" msgstr "创建一个空的 git 版本库或者重新初始化一个" #: common-cmds.h:18 msgid "Show commit logs" msgstr "显示提交日志" #: common-cmds.h:19 msgid "Join two or more development histories together" msgstr "合并两个或更多开发历史" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或重命名一个文件、目录或符号链接" #: common-cmds.h:21 msgid "Fetch from and merge with another repository or a local branch" msgstr "获取并合并另外的版本库或一个本地分支" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" msgstr "本地提交转移至更新后的上游分支中" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" msgstr "重置当前HEAD到指定状态" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引中删除文件" #: common-cmds.h:26 msgid "Show various types of objects" msgstr "显示各种类型的对象" #: common-cmds.h:27 msgid "Show the working tree status" msgstr "显示工作区状态" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" #: git-am.sh:50 msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" #: git-am.sh:95 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" #: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem, run \"$cmdline --resolved\".\n" "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n" "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" #: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "无法求助于三路合并。" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺乏必要的二进制对象(blob)以进行三路合并。" #: git-am.sh:139 msgid "Using index info to reconstruct a base tree..." msgstr "更新索引信息以重建基树..." #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁?\n" "无法应用补丁到索引中的二进制对象(blob)上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补丁及进行三路合并..." #: git-am.sh:179 msgid "Failed to merge in the changes." msgstr "无法合并变更。" #: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" #: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" #: git-am.sh:363 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" #: git-am.sh:389 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n" "请不要再使用它了。" #: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" #: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ?" #: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行,我们不会继续。" #: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引:不能应用补丁(脏文件:$files)" #: git-am.sh:679 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" "补丁为空。是不是切分错误?\n" "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" #: git-am.sh:706 msgid "Patch does not have a valid e-mail address." msgstr "补丁中没有一个有效的邮件地址。" #: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联,不能进行交互式操作。" #: git-am.sh:757 msgid "Commit Body is:" msgstr "提交内容为:" # 译者:注意保持句尾空格 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. #: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " #: git-am.sh:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用:$FIRSTLINE" #: git-am.sh:821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" "没有变更 —— 您是不是忘了执行 'git add'?\n" "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" #: git-am.sh:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?" #: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "没有变更 -- 补丁已经应用过。" #: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "补丁失败于 $msgnum $FIRSTLINE" #: git-am.sh:858 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" #: git-am.sh:876 msgid "applying to an empty history" msgstr "正应用到一个空历史上" #: git-bisect.sh:48 msgid "You need to start by \"git bisect start\"" msgstr "您需要执行 \"git bisect start\" 来开始" # 译者:注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:54 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]? " #: git-bisect.sh:95 #, sh-format msgid "unrecognised option: '$arg'" msgstr "未能识别的选项:'$arg'" #: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' 看起来不像是一个有效的版本" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" #: git-bisect.sh:130 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" #: git-bisect.sh:140 msgid "won't bisect on seeked tree" msgstr "不会在已查找过的树上二分查找" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" #: git-bisect.sh:189 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "坏的 bisect_write 参数:$state" #: git-bisect.sh:218 #, sh-format msgid "Bad rev input: $arg" msgstr "输入坏的版本:$arg" #: git-bisect.sh:232 msgid "Please call 'bisect_state' with at least one argument." msgstr "请在调用 'bisect_state' 时跟至少一个参数。" #: git-bisect.sh:244 #, sh-format msgid "Bad rev input: $rev" msgstr "输入坏的版本:$rev" #: git-bisect.sh:250 msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' 只能带一个参数。" #. have bad but not good. we could bisect although #. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." msgstr "警告:在仅有一个坏提交下进行二分查找。" # 译者:注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:279 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]? " #: git-bisect.sh:289 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需要给我至少一个好版本和一个坏版本。\n" "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需要执行 \"git bisect start\" 来开始。\n" "然后需要提供我至少一个好版本和一个坏版本。\n" "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" #: git-bisect.sh:347 git-bisect.sh:474 msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: git-bisect.sh:354 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' 不是一个有效的提交" #: git-bisect.sh:363 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" "不能检出原始 HEAD '$branch'。\n" "尝试 'git bisect reset <commit>'。" #: git-bisect.sh:390 msgid "No logfile given" msgstr "未提供日志文件" #: git-bisect.sh:391 #, sh-format msgid "cannot read $file for replaying" msgstr "不能读取 $file 来重放" #: git-bisect.sh:408 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" #: git-bisect.sh:420 #, sh-format msgid "running $command" msgstr "运行 $command" #: git-bisect.sh:427 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "二分查找运行失败:\n" "命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" #: git-bisect.sh:459 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "二分查找运行失败:\n" "'bisect_state $state' 退出码为 $res" #: git-bisect.sh:466 msgid "bisect run success" msgstr "二分查找运行成功" #: git-pull.sh:21 msgid "" "Pull is not possible because you have unmerged files.\n" "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution, or use 'git commit -a'." msgstr "" "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" "然后酌情使用 'git add/rm <file>' 标记解决方案,\n" "或者使用 'git commit -a'。" #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "Pull 不可用,因为您尚有未合并的文件。" #: git-pull.sh:197 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支,变更添加至索引" #. The fetch involved updating the current branch. #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. #: git-pull.sh:228 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" "Warning: fast-forwarding your working tree from\n" "Warning: commit $orig_head." msgstr "" "警告:fetch 更新了当前的分支。您的工作区\n" "警告:从原提交 $orig_head 快进。" #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" #: git-pull.sh:257 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" #: git-rebase.sh:52 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" "To check out the original branch and stop rebasing, run \"git rebase --abort" "\"." msgstr "" "当您解决了此问题后,执行 \"git rebase --continue\"。\n" "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" #: git-rebase.sh:159 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基。" #: git-rebase.sh:164 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" #: git-rebase.sh:295 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" #: git-rebase.sh:300 msgid "No rebase in progress?" msgstr "没有正在进行的变基?" #: git-rebase.sh:313 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" #: git-rebase.sh:316 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" "您必须编辑所有的合并冲突,然后通过 git add\n" "命令将它们标记为已解决" #: git-rebase.sh:334 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" #: git-rebase.sh:350 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" "I wonder if you are in the middle of another rebase. If that is the\n" "case, please try\n" "\t$cmd_live_rebase\n" "If that is not the case, please\n" "\t$cmd_clear_stale_rebase\n" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n" "如果是这样,请尝试执行\n" "\t$cmd_live_rebase\n" "如果不是这样,请执行\n" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。" #: git-rebase.sh:395 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" #: git-rebase.sh:419 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" #: git-rebase.sh:422 git-rebase.sh:426 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" #: git-rebase.sh:431 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交:$onto_name" #: git-rebase.sh:454 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误:无此分支:$branch_name" #: git-rebase.sh:474 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" #: git-rebase.sh:492 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" #: git-rebase.sh:495 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的,强制变基。" #: git-rebase.sh:506 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto:" #. Detach HEAD and reset the tree #: git-rebase.sh:515 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先,重置头指针以便在上面重放您的工作..." #: git-rebase.sh:523 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" #: git-stash.sh:74 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" #: git-stash.sh:89 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" #: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" #: git-stash.sh:140 msgid "No changes selected" msgstr "没有选择变更" #: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" msgstr "无法删除临时索引(不应发生)" #: git-stash.sh:156 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line #. up the second line with however many characters the #. translation of "error: " takes in your language. E.g. in #. English this is: #. #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' #: git-stash.sh:202 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" "错误:'stash save' 的未知选项:$option\n" " 要提供一个描述信息,使用 git stash save -- '$option'" #: git-stash.sh:223 msgid "No local changes to save" msgstr "没有要保存的本地修改" #: git-stash.sh:227 msgid "Cannot initialize stash" msgstr "无法初始化 stash" #: git-stash.sh:235 msgid "Cannot save the current status" msgstr "无法保存当前状态" #: git-stash.sh:253 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" #: git-stash.sh:352 msgid "No stash found." msgstr "未发现 stash。" #: git-stash.sh:359 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本:$REV" #: git-stash.sh:365 #, sh-format msgid "$reference is not valid reference" msgstr "$reference 不是有效的引用" #: git-stash.sh:393 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是 stash 样提交" #: git-stash.sh:404 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个 stash 引用" #: git-stash.sh:412 msgid "unable to refresh index" msgstr "无法刷新索引" #: git-stash.sh:416 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程中恢复进度" #: git-stash.sh:424 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" #: git-stash.sh:426 msgid "Could not save index tree" msgstr "不能保存索引树" #: git-stash.sh:460 msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" #: git-stash.sh:475 msgid "Index was not unstashed." msgstr "索引的进度没有被恢复。" #: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" #: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}:不能丢弃进度条目" #: git-stash.sh:500 msgid "No branch name specified" msgstr "未指定分支名" #: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "(为恢复数据输入 \"git stash apply\")" #: git-submodule.sh:88 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "无法从 url '$remoteurl' 剥离一个组件" #: git-submodule.sh:167 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" #: git-submodule.sh:211 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" #: git-submodule.sh:223 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" #: git-submodule.sh:312 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" #: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" #: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" "$sm_path\n" "Use -f if you really want to add it." msgstr "" "以下路径被您的一个 .gitignore 文件所忽略:\n" "$sm_path\n" "如果您确实想添加它,使用 -f 参数。" #: git-submodule.sh:344 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" #: git-submodule.sh:346 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" #: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" #: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" #: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" #: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" #: git-submodule.sh:427 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path',脚本返回非零值。" #: git-submodule.sh:471 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" #: git-submodule.sh:480 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" #: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" #: git-submodule.sh:490 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" #: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'?" #: git-submodule.sh:603 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" #: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" #: git-submodule.sh:636 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" #: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path':变基至 '$sha1'" #: git-submodule.sh:642 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" #: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path':已合并入 '$sha1'" #: git-submodule.sh:648 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" #: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "子模组路径 '$sm_path':检出 '$sha1'" #: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" #: git-submodule.sh:779 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type #: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者:注意保持前导空格 #: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告:$name 未包含提交 $sha1_src" # 译者:注意保持前导空格 #: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告:$name 未包含提交 $sha1_dst" # 译者:注意保持前导空格 #: git-submodule.sh:843 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst" #: git-submodule.sh:868 msgid "blob" msgstr "二进制对象" #: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "# 子模组已修改但尚未更新:" #: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "要提交的子模组变更:" #: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' 同步子模组 url" # 译者:中文字符串拼接,可删除前导空格 #~ msgid " (use \"git add\" to track)" #~ msgstr "(使用 \"git add\" 建立跟踪)" #~ msgid "-B cannot be used with -b" #~ msgstr "-B 不能和 -b 同时使用" #~ msgid "--patch is incompatible with all other options" #~ msgstr "--patch 选项和其他选项不兼容" #~ msgid "--detach cannot be used with -b/-B/--orphan" #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" #~ msgid "--detach cannot be used with -t" #~ msgstr "--detach 不能和 -t 同时使用" #~ msgid "--orphan and -b|-B are mutually exclusive" #~ msgstr "--orphan 和 -b|-B 互斥" #~ msgid "--orphan cannot be used with -t" #~ msgstr "--orphan 不能和 -t 同时使用" #~ msgid "git checkout: -f and -m are incompatible" #~ msgstr "git checkout:-f 和 -m 不兼容" #~ msgid "" #~ "git checkout: updating paths is incompatible with switching branches." #~ msgstr "git checkout:更新路径和切换分支不兼容。" #~ msgid "diff setup failed" #~ msgstr "diff 设置失败" #~ msgid "merge-recursive: disk full?" #~ msgstr "merge-recursive:磁盘已满?" #~ msgid "diff_setup_done failed" #~ msgstr "diff_setup_done 失败"