Created
October 28, 2014 03:00
-
-
Save jiangxin/25f861f83cc66f15a1a7 to your computer and use it in GitHub Desktop.
Git l10n for zh_CN patches
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit a5ff85ac19f2abe9a172d13658a04caf06062257 | |
| Author: Jiang Xin <worldhello.net@gmail.com> | |
| Date: Wed Oct 8 10:55:14 2014 +0800 | |
| Draft: l10n: zh_CN: translations for git v2.2.0 | |
| Translations for git v2.2.0. Also changed the translation of | |
| bare (repository). | |
| Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | |
| diff --git a/po/zh_CN.po b/po/zh_CN.po | |
| index 7cb670e..d5c8bd3 100644 | |
| --- a/po/zh_CN.po | |
| +++ b/po/zh_CN.po | |
| @@ -2,8 +2,8 @@ msgid "" | |
| msgstr "" | |
| "Project-Id-Version: Git\n" | |
| "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
| -"POT-Creation-Date: 2014-08-04 14:48+0800\n" | |
| -"PO-Revision-Date: 2014-08-04 16:16+0800\n" | |
| +"POT-Creation-Date: 2014-10-22 16:02+0800\n" | |
| +"PO-Revision-Date: 2014-10-28 10:35+0800\n" | |
| "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" | |
| "Language-Team: GitHub <https://github.com/gotgit/git/>\n" | |
| "Language: zh_CN\n" | |
| @@ -17,11 +17,10 @@ msgstr "提示：%.*s\n" | |
| msgid "" | |
| "Fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
| -"as appropriate to mark resolution and make a commit, or use\n" | |
| -"'git commit -a'." | |
| +"as appropriate to mark resolution and make a commit." | |
| msgstr "" | |
| "请在工作区改正文件，然后酌情使用 'git add/rm <file>' 命令标记\n" | |
| -"解决方案并提交，或者使用 'git commit -a'。" | |
| +"解决方案并提交。" | |
| msgid "git archive [options] <tree-ish> [<path>...]" | |
| msgstr "git archive [选项] <树或提交> [<路径>...]" | |
| @@ -166,12 +165,6 @@ msgstr "歧义的对象名：'%s'。" | |
| msgid "Not a valid branch point: '%s'." | |
| msgstr "无效的分支点：'%s'。" | |
| -msgid "Failed to lock ref for update" | |
| -msgstr "无法为更新锁定引用" | |
| - | |
| -msgid "Failed to write ref" | |
| -msgstr "不能写引用" | |
| - | |
| msgid "'%s' does not look like a v2 bundle file" | |
| msgstr "'%s' 不像是一个 v2 版本的包文件" | |
| @@ -224,6 +217,9 @@ msgstr "不能创建 '%s'" | |
| msgid "index-pack died" | |
| msgstr "index-pack 终止" | |
| +msgid "invalid color value: %.*s" | |
| +msgstr "无效的颜色值：%.*s" | |
| + | |
| msgid "could not parse %s" | |
| msgstr "不能解析 %s" | |
| @@ -233,6 +229,39 @@ msgstr "%s %s 不是一个提交!" | |
| msgid "memory exhausted" | |
| msgstr "内存耗尽" | |
| +msgid "bad config file line %d in %s" | |
| +msgstr "错误的配置文件 %2$s，出错于第 %1$d 行" | |
| + | |
| +msgid "bad numeric config value '%s' for '%s' in %s: %s" | |
| +msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s" | |
| + | |
| +msgid "bad numeric config value '%s' for '%s': %s" | |
| +msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
| + | |
| +msgid "failed to expand user dir in: '%s'" | |
| +msgstr "无法扩展 '%s' 中的用户目录" | |
| + | |
| +msgid "bad zlib compression level %d" | |
| +msgstr "错误的 zlib 压缩级别 %d" | |
| + | |
| +msgid "invalid mode for object creation: %s" | |
| +msgstr "无效的对象创建模式：%s" | |
| + | |
| +msgid "unable to parse command-line config" | |
| +msgstr "无法解析命令行配置" | |
| + | |
| +msgid "unknown error occured while reading the configuration files" | |
| +msgstr "在读取配置文件时遇到未知错误" | |
| + | |
| +msgid "unable to parse '%s' from command-line config" | |
| +msgstr "无法解析命令行配置中的 '%s'" | |
| + | |
| +msgid "bad config variable '%s' in file '%s' at line %d" | |
| +msgstr "错误的配置变量 '%s' 位于文件 '%s' 第 %d 行" | |
| + | |
| +msgid "%s has multiple values" | |
| +msgstr "%s 有多个取值" | |
| + | |
| msgid "Could not run 'git rev-list'" | |
| msgstr "不能执行 'git rev-list'" | |
| @@ -400,6 +429,12 @@ msgstr[1] "" | |
| msgid "%s: %s - %s" | |
| msgstr "%s：%s - %s" | |
| +msgid "BUG: reopen a lockfile that is still open" | |
| +msgstr "BUG: 重新打开一个仍打开着的锁文件" | |
| + | |
| +msgid "BUG: reopen a lockfile that has been committed" | |
| +msgstr "BUG: 重新打开一个已提交的锁文件" | |
| + | |
| msgid "failed to read the cache" | |
| msgstr "无法读取缓存" | |
| @@ -647,6 +682,9 @@ msgstr "" | |
| "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
| "添加 ':/' 或 '.' ？" | |
| +msgid "unable to parse --pretty format" | |
| +msgstr "不能解析 --pretty 格式" | |
| + | |
| msgid "done" | |
| msgstr "完成" | |
| @@ -724,6 +762,12 @@ msgstr "不能打开 /dev/null" | |
| msgid "dup2(%d,%d) failed" | |
| msgstr "不能调用 dup2(%d,%d)" | |
| +msgid "failed to sign the push certificate" | |
| +msgstr "无法为推送证书签名" | |
| + | |
| +msgid "the receiving end does not support --signed push" | |
| +msgstr "接收端不支持签名推送" | |
| + | |
| msgid "Could not open '%s' for writing" | |
| msgstr "不能为写入打开 '%s'" | |
| @@ -760,9 +804,6 @@ msgstr "您的本地修改将被还原操作覆盖。" | |
| msgid "Commit your changes or stash them to proceed." | |
| msgstr "提交您的修改或保存进度后再继续。" | |
| -msgid "Failed to lock HEAD during fast_forward_to" | |
| -msgstr "在快进时无法为 HEAD 加锁" | |
| - | |
| msgid "%s: Unable to write new index file" | |
| msgstr "%s：无法写入新索引文件" | |
| @@ -939,6 +980,21 @@ msgstr "不能创建 git link %s" | |
| msgid "Could not set core.worktree in %s" | |
| msgstr "不能在 %s 中设置 core.worktree" | |
| +msgid "unknown value '%s' for key '%s'" | |
| +msgstr "键 '%2$s' 的取值 '%1$s' 错误" | |
| + | |
| +msgid "more than one %s" | |
| +msgstr "多于一个 %s" | |
| + | |
| +msgid "empty trailer token in trailer '%s'" | |
| +msgstr "签名 '%s' 的键为空" | |
| + | |
| +msgid "could not read input file '%s'" | |
| +msgstr "不能读取输入文件 '%s'" | |
| + | |
| +msgid "could not read from stdin" | |
| +msgstr "不能自标准输入读取" | |
| + | |
| msgid "Checking out files" | |
| msgstr "正在检出文件" | |
| @@ -975,6 +1031,9 @@ msgstr "无法在口令文件中查询到当前用户：%s" | |
| msgid "no such user" | |
| msgstr "无此用户" | |
| +msgid "unable to get current working directory" | |
| +msgstr "不能获取当前工作目录" | |
| + | |
| msgid "Unmerged paths:" | |
| msgstr "未合并的路径：" | |
| @@ -2557,10 +2616,10 @@ msgid "don't create a checkout" | |
| msgstr "不创建一个检出" | |
| msgid "create a bare repository" | |
| -msgstr "创建一个裸版本库" | |
| +msgstr "创建一个纯版本库" | |
| msgid "create a mirror repository (implies bare)" | |
| -msgstr "创建一个镜像版本库（也是裸版本库）" | |
| +msgstr "创建一个镜像版本库（也是纯版本库）" | |
| msgid "to clone from a local repository" | |
| msgstr "从本地版本库克隆" | |
| @@ -2701,7 +2760,7 @@ msgid "could not create work tree dir '%s'." | |
| msgstr "不能为 '%s' 创建工作区目录。" | |
| msgid "Cloning into bare repository '%s'...\n" | |
| -msgstr "克隆到裸版本库 '%s'...\n" | |
| +msgstr "克隆到纯版本库 '%s'...\n" | |
| msgid "Cloning into '%s'...\n" | |
| msgstr "正克隆到 '%s'...\n" | |
| @@ -2757,6 +2816,29 @@ msgstr "git status [选项] [--] <路径规则>..." | |
| 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. Run the\n" | |
| +"following command and follow the instructions in your editor to edit\n" | |
| +"your configuration file:\n" | |
| +"\n" | |
| +" git config --global --edit\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" | |
| +"\n" | |
| +" git config --global --edit\n" | |
| +"\n" | |
| +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" | |
| +"\n" | |
| +" git commit --amend --reset-author\n" | |
| + | |
| +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" | |
| @@ -2767,7 +2849,7 @@ msgid "" | |
| " git commit --amend --reset-author\n" | |
| msgstr "" | |
| "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
| -"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n" | |
| +"与否。您可以对其进行设置以免再出现本提示信息：\n" | |
| "\n" | |
| " git config --global user.name \"Your Name\"\n" | |
| " git config --global user.email you@example.com\n" | |
| @@ -2824,6 +2906,15 @@ msgstr "不能创建临时索引" | |
| msgid "interactive add failed" | |
| msgstr "交互式添加失败" | |
| +msgid "unable to write index file" | |
| +msgstr "无法写入索引文件" | |
| + | |
| +msgid "unable to update temporary index" | |
| +msgstr "无法更新临时索引" | |
| + | |
| +msgid "Failed to update main cache tree" | |
| +msgstr "不能更新树的主缓存" | |
| + | |
| msgid "unable to write new_index file" | |
| msgstr "无法写 new_index 文件" | |
| @@ -2839,8 +2930,11 @@ msgstr "无法读取索引" | |
| msgid "unable to write temporary index file" | |
| msgstr "无法写临时索引文件" | |
| -msgid "invalid commit: %s" | |
| -msgstr "无效的提交：%s" | |
| +msgid "commit '%s' lacks author header" | |
| +msgstr "提交 '%s' 缺少作者信息" | |
| + | |
| +msgid "commit '%s' has malformed author line" | |
| +msgstr "提交 '%s' 有非法的作者信息" | |
| msgid "malformed --author parameter" | |
| msgstr "非法的 --author 参数" | |
| @@ -3165,15 +3259,9 @@ msgstr "终止提交因为提交说明为空。\n" | |
| msgid "failed to write commit object" | |
| msgstr "无法写提交对象" | |
| -msgid "cannot lock HEAD ref" | |
| -msgstr "无法锁定 HEAD 引用" | |
| - | |
| -msgid "cannot update HEAD ref" | |
| -msgstr "无法更新 HEAD 引用" | |
| - | |
| msgid "" | |
| "Repository has been updated, but unable to write\n" | |
| -"new_index file. Check that disk is not full or quota is\n" | |
| +"new_index file. Check that disk is not full and quota is\n" | |
| "not exceeded, and then \"git reset HEAD\" to recover." | |
| msgstr "" | |
| "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" | |
| @@ -3275,6 +3363,25 @@ msgstr "终止值是NUL字节" | |
| msgid "respect include directives on lookup" | |
| msgstr "查询时参照 include 指令递归查找" | |
| +msgid "unable to parse default color value" | |
| +msgstr "不能解析缺省的颜色值" | |
| + | |
| +msgid "" | |
| +"# This is Git's per-user configuration file.\n" | |
| +"[core]\n" | |
| +"# Please adapt and uncomment the following lines:\n" | |
| +"#\tuser = %s\n" | |
| +"#\temail = %s\n" | |
| +msgstr "" | |
| +"# This is Git's per-user configuration file.\n" | |
| +"[core]\n" | |
| +"# Please adapt and uncomment the following lines:\n" | |
| +"#\tuser = %s\n" | |
| +"#\temail = %s\n" | |
| + | |
| +msgid "cannot create configuration file %s" | |
| +msgstr "不能创建配置文件 %s" | |
| + | |
| msgid "git count-objects [-v] [-H | --human-readable]" | |
| msgstr "git count-objects [-v] [-H | --human-readable]" | |
| @@ -3434,6 +3541,9 @@ msgstr "引用表达式" | |
| msgid "Apply refspec to exported refs" | |
| msgstr "对导出的引用应用引用表达式" | |
| +msgid "anonymize output" | |
| +msgstr "匿名输出" | |
| + | |
| msgid "git fetch [<options>] [<repository> [<refspec>...]]" | |
| msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" | |
| @@ -3577,7 +3687,7 @@ msgid "(none)" | |
| msgstr "（无）" | |
| msgid "Refusing to fetch into current branch %s of non-bare repository" | |
| -msgstr "拒绝获取到非裸版本库的当前分支 %s" | |
| +msgstr "拒绝获取到非纯版本库的当前分支 %s" | |
| msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
| msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
| @@ -3642,6 +3752,9 @@ msgstr "使用 <文本> 作为提交说明的开始" | |
| msgid "file to read from" | |
| msgstr "从文件中读取" | |
| +msgid "unable to parse format" | |
| +msgstr "不能解析格式" | |
| + | |
| msgid "git for-each-ref [options] [<pattern>]" | |
| msgstr "git for-each-ref [选项] [<模式>]" | |
| @@ -3717,8 +3830,8 @@ msgstr "检查对象中" | |
| msgid "git gc [options]" | |
| msgstr "git gc [选项]" | |
| -msgid "Invalid %s: '%s'" | |
| -msgstr "无效的 %s：'%s'" | |
| +msgid "Invalid gc.pruneexpire: '%s'" | |
| +msgstr "无效的 gc.pruneexpire：'%s'" | |
| msgid "insanely long object directory %.*s" | |
| msgstr "不正常的长对象目录 %.*s" | |
| @@ -3943,6 +4056,10 @@ msgstr "从标准输入读取对象" | |
| msgid "store file as is without filters" | |
| msgstr "原样存储文件不使用过滤器" | |
| +msgid "" | |
| +"just hash any random garbage to create corrupt objects for debugging Git" | |
| +msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
| + | |
| msgid "process file as it were from this path" | |
| msgstr "处理文件并假设其来自于此路径" | |
| @@ -4005,6 +4122,9 @@ msgstr "没有 info 查看器处理此请求" | |
| msgid "Defining attributes per path" | |
| msgstr "定义路径的属性" | |
| +msgid "Everyday Git With 20 Commands Or So" | |
| +msgstr "每一天 Git 常用的约 20 条命令" | |
| + | |
| msgid "A Git glossary" | |
| msgstr "Git 词汇表" | |
| @@ -4285,9 +4405,6 @@ msgstr "初始化空的" | |
| msgid " shared" | |
| msgstr "共享" | |
| -msgid "cannot tell cwd" | |
| -msgstr "无法获知当前路径" | |
| - | |
| msgid "" | |
| "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" | |
| "shared[=<permissions>]] [directory]" | |
| @@ -4317,18 +4434,32 @@ msgstr "" | |
| "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-" | |
| "dir=<directory>）" | |
| -msgid "Cannot access current working directory" | |
| -msgstr "不能访问当前工作目录" | |
| - | |
| msgid "Cannot access work tree '%s'" | |
| msgstr "不能访问工作区 '%s'" | |
| +msgid "" | |
| +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " | |
| +"[<file>...]" | |
| +msgstr "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件>...]" | |
| + | |
| +msgid "trim empty trailers" | |
| +msgstr "删除空签名" | |
| + | |
| +msgid "trailer" | |
| +msgstr "签名" | |
| + | |
| +msgid "trailer(s) to add" | |
| +msgstr "要添加的签名" | |
| + | |
| msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" | |
| msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" | |
| msgid " or: git show [options] <object>..." | |
| msgstr " 或者：git show [选项] <对象>..." | |
| +msgid "invalid --decorate option: %s" | |
| +msgstr "无效的 --decorate 选项：%s" | |
| + | |
| msgid "suppress diff output" | |
| msgstr "不显示差异输出" | |
| @@ -4341,9 +4472,15 @@ msgstr "使用邮件映射文件" | |
| msgid "decorate options" | |
| msgstr "修饰选项" | |
| +msgid "Process line range n,m in file, counting from 1" | |
| +msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" | |
| + | |
| msgid "Final output: %d %s\n" | |
| msgstr "最终输出：%d %s\n" | |
| +msgid "git show %s: bad file" | |
| +msgstr "git show %s: 损坏的文件" | |
| + | |
| msgid "Could not read object %s" | |
| msgstr "不能读取对象 %s" | |
| @@ -4546,7 +4683,7 @@ msgstr "显示暂存区内容的对象名称" | |
| msgid "show files on the filesystem that need to be removed" | |
| msgstr "显示文件系统需要删除的文件" | |
| -msgid "show 'other' directories' name only" | |
| +msgid "show 'other' directories' names only" | |
| msgstr "只显示“其他”目录的名称" | |
| msgid "don't show empty directories" | |
| @@ -4773,7 +4910,7 @@ msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" | |
| msgid "" | |
| "You have not concluded your merge (MERGE_HEAD exists).\n" | |
| -"Please, commit your changes before you can merge." | |
| +"Please, commit your changes before you merge." | |
| msgstr "" | |
| "您尚未结束您的合并（存在 MERGE_HEAD）。\n" | |
| "请在合并前先提交您的修改。" | |
| @@ -4783,7 +4920,7 @@ msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" | |
| msgid "" | |
| "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
| -"Please, commit your changes before you can merge." | |
| +"Please, commit your changes before you merge." | |
| msgstr "" | |
| "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" | |
| "请在合并前先提交您的修改。" | |
| @@ -4926,12 +5063,24 @@ msgstr "允许创建一个以上的树" | |
| msgid "git mv [options] <source>... <destination>" | |
| msgstr "git mv [选项] <源>... <目标>" | |
| +msgid "Directory %s is in index and no submodule?" | |
| +msgstr "目录 %s 在索引中并且不是子模组？" | |
| + | |
| +msgid "Please stage your changes to .gitmodules or stash them to proceed" | |
| +msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
| + | |
| +msgid "%.*s is in index" | |
| +msgstr "%.*s 在索引中" | |
| + | |
| msgid "force move/rename even if target exists" | |
| msgstr "强制移动/重命令，即使目标存在" | |
| msgid "skip move/rename errors" | |
| msgstr "跳过移动/重命名错误" | |
| +msgid "destination '%s' is not a directory" | |
| +msgstr "目标 '%s' 不是一个目录" | |
| + | |
| msgid "Checking rename of '%s' to '%s'\n" | |
| msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
| @@ -4944,15 +5093,6 @@ msgstr "不能将目录移动到自身" | |
| msgid "cannot move directory over file" | |
| msgstr "不能将目录移动到文件" | |
| -msgid "Huh? Directory %s is in index and no submodule?" | |
| -msgstr "嗯？目录 %s 在索引中并且不是子模组？" | |
| - | |
| -msgid "Please, stage your changes to .gitmodules or stash them to proceed" | |
| -msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
| - | |
| -msgid "Huh? %.*s is in index?" | |
| -msgstr "嗯？%.*s 在索引中？" | |
| - | |
| msgid "source directory is empty" | |
| msgstr "源目录为空" | |
| @@ -5118,8 +5258,8 @@ msgstr "删除对象 %s 的注解\n" | |
| msgid "unable to write note object" | |
| msgstr "不能写注解对象" | |
| -msgid "The note contents has been left in %s" | |
| -msgstr "注解内容被留在文件 %s 中" | |
| +msgid "The note contents have been left in %s" | |
| +msgstr "注解内容被留在 %s 中" | |
| msgid "cannot read '%s'" | |
| msgstr "不能读取 '%s'" | |
| @@ -5648,6 +5788,9 @@ msgstr "绕过 pre-push 钩子" | |
| msgid "push missing but relevant tags" | |
| msgstr "推送缺失的有关的 tags" | |
| +msgid "GPG sign the push" | |
| +msgstr "用 GPG 为推送签名" | |
| + | |
| msgid "--delete is incompatible with --all, --mirror and --tags" | |
| msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
| @@ -5828,9 +5971,6 @@ msgstr "'%s' 不是一个有效的远程名称" | |
| msgid "Could not setup master '%s'" | |
| msgstr "无法设置 master '%s'" | |
| -msgid "more than one %s" | |
| -msgstr "多于一个 %s" | |
| - | |
| msgid "Could not get fetch map for refspec %s" | |
| msgstr "无法得到引用规则 %s 的获取列表" | |
| @@ -6256,7 +6396,7 @@ msgid "Cannot do %s reset with paths." | |
| msgstr "不能带路径进行%s重置。" | |
| msgid "%s reset is not allowed in a bare repository" | |
| -msgstr "不能对裸版本库进行%s重置" | |
| +msgstr "不能对纯版本库进行%s重置" | |
| msgid "-N can only be used with --mixed" | |
| msgstr "-N 只能和 --mixed 同时使用" | |
| @@ -6368,10 +6508,10 @@ msgid "" | |
| "the following submodule (or one of its nested submodules)\n" | |
| "uses a .git directory:" | |
| msgid_plural "" | |
| -"the following submodules (or one of its nested submodules)\n" | |
| +"the following submodules (or one of their nested submodules)\n" | |
| "use a .git directory:" | |
| -msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" | |
| -msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" | |
| +msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" | |
| +msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录：" | |
| msgid "" | |
| "\n" | |
| @@ -6428,6 +6568,9 @@ msgstr "允许递归删除" | |
| msgid "exit with a zero status even if nothing matched" | |
| msgstr "即使没有匹配，也以零状态退出" | |
| +msgid "Please, stage your changes to .gitmodules or stash them to proceed" | |
| +msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
| + | |
| msgid "not removing '%s' recursively without -r" | |
| msgstr "未提供 -r 选项不会递归删除 '%s'" | |
| @@ -6729,12 +6872,6 @@ msgstr "'%s' 不是一个有效的tag名称。" | |
| msgid "tag '%s' already exists" | |
| msgstr "tag '%s' 已存在" | |
| -msgid "%s: cannot lock the ref" | |
| -msgstr "%s：不能锁定引用" | |
| - | |
| -msgid "%s: cannot update the ref" | |
| -msgstr "%s：不能更新引用" | |
| - | |
| msgid "Updated tag '%s' (was %s)\n" | |
| msgstr "已更新tag '%s'（曾为 %s）\n" | |
| @@ -6888,28 +7025,17 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" | |
| msgid "only useful for debugging" | |
| msgstr "只对调试有用" | |
| +msgid "print debugging messages to stderr" | |
| +msgstr "调试信息输出到标准错误" | |
| + | |
| msgid "" | |
| -"'git help -a' and 'git help -g' lists available subcommands and some\n" | |
| +"'git help -a' and 'git help -g' list available subcommands and some\n" | |
| "concept guides. See 'git help <command>' or 'git help <concept>'\n" | |
| "to read about a specific subcommand or concept." | |
| msgstr "" | |
| -"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" | |
| -"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" | |
| - | |
| -msgid "expiry-date" | |
| -msgstr "逾期日期" | |
| - | |
| -msgid "no-op (backward compatibility)" | |
| -msgstr "空操作（向后兼容）" | |
| - | |
| -msgid "be more verbose" | |
| -msgstr "更加详细" | |
| - | |
| -msgid "be more quiet" | |
| -msgstr "更加安静" | |
| - | |
| -msgid "use <n> digits to display SHA-1s" | |
| -msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
| +"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" | |
| +"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
| +"帮助。" | |
| msgid "Add file contents to the index" | |
| msgstr "添加文件内容至索引" | |
| @@ -6974,6 +7100,24 @@ msgstr "显示工作区状态" | |
| msgid "Create, list, delete or verify a tag object signed with GPG" | |
| msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" | |
| +msgid "expiry-date" | |
| +msgstr "逾期日期" | |
| + | |
| +msgid "no-op (backward compatibility)" | |
| +msgstr "空操作（向后兼容）" | |
| + | |
| +msgid "be more verbose" | |
| +msgstr "更加详细" | |
| + | |
| +msgid "be more quiet" | |
| +msgstr "更加安静" | |
| + | |
| +msgid "use <n> digits to display SHA-1s" | |
| +msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
| + | |
| +msgid "update the index with reused conflict resolution if possible" | |
| +msgstr "如果可能，重用冲突解决更新索引" | |
| + | |
| msgid "You need to set your committer info first" | |
| msgstr "您需要先设置你的提交者信息" | |
| @@ -7149,20 +7293,20 @@ msgid "Are you sure [Y/n]? " | |
| msgstr "您确认么[Y/n]？ " | |
| msgid "" | |
| -"You need to give me at least one good and one bad revisions.\n" | |
| +"You need to give me at least one good and one bad revision.\n" | |
| "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" | |
| msgstr "" | |
| "您需要给我至少一个好版本和一个坏版本。\n" | |
| -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" | |
| +"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）" | |
| msgid "" | |
| "You need to start by \"git bisect start\".\n" | |
| -"You then need to give me at least one good and one bad revisions.\n" | |
| +"You then need to give me at least one good and one bad revision.\n" | |
| "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" | |
| msgstr "" | |
| "您需要执行 \"git bisect start\" 来开始。\n" | |
| "然后需要提供我至少一个好版本和一个坏版本。\n" | |
| -"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" | |
| +"（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）" | |
| msgid "We are not bisecting." | |
| msgstr "我们没有在二分查找。" | |
| @@ -7212,15 +7356,21 @@ msgstr "二分查找运行成功" | |
| msgid "" | |
| "Pull is not possible because you have unmerged files.\n" | |
| "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
| -"as appropriate to mark resolution, or use 'git commit -a'." | |
| +"as appropriate to mark resolution and make a commit." | |
| msgstr "" | |
| "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" | |
| -"然后酌情使用 'git add/rm <file>' 标记解决方案，\n" | |
| -"或者使用 'git commit -a'。" | |
| +"然后酌情使用 'git add/rm <file>' 标记解决方案，再做提交。" | |
| msgid "Pull is not possible because you have unmerged files." | |
| msgstr "Pull 不可用，因为您尚有未合并的文件。" | |
| +msgid "" | |
| +"You have not concluded your merge (MERGE_HEAD exists).\n" | |
| +"Please, commit your changes before you can merge." | |
| +msgstr "" | |
| +"您尚未结束您的合并（存在 MERGE_HEAD）。\n" | |
| +"请在合并前先提交您的修改。" | |
| + | |
| msgid "updating an unborn branch with changes added to the index" | |
| msgstr "更新尚未诞生的分支，变更添加至索引" | |
| @@ -7396,8 +7546,8 @@ msgstr "未发现 stash。" | |
| msgid "Too many revisions specified: $REV" | |
| msgstr "指定了太多的版本：$REV" | |
| -msgid "$reference is not valid reference" | |
| -msgstr "$reference 不是有效的引用" | |
| +msgid "$reference is not a valid reference" | |
| +msgstr "$reference 不是一个有效的引用" | |
| msgid "'$args' is not a stash-like commit" | |
| msgstr "'$args' 不是 stash 样提交" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment