# Chinese translations for Git package # Git 软件包的简体中文翻译. # Copyright (C) 2012 Jiang Xin # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin # - Riku # - Zhuang Ya # - Lian Cheng # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2012-08-06 23:47+0800\n" "PO-Revision-Date: 2012-08-07 01:07+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \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 ' as\n" "appropriate to mark resolution and make a commit,\n" "or use 'git commit -a'." msgstr "" "请先在工作区改正文件,然后酌情使用\n" "'git add/rm ' 标记解决方案,\n" "或使用 'git commit -a'。" #: 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:699 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交:" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 #: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 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:1212 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:1400 msgid " 0 files changed" msgstr " 0 个文件被修改" #: diff.c:1404 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" msgstr[1] " %d 个文件被修改" #: diff.c:1421 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ",插入 %d 行(+)" msgstr[1] ",插入 %d 行(+)" #: diff.c:1432 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] ",删除 %d 行(-)" msgstr[1] ",删除 %d 行(-)" #: diff.c:3461 #, 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:497 msgid "diff setup failed" msgstr "diff 设置失败" #: merge-recursive.c:627 msgid "merge-recursive: disk full?" msgstr "merge-recursive:磁盘已满?" #: merge-recursive.c:690 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" #: merge-recursive.c:701 #, 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:715 merge-recursive.c:736 msgid ": perhaps a D/F conflict?" msgstr ":可能是一个目录/文件冲突?" #: merge-recursive.c:726 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" #: merge-recursive.c:766 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:768 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为二进制对象(blob)" #: merge-recursive.c:791 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "无法打开 '%s'" #: merge-recursive.c:799 #, c-format msgid "failed to symlink '%s'" msgstr "无法创建符号链接 '%s'" #: merge-recursive.c:802 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" #: merge-recursive.c:939 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" #: merge-recursive.c:943 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-recursive.c:959 msgid "unsupported object type in the tree" msgstr "在树中有不支持的对象类型" #: merge-recursive.c:1038 merge-recursive.c:1052 #, 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:1044 merge-recursive.c:1057 #, 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:1098 msgid "rename" msgstr "重命名" #: merge-recursive.c:1098 msgid "renamed" msgstr "重命名" #: merge-recursive.c:1154 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" #: merge-recursive.c:1176 #, 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:1181 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1235 #, 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:1265 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" #: merge-recursive.c:1464 #, 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:1474 #, c-format msgid "Adding merged %s" msgstr "添加合并后的 %s" #: merge-recursive.c:1479 merge-recursive.c:1677 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" #: merge-recursive.c:1530 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" #: merge-recursive.c:1533 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个二进制对象(blob)" #: merge-recursive.c:1581 msgid "modify" msgstr "修改" #: merge-recursive.c:1581 msgid "modified" msgstr "修改" #: merge-recursive.c:1591 msgid "content" msgstr "内容" #: merge-recursive.c:1598 msgid "add/add" msgstr "添加/添加" #: merge-recursive.c:1632 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已经做过相同合并)" #: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" #: merge-recursive.c:1650 git-submodule.sh:844 msgid "submodule" msgstr "子模组" #: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突(%s):合并冲突于 %s" #: merge-recursive.c:1741 #, c-format msgid "Removing %s" msgstr "删除 %s" #: merge-recursive.c:1766 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:1772 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:1777 #, 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:1787 #, c-format msgid "Adding %s" msgstr "添加 %s" #: merge-recursive.c:1804 msgid "Fatal merge failure, shouldn't happen." msgstr "严重的合并错误,不应发生。" #: merge-recursive.c:1823 msgid "Already up-to-date!" msgstr "已经是最新的!" #: merge-recursive.c:1832 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" #: merge-recursive.c:1862 #, c-format msgid "Unprocessed path??? %s" msgstr "未处理的路径??? %s" #: merge-recursive.c:1907 msgid "Merging:" msgstr "合并:" #: merge-recursive.c:1920 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先:" msgstr[1] "发现 %u 个共同祖先:" #: merge-recursive.c:1957 msgid "merge returned no commit" msgstr "合并未返回提交" #: merge-recursive.c:2014 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" #: merge-recursive.c:2026 builtin/merge.c:697 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:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 #: builtin/merge.c:1090 builtin/merge.c:1103 #, 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 ' or 'git rm '" msgstr "" "冲突解决完毕后,用 'git add ' 或 'git rm '\n" "命令标记修正后的文件" #: sequencer.c:147 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" "冲突解决完毕后,用 'git add ' 或 'git rm '\n" "对修正后的文件做标记,然后用 'git commit' 提交" #: sequencer.c:160 sequencer.c:758 sequencer.c:841 #, 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:324 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" #: sequencer.c:329 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" #: sequencer.c:395 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" #: sequencer.c:398 msgid "You do not have a valid HEAD" msgstr "您没有一个有效的 HEAD" #: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" #: sequencer.c:421 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" #: sequencer.c:425 #, 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:436 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:不能解析父提交 %s" #: sequencer.c:440 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #: sequencer.c:524 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" #: sequencer.c:525 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" #: sequencer.c:553 msgid "empty commit set passed" msgstr "提供了空的提交集" #: sequencer.c:561 #, c-format msgid "git %s: failed to read the index" msgstr "git %s:无法读取索引" #: sequencer.c:566 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s:无法刷新索引" #: sequencer.c:624 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" #: sequencer.c:646 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" #: sequencer.c:651 msgid "No commits parsed." msgstr "没有提交被解析。" #: sequencer.c:664 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" #: sequencer.c:668 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" #: sequencer.c:675 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单:%s" #: sequencer.c:703 #, c-format msgid "Invalid key: %s" msgstr "无效键名:%s" #: sequencer.c:706 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效:%s" #: sequencer.c:718 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单:%s" #: sequencer.c:739 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" #: sequencer.c:740 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:744 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" #: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" #: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "没有拣选或还原操作在进行" #: sequencer.c:781 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" #: sequencer.c:783 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" #: sequencer.c:805 builtin/apply.c:3988 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s:%s" #: sequencer.c:808 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s:%s" #: sequencer.c:809 msgid "unexpected end of file" msgstr "未预期的文件结束" #: sequencer.c:815 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" #: sequencer.c:838 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" #: sequencer.c:1000 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" #: sequencer.c:1001 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:413 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "无法在 passwd 文件中查询到当前用户:%s" #: wrapper.c:414 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 ...\" to unstage)" msgstr " (使用 \"git reset %s ...\" 撤出暂存区)" # 译者:注意保持前导空格 #: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached ...\" to unstage)" msgstr " (使用 \"git rm --cached ...\" 撤出暂存区)" # 译者:注意保持前导空格 #: wt-status.c:173 msgid " (use \"git add ...\" to mark resolution)" msgstr " (使用 \"git add ...\" 标记解决方案)" # 译者:注意保持前导空格 #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm ...\" 标记解决方案)" # 译者:注意保持前导空格 #: wt-status.c:177 msgid " (use \"git rm ...\" to mark resolution)" msgstr " (使用 \"git rm ...\" 标记解决方案)" #: 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 ...\" to update what will be committed)" msgstr " (使用 \"git add ...\" 更新要提交的内容)" # 译者:注意保持前导空格 #: wt-status.c:212 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr " (使用 \"git add/rm ...\" 更新要提交的内容)" # 译者:注意保持前导空格 #: wt-status.c:213 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- ...\" 丢弃工作区的改动)" # 译者:注意保持前导空格 #: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" #: wt-status.c:224 #, c-format msgid "%s files:" msgstr "%s文件:" # 译者:注意保持前导空格 #: wt-status.c:227 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr " (使用 \"git %s ...\" 以包含要提交的内容)" #: 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 msgid "Untracked" msgstr "未跟踪的" #: wt-status.c:1013 msgid "Ignored" 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:1027 #, c-format msgid "no changes added to commit%s\n" msgstr "修改尚未加入提交%s\n" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "(使用 \"git add\" 和/或 \"git commit -a\")" #: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "空提交但存在未跟踪文件%s\n" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1033 msgid " (use \"git add\" to track)" msgstr "(使用 \"git add\" 建立跟踪)" #: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "无须提交%s\n" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1039 msgid " (use -u to show untracked files)" msgstr "(使用 -u 显示未跟踪文件)" # 译者:中文字符串拼接,可删除前导空格 #: wt-status.c:1042 msgid " (working directory clean)" msgstr "(干净的工作区)" #: wt-status.c:1150 msgid "HEAD (no branch)" msgstr "HEAD(非分支)" # 译者:注意保持句尾空格 #: wt-status.c:1156 msgid "Initial commit on " msgstr "初始提交于 " # 译者:注意保持句尾空格 #: wt-status.c:1171 msgid "behind " msgstr "落后 " # 译者:注意保持句尾空格 #: wt-status.c:1174 wt-status.c:1177 msgid "ahead " msgstr "领先 " # 译者:注意保持句尾空格 #: wt-status.c:1179 msgid ", behind " msgstr ",落后 " #: 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:459 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:312 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n" #: builtin/add.c:352 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" #: builtin/add.c:353 msgid "no files added" msgstr "没有文件被添加" #: builtin/add.c:359 msgid "adding files failed" msgstr "添加文件失败" #: builtin/add.c:391 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" #: builtin/add.c:393 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" #: builtin/add.c:413 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件,也没有文件被添加。\n" #: builtin/add.c:414 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'?\n" #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "索引文件损坏" #: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: builtin/apply.c:57 msgid "git apply [options] [...]" 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:824 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: builtin/apply.c:833 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: builtin/apply.c:914 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: builtin/apply.c:946 #, 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:950 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" #: builtin/apply.c:951 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" #: builtin/apply.c:958 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行" #: builtin/apply.c:1403 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:意外的行:%.*s" #: builtin/apply.c:1460 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息:%.*s" #: builtin/apply.c:1477 #, 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:1637 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: builtin/apply.c:1639 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: builtin/apply.c:1665 #, c-format msgid "corrupt patch at line %d" msgstr "补丁损坏位于第 %d 行" #: builtin/apply.c:1701 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: builtin/apply.c:1703 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: builtin/apply.c:1706 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告:文件 %s 成为空文件但并未删除" #: builtin/apply.c:1852 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏:%.*s" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1881 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: builtin/apply.c:1967 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: builtin/apply.c:2057 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: builtin/apply.c:2061 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: builtin/apply.c:2132 msgid "oops" msgstr "哎哟" #: builtin/apply.c:2654 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" #: builtin/apply.c:2772 #, 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:2784 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" #: builtin/apply.c:2790 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: builtin/apply.c:2809 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: builtin/apply.c:2912 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: builtin/apply.c:2918 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)" #: builtin/apply.c:2939 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" #: builtin/apply.c:3061 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" #: builtin/apply.c:3139 builtin/apply.c:3361 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: builtin/apply.c:3220 builtin/apply.c:3375 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" #: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 #, c-format msgid "%s: %s" msgstr "%s:%s" #: builtin/apply.c:3229 builtin/apply.c:3383 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" #: builtin/apply.c:3331 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: builtin/apply.c:3400 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: builtin/apply.c:3402 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,预期是 %o" #: builtin/apply.c:3503 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" #: builtin/apply.c:3506 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" #: builtin/apply.c:3526 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" #: builtin/apply.c:3531 #, 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:3539 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" #: builtin/apply.c:3552 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." #: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: builtin/apply.c:3750 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: builtin/apply.c:3778 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" #: builtin/apply.c:3782 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" #: builtin/apply.c:3787 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: builtin/apply.c:3790 builtin/apply.c:3898 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: builtin/apply.c:3823 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: builtin/apply.c:3872 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: builtin/apply.c:3959 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: builtin/apply.c:3967 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose #: builtin/apply.c:3970 #, 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:3980 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: builtin/apply.c:4001 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: builtin/apply.c:4004 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: builtin/apply.c:4154 msgid "unrecognized input" msgstr "未能识别的输入" #: builtin/apply.c:4165 msgid "unable to read index file" msgstr "无法读取索引文件" #: builtin/apply.c:4284 builtin/apply.c:4287 msgid "path" msgstr "路径" #: builtin/apply.c:4285 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: builtin/apply.c:4288 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: builtin/apply.c:4290 msgid "num" msgstr "数字" #: builtin/apply.c:4291 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" #: builtin/apply.c:4294 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: builtin/apply.c:4296 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" #: builtin/apply.c:4300 msgid "shows number of added and deleted lines in decimal notation" msgstr "以数字方式显示添加或删除行的数量" #: builtin/apply.c:4302 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" #: builtin/apply.c:4304 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" #: builtin/apply.c:4306 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: builtin/apply.c:4308 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: builtin/apply.c:4310 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(使用 --stat/--summary/--check 参数)" #: builtin/apply.c:4312 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" #: builtin/apply.c:4314 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: builtin/apply.c:4316 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: builtin/apply.c:4319 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: builtin/apply.c:4320 msgid "action" msgstr "动作" #: builtin/apply.c:4321 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: builtin/apply.c:4324 builtin/apply.c:4327 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: builtin/apply.c:4330 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: builtin/apply.c:4332 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: builtin/apply.c:4334 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: builtin/apply.c:4336 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: builtin/apply.c:4337 msgid "be verbose" msgstr "冗长输出" #: builtin/apply.c:4339 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "宽容不正确的文件末尾换行符" #: builtin/apply.c:4342 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: builtin/apply.c:4344 msgid "root" msgstr "根目录" #: builtin/apply.c:4345 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" #: builtin/apply.c:4367 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" #: builtin/apply.c:4375 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" #: builtin/apply.c:4378 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" #: builtin/apply.c:4394 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" #: builtin/apply.c:4408 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: builtin/apply.c:4414 builtin/apply.c:4424 #, 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:预期一个刷新" # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:144 #, 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:148 #, 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:180 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" #: builtin/branch.c:191 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" #: builtin/branch.c:202 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" #: builtin/branch.c:203 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" #: builtin/branch.c:210 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c:216 #, 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:225 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" #: builtin/branch.c:226 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" #: builtin/branch.c:233 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s(曾为 %s)。\n" #: builtin/branch.c:234 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s(曾为 %s)。\n" #: builtin/branch.c:239 msgid "Update of config-file failed" msgstr "无法更新 config 文件" #: builtin/branch.c:337 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" #: builtin/branch.c:409 #, c-format msgid "[%s: behind %d]" msgstr "[%s:落后 %d]" #: builtin/branch.c:411 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" #: builtin/branch.c:415 #, c-format msgid "[%s: ahead %d]" msgstr "[%s:领先 %d]" #: builtin/branch.c:417 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" #: builtin/branch.c:420 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s:领先 %d,落后 %d]" #: builtin/branch.c:423 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d,落后 %d]" #: builtin/branch.c:535 msgid "(no branch)" msgstr "(非分支)" #: builtin/branch.c:600 msgid "some refs could not be read" msgstr "一些引用不能读取" #: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" #: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名:'%s'" #: builtin/branch.c:638 msgid "Branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c:642 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" #: builtin/branch.c:646 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s,但 HEAD 没有更新!" #: builtin/branch.c:653 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名,但更新 config 文件失败" #: builtin/branch.c:668 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" #: builtin/branch.c:692 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版:%s" #: builtin/branch.c:783 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" #: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下!" #: builtin/branch.c:808 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" #: builtin/branch.c:857 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" #: 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/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:132 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:176 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:193 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s':无法合并" #: builtin/checkout.c:210 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" #: builtin/checkout.c:235 builtin/checkout.c:393 msgid "corrupt index file" msgstr "损坏的索引文件" #: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" #: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "无法写新的索引文件" #: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done 失败" #: builtin/checkout.c:415 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" #: builtin/checkout.c:534 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "不能对 '%s' 执行 reflog 操作\n" #: builtin/checkout.c:567 msgid "HEAD is now at" msgstr "HEAD 目前位于" #: builtin/checkout.c:574 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" #: builtin/checkout.c:577 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" #: builtin/checkout.c:581 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" #: builtin/checkout.c:583 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" #: builtin/checkout.c:585 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者:注意保持前导空格 #: builtin/checkout.c:641 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #. The singular version #: builtin/checkout.c:647 #, 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:665 #, 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:695 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" #: builtin/checkout.c:699 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" #: builtin/checkout.c:725 builtin/checkout.c:920 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) #: builtin/checkout.c:856 #, c-format msgid "invalid reference: %s" msgstr "无效引用:%s" #. case (1): want a tree #: builtin/checkout.c:895 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树:%s" #: builtin/checkout.c:977 msgid "-B cannot be used with -b" msgstr "-B 不能和 -b 同时使用" #: builtin/checkout.c:986 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项不兼容" #: builtin/checkout.c:989 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach 不能和 -b/-B/--orphan 同时使用" #: builtin/checkout.c:991 msgid "--detach cannot be used with -t" msgstr "--detach 不能和 -t 同时使用" #: builtin/checkout.c:997 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" #: builtin/checkout.c:1004 msgid "Missing branch name; try -b" msgstr "缺少分支名;尝试 -b" #: builtin/checkout.c:1010 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan 和 -b|-B 互斥" #: builtin/checkout.c:1012 msgid "--orphan cannot be used with -t" msgstr "--orphan 不能和 -t 同时使用" #: builtin/checkout.c:1022 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout:-f 和 -m 不兼容" #: builtin/checkout.c:1056 msgid "invalid path specification" msgstr "无效的路径规格" #: builtin/checkout.c:1064 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" "git checkout:更新路径和切换分支不兼容。\n" "您是想要检出 '%s' 但未能将其解析为提交么?" #: builtin/checkout.c:1066 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout:更新路径和切换分支不兼容。" #: builtin/checkout.c:1071 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout:--detach 不跟路径参数" #: builtin/checkout.c:1074 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/checkout.c:1093 msgid "Cannot switch branch to a non-commit." msgstr "无法切换分支到一个非提交。" #: builtin/checkout.c:1096 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs 和切换分支不兼容。" #: 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: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:75 #, 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:341 #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" #: 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/c