| # Chinese translations for Git package |
| # Git 软件包的简体中文翻译. |
| # Copyright (C) 2012,2013 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: 2014-04-23 12:50+0800\n" |
| "PO-Revision-Date: 2014-04-23 12:53+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:55 |
| #, c-format |
| msgid "hint: %.*s\n" |
| msgstr "提示:%.*s\n" |
| |
| #: advice.c:85 |
| 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 |
| msgid "git archive [options] <tree-ish> [<path>...]" |
| msgstr "git archive [选项] <树或提交> [<路径>...]" |
| |
| #: archive.c:11 |
| msgid "git archive --list" |
| msgstr "git archive --list" |
| |
| #: archive.c:12 |
| msgid "" |
| "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" |
| msgstr "" |
| "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" |
| |
| #: archive.c:13 |
| msgid "git archive --remote <repo> [--exec <cmd>] --list" |
| msgstr "git archive --remote <版本库> [--exec <命令>] --list" |
| |
| #: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328 |
| #, c-format |
| msgid "pathspec '%s' did not match any files" |
| msgstr "路径规则 '%s' 未匹配任何文件" |
| |
| #: archive.c:328 |
| msgid "fmt" |
| msgstr "格式" |
| |
| #: archive.c:328 |
| msgid "archive format" |
| msgstr "归档格式" |
| |
| #: archive.c:329 builtin/log.c:1193 |
| msgid "prefix" |
| msgstr "前缀" |
| |
| #: archive.c:330 |
| msgid "prepend prefix to each pathname in the archive" |
| msgstr "为归档中每个路径名加上前缀" |
| |
| #: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265 |
| #: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680 |
| #: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77 |
| #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 |
| #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 |
| msgid "file" |
| msgstr "文件" |
| |
| #: archive.c:332 builtin/archive.c:89 |
| msgid "write the archive to this file" |
| msgstr "归档写入此文件" |
| |
| #: archive.c:334 |
| msgid "read .gitattributes in working directory" |
| msgstr "读取工作区中的 .gitattributes" |
| |
| #: archive.c:335 |
| msgid "report archived files on stderr" |
| msgstr "在标准错误上报告归档文件" |
| |
| #: archive.c:336 |
| msgid "store only" |
| msgstr "只存储" |
| |
| #: archive.c:337 |
| msgid "compress faster" |
| msgstr "压缩速度更快" |
| |
| #: archive.c:345 |
| msgid "compress better" |
| msgstr "压缩效果更好" |
| |
| #: archive.c:348 |
| msgid "list supported archive formats" |
| msgstr "列出支持的归档格式" |
| |
| #: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 |
| msgid "repo" |
| msgstr "版本库" |
| |
| #: archive.c:351 builtin/archive.c:91 |
| msgid "retrieve the archive from remote repository <repo>" |
| msgstr "从远程版本库(<版本库>)提取归档文件" |
| |
| #: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 |
| msgid "command" |
| msgstr "命令" |
| |
| #: archive.c:353 builtin/archive.c:93 |
| msgid "path to the remote git-upload-archive command" |
| msgstr "远程 git-upload-archive 命令的路径" |
| |
| #: attr.c:259 |
| msgid "" |
| "Negative patterns are ignored in git attributes\n" |
| "Use '\\!' for literal leading exclamation." |
| msgstr "" |
| "负值模版在 git attributes 中被忽略\n" |
| "当字符串确实要以感叹号开始时,使用 '\\!'。" |
| |
| #: branch.c:60 |
| #, c-format |
| msgid "Not setting branch %s as its own upstream." |
| msgstr "未设置分支 %s 作为它自己的上游。" |
| |
| #: branch.c:83 |
| #, c-format |
| msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
| msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" |
| |
| #: branch.c:84 |
| #, c-format |
| msgid "Branch %s set up to track remote branch %s from %s." |
| msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" |
| |
| #: branch.c:88 |
| #, c-format |
| msgid "Branch %s set up to track local branch %s by rebasing." |
| msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" |
| |
| #: branch.c:89 |
| #, c-format |
| msgid "Branch %s set up to track local branch %s." |
| msgstr "分支 %s 设置为跟踪本地分支 %s。" |
| |
| #: branch.c:94 |
| #, c-format |
| msgid "Branch %s set up to track remote ref %s by rebasing." |
| msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" |
| |
| #: branch.c:95 |
| #, c-format |
| msgid "Branch %s set up to track remote ref %s." |
| msgstr "分支 %s 设置为跟踪远程引用 %s。" |
| |
| #: branch.c:99 |
| #, c-format |
| msgid "Branch %s set up to track local ref %s by rebasing." |
| msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" |
| |
| #: branch.c:100 |
| #, c-format |
| msgid "Branch %s set up to track local ref %s." |
| msgstr "分支 %s 设置为跟踪本地引用 %s。" |
| |
| #: branch.c:133 |
| #, c-format |
| msgid "Not tracking: ambiguous information for ref %s" |
| msgstr "未跟踪:引用 %s 有歧义" |
| |
| #: branch.c:178 |
| #, c-format |
| msgid "'%s' is not a valid branch name." |
| msgstr "'%s' 不是一个有效的分支名称。" |
| |
| #: branch.c:183 |
| #, c-format |
| msgid "A branch named '%s' already exists." |
| msgstr "一个分支名 '%s' 已经存在。" |
| |
| #: branch.c:191 |
| msgid "Cannot force update the current branch." |
| msgstr "无法强制更新当前分支。" |
| |
| #: branch.c:211 |
| #, c-format |
| msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
| msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" |
| |
| #: branch.c:213 |
| #, c-format |
| msgid "the requested upstream branch '%s' does not exist" |
| msgstr "请求的上游分支 '%s' 不存在" |
| |
| #: branch.c:215 |
| msgid "" |
| "\n" |
| "If you are planning on basing your work on an upstream\n" |
| "branch that already exists at the remote, you may need to\n" |
| "run \"git fetch\" to retrieve it.\n" |
| "\n" |
| "If you are planning to push out a new local branch that\n" |
| "will track its remote counterpart, you may want to use\n" |
| "\"git push -u\" to set the upstream config as you push." |
| msgstr "" |
| "\n" |
| "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" |
| "您可能需要执行 \"git fetch\" 来获取分支。\n" |
| "\n" |
| "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" |
| "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" |
| |
| #: branch.c:260 |
| #, c-format |
| msgid "Not a valid object name: '%s'." |
| msgstr "不是一个有效的对象名:'%s'。" |
| |
| #: branch.c:280 |
| #, c-format |
| msgid "Ambiguous object name: '%s'." |
| msgstr "歧义的对象名:'%s'。" |
| |
| #: branch.c:285 |
| #, c-format |
| msgid "Not a valid branch point: '%s'." |
| msgstr "无效的分支点:'%s'。" |
| |
| #: branch.c:291 |
| msgid "Failed to lock ref for update" |
| msgstr "无法为更新锁定引用" |
| |
| #: branch.c:309 |
| msgid "Failed to write ref" |
| msgstr "不能写引用" |
| |
| #: bundle.c:33 |
| #, c-format |
| msgid "'%s' does not look like a v2 bundle file" |
| msgstr "'%s' 不像是一个 v2 版本的包文件" |
| |
| #: bundle.c:60 |
| #, c-format |
| msgid "unrecognized header: %s%s (%d)" |
| msgstr "未能识别的包头:%s%s (%d)" |
| |
| #: bundle.c:86 builtin/commit.c:706 |
| #, c-format |
| msgid "could not open '%s'" |
| msgstr "不能打开 '%s'" |
| |
| #: bundle.c:138 |
| msgid "Repository lacks these prerequisite commits:" |
| msgstr "版本库缺少这些必备的提交:" |
| |
| #: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332 |
| #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 |
| #: builtin/shortlog.c:158 |
| msgid "revision walk setup failed" |
| msgstr "版本遍历设置失败" |
| |
| #: bundle.c:184 |
| #, c-format |
| msgid "The bundle contains this ref:" |
| msgid_plural "The bundle contains these %d refs:" |
| msgstr[0] "这个包中含有这个引用:" |
| msgstr[1] "这个包中含有 %d 个引用:" |
| |
| #: bundle.c:191 |
| msgid "The bundle records a complete history." |
| msgstr "这个包记录一个完整历史。" |
| |
| #: bundle.c:193 |
| #, c-format |
| msgid "The bundle requires this ref:" |
| msgid_plural "The bundle requires these %d refs:" |
| msgstr[0] "这个包需要这个引用:" |
| msgstr[1] "这个包需要 %d 个引用:" |
| |
| #: bundle.c:293 |
| msgid "rev-list died" |
| msgstr "rev-list 终止" |
| |
| #: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261 |
| #, c-format |
| msgid "unrecognized argument: %s" |
| msgstr "未能识别的参数:%s" |
| |
| #: bundle.c:334 |
| #, c-format |
| msgid "ref '%s' is excluded by the rev-list options" |
| msgstr "引用 '%s' 被 rev-list 选项排除" |
| |
| #: bundle.c:379 |
| msgid "Refusing to create empty bundle." |
| msgstr "不能创建空包。" |
| |
| #: bundle.c:395 |
| msgid "Could not spawn pack-objects" |
| msgstr "不能生成 pack-objects 进程" |
| |
| #: bundle.c:413 |
| msgid "pack-objects died" |
| msgstr "pack-objects 终止" |
| |
| #: bundle.c:416 |
| #, c-format |
| msgid "cannot create '%s'" |
| msgstr "不能创建 '%s'" |
| |
| #: bundle.c:438 |
| msgid "index-pack died" |
| msgstr "index-pack 终止" |
| |
| #: commit.c:54 |
| #, c-format |
| msgid "could not parse %s" |
| msgstr "不能解析 %s" |
| |
| #: commit.c:56 |
| #, 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:70 |
| msgid "Could not run 'git rev-list'" |
| msgstr "不能执行 'git rev-list'" |
| |
| #: connected.c:90 |
| #, c-format |
| msgid "failed write to rev-list: %s" |
| msgstr "无法写入 rev-list:%s" |
| |
| #: connected.c:98 |
| #, 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 年" |
| |
| #. TRANSLATORS: "%s" is "<n> years" |
| #: 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 年前" |
| |
| #: diffcore-order.c:24 |
| #, c-format |
| msgid "failed to read orderfile '%s'" |
| msgstr "无法读取排序文件 '%s'" |
| |
| #: diffcore-rename.c:517 |
| msgid "Performing inexact rename detection" |
| msgstr "正在进行非精确的重命名检测" |
| |
| # 译者:注意保持前导空格 |
| #: diff.c:113 |
| #, c-format |
| msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
| msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" |
| |
| # 译者:注意保持前导空格 |
| #: diff.c:118 |
| #, c-format |
| msgid " Unknown dirstat parameter '%s'\n" |
| msgstr " 未知的 dirstat 参数 '%s'\n" |
| |
| #: diff.c:213 |
| #, c-format |
| msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
| msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" |
| |
| #: diff.c:263 |
| #, c-format |
| msgid "" |
| "Found errors in 'diff.dirstat' config variable:\n" |
| "%s" |
| msgstr "" |
| "发现配置变量 'diff.dirstat' 中的错误:\n" |
| "%s" |
| |
| #: diff.c:3495 |
| #, c-format |
| msgid "" |
| "Failed to parse --dirstat/-X option parameter:\n" |
| "%s" |
| msgstr "" |
| "无法解析 --dirstat/-X 选项的参数:\n" |
| "%s" |
| |
| #: diff.c:3509 |
| #, c-format |
| msgid "Failed to parse --submodule option parameter: '%s'" |
| msgstr "无法解析 --submodule 选项的参数:'%s'" |
| |
| #: gpg-interface.c:59 gpg-interface.c:131 |
| 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 无法为数据签名" |
| |
| #: gpg-interface.c:115 |
| #, c-format |
| msgid "could not create temporary file '%s': %s" |
| msgstr "不能创建临时文件 '%s':%s" |
| |
| #: gpg-interface.c:118 |
| #, c-format |
| msgid "failed writing detached signature to '%s': %s" |
| msgstr "无法将分离式签名写入 '%s':%s" |
| |
| #: grep.c:1698 |
| #, c-format |
| msgid "'%s': unable to read %s" |
| msgstr "'%s':无法读取 %s" |
| |
| #: grep.c:1715 |
| #, c-format |
| msgid "'%s': %s" |
| msgstr "'%s':%s" |
| |
| #: grep.c:1726 |
| #, c-format |
| msgid "'%s': short read %s" |
| msgstr "'%s':读取不完整 %s" |
| |
| #: help.c:209 |
| #, c-format |
| msgid "available git commands in '%s'" |
| msgstr "在 '%s' 下可用的 git 命令" |
| |
| #: help.c:216 |
| msgid "git commands available from elsewhere on your $PATH" |
| msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
| |
| #: help.c:232 |
| msgid "The most commonly used git commands are:" |
| msgstr "最常用的 git 命令有:" |
| |
| #: help.c:289 |
| #, 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:346 |
| msgid "Uh oh. Your system reports no Git commands at all." |
| msgstr "唉呀,您的系统中未发现 Git 命令。" |
| |
| #: help.c:368 |
| #, 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:373 |
| #, c-format |
| msgid "in %0.1f seconds automatically..." |
| msgstr "在 %0.1f 秒钟后自动运行..." |
| |
| #: help.c:380 |
| #, c-format |
| msgid "git: '%s' is not a git command. See 'git --help'." |
| msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
| |
| #: help.c:384 help.c:443 |
| msgid "" |
| "\n" |
| "Did you mean this?" |
| msgid_plural "" |
| "\n" |
| "Did you mean one of these?" |
| msgstr[0] "" |
| "\n" |
| "您指的是这个么?" |
| msgstr[1] "" |
| "\n" |
| "您指的是这其中的某一个么?" |
| |
| #: help.c:439 |
| #, c-format |
| msgid "%s: %s - %s" |
| msgstr "%s:%s - %s" |
| |
| #: merge.c:56 |
| msgid "failed to read the cache" |
| msgstr "无法读取缓存" |
| |
| #: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558 |
| #: builtin/clone.c:661 |
| msgid "unable to write new index file" |
| msgstr "无法写新的索引文件" |
| |
| #: merge-recursive.c:190 |
| #, c-format |
| msgid "(bad commit)\n" |
| msgstr "(坏提交)\n" |
| |
| #: merge-recursive.c:208 |
| #, c-format |
| msgid "addinfo_cache failed for path '%s'" |
| msgstr "为路径 '%s' addinfo_cache 失败" |
| |
| #: merge-recursive.c:271 |
| msgid "error building trees" |
| msgstr "无法创建树" |
| |
| #: merge-recursive.c:675 |
| #, c-format |
| msgid "failed to create path '%s'%s" |
| msgstr "无法创建路径 '%s'%s" |
| |
| #: merge-recursive.c:686 |
| #, c-format |
| msgid "Removing %s to make room for subdirectory\n" |
| msgstr "删除 %s 以便为子目录留出空间\n" |
| |
| #: merge-recursive.c:700 merge-recursive.c:721 |
| msgid ": perhaps a D/F conflict?" |
| msgstr ":可能是一个目录/文件冲突?" |
| |
| #: merge-recursive.c:711 |
| #, c-format |
| msgid "refusing to lose untracked file at '%s'" |
| msgstr "拒绝丢弃 '%s' 中的未跟踪文件" |
| |
| #: merge-recursive.c:751 |
| #, c-format |
| msgid "cannot read object %s '%s'" |
| msgstr "不能读取对象 %s '%s'" |
| |
| #: merge-recursive.c:753 |
| #, c-format |
| msgid "blob expected for %s '%s'" |
| msgstr "%s '%s' 应为数据(blob)对象" |
| |
| #: merge-recursive.c:776 builtin/clone.c:317 |
| #, c-format |
| msgid "failed to open '%s'" |
| msgstr "无法打开 '%s'" |
| |
| #: merge-recursive.c:784 |
| #, c-format |
| msgid "failed to symlink '%s'" |
| msgstr "无法创建符号链接 '%s'" |
| |
| #: merge-recursive.c:787 |
| #, c-format |
| msgid "do not know what to do with %06o %s '%s'" |
| msgstr "不知道如何处理 %06o %s '%s'" |
| |
| #: merge-recursive.c:925 |
| msgid "Failed to execute internal merge" |
| msgstr "无法执行内部合并" |
| |
| #: merge-recursive.c:929 |
| #, c-format |
| msgid "Unable to add %s to database" |
| msgstr "不能添加 %s 至对象库" |
| |
| #: merge-recursive.c:945 |
| msgid "unsupported object type in the tree" |
| msgstr "在树中有不支持的对象类型" |
| |
| #: merge-recursive.c:1024 merge-recursive.c:1038 |
| #, 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:1030 merge-recursive.c:1043 |
| #, 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:1084 |
| msgid "rename" |
| msgstr "重命名" |
| |
| #: merge-recursive.c:1084 |
| msgid "renamed" |
| msgstr "重命名" |
| |
| #: merge-recursive.c:1140 |
| #, c-format |
| msgid "%s is a directory in %s adding as %s instead" |
| msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" |
| |
| #: merge-recursive.c:1162 |
| #, 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:1167 |
| msgid " (left unresolved)" |
| msgstr "(留下未解决)" |
| |
| #: merge-recursive.c:1221 |
| #, 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:1251 |
| #, c-format |
| msgid "Renaming %s to %s and %s to %s instead" |
| msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
| |
| #: merge-recursive.c:1450 |
| #, 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:1460 |
| #, c-format |
| msgid "Adding merged %s" |
| msgstr "添加合并后的 %s" |
| |
| #: merge-recursive.c:1465 merge-recursive.c:1663 |
| #, c-format |
| msgid "Adding as %s instead" |
| msgstr "而是以 %s 为名添加" |
| |
| #: merge-recursive.c:1516 |
| #, c-format |
| msgid "cannot read object %s" |
| msgstr "不能读取对象 %s" |
| |
| #: merge-recursive.c:1519 |
| #, c-format |
| msgid "object %s is not a blob" |
| msgstr "对象 %s 不是一个数据(blob)对象" |
| |
| #: merge-recursive.c:1567 |
| msgid "modify" |
| msgstr "修改" |
| |
| #: merge-recursive.c:1567 |
| msgid "modified" |
| msgstr "修改" |
| |
| #: merge-recursive.c:1577 |
| msgid "content" |
| msgstr "内容" |
| |
| #: merge-recursive.c:1584 |
| msgid "add/add" |
| msgstr "添加/添加" |
| |
| #: merge-recursive.c:1618 |
| #, c-format |
| msgid "Skipped %s (merged same as existing)" |
| msgstr "略过 %s(已经做过相同合并)" |
| |
| #: merge-recursive.c:1632 |
| #, c-format |
| msgid "Auto-merging %s" |
| msgstr "自动合并 %s" |
| |
| #: merge-recursive.c:1636 git-submodule.sh:1149 |
| msgid "submodule" |
| msgstr "子模组" |
| |
| #: merge-recursive.c:1637 |
| #, c-format |
| msgid "CONFLICT (%s): Merge conflict in %s" |
| msgstr "冲突(%s):合并冲突于 %s" |
| |
| #: merge-recursive.c:1727 |
| #, c-format |
| msgid "Removing %s" |
| msgstr "删除 %s" |
| |
| #: merge-recursive.c:1752 |
| msgid "file/directory" |
| msgstr "文件/目录" |
| |
| #: merge-recursive.c:1758 |
| msgid "directory/file" |
| msgstr "目录/文件" |
| |
| #: merge-recursive.c:1763 |
| #, 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:1773 |
| #, c-format |
| msgid "Adding %s" |
| msgstr "添加 %s" |
| |
| #: merge-recursive.c:1790 |
| msgid "Fatal merge failure, shouldn't happen." |
| msgstr "严重的合并错误,不应发生。" |
| |
| #: merge-recursive.c:1809 |
| msgid "Already up-to-date!" |
| msgstr "已经是最新的!" |
| |
| #: merge-recursive.c:1818 |
| #, c-format |
| msgid "merging of trees %s and %s failed" |
| msgstr "无法合并树 %s 和 %s" |
| |
| #: merge-recursive.c:1848 |
| #, c-format |
| msgid "Unprocessed path??? %s" |
| msgstr "未处理的路径??? %s" |
| |
| #: merge-recursive.c:1893 |
| msgid "Merging:" |
| msgstr "合并:" |
| |
| #: merge-recursive.c:1906 |
| #, c-format |
| msgid "found %u common ancestor:" |
| msgid_plural "found %u common ancestors:" |
| msgstr[0] "发现 %u 个共同祖先:" |
| msgstr[1] "发现 %u 个共同祖先:" |
| |
| #: merge-recursive.c:1943 |
| msgid "merge returned no commit" |
| msgstr "合并未返回提交" |
| |
| #: merge-recursive.c:2000 |
| #, c-format |
| msgid "Could not parse object '%s'" |
| msgstr "不能解析对象 '%s'" |
| |
| #: merge-recursive.c:2012 builtin/merge.c:668 |
| msgid "Unable to write index." |
| msgstr "不能写入索引。" |
| |
| #: notes-utils.c:40 |
| msgid "Cannot commit uninitialized/unreferenced notes tree" |
| msgstr "不能提交未初始化/未引用的注解树" |
| |
| #: notes-utils.c:81 |
| #, c-format |
| msgid "Bad notes.rewriteMode value: '%s'" |
| msgstr "坏的 notes.rewriteMode 值:'%s'" |
| |
| #: notes-utils.c:91 |
| #, 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 |
| #: notes-utils.c:118 |
| #, c-format |
| msgid "Bad %s value: '%s'" |
| msgstr "坏的 %s 值:'%s'" |
| |
| #: object.c:229 |
| #, c-format |
| msgid "unable to parse object: %s" |
| msgstr "不能解析对象:%s" |
| |
| #: parse-options.c:532 |
| msgid "..." |
| msgstr "..." |
| |
| #: parse-options.c:550 |
| #, c-format |
| msgid "usage: %s" |
| msgstr "用法:%s" |
| |
| #. TRANSLATORS: the colon here should align with the |
| #. one in "usage: %s" translation |
| #: parse-options.c:554 |
| #, c-format |
| msgid " or: %s" |
| msgstr " 或:%s" |
| |
| # 译者:为保证在输出中对齐,注意调整句中空格! |
| #: parse-options.c:557 |
| #, c-format |
| msgid " %s" |
| msgstr " %s" |
| |
| #: parse-options.c:591 |
| msgid "-NUM" |
| msgstr "-数字" |
| |
| #: pathspec.c:133 |
| msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
| msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" |
| |
| #: pathspec.c:143 |
| msgid "" |
| "global 'literal' pathspec setting is incompatible with all other global " |
| "pathspec settings" |
| msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" |
| |
| #: pathspec.c:177 |
| msgid "invalid parameter for pathspec magic 'prefix'" |
| msgstr "路径规则包含无效的神奇前缀" |
| |
| #: pathspec.c:183 |
| #, c-format |
| msgid "Invalid pathspec magic '%.*s' in '%s'" |
| msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
| |
| #: pathspec.c:187 |
| #, c-format |
| msgid "Missing ')' at the end of pathspec magic in '%s'" |
| msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" |
| |
| #: pathspec.c:205 |
| #, c-format |
| msgid "Unimplemented pathspec magic '%c' in '%s'" |
| msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
| |
| #: pathspec.c:230 |
| #, c-format |
| msgid "%s: 'literal' and 'glob' are incompatible" |
| msgstr "%s:'literal' 和 'glob' 不兼容" |
| |
| #: pathspec.c:241 |
| #, c-format |
| msgid "%s: '%s' is outside repository" |
| msgstr "%s:'%s' 在版本库之外" |
| |
| #: pathspec.c:291 |
| #, c-format |
| msgid "Pathspec '%s' is in submodule '%.*s'" |
| msgstr "路径规则 '%s' 在子模组 '%.*s' 中" |
| |
| #: pathspec.c:353 |
| #, c-format |
| msgid "%s: pathspec magic not supported by this command: %s" |
| msgstr "%s:路径规则神奇前缀不被此命令支持:%s" |
| |
| #: pathspec.c:433 |
| #, c-format |
| msgid "pathspec '%s' is beyond a symbolic link" |
| msgstr "路径规则 '%s' 位于符号链接中" |
| |
| #: pathspec.c:442 |
| msgid "" |
| "There is nothing to exclude from by :(exclude) patterns.\n" |
| "Perhaps you forgot to add either ':/' or '.' ?" |
| msgstr "" |
| "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" |
| "添加 ':/' 或 '.' ?" |
| |
| #: progress.c:224 |
| msgid "done" |
| msgstr "完成" |
| |
| #: read-cache.c:1238 |
| #, c-format |
| msgid "" |
| "index.version set, but the value is invalid.\n" |
| "Using version %i" |
| msgstr "" |
| "设置了 index.version,但是取值无效。\n" |
| "使用版本 %i" |
| |
| #: read-cache.c:1248 |
| #, c-format |
| msgid "" |
| "GIT_INDEX_VERSION set, but the value is invalid.\n" |
| "Using version %i" |
| msgstr "" |
| "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
| "使用版本 %i" |
| |
| #: remote.c:758 |
| #, c-format |
| msgid "Cannot fetch both %s and %s to %s" |
| msgstr "不能同时获取 %s 和 %s 至 %s" |
| |
| #: remote.c:762 |
| #, c-format |
| msgid "%s usually tracks %s, not %s" |
| msgstr "%s 通常跟踪 %s,而非 %s" |
| |
| #: remote.c:766 |
| #, c-format |
| msgid "%s tracks both %s and %s" |
| msgstr "%s 同时跟踪 %s 和 %s" |
| |
| #: remote.c:774 |
| msgid "Internal error" |
| msgstr "内部错误" |
| |
| #: remote.c:1948 |
| #, c-format |
| msgid "Your branch is based on '%s', but the upstream is gone.\n" |
| msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" |
| |
| #: remote.c:1952 |
| msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
| msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" |
| |
| #: remote.c:1955 |
| #, c-format |
| msgid "Your branch is up-to-date with '%s'.\n" |
| msgstr "您的分支与上游分支 '%s' 一致。\n" |
| |
| #: remote.c:1959 |
| #, 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:1965 |
| msgid " (use \"git push\" to publish your local commits)\n" |
| msgstr " (使用 \"git push\" 来发布您的本地提交)\n" |
| |
| #: remote.c:1968 |
| #, 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:1976 |
| msgid " (use \"git pull\" to update your local branch)\n" |
| msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" |
| |
| #: remote.c:1979 |
| #, 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" |
| |
| # 译者:注意保持前导空格 |
| #: remote.c:1989 |
| msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
| msgstr " (使用 \"git pull\" 来合并远程分支)\n" |
| |
| #: run-command.c:80 |
| msgid "open /dev/null failed" |
| msgstr "不能打开 /dev/null" |
| |
| #: run-command.c:82 |
| #, c-format |
| msgid "dup2(%d,%d) failed" |
| msgstr "不能调用 dup2(%d,%d)" |
| |
| #: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899 |
| #: builtin/merge.c:1009 builtin/merge.c:1019 |
| #, c-format |
| msgid "Could not open '%s' for writing" |
| msgstr "不能为写入打开 '%s'" |
| |
| #: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789 |
| #: builtin/merge.c:1011 builtin/merge.c:1024 |
| #, c-format |
| msgid "Could not write to '%s'" |
| msgstr "不能写入 '%s'" |
| |
| #: sequencer.c:229 |
| 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:232 |
| 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:245 sequencer.c:879 sequencer.c:962 |
| #, c-format |
| msgid "Could not write to %s" |
| msgstr "不能写入 %s" |
| |
| #: sequencer.c:248 |
| #, c-format |
| msgid "Error wrapping up %s" |
| msgstr "错误收尾 %s" |
| |
| #: sequencer.c:263 |
| msgid "Your local changes would be overwritten by cherry-pick." |
| msgstr "您的本地修改将被拣选操作覆盖。" |
| |
| #: sequencer.c:265 |
| msgid "Your local changes would be overwritten by revert." |
| msgstr "您的本地修改将被还原操作覆盖。" |
| |
| #: sequencer.c:268 |
| msgid "Commit your changes or stash them to proceed." |
| msgstr "提交您的修改或保存进度后再继续。" |
| |
| #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
| #: sequencer.c:325 |
| #, c-format |
| msgid "%s: Unable to write new index file" |
| msgstr "%s:无法写入新索引文件" |
| |
| #: sequencer.c:356 |
| msgid "Could not resolve HEAD commit\n" |
| msgstr "不能解析 HEAD 提交\n" |
| |
| #: sequencer.c:378 |
| msgid "Unable to update cache tree\n" |
| msgstr "不能更新缓存\n" |
| |
| #: sequencer.c:430 |
| #, c-format |
| msgid "Could not parse commit %s\n" |
| msgstr "不能解析提交 %s\n" |
| |
| #: sequencer.c:435 |
| #, c-format |
| msgid "Could not parse parent commit %s\n" |
| msgstr "不能解析父提交 %s\n" |
| |
| #: sequencer.c:501 |
| msgid "Your index file is unmerged." |
| msgstr "您的索引文件未完成合并。" |
| |
| #: sequencer.c:520 |
| #, c-format |
| msgid "Commit %s is a merge but no -m option was given." |
| msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" |
| |
| #: sequencer.c:528 |
| #, c-format |
| msgid "Commit %s does not have parent %d" |
| msgstr "提交 %s 没有父提交 %d" |
| |
| #: sequencer.c:532 |
| #, 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:545 |
| #, c-format |
| msgid "%s: cannot parse parent commit %s" |
| msgstr "%s:不能解析父提交 %s" |
| |
| #: sequencer.c:549 |
| #, c-format |
| msgid "Cannot get commit message for %s" |
| msgstr "不能得到 %s 的提交说明" |
| |
| #: sequencer.c:635 |
| #, c-format |
| msgid "could not revert %s... %s" |
| msgstr "不能还原 %s... %s" |
| |
| #: sequencer.c:636 |
| #, c-format |
| msgid "could not apply %s... %s" |
| msgstr "不能应用 %s... %s" |
| |
| #: sequencer.c:672 |
| msgid "empty commit set passed" |
| msgstr "提供了空的提交集" |
| |
| #: sequencer.c:680 |
| #, c-format |
| msgid "git %s: failed to read the index" |
| msgstr "git %s:无法读取索引" |
| |
| #: sequencer.c:685 |
| #, c-format |
| msgid "git %s: failed to refresh the index" |
| msgstr "git %s:无法刷新索引" |
| |
| #: sequencer.c:743 |
| #, c-format |
| msgid "Cannot %s during a %s" |
| msgstr "无法 %s 在一个 %s 过程中" |
| |
| #: sequencer.c:765 |
| #, c-format |
| msgid "Could not parse line %d." |
| msgstr "不能解析第 %d 行。" |
| |
| #: sequencer.c:770 |
| msgid "No commits parsed." |
| msgstr "没有提交被解析。" |
| |
| #: sequencer.c:783 |
| #, c-format |
| msgid "Could not open %s" |
| msgstr "不能打开 %s" |
| |
| #: sequencer.c:787 |
| #, c-format |
| msgid "Could not read %s." |
| msgstr "不能读取 %s。" |
| |
| #: sequencer.c:794 |
| #, c-format |
| msgid "Unusable instruction sheet: %s" |
| msgstr "无用的指令表单:%s" |
| |
| #: sequencer.c:824 |
| #, c-format |
| msgid "Invalid key: %s" |
| msgstr "无效键名:%s" |
| |
| #: sequencer.c:827 |
| #, c-format |
| msgid "Invalid value for %s: %s" |
| msgstr "%s 的值无效:%s" |
| |
| #: sequencer.c:839 |
| #, c-format |
| msgid "Malformed options sheet: %s" |
| msgstr "非法的选项表单:%s" |
| |
| #: sequencer.c:860 |
| msgid "a cherry-pick or revert is already in progress" |
| msgstr "一个拣选或还原操作已在进行" |
| |
| #: sequencer.c:861 |
| msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
| msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" |
| |
| #: sequencer.c:865 |
| #, c-format |
| msgid "Could not create sequencer directory %s" |
| msgstr "不能创建序列目录 %s" |
| |
| #: sequencer.c:881 sequencer.c:966 |
| #, c-format |
| msgid "Error wrapping up %s." |
| msgstr "错误收尾 %s。" |
| |
| #: sequencer.c:900 sequencer.c:1036 |
| msgid "no cherry-pick or revert in progress" |
| msgstr "拣选或还原操作并未进行" |
| |
| #: sequencer.c:902 |
| msgid "cannot resolve HEAD" |
| msgstr "不能解析 HEAD" |
| |
| #: sequencer.c:904 |
| msgid "cannot abort from a branch yet to be born" |
| msgstr "不能从尚未建立的分支终止" |
| |
| #: sequencer.c:926 builtin/apply.c:4061 |
| #, c-format |
| msgid "cannot open %s: %s" |
| msgstr "不能打开 %s:%s" |
| |
| #: sequencer.c:929 |
| #, c-format |
| msgid "cannot read %s: %s" |
| msgstr "不能读取 %s:%s" |
| |
| #: sequencer.c:930 |
| msgid "unexpected end of file" |
| msgstr "意外的文件结束" |
| |
| #: sequencer.c:936 |
| #, c-format |
| msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
| msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
| |
| #: sequencer.c:959 |
| #, c-format |
| msgid "Could not format %s." |
| msgstr "不能格式化 %s。" |
| |
| #: sequencer.c:1104 |
| #, c-format |
| msgid "%s: can't cherry-pick a %s" |
| msgstr "%s:不能拣选一个%s" |
| |
| #: sequencer.c:1107 |
| #, c-format |
| msgid "%s: bad revision" |
| msgstr "%s:错误的版本" |
| |
| #: sequencer.c:1141 |
| msgid "Can't revert as initial commit" |
| msgstr "不能作为初始提交还原" |
| |
| #: sequencer.c:1142 |
| msgid "Can't cherry-pick into empty head" |
| msgstr "不能拣选到空分支" |
| |
| #: sha1_name.c:439 |
| msgid "" |
| "Git normally never creates a ref that ends with 40 hex characters\n" |
| "because it will be ignored when you just specify 40-hex. These refs\n" |
| "may be created by mistake. For example,\n" |
| "\n" |
| " git checkout -b $br $(git rev-parse ...)\n" |
| "\n" |
| "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" |
| "examine these refs and maybe delete them. Turn this message off by\n" |
| "running \"git config advice.objectNameWarning false\"" |
| msgstr "" |
| "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" |
| "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" |
| "\n" |
| " git checkout -b $br $(git rev-parse ...)\n" |
| "\n" |
| "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" |
| "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
| "命令关闭本消息通知。" |
| |
| #: sha1_name.c:1072 |
| msgid "HEAD does not point to a branch" |
| msgstr "HEAD 没有指向一个分支" |
| |
| #: sha1_name.c:1075 |
| #, c-format |
| msgid "No such branch: '%s'" |
| msgstr "没有此分支:'%s'" |
| |
| #: sha1_name.c:1077 |
| #, c-format |
| msgid "No upstream configured for branch '%s'" |
| msgstr "尚未给分支 '%s' 设置上游" |
| |
| #: sha1_name.c:1081 |
| #, c-format |
| msgid "Upstream branch '%s' not stored as a remote-tracking branch" |
| msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" |
| |
| #: submodule.c:64 submodule.c:98 |
| msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
| msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" |
| |
| #: submodule.c:68 submodule.c:102 |
| #, c-format |
| msgid "Could not find section in .gitmodules where path=%s" |
| msgstr "无法在 .gitmodules 中找到 path=%s 的小节" |
| |
| #: submodule.c:76 |
| #, c-format |
| msgid "Could not update .gitmodules entry %s" |
| msgstr "不能更新 .gitmodules 条目 %s" |
| |
| #: submodule.c:109 |
| #, c-format |
| msgid "Could not remove .gitmodules entry for %s" |
| msgstr "无法移除 %s 的 .gitmodules 条目" |
| |
| #: submodule.c:120 |
| msgid "staging updated .gitmodules failed" |
| msgstr "将更新后 .gitmodules 添加暂存区失败" |
| |
| #: submodule.c:1121 builtin/init-db.c:363 |
| #, c-format |
| msgid "Could not create git link %s" |
| msgstr "不能创建 git link %s" |
| |
| #: submodule.c:1132 |
| #, c-format |
| msgid "Could not set core.worktree in %s" |
| msgstr "不能在 %s 中设置 core.worktree" |
| |
| #: unpack-trees.c:206 |
| msgid "Checking out files" |
| msgstr "正在检出文件" |
| |
| #: urlmatch.c:120 |
| msgid "invalid URL scheme name or missing '://' suffix" |
| msgstr "无效的 URL 方案名称或丢失 '://' 后缀" |
| |
| #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 |
| #, c-format |
| msgid "invalid %XX escape sequence" |
| msgstr "无效的 %XX 转义序列" |
| |
| #: urlmatch.c:172 |
| msgid "missing host and scheme is not 'file:'" |
| msgstr "缺失主机名且URL方案不是 'file:'" |
| |
| #: urlmatch.c:189 |
| msgid "a 'file:' URL may not have a port number" |
| msgstr "一个 'file:' URL 不应该包含端口号" |
| |
| #: urlmatch.c:199 |
| msgid "invalid characters in host name" |
| msgstr "主机名中包含无效的字符" |
| |
| #: urlmatch.c:244 urlmatch.c:255 |
| msgid "invalid port number" |
| msgstr "无效的端口号" |
| |
| #: urlmatch.c:322 |
| msgid "invalid '..' path segment" |
| msgstr "无效的 '..' 路径片段" |
| |
| #: wrapper.c:422 |
| #, c-format |
| msgid "unable to access '%s': %s" |
| msgstr "不能访问 '%s':%s" |
| |
| #: wrapper.c:443 |
| #, c-format |
| msgid "unable to access '%s'" |
| msgstr "不能访问 '%s'" |
| |
| #: wrapper.c:454 |
| #, c-format |
| msgid "unable to look up current user in the passwd file: %s" |
| msgstr "无法在口令文件中查询到当前用户:%s" |
| |
| #: wrapper.c:455 |
| msgid "no such user" |
| msgstr "无此用户" |
| |
| #: wt-status.c:150 |
| msgid "Unmerged paths:" |
| msgstr "未合并的路径:" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:177 wt-status.c:204 |
| #, c-format |
| msgid " (use \"git reset %s <file>...\" to unstage)" |
| msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:179 wt-status.c:206 |
| msgid " (use \"git rm --cached <file>...\" to unstage)" |
| msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:183 |
| msgid " (use \"git add <file>...\" to mark resolution)" |
| msgstr " (使用 \"git add <file>...\" 标记解决方案)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:185 wt-status.c:189 |
| msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
| msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:187 |
| msgid " (use \"git rm <file>...\" to mark resolution)" |
| msgstr " (使用 \"git rm <file>...\" 标记解决方案)" |
| |
| #: wt-status.c:198 |
| msgid "Changes to be committed:" |
| msgstr "要提交的变更:" |
| |
| #: wt-status.c:216 |
| msgid "Changes not staged for commit:" |
| msgstr "尚未暂存以备提交的变更:" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:220 |
| msgid " (use \"git add <file>...\" to update what will be committed)" |
| msgstr " (使用 \"git add <file>...\" 更新要提交的内容)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:222 |
| msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
| msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:223 |
| msgid "" |
| " (use \"git checkout -- <file>...\" to discard changes in working directory)" |
| msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:225 |
| msgid " (commit or discard the untracked or modified content in submodules)" |
| msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:237 |
| #, c-format |
| msgid " (use \"git %s <file>...\" to include in what will be committed)" |
| msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)" |
| |
| #: wt-status.c:252 |
| msgid "both deleted:" |
| msgstr "双方删除:" |
| |
| #: wt-status.c:254 |
| msgid "added by us:" |
| msgstr "由我们添加:" |
| |
| #: wt-status.c:256 |
| msgid "deleted by them:" |
| msgstr "由他们删除:" |
| |
| #: wt-status.c:258 |
| msgid "added by them:" |
| msgstr "由他们添加:" |
| |
| #: wt-status.c:260 |
| msgid "deleted by us:" |
| msgstr "由我们删除:" |
| |
| #: wt-status.c:262 |
| msgid "both added:" |
| msgstr "双方添加:" |
| |
| #: wt-status.c:264 |
| msgid "both modified:" |
| msgstr "双方修改:" |
| |
| #: wt-status.c:266 |
| #, c-format |
| msgid "bug: unhandled unmerged status %x" |
| msgstr "bug:无法处理的未合并状态 %x" |
| |
| #: wt-status.c:274 |
| msgid "new file:" |
| msgstr "新文件:" |
| |
| #: wt-status.c:276 |
| msgid "copied:" |
| msgstr "拷贝:" |
| |
| #: wt-status.c:278 |
| msgid "deleted:" |
| msgstr "删除:" |
| |
| #: wt-status.c:280 |
| msgid "modified:" |
| msgstr "修改:" |
| |
| #: wt-status.c:282 |
| msgid "renamed:" |
| msgstr "重命名:" |
| |
| #: wt-status.c:284 |
| msgid "typechange:" |
| msgstr "类型变更:" |
| |
| #: wt-status.c:286 |
| msgid "unknown:" |
| msgstr "未知:" |
| |
| #: wt-status.c:288 |
| msgid "unmerged:" |
| msgstr "未合并:" |
| |
| # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
| #: wt-status.c:370 |
| msgid "new commits, " |
| msgstr "新提交, " |
| |
| # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
| #: wt-status.c:372 |
| msgid "modified content, " |
| msgstr "修改的内容, " |
| |
| # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
| #: wt-status.c:374 |
| msgid "untracked content, " |
| msgstr "未跟踪的内容, " |
| |
| #: wt-status.c:391 |
| #, c-format |
| msgid "bug: unhandled diff status %c" |
| msgstr "bug:无法处理的差异状态 %c" |
| |
| #: wt-status.c:765 |
| msgid "Submodules changed but not updated:" |
| msgstr "子模组已修改但尚未更新:" |
| |
| #: wt-status.c:767 |
| msgid "Submodule changes to be committed:" |
| msgstr "要提交的子模组变更:" |
| |
| #: wt-status.c:846 |
| msgid "" |
| "Do not touch the line above.\n" |
| "Everything below will be removed." |
| msgstr "" |
| "不要改动上面的一行。\n" |
| "下面的所有内容均将被删除。" |
| |
| #: wt-status.c:937 |
| msgid "You have unmerged paths." |
| msgstr "您有尚未合并的路径。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:940 |
| msgid " (fix conflicts and run \"git commit\")" |
| msgstr " (解决冲突并运行 \"git commit\")" |
| |
| #: wt-status.c:943 |
| msgid "All conflicts fixed but you are still merging." |
| msgstr "所有冲突已解决但您仍处于合并中。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:946 |
| msgid " (use \"git commit\" to conclude merge)" |
| msgstr " (使用 \"git commit\" 结束合并)" |
| |
| #: wt-status.c:956 |
| msgid "You are in the middle of an am session." |
| msgstr "您正处于 am 操作过程中。" |
| |
| #: wt-status.c:959 |
| msgid "The current patch is empty." |
| msgstr "当前的补丁为空。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:963 |
| msgid " (fix conflicts and then run \"git am --continue\")" |
| msgstr " (解决冲突,然后运行 \"git am --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:965 |
| msgid " (use \"git am --skip\" to skip this patch)" |
| msgstr " (使用 \"git am --skip\" 跳过此补丁)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:967 |
| msgid " (use \"git am --abort\" to restore the original branch)" |
| msgstr " (使用 \"git am --abort\" 恢复原有分支)" |
| |
| #: wt-status.c:1027 wt-status.c:1044 |
| #, c-format |
| msgid "You are currently rebasing branch '%s' on '%s'." |
| msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
| |
| #: wt-status.c:1032 wt-status.c:1049 |
| msgid "You are currently rebasing." |
| msgstr "您在执行变基操作。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1035 |
| msgid " (fix conflicts and then run \"git rebase --continue\")" |
| msgstr " (解决冲突,然后运行 \"git rebase --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1037 |
| msgid " (use \"git rebase --skip\" to skip this patch)" |
| msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1039 |
| msgid " (use \"git rebase --abort\" to check out the original branch)" |
| msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1052 |
| msgid " (all conflicts fixed: run \"git rebase --continue\")" |
| msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" |
| |
| #: wt-status.c:1056 |
| #, c-format |
| msgid "" |
| "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
| msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
| |
| #: wt-status.c:1061 |
| msgid "You are currently splitting a commit during a rebase." |
| msgstr "您在执行变基操作时拆分提交。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1064 |
| msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
| msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" |
| |
| #: wt-status.c:1068 |
| #, c-format |
| msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
| msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
| |
| #: wt-status.c:1073 |
| msgid "You are currently editing a commit during a rebase." |
| msgstr "您在执行变基操作时编辑提交。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1076 |
| msgid " (use \"git commit --amend\" to amend the current commit)" |
| msgstr " (使用 \"git commit --amend\" 修补当前提交)" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1078 |
| msgid "" |
| " (use \"git rebase --continue\" once you are satisfied with your changes)" |
| msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
| |
| #: wt-status.c:1088 |
| #, c-format |
| msgid "You are currently cherry-picking commit %s." |
| msgstr "您在执行拣选提交 %s 的操作。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1093 |
| msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
| msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1096 |
| msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
| msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1098 |
| msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
| msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" |
| |
| #: wt-status.c:1107 |
| #, c-format |
| msgid "You are currently reverting commit %s." |
| msgstr "您在执行反转提交 %s 的操作。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1112 |
| msgid " (fix conflicts and run \"git revert --continue\")" |
| msgstr " (解决冲突并运行 \"git revert --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1115 |
| msgid " (all conflicts fixed: run \"git revert --continue\")" |
| msgstr " (所有冲突已解决:运行 \"git revert --continue\")" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1117 |
| msgid " (use \"git revert --abort\" to cancel the revert operation)" |
| msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" |
| |
| #: wt-status.c:1128 |
| #, c-format |
| msgid "You are currently bisecting, started from branch '%s'." |
| msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
| |
| #: wt-status.c:1132 |
| msgid "You are currently bisecting." |
| msgstr "您在执行二分查找操作。" |
| |
| # 译者:注意保持前导空格 |
| #: wt-status.c:1135 |
| msgid " (use \"git bisect reset\" to get back to the original branch)" |
| msgstr " (使用 \"git bisect reset\" 以回到原有分支)" |
| |
| #: wt-status.c:1310 |
| msgid "On branch " |
| msgstr "位于分支 " |
| |
| #: wt-status.c:1317 |
| msgid "rebase in progress; onto " |
| msgstr "变基操作正在进行中;至 " |
| |
| #: wt-status.c:1324 |
| msgid "HEAD detached at " |
| msgstr "头指针分离于 " |
| |
| #: wt-status.c:1326 |
| msgid "HEAD detached from " |
| msgstr "头指针分离自 " |
| |
| #: wt-status.c:1329 |
| msgid "Not currently on any branch." |
| msgstr "当前不在任何分支上。" |
| |
| #: wt-status.c:1346 |
| msgid "Initial commit" |
| msgstr "初始提交" |
| |
| #: wt-status.c:1360 |
| msgid "Untracked files" |
| msgstr "未跟踪的文件" |
| |
| #: wt-status.c:1362 |
| msgid "Ignored files" |
| msgstr "忽略的文件" |
| |
| #: wt-status.c:1366 |
| #, c-format |
| msgid "" |
| "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| "may speed it up, but you have to be careful not to forget to add\n" |
| "new files yourself (see 'git help status')." |
| msgstr "" |
| "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" |
| "但您需要小心不要忘了添加新文件(参见 'git help status')。" |
| |
| #: wt-status.c:1372 |
| #, c-format |
| msgid "Untracked files not listed%s" |
| msgstr "未跟踪的文件没有列出%s" |
| |
| # 译者:中文字符串拼接,可删除前导空格 |
| #: wt-status.c:1374 |
| msgid " (use -u option to show untracked files)" |
| msgstr "(使用 -u 参数显示未跟踪的文件)" |
| |
| #: wt-status.c:1380 |
| msgid "No changes" |
| msgstr "没有修改" |
| |
| #: wt-status.c:1385 |
| #, c-format |
| msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
| msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
| |
| #: wt-status.c:1388 |
| #, c-format |
| msgid "no changes added to commit\n" |
| msgstr "修改尚未加入提交\n" |
| |
| #: wt-status.c:1391 |
| #, c-format |
| msgid "" |
| "nothing added to commit but untracked files present (use \"git add\" to " |
| "track)\n" |
| msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
| |
| #: wt-status.c:1394 |
| #, c-format |
| msgid "nothing added to commit but untracked files present\n" |
| msgstr "提交为空,但是存在尚未跟踪的文件\n" |
| |
| # 译者:中文字符串拼接,可删除前导空格 |
| #: wt-status.c:1397 |
| #, c-format |
| msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
| msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
| |
| #: wt-status.c:1400 wt-status.c:1405 |
| #, c-format |
| msgid "nothing to commit\n" |
| msgstr "无文件要提交\n" |
| |
| # 译者:中文字符串拼接,可删除前导空格 |
| #: wt-status.c:1403 |
| #, c-format |
| msgid "nothing to commit (use -u to show untracked files)\n" |
| msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
| |
| # 译者:中文字符串拼接,可删除前导空格 |
| #: wt-status.c:1407 |
| #, c-format |
| msgid "nothing to commit, working directory clean\n" |
| msgstr "无文件要提交,干净的工作区\n" |
| |
| #: wt-status.c:1516 |
| msgid "HEAD (no branch)" |
| msgstr "HEAD(非分支)" |
| |
| # 译者:注意保持句尾空格 |
| #: wt-status.c:1522 |
| msgid "Initial commit on " |
| msgstr "初始提交于 " |
| |
| #: wt-status.c:1554 |
| msgid "gone" |
| msgstr "丢失" |
| |
| # 译者:注意保持句尾空格 |
| #: wt-status.c:1556 wt-status.c:1564 |
| msgid "behind " |
| msgstr "落后 " |
| |
| #: compat/precompose_utf8.c:55 builtin/clone.c:356 |
| #, c-format |
| msgid "failed to unlink '%s'" |
| msgstr "无法删除 '%s'" |
| |
| #: builtin/add.c:21 |
| msgid "git add [options] [--] <pathspec>..." |
| msgstr "git add [选项] [--] <路径规则>..." |
| |
| #: builtin/add.c:64 |
| #, c-format |
| msgid "unexpected diff status %c" |
| msgstr "意外的差异状态 %c" |
| |
| #: builtin/add.c:69 builtin/commit.c:261 |
| msgid "updating files failed" |
| msgstr "更新文件失败" |
| |
| #: builtin/add.c:79 |
| #, c-format |
| msgid "remove '%s'\n" |
| msgstr "删除 '%s'\n" |
| |
| #: builtin/add.c:133 |
| msgid "Unstaged changes after refreshing the index:" |
| msgstr "刷新索引之后尚未被暂存的变更:" |
| |
| #: builtin/add.c:193 |
| msgid "Could not read the index" |
| msgstr "不能读取索引" |
| |
| #: builtin/add.c:204 |
| #, c-format |
| msgid "Could not open '%s' for writing." |
| msgstr "不能打开 '%s' 以写入。" |
| |
| #: builtin/add.c:208 |
| msgid "Could not write patch" |
| msgstr "不能生成补丁" |
| |
| #: builtin/add.c:213 |
| #, c-format |
| msgid "Could not stat '%s'" |
| msgstr "不能查看文件状态 '%s'" |
| |
| #: builtin/add.c:215 |
| msgid "Empty patch. Aborted." |
| msgstr "空补丁。异常终止。" |
| |
| #: builtin/add.c:221 |
| #, c-format |
| msgid "Could not apply '%s'" |
| msgstr "不能应用 '%s'" |
| |
| #: builtin/add.c:231 |
| msgid "The following paths are ignored by one of your .gitignore files:\n" |
| msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
| |
| #: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70 |
| #: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344 |
| #: builtin/rm.c:269 |
| msgid "dry run" |
| msgstr "演习" |
| |
| #: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19 |
| #: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612 |
| #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 |
| msgid "be verbose" |
| msgstr "冗长输出" |
| |
| #: builtin/add.c:251 |
| msgid "interactive picking" |
| msgstr "交互式拣选" |
| |
| #: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283 |
| msgid "select hunks interactively" |
| msgstr "交互式挑选数据块" |
| |
| #: builtin/add.c:253 |
| msgid "edit current diff and apply" |
| msgstr "编辑当前差异并应用" |
| |
| #: builtin/add.c:254 |
| msgid "allow adding otherwise ignored files" |
| msgstr "允许添加忽略的文件" |
| |
| #: builtin/add.c:255 |
| msgid "update tracked files" |
| msgstr "更新已跟踪的文件" |
| |
| #: builtin/add.c:256 |
| msgid "record only the fact that the path will be added later" |
| msgstr "只记录,该路径稍后再添加" |
| |
| #: builtin/add.c:257 |
| msgid "add changes from all tracked and untracked files" |
| msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
| |
| #: builtin/add.c:260 |
| msgid "ignore paths removed in the working tree (same as --no-all)" |
| msgstr "忽略工作区中移除的路径(和 --no-all 相同)" |
| |
| #: builtin/add.c:262 |
| msgid "don't add, only refresh the index" |
| msgstr "不添加,只刷新索引" |
| |
| #: builtin/add.c:263 |
| msgid "just skip files which cannot be added because of errors" |
| msgstr "跳过因出错不能添加的文件" |
| |
| #: builtin/add.c:264 |
| msgid "check if - even missing - files are ignored in dry run" |
| msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
| |
| #: builtin/add.c:286 |
| #, c-format |
| msgid "Use -f if you really want to add them.\n" |
| msgstr "使用 -f 参数如果您确实要添加它们。\n" |
| |
| #: builtin/add.c:287 |
| msgid "no files added" |
| msgstr "没有文件被添加" |
| |
| #: builtin/add.c:293 |
| msgid "adding files failed" |
| msgstr "添加文件失败" |
| |
| #: builtin/add.c:330 |
| msgid "-A and -u are mutually incompatible" |
| msgstr "-A 和 -u 选项互斥" |
| |
| #: builtin/add.c:337 |
| msgid "Option --ignore-missing can only be used together with --dry-run" |
| msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
| |
| #: builtin/add.c:358 |
| #, c-format |
| msgid "Nothing specified, nothing added.\n" |
| msgstr "没有指定文件,也没有文件被添加。\n" |
| |
| #: builtin/add.c:359 |
| #, c-format |
| msgid "Maybe you wanted to say 'git add .'?\n" |
| msgstr "也许您想要执行 'git add .'?\n" |
| |
| #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920 |
| #: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 |
| msgid "index file corrupt" |
| msgstr "索引文件损坏" |
| |
| #: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432 |
| 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:1422 |
| #, c-format |
| msgid "recount: unexpected line: %.*s" |
| msgstr "recount:意外的行:%.*s" |
| |
| #: builtin/apply.c:1479 |
| #, c-format |
| msgid "patch fragment without header at line %d: %.*s" |
| msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
| |
| #: builtin/apply.c:1496 |
| #, 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:1656 |
| msgid "new file depends on old contents" |
| msgstr "新文件依赖旧内容" |
| |
| #: builtin/apply.c:1658 |
| msgid "deleted file still has contents" |
| msgstr "删除的文件仍有内容" |
| |
| #: builtin/apply.c:1684 |
| #, c-format |
| msgid "corrupt patch at line %d" |
| msgstr "补丁在第 %d 行损坏" |
| |
| #: builtin/apply.c:1720 |
| #, c-format |
| msgid "new file %s depends on old contents" |
| msgstr "新文件 %s 依赖旧内容" |
| |
| #: builtin/apply.c:1722 |
| #, c-format |
| msgid "deleted file %s still has contents" |
| msgstr "删除的文件 %s 仍有内容" |
| |
| #: builtin/apply.c:1725 |
| #, c-format |
| msgid "** warning: file %s becomes empty but is not deleted" |
| msgstr "** 警告:文件 %s 成为空文件但并未删除" |
| |
| #: builtin/apply.c:1871 |
| #, c-format |
| msgid "corrupt binary patch at line %d: %.*s" |
| msgstr "二进制补丁在第 %d 行损坏:%.*s" |
| |
| #: builtin/apply.c:1900 |
| #, c-format |
| msgid "unrecognized binary patch at line %d" |
| msgstr "未能识别的二进制补丁位于第 %d 行" |
| |
| #: builtin/apply.c:1986 |
| #, c-format |
| msgid "patch with only garbage at line %d" |
| msgstr "补丁文件的第 %d 行只有垃圾数据" |
| |
| #: builtin/apply.c:2076 |
| #, c-format |
| msgid "unable to read symlink %s" |
| msgstr "无法读取符号链接 %s" |
| |
| #: builtin/apply.c:2080 |
| #, c-format |
| msgid "unable to open or read %s" |
| msgstr "不能打开或读取 %s" |
| |
| #: builtin/apply.c:2688 |
| #, c-format |
| msgid "invalid start of line: '%c'" |
| msgstr "无效的行首字符:'%c'" |
| |
| #: builtin/apply.c:2806 |
| #, 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:2818 |
| #, c-format |
| msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
| msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
| |
| #: builtin/apply.c:2824 |
| #, c-format |
| msgid "" |
| "while searching for:\n" |
| "%.*s" |
| msgstr "" |
| "当查询:\n" |
| "%.*s" |
| |
| #: builtin/apply.c:2843 |
| #, c-format |
| msgid "missing binary patch data for '%s'" |
| msgstr "缺失 '%s' 的二进制补丁数据" |
| |
| #: builtin/apply.c:2946 |
| #, c-format |
| msgid "binary patch does not apply to '%s'" |
| msgstr "二进制补丁未应用到 '%s'" |
| |
| #: builtin/apply.c:2952 |
| #, c-format |
| msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
| msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
| |
| #: builtin/apply.c:2973 |
| #, c-format |
| msgid "patch failed: %s:%ld" |
| msgstr "打补丁失败:%s:%ld" |
| |
| #: builtin/apply.c:3095 |
| #, c-format |
| msgid "cannot checkout %s" |
| msgstr "不能检出 %s" |
| |
| #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 |
| #, c-format |
| msgid "read of %s failed" |
| msgstr "读取 %s 失败" |
| |
| #: builtin/apply.c:3174 builtin/apply.c:3396 |
| #, c-format |
| msgid "path %s has been renamed/deleted" |
| msgstr "路径 %s 已经被重命名/删除" |
| |
| #: builtin/apply.c:3255 builtin/apply.c:3410 |
| #, c-format |
| msgid "%s: does not exist in index" |
| msgstr "%s:不存在于索引中" |
| |
| #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 |
| #, c-format |
| msgid "%s: %s" |
| msgstr "%s:%s" |
| |
| #: builtin/apply.c:3264 builtin/apply.c:3418 |
| #, c-format |
| msgid "%s: does not match index" |
| msgstr "%s:和索引不匹配" |
| |
| #: builtin/apply.c:3366 |
| msgid "removal patch leaves file contents" |
| msgstr "移除补丁仍留下了文件内容" |
| |
| #: builtin/apply.c:3435 |
| #, c-format |
| msgid "%s: wrong type" |
| msgstr "%s:错误类型" |
| |
| #: builtin/apply.c:3437 |
| #, c-format |
| msgid "%s has type %o, expected %o" |
| msgstr "%s 的类型是 %o,应为 %o" |
| |
| #: builtin/apply.c:3538 |
| #, c-format |
| msgid "%s: already exists in index" |
| msgstr "%s:已经存在于索引中" |
| |
| #: builtin/apply.c:3541 |
| #, c-format |
| msgid "%s: already exists in working directory" |
| msgstr "%s:已经存在于工作区中" |
| |
| #: builtin/apply.c:3561 |
| #, c-format |
| msgid "new mode (%o) of %s does not match old mode (%o)" |
| msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" |
| |
| #: builtin/apply.c:3566 |
| #, 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:3574 |
| #, c-format |
| msgid "%s: patch does not apply" |
| msgstr "%s:补丁未应用" |
| |
| #: builtin/apply.c:3587 |
| #, c-format |
| msgid "Checking patch %s..." |
| msgstr "检查补丁 %s..." |
| |
| #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 |
| #, c-format |
| msgid "make_cache_entry failed for path '%s'" |
| msgstr "对路径 '%s' 的 make_cache_entry 操作失败" |
| |
| #: builtin/apply.c:3823 |
| #, c-format |
| msgid "unable to remove %s from index" |
| msgstr "不能从索引中移除 %s" |
| |
| #: builtin/apply.c:3851 |
| #, c-format |
| msgid "corrupt patch for submodule %s" |
| msgstr "子模组 %s 损坏的补丁" |
| |
| #: builtin/apply.c:3855 |
| #, c-format |
| msgid "unable to stat newly created file '%s'" |
| msgstr "不能枚举新建文件 '%s' 的状态" |
| |
| #: builtin/apply.c:3860 |
| #, c-format |
| msgid "unable to create backing store for newly created file %s" |
| msgstr "不能为新建文件 %s 创建后端存储" |
| |
| #: builtin/apply.c:3863 builtin/apply.c:3971 |
| #, c-format |
| msgid "unable to add cache entry for %s" |
| msgstr "无法为 %s 添加缓存条目" |
| |
| #: builtin/apply.c:3896 |
| #, c-format |
| msgid "closing file '%s'" |
| msgstr "关闭文件 '%s'" |
| |
| #: builtin/apply.c:3945 |
| #, c-format |
| msgid "unable to write file '%s' mode %o" |
| msgstr "不能写文件 '%s' 权限 %o" |
| |
| #: builtin/apply.c:4032 |
| #, c-format |
| msgid "Applied patch %s cleanly." |
| msgstr "成功应用补丁 %s。" |
| |
| #: builtin/apply.c:4040 |
| msgid "internal error" |
| msgstr "内部错误" |
| |
| #: builtin/apply.c:4043 |
| #, 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:4053 |
| #, c-format |
| msgid "truncating .rej filename to %.*s.rej" |
| msgstr "截短 .rej 文件名为 %.*s.rej" |
| |
| #: builtin/apply.c:4074 |
| #, c-format |
| msgid "Hunk #%d applied cleanly." |
| msgstr "第 #%d 个片段成功应用。" |
| |
| #: builtin/apply.c:4077 |
| #, c-format |
| msgid "Rejected hunk #%d." |
| msgstr "拒绝第 #%d 个片段。" |
| |
| #: builtin/apply.c:4227 |
| msgid "unrecognized input" |
| msgstr "未能识别的输入" |
| |
| #: builtin/apply.c:4238 |
| msgid "unable to read index file" |
| msgstr "无法读取索引文件" |
| |
| #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 |
| #: builtin/fetch.c:78 |
| msgid "path" |
| msgstr "路径" |
| |
| #: builtin/apply.c:4358 |
| msgid "don't apply changes matching the given path" |
| msgstr "不要应用与给出路径向匹配的变更" |
| |
| #: builtin/apply.c:4361 |
| msgid "apply changes matching the given path" |
| msgstr "应用与给出路径向匹配的变更" |
| |
| #: builtin/apply.c:4363 |
| msgid "num" |
| msgstr "数字" |
| |
| #: builtin/apply.c:4364 |
| msgid "remove <num> leading slashes from traditional diff paths" |
| msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
| |
| #: builtin/apply.c:4367 |
| msgid "ignore additions made by the patch" |
| msgstr "忽略补丁中的添加的文件" |
| |
| #: builtin/apply.c:4369 |
| msgid "instead of applying the patch, output diffstat for the input" |
| msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
| |
| #: builtin/apply.c:4373 |
| msgid "show number of added and deleted lines in decimal notation" |
| msgstr "以十进制数显示添加和删除的行数" |
| |
| #: builtin/apply.c:4375 |
| msgid "instead of applying the patch, output a summary for the input" |
| msgstr "不应用补丁,而是显示输入的概要" |
| |
| #: builtin/apply.c:4377 |
| msgid "instead of applying the patch, see if the patch is applicable" |
| msgstr "不应用补丁,而是查看补丁是否可应用" |
| |
| #: builtin/apply.c:4379 |
| msgid "make sure the patch is applicable to the current index" |
| msgstr "确认补丁可以应用到当前索引" |
| |
| #: builtin/apply.c:4381 |
| msgid "apply a patch without touching the working tree" |
| msgstr "应用补丁而不修改工作区" |
| |
| #: builtin/apply.c:4383 |
| msgid "also apply the patch (use with --stat/--summary/--check)" |
| msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
| |
| #: builtin/apply.c:4385 |
| msgid "attempt three-way merge if a patch does not apply" |
| msgstr "如果一个补丁不能应用则尝试三路合并" |
| |
| #: builtin/apply.c:4387 |
| msgid "build a temporary index based on embedded index information" |
| msgstr "创建一个临时索引基于嵌入的索引信息" |
| |
| #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455 |
| msgid "paths are separated with NUL character" |
| msgstr "路径以 NUL 字符分隔" |
| |
| #: builtin/apply.c:4392 |
| msgid "ensure at least <n> lines of context match" |
| msgstr "确保至少匹配 <n> 行上下文" |
| |
| #: builtin/apply.c:4393 |
| msgid "action" |
| msgstr "动作" |
| |
| #: builtin/apply.c:4394 |
| msgid "detect new or modified lines that have whitespace errors" |
| msgstr "检查新增和修改的行中间的空白字符滥用" |
| |
| #: builtin/apply.c:4397 builtin/apply.c:4400 |
| msgid "ignore changes in whitespace when finding context" |
| msgstr "查找上下文时忽略空白字符的变更" |
| |
| #: builtin/apply.c:4403 |
| msgid "apply the patch in reverse" |
| msgstr "反向应用补丁" |
| |
| #: builtin/apply.c:4405 |
| msgid "don't expect at least one line of context" |
| msgstr "无需至少一行上下文" |
| |
| #: builtin/apply.c:4407 |
| msgid "leave the rejected hunks in corresponding *.rej files" |
| msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
| |
| #: builtin/apply.c:4409 |
| msgid "allow overlapping hunks" |
| msgstr "允许重叠的补丁片段" |
| |
| #: builtin/apply.c:4412 |
| msgid "tolerate incorrectly detected missing new-line at the end of file" |
| msgstr "允许不正确的文件末尾换行符" |
| |
| #: builtin/apply.c:4415 |
| msgid "do not trust the line counts in the hunk headers" |
| msgstr "不信任补丁片段的头信息中的行号" |
| |
| #: builtin/apply.c:4417 |
| msgid "root" |
| msgstr "根目录" |
| |
| #: builtin/apply.c:4418 |
| msgid "prepend <root> to all filenames" |
| msgstr "为所有文件名前添加 <根目录>" |
| |
| #: builtin/apply.c:4440 |
| msgid "--3way outside a repository" |
| msgstr "--3way 在一个版本库之外" |
| |
| #: builtin/apply.c:4448 |
| msgid "--index outside a repository" |
| msgstr "--index 在一个版本库之外" |
| |
| #: builtin/apply.c:4451 |
| msgid "--cached outside a repository" |
| msgstr "--cached 在一个版本库之外" |
| |
| #: builtin/apply.c:4467 |
| #, c-format |
| msgid "can't open patch '%s'" |
| msgstr "不能打开补丁 '%s'" |
| |
| #: builtin/apply.c:4481 |
| #, c-format |
| msgid "squelched %d whitespace error" |
| msgid_plural "squelched %d whitespace errors" |
| msgstr[0] "抑制下仍有 %d 个空白字符误用" |
| msgstr[1] "抑制下仍有 %d 个空白字符误用" |
| |
| #: builtin/apply.c:4487 builtin/apply.c:4497 |
| #, 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:61 |
| #, c-format |
| msgid "git archive: NACK %s" |
| msgstr "git archive:NACK %s" |
| |
| #: builtin/archive.c:63 |
| #, c-format |
| msgid "remote error: %s" |
| msgstr "远程错误:%s" |
| |
| #: builtin/archive.c:64 |
| msgid "git archive: protocol error" |
| msgstr "git archive:协议错误" |
| |
| #: builtin/archive.c:68 |
| msgid "git archive: expected a flush" |
| msgstr "git archive:应为刷新" |
| |
| #: builtin/bisect--helper.c:7 |
| msgid "git bisect--helper --next-all [--no-checkout]" |
| msgstr "git bisect--helper --next-all [--no-checkout]" |
| |
| #: builtin/bisect--helper.c:17 |
| msgid "perform 'git bisect next'" |
| msgstr "执行 'git bisect next'" |
| |
| #: builtin/bisect--helper.c:19 |
| msgid "update BISECT_HEAD instead of checking out the current commit" |
| msgstr "更新 BISECT_HEAD 而非检出当前提交" |
| |
| #: builtin/blame.c:27 |
| msgid "git blame [options] [rev-opts] [rev] [--] file" |
| msgstr "git blame [选项] [版本选项] [版本] [--] 文件" |
| |
| #: builtin/blame.c:32 |
| msgid "[rev-opts] are documented in git-rev-list(1)" |
| msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" |
| |
| #: builtin/blame.c:2249 |
| msgid "Show blame entries as we find them, incrementally" |
| msgstr "增量式地显示发现的 blame 条目" |
| |
| #: builtin/blame.c:2250 |
| msgid "Show blank SHA-1 for boundary commits (Default: off)" |
| msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
| |
| #: builtin/blame.c:2251 |
| msgid "Do not treat root commits as boundaries (Default: off)" |
| msgstr "不把根提交作为边界(默认:关闭)" |
| |
| #: builtin/blame.c:2252 |
| msgid "Show work cost statistics" |
| msgstr "显示命令消耗统计" |
| |
| #: builtin/blame.c:2253 |
| msgid "Show output score for blame entries" |
| msgstr "显示判断 blame 条目位移的得分诊断信息" |
| |
| #: builtin/blame.c:2254 |
| msgid "Show original filename (Default: auto)" |
| msgstr "显示原始文件名(默认:自动)" |
| |
| #: builtin/blame.c:2255 |
| msgid "Show original linenumber (Default: off)" |
| msgstr "显示原始的行号(默认:关闭)" |
| |
| #: builtin/blame.c:2256 |
| msgid "Show in a format designed for machine consumption" |
| msgstr "显示为一个适合机器读取的格式" |
| |
| #: builtin/blame.c:2257 |
| msgid "Show porcelain format with per-line commit information" |
| msgstr "为每一行显示机器适用的提交信息" |
| |
| #: builtin/blame.c:2258 |
| msgid "Use the same output mode as git-annotate (Default: off)" |
| msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
| |
| #: builtin/blame.c:2259 |
| msgid "Show raw timestamp (Default: off)" |
| msgstr "显示原始时间戳(默认:关闭)" |
| |
| #: builtin/blame.c:2260 |
| msgid "Show long commit SHA1 (Default: off)" |
| msgstr "显示长的SHA1提交号(默认:关闭)" |
| |
| #: builtin/blame.c:2261 |
| msgid "Suppress author name and timestamp (Default: off)" |
| msgstr "隐藏作者名字和时间戳(默认:关闭)" |
| |
| #: builtin/blame.c:2262 |
| msgid "Show author email instead of name (Default: off)" |
| msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
| |
| #: builtin/blame.c:2263 |
| msgid "Ignore whitespace differences" |
| msgstr "忽略空白差异" |
| |
| #: builtin/blame.c:2264 |
| msgid "Spend extra cycles to find better match" |
| msgstr "花费额外的循环来找到更好的匹配" |
| |
| #: builtin/blame.c:2265 |
| msgid "Use revisions from <file> instead of calling git-rev-list" |
| msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" |
| |
| #: builtin/blame.c:2266 |
| msgid "Use <file>'s contents as the final image" |
| msgstr "使用 <file> 的内容作为最终的图片" |
| |
| #: builtin/blame.c:2267 builtin/blame.c:2268 |
| msgid "score" |
| msgstr "得分" |
| |
| #: builtin/blame.c:2267 |
| msgid "Find line copies within and across files" |
| msgstr "找到文件内及跨文件的行拷贝" |
| |
| #: builtin/blame.c:2268 |
| msgid "Find line movements within and across files" |
| msgstr "找到文件内及跨文件的行移动" |
| |
| #: builtin/blame.c:2269 |
| msgid "n,m" |
| msgstr "n,m" |
| |
| #: builtin/blame.c:2269 |
| msgid "Process only line range n,m, counting from 1" |
| msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
| |
| #. TRANSLATORS: This string is used to tell us the maximum |
| #. display width for a relative timestamp in "git blame" |
| #. output. For C locale, "4 years, 11 months ago", which |
| #. takes 22 places, is the longest among various forms of |
| #. relative timestamps, but your language may need more or |
| #. fewer display columns. |
| #: builtin/blame.c:2347 |
| msgid "4 years, 11 months ago" |
| msgstr "4 年 11 个月前" |
| |
| #: builtin/branch.c:24 |
| msgid "git branch [options] [-r | -a] [--merged | --no-merged]" |
| msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" |
| |
| #: builtin/branch.c:25 |
| msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" |
| msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" |
| |
| #: builtin/branch.c:26 |
| msgid "git branch [options] [-r] (-d | -D) <branchname>..." |
| msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." |
| |
| #: builtin/branch.c:27 |
| msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" |
| msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" |
| |
| # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
| #: builtin/branch.c:150 |
| #, 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:154 |
| #, 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:168 |
| #, c-format |
| msgid "Couldn't look up commit object for '%s'" |
| msgstr "无法查询 '%s' 指向的提交对象" |
| |
| #: builtin/branch.c:172 |
| #, 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:185 |
| msgid "Update of config-file failed" |
| msgstr "无法更新 config 文件" |
| |
| #: builtin/branch.c:213 |
| msgid "cannot use -a with -d" |
| msgstr "不能将 -a 和 -d 同时使用" |
| |
| #: builtin/branch.c:219 |
| msgid "Couldn't look up commit object for HEAD" |
| msgstr "无法查询 HEAD 指向的提交对象" |
| |
| #: builtin/branch.c:227 |
| #, c-format |
| msgid "Cannot delete the branch '%s' which you are currently on." |
| msgstr "无法删除您当前所在的分支 '%s'。" |
| |
| #: builtin/branch.c:240 |
| #, c-format |
| msgid "remote branch '%s' not found." |
| msgstr "远程分支 '%s' 未发现。" |
| |
| #: builtin/branch.c:241 |
| #, c-format |
| msgid "branch '%s' not found." |
| msgstr "分支 '%s' 未发现。" |
| |
| #: builtin/branch.c:255 |
| #, c-format |
| msgid "Error deleting remote branch '%s'" |
| msgstr "删除远程分支 '%s' 时出错" |
| |
| #: builtin/branch.c:256 |
| #, c-format |
| msgid "Error deleting branch '%s'" |
| msgstr "删除分支 '%s' 时出错" |
| |
| #: builtin/branch.c:263 |
| #, c-format |
| msgid "Deleted remote branch %s (was %s).\n" |
| msgstr "已删除远程分支 %s(曾为 %s)。\n" |
| |
| #: builtin/branch.c:264 |
| #, c-format |
| msgid "Deleted branch %s (was %s).\n" |
| msgstr "已删除分支 %s(曾为 %s)。\n" |
| |
| #: builtin/branch.c:366 |
| #, c-format |
| msgid "branch '%s' does not point at a commit" |
| msgstr "分支 '%s' 未指向一个提交" |
| |
| #: builtin/branch.c:454 |
| #, c-format |
| msgid "[%s: gone]" |
| msgstr "[%s: 丢失]" |
| |
| #: builtin/branch.c:459 |
| #, c-format |
| msgid "[%s]" |
| msgstr "[%s]" |
| |
| #: builtin/branch.c:464 |
| #, c-format |
| msgid "[%s: behind %d]" |
| msgstr "[%s:落后 %d]" |
| |
| #: builtin/branch.c:466 |
| #, c-format |
| msgid "[behind %d]" |
| msgstr "[落后 %d]" |
| |
| #: builtin/branch.c:470 |
| #, c-format |
| msgid "[%s: ahead %d]" |
| msgstr "[%s:领先 %d]" |
| |
| #: builtin/branch.c:472 |
| #, c-format |
| msgid "[ahead %d]" |
| msgstr "[领先 %d]" |
| |
| #: builtin/branch.c:475 |
| #, c-format |
| msgid "[%s: ahead %d, behind %d]" |
| msgstr "[%s:领先 %d,落后 %d]" |
| |
| #: builtin/branch.c:478 |
| #, c-format |
| msgid "[ahead %d, behind %d]" |
| msgstr "[领先 %d,落后 %d]" |
| |
| #: builtin/branch.c:502 |
| msgid " **** invalid ref ****" |
| msgstr " **** 无效引用 ****" |
| |
| #: builtin/branch.c:594 |
| #, c-format |
| msgid "(no branch, rebasing %s)" |
| msgstr "(非分支,正变基 %s)" |
| |
| #: builtin/branch.c:597 |
| #, c-format |
| msgid "(no branch, bisect started on %s)" |
| msgstr "(非分支,二分查找开始于 %s)" |
| |
| #: builtin/branch.c:600 |
| #, c-format |
| msgid "(detached from %s)" |
| msgstr "(分离自 %s)" |
| |
| #: builtin/branch.c:603 |
| msgid "(no branch)" |
| msgstr "(非分支)" |
| |
| #: builtin/branch.c:649 |
| #, c-format |
| msgid "object '%s' does not point to a commit" |
| msgstr "对象 '%s' 没有指向一个提交" |
| |
| #: builtin/branch.c:681 |
| msgid "some refs could not be read" |
| msgstr "一些引用不能读取" |
| |
| #: builtin/branch.c:694 |
| msgid "cannot rename the current branch while not on any." |
| msgstr "无法重命名当前分支因为不处于任何分支上。" |
| |
| #: builtin/branch.c:704 |
| #, c-format |
| msgid "Invalid branch name: '%s'" |
| msgstr "无效的分支名:'%s'" |
| |
| #: builtin/branch.c:719 |
| msgid "Branch rename failed" |
| msgstr "分支重命名失败" |
| |
| #: builtin/branch.c:723 |
| #, c-format |
| msgid "Renamed a misnamed branch '%s' away" |
| msgstr "重命名掉一个错误命名的旧分支 '%s'" |
| |
| #: builtin/branch.c:727 |
| #, c-format |
| msgid "Branch renamed to %s, but HEAD is not updated!" |
| msgstr "分支重命名为 %s,但 HEAD 没有更新!" |
| |
| #: builtin/branch.c:734 |
| msgid "Branch is renamed, but update of config-file failed" |
| msgstr "分支被重命名,但更新 config 文件失败" |
| |
| #: builtin/branch.c:749 |
| #, c-format |
| msgid "malformed object name %s" |
| msgstr "非法的对象名 %s" |
| |
| #: builtin/branch.c:773 |
| #, c-format |
| msgid "could not write branch description template: %s" |
| msgstr "不能写分支描述模版:%s" |
| |
| #: builtin/branch.c:803 |
| msgid "Generic options" |
| msgstr "通用选项" |
| |
| #: builtin/branch.c:805 |
| msgid "show hash and subject, give twice for upstream branch" |
| msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
| |
| #: builtin/branch.c:806 |
| msgid "suppress informational messages" |
| msgstr "不显示信息" |
| |
| #: builtin/branch.c:807 |
| msgid "set up tracking mode (see git-pull(1))" |
| msgstr "设置跟踪模式(参见 git-pull(1))" |
| |
| #: builtin/branch.c:809 |
| msgid "change upstream info" |
| msgstr "改变上游信息" |
| |
| #: builtin/branch.c:813 |
| msgid "use colored output" |
| msgstr "使用彩色输出" |
| |
| #: builtin/branch.c:814 |
| msgid "act on remote-tracking branches" |
| msgstr "作用于远程跟踪分支" |
| |
| #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 |
| #: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495 |
| #: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527 |
| #: builtin/tag.c:533 |
| msgid "commit" |
| msgstr "提交" |
| |
| #: builtin/branch.c:818 builtin/branch.c:824 |
| msgid "print only branches that contain the commit" |
| msgstr "只打印包含该提交的分支" |
| |
| #: builtin/branch.c:830 |
| msgid "Specific git-branch actions:" |
| msgstr "具体的 git-branch 动作:" |
| |
| #: builtin/branch.c:831 |
| msgid "list both remote-tracking and local branches" |
| msgstr "列出远程跟踪及本地分支" |
| |
| #: builtin/branch.c:833 |
| msgid "delete fully merged branch" |
| msgstr "删除完全合并的分支" |
| |
| #: builtin/branch.c:834 |
| msgid "delete branch (even if not merged)" |
| msgstr "删除分支(即使没有合并)" |
| |
| #: builtin/branch.c:835 |
| msgid "move/rename a branch and its reflog" |
| msgstr "移动/重命名一个分支,以及它的引用日志" |
| |
| #: builtin/branch.c:836 |
| msgid "move/rename a branch, even if target exists" |
| msgstr "移动/重命名一个分支,即使目标已存在" |
| |
| #: builtin/branch.c:837 |
| msgid "list branch names" |
| msgstr "列出分支名" |
| |
| #: builtin/branch.c:838 |
| msgid "create the branch's reflog" |
| msgstr "创建分支的引用日志" |
| |
| #: builtin/branch.c:840 |
| msgid "edit the description for the branch" |
| msgstr "标记分支的描述" |
| |
| #: builtin/branch.c:841 |
| msgid "force creation (when already exists)" |
| msgstr "强制创建(当已经存在)" |
| |
| #: builtin/branch.c:844 |
| msgid "print only not merged branches" |
| msgstr "只打印没有合并的分支" |
| |
| #: builtin/branch.c:850 |
| msgid "print only merged branches" |
| msgstr "只打印合并的分支" |
| |
| #: builtin/branch.c:854 |
| msgid "list branches in columns" |
| msgstr "以列的方式显示分支" |
| |
| #: builtin/branch.c:867 |
| msgid "Failed to resolve HEAD as a valid ref." |
| msgstr "无法将 HEAD 解析为有效引用。" |
| |
| #: builtin/branch.c:872 builtin/clone.c:635 |
| msgid "HEAD not found below refs/heads!" |
| msgstr "HEAD 没有位于 /refs/heads 之下!" |
| |
| #: builtin/branch.c:896 |
| msgid "--column and --verbose are incompatible" |
| msgstr "--column 和 --verbose 不兼容" |
| |
| #: builtin/branch.c:902 builtin/branch.c:941 |
| msgid "branch name required" |
| msgstr "必须提供分支名" |
| |
| #: builtin/branch.c:917 |
| msgid "Cannot give description to detached HEAD" |
| msgstr "不能向分离头指针提供描述" |
| |
| #: builtin/branch.c:922 |
| msgid "cannot edit description of more than one branch" |
| msgstr "不能为一个以上的分支编辑描述" |
| |
| #: builtin/branch.c:929 |
| #, c-format |
| msgid "No commit on branch '%s' yet." |
| msgstr "分支 '%s' 尚无提交。" |
| |
| #: builtin/branch.c:932 |
| #, c-format |
| msgid "No branch named '%s'." |
| msgstr "没有分支 '%s'。" |
| |
| #: builtin/branch.c:947 |
| msgid "too many branches for a rename operation" |
| msgstr "为重命名操作提供了太多的分支名" |
| |
| #: builtin/branch.c:952 |
| msgid "too many branches to set new upstream" |
| msgstr "为设置新上游提供了太多的分支名" |
| |
| #: builtin/branch.c:956 |
| #, c-format |
| msgid "" |
| "could not set upstream of HEAD to %s when it does not point to any branch." |
| msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" |
| |
| #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 |
| #, c-format |
| msgid "no such branch '%s'" |
| msgstr "没有此分支 '%s'" |
| |
| #: builtin/branch.c:963 |
| #, c-format |
| msgid "branch '%s' does not exist" |
| msgstr "分支 '%s' 不存在" |
| |
| #: builtin/branch.c:975 |
| msgid "too many branches to unset upstream" |
| msgstr "为取消上游设置操作提供了太多的分支名" |
| |
| #: builtin/branch.c:979 |
| msgid "could not unset upstream of HEAD when it does not point to any branch." |
| msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" |
| |
| #: builtin/branch.c:985 |
| #, c-format |
| msgid "Branch '%s' has no upstream information" |
| msgstr "分支 '%s' 没有上游信息" |
| |
| #: builtin/branch.c:999 |
| msgid "it does not make sense to create 'HEAD' manually" |
| msgstr "手工创建 'HEAD' 没有意义" |
| |
| #: builtin/branch.c:1005 |
| msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
| msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" |
| |
| #: builtin/branch.c:1008 |
| #, c-format |
| msgid "" |
| "The --set-upstream flag is deprecated and will be removed. Consider using --" |
| "track or --set-upstream-to\n" |
| msgstr "" |
| "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
| |
| #: builtin/branch.c:1025 |
| #, c-format |
| msgid "" |
| "\n" |
| "If you wanted to make '%s' track '%s', do this:\n" |
| "\n" |
| msgstr "" |
| "\n" |
| "如果你想用 '%s' 跟踪 '%s', 这么做:\n" |
| "\n" |
| |
| #: builtin/branch.c:1026 |
| #, c-format |
| msgid " git branch -d %s\n" |
| msgstr " git branch -d %s\n" |
| |
| #: builtin/branch.c:1027 |
| #, c-format |
| msgid " git branch --set-upstream-to %s\n" |
| msgstr " git branch --set-upstream-to %s\n" |
| |
| #: 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:331 |
| msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" |
| msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" |
| |
| #: builtin/cat-file.c:332 |
| msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" |
| msgstr "git cat-file (--batch|--batch-check) < <对象列表>" |
| |
| #: builtin/cat-file.c:369 |
| msgid "<type> can be one of: blob, tree, commit, tag" |
| msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
| |
| #: builtin/cat-file.c:370 |
| msgid "show object type" |
| msgstr "显示对象类型" |
| |
| #: builtin/cat-file.c:371 |
| msgid "show object size" |
| msgstr "显示对象大小" |
| |
| #: builtin/cat-file.c:373 |
| msgid "exit with zero when there's no error" |
| msgstr "当没有错误时退出并返回零" |
| |
| #: builtin/cat-file.c:374 |
| msgid "pretty-print object's content" |
| msgstr "美观地打印对象的内容" |
| |
| #: builtin/cat-file.c:376 |
| msgid "for blob objects, run textconv on object's content" |
| msgstr "对于数据(blob)对象,对其内容执行 textconv" |
| |
| #: builtin/cat-file.c:378 |
| msgid "show info and content of objects fed from the standard input" |
| msgstr "显示从标准输入提供的对象的信息和内容" |
| |
| #: builtin/cat-file.c:381 |
| 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 "git check-attr [-a | --all | attr...] [--] 路径名..." |
| |
| #: builtin/check-attr.c:12 |
| msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" |
| msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" |
| |
| #: 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 "只使用索引中的 .gitattributes" |
| |
| #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 |
| msgid "read file names from stdin" |
| msgstr "从标准输入读出文件名" |
| |
| #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
| msgid "terminate input and output records by a NUL character" |
| msgstr "输入和输出的记录使用 NUL 字符终结" |
| |
| #: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271 |
| msgid "suppress progress reporting" |
| msgstr "不显示进度报告" |
| |
| #: builtin/check-ignore.c:26 |
| msgid "show non-matching input paths" |
| msgstr "显示未匹配的输入路径" |
| |
| #: builtin/check-ignore.c:28 |
| msgid "ignore index when checking" |
| msgstr "检查时忽略索引" |
| |
| #: builtin/check-ignore.c:154 |
| msgid "cannot specify pathnames with --stdin" |
| msgstr "不能同时提供路径及 --stdin 参数" |
| |
| #: builtin/check-ignore.c:157 |
| msgid "-z only makes sense with --stdin" |
| msgstr "-z 需要和 --stdin 参数共用才有意义" |
| |
| #: builtin/check-ignore.c:159 |
| msgid "no path specified" |
| msgstr "未指定路径" |
| |
| #: builtin/check-ignore.c:163 |
| msgid "--quiet is only valid with a single pathname" |
| msgstr "参数 --quiet 只在提供一个路径名时有效" |
| |
| #: builtin/check-ignore.c:165 |
| msgid "cannot have both --quiet and --verbose" |
| msgstr "不能同时提供 --quiet 和 --verbose 参数" |
| |
| #: builtin/check-ignore.c:168 |
| msgid "--non-matching is only valid with --verbose" |
| msgstr "--non-matching 选项只在使用 --verbose 时有效" |
| |
| #: builtin/check-mailmap.c:8 |
| msgid "git check-mailmap [options] <contact>..." |
| msgstr "git check-mailmap [选项] <联系地址>..." |
| |
| #: builtin/check-mailmap.c:13 |
| msgid "also read contacts from stdin" |
| msgstr "还从标准输入读取联系地址" |
| |
| #: builtin/check-mailmap.c:24 |
| #, c-format |
| msgid "unable to parse contact: %s" |
| msgstr "不能解析联系地址:%s" |
| |
| #: builtin/check-mailmap.c:47 |
| msgid "no contacts specified" |
| msgstr "未指定联系地址" |
| |
| #: builtin/checkout-index.c:126 |
| msgid "git checkout-index [options] [--] [<file>...]" |
| msgstr "git checkout-index [选项] [--] [<文件>...]" |
| |
| #: 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 |
| msgid "don't checkout new files" |
| msgstr "不检出新文件" |
| |
| #: builtin/checkout-index.c:194 |
| msgid "update stat information in the index file" |
| msgstr "更新索引中文件的状态信息" |
| |
| #: builtin/checkout-index.c:200 |
| msgid "read list of paths from the standard input" |
| msgstr "从标准输入读取路径列表" |
| |
| #: 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 |
| msgid "git checkout [options] <branch>" |
| msgstr "git checkout [选项] <分支>" |
| |
| #: builtin/checkout.c:26 |
| msgid "git checkout [options] [<branch>] -- <file>..." |
| msgstr "git checkout [选项] [<分支>] -- <文件>..." |
| |
| #: 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:232 builtin/checkout.c:235 builtin/checkout.c:238 |
| #: builtin/checkout.c:241 |
| #, c-format |
| msgid "'%s' cannot be used with updating paths" |
| msgstr "'%s' 不能在更新路径时使用" |
| |
| #: builtin/checkout.c:244 builtin/checkout.c:247 |
| #, c-format |
| msgid "'%s' cannot be used with %s" |
| msgstr "'%s' 不能和 %s 同时使用" |
| |
| #: builtin/checkout.c:250 |
| #, c-format |
| msgid "Cannot update paths and switch to branch '%s' at the same time." |
| msgstr "不能同时更新路径并切换到分支'%s'。" |
| |
| #: builtin/checkout.c:261 builtin/checkout.c:450 |
| msgid "corrupt index file" |
| msgstr "损坏的索引文件" |
| |
| #: builtin/checkout.c:321 builtin/checkout.c:328 |
| #, c-format |
| msgid "path '%s' is unmerged" |
| msgstr "路径 '%s' 未合并" |
| |
| #: builtin/checkout.c:472 |
| msgid "you need to resolve your current index first" |
| msgstr "您需要先解决当前索引的冲突" |
| |
| #: builtin/checkout.c:593 |
| #, c-format |
| msgid "Can not do reflog for '%s'\n" |
| msgstr "不能对 '%s' 执行 reflog 操作\n" |
| |
| #: builtin/checkout.c:631 |
| msgid "HEAD is now at" |
| msgstr "HEAD 目前位于" |
| |
| #: builtin/checkout.c:638 |
| #, c-format |
| msgid "Reset branch '%s'\n" |
| msgstr "重置分支 '%s'\n" |
| |
| #: builtin/checkout.c:641 |
| #, c-format |
| msgid "Already on '%s'\n" |
| msgstr "已经位于 '%s'\n" |
| |
| #: builtin/checkout.c:645 |
| #, c-format |
| msgid "Switched to and reset branch '%s'\n" |
| msgstr "切换并重置分支 '%s'\n" |
| |
| #: builtin/checkout.c:647 builtin/checkout.c:1032 |
| #, c-format |
| msgid "Switched to a new branch '%s'\n" |
| msgstr "切换到一个新分支 '%s'\n" |
| |
| #: builtin/checkout.c:649 |
| #, c-format |
| msgid "Switched to branch '%s'\n" |
| msgstr "切换到分支 '%s'\n" |
| |
| # 译者:注意保持前导空格 |
| #: builtin/checkout.c:705 |
| #, c-format |
| msgid " ... and %d more.\n" |
| msgstr " ... 及其它 %d 个。\n" |
| |
| #: builtin/checkout.c:711 |
| #, 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:729 |
| #, 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:759 |
| msgid "internal error in revision walk" |
| msgstr "在版本遍历时遇到内部错误" |
| |
| #: builtin/checkout.c:763 |
| msgid "Previous HEAD position was" |
| msgstr "之前的 HEAD 位置是" |
| |
| #: builtin/checkout.c:790 builtin/checkout.c:1027 |
| msgid "You are on a branch yet to be born" |
| msgstr "您位于一个尚未初始化的分支" |
| |
| #: builtin/checkout.c:934 |
| #, c-format |
| msgid "only one reference expected, %d given." |
| msgstr "只要一个引用,却给出了 %d 个" |
| |
| #: builtin/checkout.c:973 |
| #, c-format |
| msgid "invalid reference: %s" |
| msgstr "无效引用:%s" |
| |
| #: builtin/checkout.c:1002 |
| #, c-format |
| msgid "reference is not a tree: %s" |
| msgstr "引用不是一个树:%s" |
| |
| #: builtin/checkout.c:1041 |
| msgid "paths cannot be used with switching branches" |
| msgstr "路径不能和切换分支同时使用" |
| |
| #: builtin/checkout.c:1044 builtin/checkout.c:1048 |
| #, c-format |
| msgid "'%s' cannot be used with switching branches" |
| msgstr "'%s' 不能和切换分支同时使用" |
| |
| #: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 |
| #: builtin/checkout.c:1063 |
| #, c-format |
| msgid "'%s' cannot be used with '%s'" |
| msgstr "'%s' 不能和 '%s' 同时使用" |
| |
| #: builtin/checkout.c:1068 |
| #, c-format |
| msgid "Cannot switch branch to a non-commit '%s'" |
| msgstr "不能切换分支到一个非提交 '%s'" |
| |
| #: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88 |
| #: builtin/remote.c:159 builtin/remote.c:161 |
| msgid "branch" |
| msgstr "分支" |
| |
| #: builtin/checkout.c:1091 |
| msgid "create and checkout a new branch" |
| msgstr "创建并检出一个新的分支" |
| |
| #: builtin/checkout.c:1093 |
| msgid "create/reset and checkout a branch" |
| msgstr "创建/重置并检出一个分支" |
| |
| #: builtin/checkout.c:1094 |
| msgid "create reflog for new branch" |
| msgstr "为新的分支创建引用日志" |
| |
| #: builtin/checkout.c:1095 |
| msgid "detach the HEAD at named commit" |
| msgstr "成为指向该提交的分离头指针" |
| |
| #: builtin/checkout.c:1096 |
| msgid "set upstream info for new branch" |
| msgstr "为新的分支设置上游信息" |
| |
| #: builtin/checkout.c:1098 |
| msgid "new-branch" |
| msgstr "新分支" |
| |
| #: builtin/checkout.c:1098 |
| msgid "new unparented branch" |
| msgstr "新的没有父提交的分支" |
| |
| #: builtin/checkout.c:1099 |
| msgid "checkout our version for unmerged files" |
| msgstr "对尚未合并的文件检出我们的版本" |
| |
| #: builtin/checkout.c:1101 |
| msgid "checkout their version for unmerged files" |
| msgstr "对尚未合并的文件检出他们的版本" |
| |
| #: builtin/checkout.c:1103 |
| msgid "force checkout (throw away local modifications)" |
| msgstr "强制检出(丢弃本地修改)" |
| |
| #: builtin/checkout.c:1104 |
| msgid "perform a 3-way merge with the new branch" |
| msgstr "和新的分支执行三路合并" |
| |
| #: builtin/checkout.c:1105 builtin/merge.c:225 |
| msgid "update ignored files (default)" |
| msgstr "更新忽略的文件(默认)" |
| |
| #: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245 |
| msgid "style" |
| msgstr "风格" |
| |
| #: builtin/checkout.c:1107 |
| msgid "conflict style (merge or diff3)" |
| msgstr "冲突输出风格(merge 或 diff3)" |
| |
| #: builtin/checkout.c:1110 |
| msgid "do not limit pathspecs to sparse entries only" |
| msgstr "对路径不做稀疏检出的限制" |
| |
| #: builtin/checkout.c:1112 |
| msgid "second guess 'git checkout no-such-branch'" |
| msgstr "再者猜测'git checkout no-such-branch'" |
| |
| #: builtin/checkout.c:1135 |
| msgid "-b, -B and --orphan are mutually exclusive" |
| msgstr "-b、-B 和 --orphan 是互斥的" |
| |
| #: builtin/checkout.c:1152 |
| msgid "--track needs a branch name" |
| msgstr "--track 需要一个分支名" |
| |
| #: builtin/checkout.c:1159 |
| msgid "Missing branch name; try -b" |
| msgstr "缺少分支名;尝试 -b" |
| |
| #: builtin/checkout.c:1196 |
| msgid "invalid path specification" |
| msgstr "无效的路径规格" |
| |
| #: builtin/checkout.c:1203 |
| #, 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 "" |
| "不能同时更新路径并切换到分支'%s'。\n" |
| "您是想要检出 '%s' 但其未能解析为提交么?" |
| |
| #: builtin/checkout.c:1208 |
| #, c-format |
| msgid "git checkout: --detach does not take a path argument '%s'" |
| msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
| |
| #: builtin/checkout.c:1212 |
| 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:26 |
| msgid "" |
| "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
| msgstr "" |
| "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." |
| |
| #: builtin/clean.c:30 |
| #, c-format |
| msgid "Removing %s\n" |
| msgstr "正删除 %s\n" |
| |
| #: builtin/clean.c:31 |
| #, c-format |
| msgid "Would remove %s\n" |
| msgstr "将删除 %s\n" |
| |
| #: builtin/clean.c:32 |
| #, c-format |
| msgid "Skipping repository %s\n" |
| msgstr "忽略版本库 %s\n" |
| |
| #: builtin/clean.c:33 |
| #, c-format |
| msgid "Would skip repository %s\n" |
| msgstr "将忽略版本库 %s\n" |
| |
| #: builtin/clean.c:34 |
| #, c-format |
| msgid "failed to remove %s" |
| msgstr "无法删除 %s" |
| |
| #: builtin/clean.c:295 |
| msgid "" |
| "Prompt help:\n" |
| "1 - select a numbered item\n" |
| "foo - select item based on unique prefix\n" |
| " - (empty) select nothing" |
| msgstr "" |
| "帮助:\n" |
| "1 - 通过编号选择一个选项\n" |
| "foo - 通过标题选择一个选项\n" |
| " - (空)什么也不选择" |
| |
| #: builtin/clean.c:299 |
| msgid "" |
| "Prompt help:\n" |
| "1 - select a single item\n" |
| "3-5 - select a range of items\n" |
| "2-3,6-9 - select multiple ranges\n" |
| "foo - select item based on unique prefix\n" |
| "-... - unselect specified items\n" |
| "* - choose all items\n" |
| " - (empty) finish selecting" |
| msgstr "" |
| "帮助:\n" |
| "1 - 选择一个选项\n" |
| "3-5 - 选择一个范围内的所有选项\n" |
| "2-3,6-9 - 选择多个范围内的所有选项\n" |
| "foo - 通过标题选择一个选项\n" |
| "-... - 反选特定的选项\n" |
| "* - 选择所有选项\n" |
| " - (空)结束选择" |
| |
| #: builtin/clean.c:517 |
| #, c-format |
| msgid "Huh (%s)?" |
| msgstr "嗯(%s)?" |
| |
| #: builtin/clean.c:660 |
| #, c-format |
| msgid "Input ignore patterns>> " |
| msgstr "输入模版以排除条目>> " |
| |
| #: builtin/clean.c:697 |
| #, c-format |
| msgid "WARNING: Cannot find items matched by: %s" |
| msgstr "警告:无法找到和 %s 匹配的条目" |
| |
| #: builtin/clean.c:718 |
| msgid "Select items to delete" |
| msgstr "选择要删除的条目" |
| |
| #: builtin/clean.c:758 |
| #, c-format |
| msgid "remove %s? " |
| msgstr "删除 %s?" |
| |
| #: builtin/clean.c:783 |
| msgid "Bye." |
| msgstr "再见。" |
| |
| #: builtin/clean.c:791 |
| msgid "" |
| "clean - start cleaning\n" |
| "filter by pattern - exclude items from deletion\n" |
| "select by numbers - select items to be deleted by numbers\n" |
| "ask each - confirm each deletion (like \"rm -i\")\n" |
| "quit - stop cleaning\n" |
| "help - this screen\n" |
| "? - help for prompt selection" |
| msgstr "" |
| "clean - 开始清理\n" |
| "filter by pattern - 通过模版排除要删除的条目\n" |
| "select by numbers - 通过数字选择要删除的条目\n" |
| "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" |
| "quit - 停止删除并退出\n" |
| "help - 显示本帮助\n" |
| "? - 显示如何在提示符下选择的帮助" |
| |
| #: builtin/clean.c:818 |
| msgid "*** Commands ***" |
| msgstr "*** 命令 ***" |
| |
| #: builtin/clean.c:819 |
| msgid "What now" |
| msgstr "请选择" |
| |
| #: builtin/clean.c:827 |
| msgid "Would remove the following item:" |
| msgid_plural "Would remove the following items:" |
| msgstr[0] "将删除如下条目:" |
| msgstr[1] "将删除如下条目:" |
| |
| #: builtin/clean.c:844 |
| msgid "No more files to clean, exiting." |
| msgstr "没有要清理的文件,退出。" |
| |
| #: builtin/clean.c:875 |
| msgid "do not print names of files removed" |
| msgstr "不打印删除文件的名称" |
| |
| #: builtin/clean.c:877 |
| msgid "force" |
| msgstr "强制" |
| |
| #: builtin/clean.c:878 |
| msgid "interactive cleaning" |
| msgstr "交互式清除" |
| |
| #: builtin/clean.c:880 |
| msgid "remove whole directories" |
| msgstr "删除整个目录" |
| |
| #: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716 |
| #: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185 |
| msgid "pattern" |
| msgstr "模式" |
| |
| #: builtin/clean.c:882 |
| msgid "add <pattern> to ignore rules" |
| msgstr "添加<模式>到忽略规则" |
| |
| #: builtin/clean.c:883 |
| msgid "remove ignored files, too" |
| msgstr "也删除忽略的文件" |
| |
| #: builtin/clean.c:885 |
| msgid "remove only ignored files" |
| msgstr "只删除忽略的文件" |
| |
| #: builtin/clean.c:903 |
| msgid "-x and -X cannot be used together" |
| msgstr "-x 和 -X 不能同时使用" |
| |
| #: builtin/clean.c:907 |
| msgid "" |
| "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
| "clean" |
| msgstr "" |
| "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
| |
| #: builtin/clean.c:910 |
| msgid "" |
| "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
| "refusing to clean" |
| msgstr "" |
| "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
| |
| #: builtin/clone.c:36 |
| msgid "git clone [options] [--] <repo> [<dir>]" |
| msgstr "git clone [选项] [--] <版本库> [<路径>]" |
| |
| #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 |
| #: builtin/push.c:504 |
| 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:486 |
| msgid "create a bare repository" |
| msgstr "创建一个裸版本库" |
| |
| #: builtin/clone.c:71 |
| msgid "create a mirror repository (implies bare)" |
| msgstr "创建一个镜像版本库(也是裸版本库)" |
| |
| #: builtin/clone.c:73 |
| msgid "to clone from a local repository" |
| msgstr "从本地版本库克隆" |
| |
| #: builtin/clone.c:75 |
| msgid "don't use local hardlinks, always copy" |
| msgstr "不使用本地硬链接,始终复制" |
| |
| #: builtin/clone.c:77 |
| msgid "setup as shared repository" |
| msgstr "设置为共享版本库" |
| |
| #: builtin/clone.c:79 builtin/clone.c:81 |
| msgid "initialize submodules in the clone" |
| msgstr "在克隆时初始化子模组" |
| |
| #: builtin/clone.c:82 builtin/init-db.c:483 |
| msgid "template-directory" |
| msgstr "模板目录" |
| |
| #: builtin/clone.c:83 builtin/init-db.c:484 |
| msgid "directory from which templates will be used" |
| msgstr "模板目录将被使用" |
| |
| #: builtin/clone.c:85 |
| msgid "reference repository" |
| msgstr "参考版本库" |
| |
| #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 |
| msgid "name" |
| msgstr "名称" |
| |
| #: builtin/clone.c:87 |
| msgid "use <name> instead of 'origin' to track upstream" |
| msgstr "使用<名称>而不是 'origin' 去跟踪上游" |
| |
| #: builtin/clone.c:89 |
| msgid "checkout <branch> instead of the remote's HEAD" |
| msgstr "检出<分支>而不是远程HEAD" |
| |
| #: builtin/clone.c:91 |
| msgid "path to git-upload-pack on the remote" |
| msgstr "远程 git-upload-pack 路径" |
| |
| #: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661 |
| msgid "depth" |
| msgstr "深度" |
| |
| #: builtin/clone.c:93 |
| msgid "create a shallow clone of that depth" |
| msgstr "创建一个指定深度的浅克隆" |
| |
| #: builtin/clone.c:95 |
| msgid "clone only one branch, HEAD or --branch" |
| msgstr "只克隆一个分支、HEAD 或 --branch" |
| |
| #: builtin/clone.c:96 builtin/init-db.c:492 |
| msgid "gitdir" |
| msgstr "git目录" |
| |
| #: builtin/clone.c:97 builtin/init-db.c:493 |
| msgid "separate git dir from working tree" |
| msgstr "git目录和工作区分离" |
| |
| #: builtin/clone.c:98 |
| msgid "key=value" |
| msgstr "key=value" |
| |
| #: builtin/clone.c:99 |
| msgid "set config inside the new repository" |
| msgstr "在新版本库中设置配置信息" |
| |
| #: builtin/clone.c:252 |
| #, c-format |
| msgid "reference repository '%s' is not a local repository." |
| msgstr "参考版本库 '%s' 不是一个本地版本库。" |
| |
| #: builtin/clone.c:256 |
| #, c-format |
| msgid "reference repository '%s' is shallow" |
| msgstr "参考版本库 '%s' 是一个浅克隆" |
| |
| #: builtin/clone.c:259 |
| #, c-format |
| msgid "reference repository '%s' is grafted" |
| msgstr "参考版本库 '%s' 已被嫁接" |
| |
| #: builtin/clone.c:321 |
| #, c-format |
| msgid "failed to create directory '%s'" |
| msgstr "无法创建目录 '%s'" |
| |
| #: builtin/clone.c:323 builtin/diff.c:83 |
| #, c-format |
| msgid "failed to stat '%s'" |
| msgstr "无法枚举 '%s' 状态" |
| |
| #: builtin/clone.c:325 |
| #, c-format |
| msgid "%s exists and is not a directory" |
| msgstr "%s 存在且不是一个目录" |
| |
| #: builtin/clone.c:339 |
| #, c-format |
| msgid "failed to stat %s\n" |
| msgstr "无法枚举 %s 状态\n" |
| |
| #: builtin/clone.c:361 |
| #, c-format |
| msgid "failed to create link '%s'" |
| msgstr "无法创建链接 '%s'" |
| |
| #: builtin/clone.c:365 |
| #, c-format |
| msgid "failed to copy file to '%s'" |
| msgstr "无法拷贝文件至 '%s'" |
| |
| #: builtin/clone.c:388 builtin/clone.c:565 |
| #, c-format |
| msgid "done.\n" |
| msgstr "完成。\n" |
| |
| #: builtin/clone.c:401 |
| msgid "" |
| "Clone succeeded, but checkout failed.\n" |
| "You can inspect what was checked out with 'git status'\n" |
| "and retry the checkout with 'git checkout -f HEAD'\n" |
| msgstr "" |
| "克隆成功,但是检出失败。\n" |
| "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" |
| "'git checkout -f HEAD' 重试\n" |
| |
| #: builtin/clone.c:480 |
| #, c-format |
| msgid "Could not find remote branch %s to clone." |
| msgstr "不能发现要克隆的远程分支 %s。" |
| |
| #: builtin/clone.c:560 |
| #, c-format |
| msgid "Checking connectivity... " |
| msgstr "检查连接... " |
| |
| #: builtin/clone.c:563 |
| msgid "remote did not send all necessary objects" |
| msgstr "远程没有发送所有必须的对象" |
| |
| #: builtin/clone.c:626 |
| msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
| msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" |
| |
| #: builtin/clone.c:657 |
| msgid "unable to checkout working tree" |
| msgstr "不能检出工作区" |
| |
| #: builtin/clone.c:765 |
| msgid "Too many arguments." |
| msgstr "太多参数。" |
| |
| #: builtin/clone.c:769 |
| msgid "You must specify a repository to clone." |
| msgstr "您必须指定一个版本库来克隆。" |
| |
| #: builtin/clone.c:780 |
| #, c-format |
| msgid "--bare and --origin %s options are incompatible." |
| msgstr "--bare 和 --origin %s 选项不兼容。" |
| |
| #: builtin/clone.c:783 |
| msgid "--bare and --separate-git-dir are incompatible." |
| msgstr "--bare 和 --separate-git-dir 选项不兼容。" |
| |
| #: builtin/clone.c:796 |
| #, c-format |
| msgid "repository '%s' does not exist" |
| msgstr "版本库 '%s' 不存在" |
| |
| #: builtin/clone.c:802 |
| msgid "--depth is ignored in local clones; use file:// instead." |
| msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" |
| |
| #: builtin/clone.c:805 |
| msgid "source repository is shallow, ignoring --local" |
| msgstr "源版本库是浅克隆,忽略 --local" |
| |
| #: builtin/clone.c:810 |
| msgid "--local is ignored" |
| msgstr "--local 被忽略" |
| |
| #: builtin/clone.c:814 builtin/fetch.c:1119 |
| #, c-format |
| msgid "depth %s is not a positive number" |
| msgstr "深度 %s 不是一个正数" |
| |
| #: builtin/clone.c:824 |
| #, c-format |
| msgid "destination path '%s' already exists and is not an empty directory." |
| msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
| |
| #: builtin/clone.c:834 |
| #, c-format |
| msgid "working tree '%s' already exists." |
| msgstr "工作区 '%s' 已经存在。" |
| |
| #: builtin/clone.c:847 builtin/clone.c:859 |
| #, c-format |
| msgid "could not create leading directories of '%s'" |
| msgstr "不能为 '%s' 创建先导目录" |
| |
| #: builtin/clone.c:850 |
| #, c-format |
| msgid "could not create work tree dir '%s'." |
| msgstr "不能为 '%s' 创建工作区目录。" |
| |
| #: builtin/clone.c:869 |
| #, c-format |
| msgid "Cloning into bare repository '%s'...\n" |
| msgstr "克隆到裸版本库 '%s'...\n" |
| |
| #: builtin/clone.c:871 |
| #, c-format |
| msgid "Cloning into '%s'...\n" |
| msgstr "正克隆到 '%s'...\n" |
| |
| #: builtin/clone.c:906 |
| #, c-format |
| msgid "Don't know how to clone %s" |
| msgstr "不知道如何克隆 %s" |
| |
| #: builtin/clone.c:957 builtin/clone.c:965 |
| #, c-format |
| msgid "Remote branch %s not found in upstream %s" |
| msgstr "远程分支 %s 在上游 %s 未发现" |
| |
| #: builtin/clone.c:968 |
| msgid "You appear to have cloned an empty repository." |
| msgstr "您似乎克隆了一个空版本库。" |
| |
| #: builtin/column.c:9 |
| msgid "git column [options]" |
| msgstr "git column [选项]" |
| |
| #: builtin/column.c:26 |
| msgid "lookup config vars" |
| msgstr "查找配置变量" |
| |
| #: builtin/column.c:27 builtin/column.c:28 |
| 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:36 |
| msgid "git commit [options] [--] <pathspec>..." |
| msgstr "git commit [选项] [--] <路径规则>..." |
| |
| #: builtin/commit.c:41 |
| msgid "git status [options] [--] <pathspec>..." |
| msgstr "git status [选项] [--] <路径规则>..." |
| |
| #: builtin/commit.c:46 |
| 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:58 |
| 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:63 |
| 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" |
| msgstr "" |
| "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
| "也要提交,使用命令:\n" |
| "\n" |
| " git commit --allow-empty\n" |
| "\n" |
| |
| #: builtin/commit.c:70 |
| msgid "Otherwise, please use 'git reset'\n" |
| msgstr "否则,请使用命令 'git reset'\n" |
| |
| #: builtin/commit.c:73 |
| msgid "" |
| "If you wish to skip this commit, use:\n" |
| "\n" |
| " git reset\n" |
| "\n" |
| "Then \"git cherry-pick --continue\" will resume cherry-picking\n" |
| "the remaining commits.\n" |
| msgstr "" |
| "如果您想跳过这个提交,使用命令:\n" |
| "\n" |
| " git reset\n" |
| "\n" |
| "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" |
| "操作。\n" |
| |
| #: builtin/commit.c:288 |
| msgid "failed to unpack HEAD tree object" |
| msgstr "无法解包 HEAD 树对象" |
| |
| #: builtin/commit.c:330 |
| msgid "unable to create temporary index" |
| msgstr "不能创建临时索引" |
| |
| #: builtin/commit.c:336 |
| msgid "interactive add failed" |
| msgstr "交互式添加失败" |
| |
| #: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440 |
| msgid "unable to write new_index file" |
| msgstr "无法写 new_index 文件" |
| |
| #: builtin/commit.c:421 |
| msgid "cannot do a partial commit during a merge." |
| msgstr "在合并过程中不能做部分提交。" |
| |
| #: builtin/commit.c:423 |
| msgid "cannot do a partial commit during a cherry-pick." |
| msgstr "在拣选过程中不能做部分提交。" |
| |
| #: builtin/commit.c:433 |
| msgid "cannot read the index" |
| msgstr "无法读取索引" |
| |
| #: builtin/commit.c:453 |
| msgid "unable to write temporary index file" |
| msgstr "无法写临时索引文件" |
| |
| #: builtin/commit.c:544 builtin/commit.c:550 |
| #, c-format |
| msgid "invalid commit: %s" |
| msgstr "无效的提交:%s" |
| |
| #: builtin/commit.c:572 |
| msgid "malformed --author parameter" |
| msgstr "非法的 --author 参数" |
| |
| #: builtin/commit.c:592 |
| #, c-format |
| msgid "Malformed ident string: '%s'" |
| msgstr "非法的身份字符串:'%s'" |
| |
| #: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014 |
| #, c-format |
| msgid "could not lookup commit %s" |
| msgstr "不能查询提交 %s" |
| |
| #: builtin/commit.c:641 builtin/shortlog.c:273 |
| #, c-format |
| msgid "(reading log message from standard input)\n" |
| msgstr "(正从标准输入中读取日志信息)\n" |
| |
| #: builtin/commit.c:643 |
| msgid "could not read log from standard input" |
| msgstr "不能从标准输入中读取日志信息" |
| |
| #: builtin/commit.c:647 |
| #, c-format |
| msgid "could not read log file '%s'" |
| msgstr "不能读取日志文件 '%s'" |
| |
| #: builtin/commit.c:654 |
| msgid "commit has empty message" |
| msgstr "提交说明为空" |
| |
| #: builtin/commit.c:670 |
| msgid "could not read MERGE_MSG" |
| msgstr "不能读取 MERGE_MSG" |
| |
|