Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1 | # Chinese translations for Git package |
| 2 | # Git 软件包的简体中文翻译. |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 3 | # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4 | # This file is distributed under the same license as the Git package. |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5 | # Contributors: |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6 | # - Jiang Xin <worldhello.net AT gmail.com> |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7 | # - Lian Cheng <rhythm.mail AT gmail.com> |
Jiang Xin | bbdf0ac | 2015-08-04 00:33:16 +0800 | [diff] [blame] | 8 | # - Ray Chen <oldsharp AT gmail.com> |
| 9 | # - Riku <lu.riku AT gmail.com> |
| 10 | # - Thynson <lanxingcan AT gmail.com> |
| 11 | # - ws3389 <willsmith3389 AT gmail.com> |
| 12 | # - Wang Sheng <wangsheng2008love AT 163.com> |
| 13 | # - Yichao Yu <yyc1992 AT gmail.com> |
| 14 | # - Zhuang Ya <zhuangya AT me.com> |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 15 | # |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 16 | # Git glossary for Chinese translators |
| 17 | # |
| 18 | # English | Chinese |
| 19 | # ---------------------------------+-------------------------------------- |
| 20 | # 3-way merge | 三方合并 |
| 21 | # abbreviate | 简写(的 SHA-1 值) |
| 22 | # alternate object database | 备用对象库 |
| 23 | # amend | 修补 |
| 24 | # ancestor | 祖先,祖先提交 |
| 25 | # annotated tag | 附注标签 |
| 26 | # bare repository | 纯仓库 |
| 27 | # bisect | 二分查找 |
| 28 | # blob object | 数据对象 |
| 29 | # branch | 分支 |
| 30 | # bundle | 包 |
| 31 | # bypass | 绕过 |
| 32 | # cache | 索引(的别称) |
| 33 | # chain | (提交)链 |
| 34 | # changeset | 变更集 |
| 35 | # checkout | 检出 |
| 36 | # checksum | 校验,校验和 |
| 37 | # cherry-picking | 拣选 |
| 38 | # clean | 干净(的工作区) |
| 39 | # clone | 克隆 |
| 40 | # commit | 提交 |
Ray Chen | 667599e | 2015-08-25 09:47:50 +0800 | [diff] [blame] | 41 | # commit message | 提交说明 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 42 | # commit object | 提交对象 |
| 43 | # commit-ish (also committish) | 提交号 |
| 44 | # conflict | 冲突 |
| 45 | # core Git | 核心 Git 工具 |
| 46 | # DAG | 有向无环图 |
| 47 | # dangling object | 摇摆对象 |
| 48 | # detached HEAD | 分离头指针 |
| 49 | # directory | 目录 |
| 50 | # dirty | 脏(的工作区) |
Ray Chen | 755c831 | 2015-08-20 09:39:17 +0800 | [diff] [blame] | 51 | # dumb HTTP protocol | 哑 HTTP 协议 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 52 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
| 53 | # fast-forward | 快进 |
| 54 | # fetch | 获取 |
| 55 | # file system | 文件系统 |
Ray Chen | e397e7e | 2015-08-20 11:01:34 +0800 | [diff] [blame] | 56 | # fork | 派生 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 57 | # Git archive | 仓库(对于 arch 用户) |
| 58 | # gitfile | gitfile(仓库链接文件) |
| 59 | # grafts | (提交)嫁接 |
| 60 | # hash | 哈希值 |
| 61 | # HEAD | HEAD(头指针,亦即当前分支) |
| 62 | # head | 头、分支 |
| 63 | # head ref | 分支 |
| 64 | # header | 头信息 |
| 65 | # hook | 钩子 |
| 66 | # hunk | 补丁片段 |
| 67 | # index | 索引 |
| 68 | # index entry | 索引条目 |
| 69 | # loose object | 松散对象 |
| 70 | # loose refs | 松散引用 |
| 71 | # master | master(默认分支名) |
| 72 | # merge | 合并 |
| 73 | # object | 对象 |
| 74 | # object database | 对象库 |
| 75 | # object identifier | 对象标识符 |
| 76 | # object name | 对象名称 |
| 77 | # object type | 对象类型 |
| 78 | # octopus | 章鱼式合并(两分支以上的合并) |
| 79 | # origin | origin(默认的远程名称) |
| 80 | # pack | 包 |
| 81 | # pack index | 包索引 |
| 82 | # packfile | 包文件 |
| 83 | # parent | 父提交 |
| 84 | # patch | 补丁 |
| 85 | # pathspec | 路径规格 |
| 86 | # pattern | 模式 |
Ray Chen | 12e5905 | 2015-08-20 15:24:01 +0800 | [diff] [blame] | 87 | # pickaxe | 挖掘 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 88 | # plumbing | 管件(Git 底层核心命令的别称) |
| 89 | # porcelain | 瓷件(Git 上层封装命令的别称) |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 90 | # precious-objects repo | 珍品仓库 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 91 | # prune | 清除 |
| 92 | # pull | 拉,拉取 |
| 93 | # push | 推,推送 |
| 94 | # reachable | 可达 |
| 95 | # rebase | 变基 |
| 96 | # ref | 引用 |
| 97 | # reflog | 引用日志 |
| 98 | # refspec | 引用规格 |
| 99 | # remote | 远程,远程仓库 |
| 100 | # remote-tracking branch | 远程跟踪分支 |
| 101 | # replay | 重放 |
| 102 | # repo | 仓库 |
| 103 | # repository | 仓库 |
| 104 | # resolve | (冲突)解决 |
| 105 | # revert | 还原 |
| 106 | # revision | 版本 |
| 107 | # rewind | 回退 |
| 108 | # SCM | 源代码管理(工具) |
Ray Chen | ee7589b | 2015-08-20 09:17:09 +0800 | [diff] [blame] | 109 | # SHA-1 | SHA-1(安全哈希算法1) |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 110 | # shallow repository | 浅(克隆)仓库 |
| 111 | # signed tag | 签名标签 |
Ray Chen | 755c831 | 2015-08-20 09:39:17 +0800 | [diff] [blame] | 112 | # smart HTTP protocol | 智能 HTTP 协议 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 113 | # squash | 压缩 |
| 114 | # stage | n. 暂存区(即索引); v. 暂存 |
| 115 | # stash | n. 进度保存; v. 保存进度 |
| 116 | # submodule | 子模组 |
| 117 | # symref | 符号引用 |
Ray Chen | 933c015 | 2015-08-20 10:22:43 +0800 | [diff] [blame] | 118 | # tag | n. 标签; v. 打标签 |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 119 | # tag object | 标签对象 |
| 120 | # tagger | 打标签者 |
| 121 | # topic branch | 主题分支 |
| 122 | # track | 跟踪 |
| 123 | # tree | 树(工作区或树对象) |
| 124 | # tree object | 树对象 |
| 125 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) |
| 126 | # unmerged index | 未合并索引 |
| 127 | # unpack | 解包 |
| 128 | # unreachable object | 不可达对象 |
| 129 | # unstage | 取消暂存 |
| 130 | # upstream | 上游 |
| 131 | # upstream branch | 上游分支 |
| 132 | # working tree | 工作区 |
| 133 | # |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 134 | msgid "" |
| 135 | msgstr "" |
| 136 | "Project-Id-Version: Git\n" |
| 137 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 138 | "POT-Creation-Date: 2017-02-18 01:00+0800\n" |
| 139 | "PO-Revision-Date: 2017-02-25 00:10+0800\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 140 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 141 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 142 | "Language: zh_CN\n" |
| 143 | "MIME-Version: 1.0\n" |
| 144 | "Content-Type: text/plain; charset=UTF-8\n" |
| 145 | "Content-Transfer-Encoding: 8bit\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 146 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 147 | |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 148 | #: advice.c:55 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 149 | #, c-format |
| 150 | msgid "hint: %.*s\n" |
| 151 | msgstr "提示:%.*s\n" |
| 152 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 153 | #: advice.c:83 |
| 154 | msgid "Cherry-picking is not possible because you have unmerged files." |
| 155 | msgstr "无法拣选,因为您有未合并的文件。" |
| 156 | |
| 157 | #: advice.c:85 |
| 158 | msgid "Committing is not possible because you have unmerged files." |
| 159 | msgstr "无法提交,因为您有未合并的文件。" |
| 160 | |
| 161 | #: advice.c:87 |
| 162 | msgid "Merging is not possible because you have unmerged files." |
| 163 | msgstr "无法合并,因为您有未合并的文件。" |
| 164 | |
| 165 | #: advice.c:89 |
| 166 | msgid "Pulling is not possible because you have unmerged files." |
| 167 | msgstr "无法拉取,因为您有未合并的文件。" |
| 168 | |
| 169 | #: advice.c:91 |
| 170 | msgid "Reverting is not possible because you have unmerged files." |
| 171 | msgstr "无法回退,因为您有未合并的文件。" |
| 172 | |
| 173 | #: advice.c:93 |
| 174 | #, c-format |
| 175 | msgid "It is not possible to %s because you have unmerged files." |
| 176 | msgstr "无法 %s,因为您有未合并的文件。" |
| 177 | |
| 178 | #: advice.c:101 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 179 | msgid "" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 180 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 181 | "as appropriate to mark resolution and make a commit." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 182 | msgstr "" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 183 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 184 | "解决方案并提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 185 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 186 | #: advice.c:109 |
| 187 | msgid "Exiting because of an unresolved conflict." |
| 188 | msgstr "因为存在未解决的冲突而退出。" |
| 189 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 190 | #: advice.c:114 builtin/merge.c:1206 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 191 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
| 192 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" |
| 193 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 194 | #: advice.c:116 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 195 | msgid "Please, commit your changes before merging." |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 196 | msgstr "请在合并前先提交您的修改。" |
| 197 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 198 | #: advice.c:117 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 199 | msgid "Exiting because of unfinished merge." |
| 200 | msgstr "因为存在未完成的合并而退出。" |
| 201 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 202 | #: advice.c:123 |
| 203 | #, c-format |
| 204 | msgid "" |
| 205 | "Note: checking out '%s'.\n" |
| 206 | "\n" |
| 207 | "You are in 'detached HEAD' state. You can look around, make experimental\n" |
| 208 | "changes and commit them, and you can discard any commits you make in this\n" |
| 209 | "state without impacting any branches by performing another checkout.\n" |
| 210 | "\n" |
| 211 | "If you want to create a new branch to retain commits you create, you may\n" |
| 212 | "do so (now or later) by using -b with the checkout command again. Example:\n" |
| 213 | "\n" |
| 214 | " git checkout -b <new-branch-name>\n" |
| 215 | "\n" |
| 216 | msgstr "" |
| 217 | "注意:正在检出 '%s'。\n" |
| 218 | "\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 219 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
| 220 | "外\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 221 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
| 222 | "\n" |
| 223 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" |
| 224 | "参数 -b 来实现(现在或稍后)。例如:\n" |
| 225 | "\n" |
| 226 | " git checkout -b <new-branch-name>\n" |
| 227 | "\n" |
| 228 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 229 | #: apply.c:57 |
| 230 | #, c-format |
| 231 | msgid "unrecognized whitespace option '%s'" |
| 232 | msgstr "未能识别的空白字符选项 '%s'" |
| 233 | |
| 234 | #: apply.c:73 |
| 235 | #, c-format |
| 236 | msgid "unrecognized whitespace ignore option '%s'" |
| 237 | msgstr "未能识别的空白字符忽略选项 '%s'" |
| 238 | |
| 239 | #: apply.c:125 |
| 240 | msgid "--reject and --3way cannot be used together." |
| 241 | msgstr "--reject 和 --3say 不能同时使用。" |
| 242 | |
| 243 | #: apply.c:127 |
| 244 | msgid "--cached and --3way cannot be used together." |
| 245 | msgstr "--cached 和 --3way 不能同时使用。" |
| 246 | |
| 247 | #: apply.c:130 |
| 248 | msgid "--3way outside a repository" |
| 249 | msgstr "--3way 在一个仓库之外" |
| 250 | |
| 251 | #: apply.c:141 |
| 252 | msgid "--index outside a repository" |
| 253 | msgstr "--index 在一个仓库之外" |
| 254 | |
| 255 | #: apply.c:144 |
| 256 | msgid "--cached outside a repository" |
| 257 | msgstr "--cached 在一个仓库之外" |
| 258 | |
| 259 | #: apply.c:845 |
| 260 | #, c-format |
| 261 | msgid "Cannot prepare timestamp regexp %s" |
| 262 | msgstr "无法准备时间戳正则表达式 %s" |
| 263 | |
| 264 | #: apply.c:854 |
| 265 | #, c-format |
| 266 | msgid "regexec returned %d for input: %s" |
| 267 | msgstr "regexec 返回 %d,输入为:%s" |
| 268 | |
| 269 | #: apply.c:938 |
| 270 | #, c-format |
| 271 | msgid "unable to find filename in patch at line %d" |
| 272 | msgstr "不能在补丁的第 %d 行找到文件名" |
| 273 | |
| 274 | #: apply.c:977 |
| 275 | #, c-format |
| 276 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" |
| 277 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
| 278 | |
| 279 | #: apply.c:983 |
| 280 | #, c-format |
| 281 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" |
| 282 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
| 283 | |
| 284 | #: apply.c:984 |
| 285 | #, c-format |
| 286 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" |
| 287 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
| 288 | |
| 289 | #: apply.c:990 |
| 290 | #, c-format |
| 291 | msgid "git apply: bad git-diff - expected /dev/null on line %d" |
| 292 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
| 293 | |
| 294 | #: apply.c:1488 |
| 295 | #, c-format |
| 296 | msgid "recount: unexpected line: %.*s" |
| 297 | msgstr "recount:意外的行:%.*s" |
| 298 | |
| 299 | #: apply.c:1557 |
| 300 | #, c-format |
| 301 | msgid "patch fragment without header at line %d: %.*s" |
| 302 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
| 303 | |
| 304 | #: apply.c:1577 |
| 305 | #, c-format |
| 306 | msgid "" |
| 307 | "git diff header lacks filename information when removing %d leading pathname " |
| 308 | "component (line %d)" |
| 309 | msgid_plural "" |
| 310 | "git diff header lacks filename information when removing %d leading pathname " |
| 311 | "components (line %d)" |
| 312 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
| 313 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
| 314 | |
| 315 | #: apply.c:1589 |
| 316 | #, c-format |
| 317 | msgid "git diff header lacks filename information (line %d)" |
| 318 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" |
| 319 | |
| 320 | #: apply.c:1759 |
| 321 | msgid "new file depends on old contents" |
| 322 | msgstr "新文件依赖旧内容" |
| 323 | |
| 324 | #: apply.c:1761 |
| 325 | msgid "deleted file still has contents" |
| 326 | msgstr "删除的文件仍有内容" |
| 327 | |
| 328 | #: apply.c:1795 |
| 329 | #, c-format |
| 330 | msgid "corrupt patch at line %d" |
| 331 | msgstr "补丁在第 %d 行损坏" |
| 332 | |
| 333 | #: apply.c:1832 |
| 334 | #, c-format |
| 335 | msgid "new file %s depends on old contents" |
| 336 | msgstr "新文件 %s 依赖旧内容" |
| 337 | |
| 338 | #: apply.c:1834 |
| 339 | #, c-format |
| 340 | msgid "deleted file %s still has contents" |
| 341 | msgstr "删除的文件 %s 仍有内容" |
| 342 | |
| 343 | #: apply.c:1837 |
| 344 | #, c-format |
| 345 | msgid "** warning: file %s becomes empty but is not deleted" |
| 346 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
| 347 | |
| 348 | #: apply.c:1984 |
| 349 | #, c-format |
| 350 | msgid "corrupt binary patch at line %d: %.*s" |
| 351 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
| 352 | |
| 353 | #: apply.c:2021 |
| 354 | #, c-format |
| 355 | msgid "unrecognized binary patch at line %d" |
| 356 | msgstr "未能识别的二进制补丁位于第 %d 行" |
| 357 | |
| 358 | #: apply.c:2182 |
| 359 | #, c-format |
| 360 | msgid "patch with only garbage at line %d" |
| 361 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
| 362 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 363 | #: apply.c:2265 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 364 | #, c-format |
| 365 | msgid "unable to read symlink %s" |
| 366 | msgstr "无法读取符号链接 %s" |
| 367 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 368 | #: apply.c:2269 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 369 | #, c-format |
| 370 | msgid "unable to open or read %s" |
| 371 | msgstr "不能打开或读取 %s" |
| 372 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 373 | #: apply.c:2922 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 374 | #, c-format |
| 375 | msgid "invalid start of line: '%c'" |
| 376 | msgstr "无效的行首字符:'%c'" |
| 377 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 378 | #: apply.c:3041 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 379 | #, c-format |
| 380 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
| 381 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." |
| 382 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
| 383 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" |
| 384 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 385 | #: apply.c:3053 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 386 | #, c-format |
| 387 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
| 388 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
| 389 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 390 | #: apply.c:3059 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 391 | #, c-format |
| 392 | msgid "" |
| 393 | "while searching for:\n" |
| 394 | "%.*s" |
| 395 | msgstr "" |
| 396 | "当查询:\n" |
| 397 | "%.*s" |
| 398 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 399 | #: apply.c:3081 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 400 | #, c-format |
| 401 | msgid "missing binary patch data for '%s'" |
| 402 | msgstr "缺失 '%s' 的二进制补丁数据" |
| 403 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 404 | #: apply.c:3089 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 405 | #, c-format |
| 406 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 407 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 408 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 409 | #: apply.c:3135 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 410 | #, c-format |
| 411 | msgid "cannot apply binary patch to '%s' without full index line" |
| 412 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" |
| 413 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 414 | #: apply.c:3145 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 415 | #, c-format |
| 416 | msgid "" |
| 417 | "the patch applies to '%s' (%s), which does not match the current contents." |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 418 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 419 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 420 | #: apply.c:3153 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 421 | #, c-format |
| 422 | msgid "the patch applies to an empty '%s' but it is not empty" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 423 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 424 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 425 | #: apply.c:3171 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 426 | #, c-format |
| 427 | msgid "the necessary postimage %s for '%s' cannot be read" |
| 428 | msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" |
| 429 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 430 | #: apply.c:3184 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 431 | #, c-format |
| 432 | msgid "binary patch does not apply to '%s'" |
| 433 | msgstr "二进制补丁未应用到 '%s'" |
| 434 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 435 | #: apply.c:3190 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 436 | #, c-format |
| 437 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
| 438 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
| 439 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 440 | #: apply.c:3211 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 441 | #, c-format |
| 442 | msgid "patch failed: %s:%ld" |
| 443 | msgstr "打补丁失败:%s:%ld" |
| 444 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 445 | #: apply.c:3333 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 446 | #, c-format |
| 447 | msgid "cannot checkout %s" |
| 448 | msgstr "不能检出 %s" |
| 449 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 450 | #: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 451 | #, c-format |
| 452 | msgid "failed to read %s" |
| 453 | msgstr "无法读取 %s" |
| 454 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 455 | #: apply.c:3389 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 456 | #, c-format |
| 457 | msgid "reading from '%s' beyond a symbolic link" |
| 458 | msgstr "读取位于符号链接中的 '%s'" |
| 459 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 460 | #: apply.c:3418 apply.c:3658 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 461 | #, c-format |
| 462 | msgid "path %s has been renamed/deleted" |
| 463 | msgstr "路径 %s 已经被重命名/删除" |
| 464 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 465 | #: apply.c:3501 apply.c:3672 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 466 | #, c-format |
| 467 | msgid "%s: does not exist in index" |
| 468 | msgstr "%s:不存在于索引中" |
| 469 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 470 | #: apply.c:3510 apply.c:3680 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 471 | #, c-format |
| 472 | msgid "%s: does not match index" |
| 473 | msgstr "%s:和索引不匹配" |
| 474 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 475 | #: apply.c:3545 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 476 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
| 477 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" |
| 478 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 479 | #: apply.c:3548 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 480 | #, c-format |
| 481 | msgid "Falling back to three-way merge...\n" |
| 482 | msgstr "回落到三方合并...\n" |
| 483 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 484 | #: apply.c:3564 apply.c:3568 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 485 | #, c-format |
| 486 | msgid "cannot read the current contents of '%s'" |
| 487 | msgstr "无法读取 '%s' 的当前内容" |
| 488 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 489 | #: apply.c:3580 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 490 | #, c-format |
| 491 | msgid "Failed to fall back on three-way merge...\n" |
| 492 | msgstr "无法回落到三方合并...\n" |
| 493 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 494 | #: apply.c:3594 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 495 | #, c-format |
| 496 | msgid "Applied patch to '%s' with conflicts.\n" |
| 497 | msgstr "应用补丁到 '%s' 存在冲突。\n" |
| 498 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 499 | #: apply.c:3599 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 500 | #, c-format |
| 501 | msgid "Applied patch to '%s' cleanly.\n" |
| 502 | msgstr "成功应用补丁到 '%s'。\n" |
| 503 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 504 | #: apply.c:3625 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 505 | msgid "removal patch leaves file contents" |
| 506 | msgstr "移除补丁仍留下了文件内容" |
| 507 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 508 | #: apply.c:3697 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 509 | #, c-format |
| 510 | msgid "%s: wrong type" |
| 511 | msgstr "%s:错误类型" |
| 512 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 513 | #: apply.c:3699 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 514 | #, c-format |
| 515 | msgid "%s has type %o, expected %o" |
| 516 | msgstr "%s 的类型是 %o,应为 %o" |
| 517 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 518 | #: apply.c:3850 apply.c:3852 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 519 | #, c-format |
| 520 | msgid "invalid path '%s'" |
| 521 | msgstr "无效路径 '%s'" |
| 522 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 523 | #: apply.c:3908 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 524 | #, c-format |
| 525 | msgid "%s: already exists in index" |
| 526 | msgstr "%s:已经存在于索引中" |
| 527 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 528 | #: apply.c:3911 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 529 | #, c-format |
| 530 | msgid "%s: already exists in working directory" |
| 531 | msgstr "%s:已经存在于工作区中" |
| 532 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 533 | #: apply.c:3931 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 534 | #, c-format |
| 535 | msgid "new mode (%o) of %s does not match old mode (%o)" |
| 536 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" |
| 537 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 538 | #: apply.c:3936 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 539 | #, c-format |
| 540 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
| 541 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" |
| 542 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 543 | #: apply.c:3956 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 544 | #, c-format |
| 545 | msgid "affected file '%s' is beyond a symbolic link" |
| 546 | msgstr "受影响的文件 '%s' 位于符号链接中" |
| 547 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 548 | #: apply.c:3960 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 549 | #, c-format |
| 550 | msgid "%s: patch does not apply" |
| 551 | msgstr "%s:补丁未应用" |
| 552 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 553 | #: apply.c:3975 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 554 | #, c-format |
| 555 | msgid "Checking patch %s..." |
| 556 | msgstr "检查补丁 %s..." |
| 557 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 558 | #: apply.c:4066 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 559 | #, c-format |
| 560 | msgid "sha1 information is lacking or useless for submodule %s" |
| 561 | msgstr "子模组 %s 的 sha1 信息缺失或无效" |
| 562 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 563 | #: apply.c:4073 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 564 | #, c-format |
| 565 | msgid "mode change for %s, which is not in current HEAD" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 566 | msgstr "%s 的模式被改变,但它不在当前 HEAD 中" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 567 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 568 | #: apply.c:4076 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 569 | #, c-format |
| 570 | msgid "sha1 information is lacking or useless (%s)." |
| 571 | msgstr "sha1 信息缺失或无效(%s)。" |
| 572 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 573 | #: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 574 | #, c-format |
| 575 | msgid "make_cache_entry failed for path '%s'" |
| 576 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" |
| 577 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 578 | #: apply.c:4085 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 579 | #, c-format |
| 580 | msgid "could not add %s to temporary index" |
| 581 | msgstr "不能在临时索引中添加 %s" |
| 582 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 583 | #: apply.c:4095 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 584 | #, c-format |
| 585 | msgid "could not write temporary index to %s" |
| 586 | msgstr "不能把临时索引写入到 %s" |
| 587 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 588 | #: apply.c:4233 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 589 | #, c-format |
| 590 | msgid "unable to remove %s from index" |
| 591 | msgstr "不能从索引中移除 %s" |
| 592 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 593 | #: apply.c:4268 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 594 | #, c-format |
| 595 | msgid "corrupt patch for submodule %s" |
| 596 | msgstr "子模组 %s 损坏的补丁" |
| 597 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 598 | #: apply.c:4274 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 599 | #, c-format |
| 600 | msgid "unable to stat newly created file '%s'" |
| 601 | msgstr "不能枚举新建文件 '%s' 的状态" |
| 602 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 603 | #: apply.c:4282 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 604 | #, c-format |
| 605 | msgid "unable to create backing store for newly created file %s" |
| 606 | msgstr "不能为新建文件 %s 创建后端存储" |
| 607 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 608 | #: apply.c:4288 apply.c:4432 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 609 | #, c-format |
| 610 | msgid "unable to add cache entry for %s" |
| 611 | msgstr "无法为 %s 添加缓存条目" |
| 612 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 613 | #: apply.c:4329 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 614 | #, c-format |
| 615 | msgid "failed to write to '%s'" |
| 616 | msgstr "无法写入 '%s'" |
| 617 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 618 | #: apply.c:4333 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 619 | #, c-format |
| 620 | msgid "closing file '%s'" |
| 621 | msgstr "关闭文件 '%s'" |
| 622 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 623 | #: apply.c:4403 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 624 | #, c-format |
| 625 | msgid "unable to write file '%s' mode %o" |
| 626 | msgstr "不能写文件 '%s' 权限 %o" |
| 627 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 628 | #: apply.c:4501 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 629 | #, c-format |
| 630 | msgid "Applied patch %s cleanly." |
| 631 | msgstr "成功应用补丁 %s。" |
| 632 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 633 | #: apply.c:4509 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 634 | msgid "internal error" |
| 635 | msgstr "内部错误" |
| 636 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 637 | #: apply.c:4512 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 638 | #, c-format |
| 639 | msgid "Applying patch %%s with %d reject..." |
| 640 | msgid_plural "Applying patch %%s with %d rejects..." |
| 641 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
| 642 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
| 643 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 644 | #: apply.c:4523 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 645 | #, c-format |
| 646 | msgid "truncating .rej filename to %.*s.rej" |
| 647 | msgstr "截短 .rej 文件名为 %.*s.rej" |
| 648 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 649 | #: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 650 | #, c-format |
| 651 | msgid "cannot open %s" |
| 652 | msgstr "不能打开 %s" |
| 653 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 654 | #: apply.c:4545 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 655 | #, c-format |
| 656 | msgid "Hunk #%d applied cleanly." |
| 657 | msgstr "第 #%d 个片段成功应用。" |
| 658 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 659 | #: apply.c:4549 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 660 | #, c-format |
| 661 | msgid "Rejected hunk #%d." |
| 662 | msgstr "拒绝第 #%d 个片段。" |
| 663 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 664 | #: apply.c:4659 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 665 | #, c-format |
| 666 | msgid "Skipped patch '%s'." |
| 667 | msgstr "略过补丁 '%s'。" |
| 668 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 669 | #: apply.c:4667 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 670 | msgid "unrecognized input" |
| 671 | msgstr "未能识别的输入" |
| 672 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 673 | #: apply.c:4686 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 674 | msgid "unable to read index file" |
| 675 | msgstr "无法读取索引文件" |
| 676 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 677 | #: apply.c:4824 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 678 | #, c-format |
| 679 | msgid "can't open patch '%s': %s" |
| 680 | msgstr "不能打开补丁 '%s':%s" |
| 681 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 682 | #: apply.c:4849 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 683 | #, c-format |
| 684 | msgid "squelched %d whitespace error" |
| 685 | msgid_plural "squelched %d whitespace errors" |
| 686 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
| 687 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
| 688 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 689 | #: apply.c:4855 apply.c:4870 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 690 | #, c-format |
| 691 | msgid "%d line adds whitespace errors." |
| 692 | msgid_plural "%d lines add whitespace errors." |
| 693 | msgstr[0] "%d 行有空白字符误用。" |
| 694 | msgstr[1] "%d 行有空白字符误用。" |
| 695 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 696 | #: apply.c:4863 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 697 | #, c-format |
| 698 | msgid "%d line applied after fixing whitespace errors." |
| 699 | msgid_plural "%d lines applied after fixing whitespace errors." |
| 700 | msgstr[0] "修复空白错误后,应用了 %d 行。" |
| 701 | msgstr[1] "修复空白错误后,应用了 %d 行。" |
| 702 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 703 | #: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 704 | msgid "Unable to write new index file" |
| 705 | msgstr "无法写入新索引文件" |
| 706 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 707 | #: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 708 | #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 709 | #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 |
| 710 | #: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 |
| 711 | #: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 |
| 712 | #: git-add--interactive.perl:239 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 713 | msgid "path" |
| 714 | msgstr "路径" |
| 715 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 716 | #: apply.c:4911 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 717 | msgid "don't apply changes matching the given path" |
| 718 | msgstr "不要应用与给出路径向匹配的变更" |
| 719 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 720 | #: apply.c:4914 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 721 | msgid "apply changes matching the given path" |
| 722 | msgstr "应用与给出路径向匹配的变更" |
| 723 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 724 | #: apply.c:4916 builtin/am.c:2286 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 725 | msgid "num" |
| 726 | msgstr "数字" |
| 727 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 728 | #: apply.c:4917 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 729 | msgid "remove <num> leading slashes from traditional diff paths" |
| 730 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
| 731 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 732 | #: apply.c:4920 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 733 | msgid "ignore additions made by the patch" |
| 734 | msgstr "忽略补丁中的添加的文件" |
| 735 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 736 | #: apply.c:4922 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 737 | msgid "instead of applying the patch, output diffstat for the input" |
| 738 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
| 739 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 740 | #: apply.c:4926 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 741 | msgid "show number of added and deleted lines in decimal notation" |
| 742 | msgstr "以十进制数显示添加和删除的行数" |
| 743 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 744 | #: apply.c:4928 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 745 | msgid "instead of applying the patch, output a summary for the input" |
| 746 | msgstr "不应用补丁,而是显示输入的概要" |
| 747 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 748 | #: apply.c:4930 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 749 | msgid "instead of applying the patch, see if the patch is applicable" |
| 750 | msgstr "不应用补丁,而是查看补丁是否可应用" |
| 751 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 752 | #: apply.c:4932 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 753 | msgid "make sure the patch is applicable to the current index" |
| 754 | msgstr "确认补丁可以应用到当前索引" |
| 755 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 756 | #: apply.c:4934 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 757 | msgid "apply a patch without touching the working tree" |
| 758 | msgstr "应用补丁而不修改工作区" |
| 759 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 760 | #: apply.c:4936 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 761 | msgid "accept a patch that touches outside the working area" |
| 762 | msgstr "接受修改工作区之外文件的补丁" |
| 763 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 764 | #: apply.c:4938 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 765 | msgid "also apply the patch (use with --stat/--summary/--check)" |
| 766 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
| 767 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 768 | #: apply.c:4940 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 769 | msgid "attempt three-way merge if a patch does not apply" |
| 770 | msgstr "如果一个补丁不能应用则尝试三方合并" |
| 771 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 772 | #: apply.c:4942 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 773 | msgid "build a temporary index based on embedded index information" |
| 774 | msgstr "创建一个临时索引基于嵌入的索引信息" |
| 775 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 776 | #: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 777 | msgid "paths are separated with NUL character" |
| 778 | msgstr "路径以 NUL 字符分隔" |
| 779 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 780 | #: apply.c:4947 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 781 | msgid "ensure at least <n> lines of context match" |
| 782 | msgstr "确保至少匹配 <n> 行上下文" |
| 783 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 784 | #: apply.c:4948 builtin/am.c:2265 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 785 | msgid "action" |
| 786 | msgstr "动作" |
| 787 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 788 | #: apply.c:4949 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 789 | msgid "detect new or modified lines that have whitespace errors" |
| 790 | msgstr "检查新增和修改的行中间的空白字符滥用" |
| 791 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 792 | #: apply.c:4952 apply.c:4955 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 793 | msgid "ignore changes in whitespace when finding context" |
| 794 | msgstr "查找上下文时忽略空白字符的变更" |
| 795 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 796 | #: apply.c:4958 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 797 | msgid "apply the patch in reverse" |
| 798 | msgstr "反向应用补丁" |
| 799 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 800 | #: apply.c:4960 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 801 | msgid "don't expect at least one line of context" |
| 802 | msgstr "无需至少一行上下文" |
| 803 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 804 | #: apply.c:4962 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 805 | msgid "leave the rejected hunks in corresponding *.rej files" |
| 806 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
| 807 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 808 | #: apply.c:4964 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 809 | msgid "allow overlapping hunks" |
| 810 | msgstr "允许重叠的补丁片段" |
| 811 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 812 | #: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 |
| 813 | #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 |
| 814 | #: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 815 | msgid "be verbose" |
| 816 | msgstr "冗长输出" |
| 817 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 818 | #: apply.c:4967 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 819 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
| 820 | msgstr "允许不正确的文件末尾换行符" |
| 821 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 822 | #: apply.c:4970 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 823 | msgid "do not trust the line counts in the hunk headers" |
| 824 | msgstr "不信任补丁片段的头信息中的行号" |
| 825 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 826 | #: apply.c:4972 builtin/am.c:2274 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 827 | msgid "root" |
| 828 | msgstr "根目录" |
| 829 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 830 | #: apply.c:4973 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 831 | msgid "prepend <root> to all filenames" |
| 832 | msgstr "为所有文件名前添加 <根目录>" |
| 833 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 834 | #: archive.c:12 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 835 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
| 836 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 837 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 838 | #: archive.c:13 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 839 | msgid "git archive --list" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 840 | msgstr "git archive --list" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 841 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 842 | #: archive.c:14 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 843 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 844 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 845 | msgstr "" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 846 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 847 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 848 | #: archive.c:15 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 849 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 850 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 851 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 852 | #: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 853 | #, c-format |
| 854 | msgid "pathspec '%s' did not match any files" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 855 | msgstr "路径规格 '%s' 未匹配任何文件" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 856 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 857 | #: archive.c:429 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 858 | msgid "fmt" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 859 | msgstr "格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 860 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 861 | #: archive.c:429 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 862 | msgid "archive format" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 863 | msgstr "归档格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 864 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 865 | #: archive.c:430 builtin/log.c:1429 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 866 | msgid "prefix" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 867 | msgstr "前缀" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 868 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 869 | #: archive.c:431 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 870 | msgid "prepend prefix to each pathname in the archive" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 871 | msgstr "为归档中每个路径名加上前缀" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 872 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 873 | #: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 |
| 874 | #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 |
| 875 | #: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 |
| 876 | #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 |
| 877 | #: parse-options.h:153 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 878 | msgid "file" |
| 879 | msgstr "文件" |
| 880 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 881 | #: archive.c:433 builtin/archive.c:89 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 882 | msgid "write the archive to this file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 883 | msgstr "归档写入此文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 884 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 885 | #: archive.c:435 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 886 | msgid "read .gitattributes in working directory" |
| 887 | msgstr "读取工作区中的 .gitattributes" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 888 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 889 | #: archive.c:436 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 890 | msgid "report archived files on stderr" |
| 891 | msgstr "在标准错误上报告归档文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 892 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 893 | #: archive.c:437 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 894 | msgid "store only" |
| 895 | msgstr "只存储" |
| 896 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 897 | #: archive.c:438 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 898 | msgid "compress faster" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 899 | msgstr "压缩速度更快" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 900 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 901 | #: archive.c:446 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 902 | msgid "compress better" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 903 | msgstr "压缩效果更好" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 904 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 905 | #: archive.c:449 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 906 | msgid "list supported archive formats" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 907 | msgstr "列出支持的归档格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 908 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 909 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 910 | #: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 911 | msgid "repo" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 912 | msgstr "仓库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 913 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 914 | #: archive.c:452 builtin/archive.c:91 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 915 | msgid "retrieve the archive from remote repository <repo>" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 916 | msgstr "从远程仓库(<仓库>)提取归档文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 917 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 918 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 919 | msgid "command" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 920 | msgstr "命令" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 921 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 922 | #: archive.c:454 builtin/archive.c:93 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 923 | msgid "path to the remote git-upload-archive command" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 924 | msgstr "远程 git-upload-archive 命令的路径" |
| 925 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 926 | #: archive.c:461 |
| 927 | msgid "Unexpected option --remote" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 928 | msgstr "未知参数 --remote" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 929 | |
| 930 | #: archive.c:463 |
| 931 | msgid "Option --exec can only be used together with --remote" |
| 932 | msgstr "选项 --exec 只能和 --remote 同时使用" |
| 933 | |
| 934 | #: archive.c:465 |
| 935 | msgid "Unexpected option --output" |
| 936 | msgstr "未知参数 --output" |
| 937 | |
| 938 | #: archive.c:487 |
| 939 | #, c-format |
| 940 | msgid "Unknown archive format '%s'" |
| 941 | msgstr "未知归档格式 '%s'" |
| 942 | |
| 943 | #: archive.c:494 |
| 944 | #, c-format |
| 945 | msgid "Argument not supported for format '%s': -%d" |
| 946 | msgstr "参数不支持此格式 '%s':-%d" |
| 947 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 948 | #: attr.c:263 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 949 | msgid "" |
Jiang Xin | a7409df | 2013-03-05 13:09:55 +0800 | [diff] [blame] | 950 | "Negative patterns are ignored in git attributes\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 951 | "Use '\\!' for literal leading exclamation." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 952 | msgstr "" |
Jiang Xin | a7409df | 2013-03-05 13:09:55 +0800 | [diff] [blame] | 953 | "负值模版在 git attributes 中被忽略\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 954 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 955 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 956 | #: bisect.c:441 |
| 957 | #, c-format |
| 958 | msgid "Could not open file '%s'" |
| 959 | msgstr "不能打开文件 '%s'" |
| 960 | |
| 961 | #: bisect.c:446 |
| 962 | #, c-format |
| 963 | msgid "Badly quoted content in file '%s': %s" |
| 964 | msgstr "文件 '%s' 包含错误的引用格式:%s" |
| 965 | |
| 966 | #: bisect.c:655 |
| 967 | #, c-format |
| 968 | msgid "We cannot bisect more!\n" |
| 969 | msgstr "我们无法进行更多的二分查找!\n" |
| 970 | |
| 971 | #: bisect.c:708 |
| 972 | #, c-format |
| 973 | msgid "Not a valid commit name %s" |
| 974 | msgstr "不是一个有效的提交名 %s" |
| 975 | |
| 976 | #: bisect.c:732 |
| 977 | #, c-format |
| 978 | msgid "" |
| 979 | "The merge base %s is bad.\n" |
| 980 | "This means the bug has been fixed between %s and [%s].\n" |
| 981 | msgstr "" |
| 982 | "合并基线 %s 是坏的。\n" |
| 983 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" |
| 984 | |
| 985 | #: bisect.c:737 |
| 986 | #, c-format |
| 987 | msgid "" |
| 988 | "The merge base %s is new.\n" |
| 989 | "The property has changed between %s and [%s].\n" |
| 990 | msgstr "" |
| 991 | "合并基线 %s 是新的。\n" |
| 992 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" |
| 993 | |
| 994 | #: bisect.c:742 |
| 995 | #, c-format |
| 996 | msgid "" |
| 997 | "The merge base %s is %s.\n" |
| 998 | "This means the first '%s' commit is between %s and [%s].\n" |
| 999 | msgstr "" |
| 1000 | "合并基线 %s 是 %s。\n" |
| 1001 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" |
| 1002 | |
| 1003 | #: bisect.c:750 |
| 1004 | #, c-format |
| 1005 | msgid "" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1006 | "Some %s revs are not ancestors of the %s rev.\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1007 | "git bisect cannot work properly in this case.\n" |
| 1008 | "Maybe you mistook %s and %s revs?\n" |
| 1009 | msgstr "" |
| 1010 | "一些 %s 版本不是 %s 版本的祖先。\n" |
| 1011 | "这种情况下 git 二分查找无法正常工作。\n" |
| 1012 | "您可能弄错了 %s 和 %s 版本?\n" |
| 1013 | |
| 1014 | #: bisect.c:763 |
| 1015 | #, c-format |
| 1016 | msgid "" |
| 1017 | "the merge base between %s and [%s] must be skipped.\n" |
| 1018 | "So we cannot be sure the first %s commit is between %s and %s.\n" |
| 1019 | "We continue anyway." |
| 1020 | msgstr "" |
| 1021 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" |
| 1022 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" |
| 1023 | "我们仍旧继续。" |
| 1024 | |
| 1025 | #: bisect.c:798 |
| 1026 | #, c-format |
| 1027 | msgid "Bisecting: a merge base must be tested\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1028 | msgstr "二分查找中:合并基线必须是经过测试的\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1029 | |
| 1030 | #: bisect.c:849 |
| 1031 | #, c-format |
| 1032 | msgid "a %s revision is needed" |
| 1033 | msgstr "需要一个 %s 版本" |
| 1034 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1035 | #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1036 | #, c-format |
| 1037 | msgid "could not create file '%s'" |
| 1038 | msgstr "不能创建文件 '%s'" |
| 1039 | |
| 1040 | #: bisect.c:917 |
| 1041 | #, c-format |
| 1042 | msgid "could not read file '%s'" |
| 1043 | msgstr "不能读取文件 '%s'" |
| 1044 | |
| 1045 | #: bisect.c:947 |
| 1046 | msgid "reading bisect refs failed" |
| 1047 | msgstr "读取二分查找引用失败" |
| 1048 | |
| 1049 | #: bisect.c:967 |
| 1050 | #, c-format |
| 1051 | msgid "%s was both %s and %s\n" |
| 1052 | msgstr "%s 同时为 %s 和 %s\n" |
| 1053 | |
| 1054 | #: bisect.c:975 |
| 1055 | #, c-format |
| 1056 | msgid "" |
| 1057 | "No testable commit found.\n" |
| 1058 | "Maybe you started with bad path parameters?\n" |
| 1059 | msgstr "" |
| 1060 | "没有发现可测试的提交。\n" |
| 1061 | "可能您在运行时使用了错误的路径参数?\n" |
| 1062 | |
| 1063 | #: bisect.c:994 |
| 1064 | #, c-format |
| 1065 | msgid "(roughly %d step)" |
| 1066 | msgid_plural "(roughly %d steps)" |
| 1067 | msgstr[0] "(大概 %d 步)" |
| 1068 | msgstr[1] "(大概 %d 步)" |
| 1069 | |
| 1070 | #. TRANSLATORS: the last %s will be replaced with |
| 1071 | #. "(roughly %d steps)" translation |
| 1072 | #: bisect.c:998 |
| 1073 | #, c-format |
| 1074 | msgid "Bisecting: %d revision left to test after this %s\n" |
| 1075 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1076 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" |
| 1077 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1078 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1079 | #: branch.c:53 |
| 1080 | #, c-format |
| 1081 | msgid "" |
| 1082 | "\n" |
| 1083 | "After fixing the error cause you may try to fix up\n" |
| 1084 | "the remote tracking information by invoking\n" |
| 1085 | "\"git branch --set-upstream-to=%s%s%s\"." |
| 1086 | msgstr "" |
| 1087 | "\n" |
| 1088 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" |
| 1089 | "\"git branch --set-upstream-to=%s%s%s\" 。" |
| 1090 | |
| 1091 | #: branch.c:67 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1092 | #, c-format |
| 1093 | msgid "Not setting branch %s as its own upstream." |
| 1094 | msgstr "未设置分支 %s 作为它自己的上游。" |
| 1095 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1096 | #: branch.c:93 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1097 | #, c-format |
| 1098 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
| 1099 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" |
| 1100 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1101 | #: branch.c:94 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1102 | #, c-format |
| 1103 | msgid "Branch %s set up to track remote branch %s from %s." |
| 1104 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" |
| 1105 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1106 | #: branch.c:98 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1107 | #, c-format |
| 1108 | msgid "Branch %s set up to track local branch %s by rebasing." |
| 1109 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" |
| 1110 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1111 | #: branch.c:99 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1112 | #, c-format |
| 1113 | msgid "Branch %s set up to track local branch %s." |
| 1114 | msgstr "分支 %s 设置为跟踪本地分支 %s。" |
| 1115 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1116 | #: branch.c:104 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1117 | #, c-format |
| 1118 | msgid "Branch %s set up to track remote ref %s by rebasing." |
| 1119 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" |
| 1120 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1121 | #: branch.c:105 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1122 | #, c-format |
| 1123 | msgid "Branch %s set up to track remote ref %s." |
| 1124 | msgstr "分支 %s 设置为跟踪远程引用 %s。" |
| 1125 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1126 | #: branch.c:109 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1127 | #, c-format |
| 1128 | msgid "Branch %s set up to track local ref %s by rebasing." |
| 1129 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" |
| 1130 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1131 | #: branch.c:110 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1132 | #, c-format |
| 1133 | msgid "Branch %s set up to track local ref %s." |
| 1134 | msgstr "分支 %s 设置为跟踪本地引用 %s。" |
| 1135 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1136 | #: branch.c:119 |
| 1137 | msgid "Unable to write upstream branch configuration" |
| 1138 | msgstr "无法写入上游分支配置" |
| 1139 | |
| 1140 | #: branch.c:156 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1141 | #, c-format |
| 1142 | msgid "Not tracking: ambiguous information for ref %s" |
| 1143 | msgstr "未跟踪:引用 %s 有歧义" |
| 1144 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1145 | #: branch.c:185 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1146 | #, c-format |
| 1147 | msgid "'%s' is not a valid branch name." |
| 1148 | msgstr "'%s' 不是一个有效的分支名称。" |
| 1149 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1150 | #: branch.c:190 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1151 | #, c-format |
| 1152 | msgid "A branch named '%s' already exists." |
| 1153 | msgstr "一个分支名 '%s' 已经存在。" |
| 1154 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1155 | #: branch.c:198 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1156 | msgid "Cannot force update the current branch." |
| 1157 | msgstr "无法强制更新当前分支。" |
| 1158 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1159 | #: branch.c:218 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 1160 | #, c-format |
| 1161 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
| 1162 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" |
| 1163 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1164 | #: branch.c:220 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 1165 | #, c-format |
| 1166 | msgid "the requested upstream branch '%s' does not exist" |
| 1167 | msgstr "请求的上游分支 '%s' 不存在" |
| 1168 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1169 | #: branch.c:222 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 1170 | msgid "" |
| 1171 | "\n" |
| 1172 | "If you are planning on basing your work on an upstream\n" |
| 1173 | "branch that already exists at the remote, you may need to\n" |
| 1174 | "run \"git fetch\" to retrieve it.\n" |
| 1175 | "\n" |
| 1176 | "If you are planning to push out a new local branch that\n" |
| 1177 | "will track its remote counterpart, you may want to use\n" |
| 1178 | "\"git push -u\" to set the upstream config as you push." |
| 1179 | msgstr "" |
| 1180 | "\n" |
| 1181 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" |
| 1182 | "您可能需要执行 \"git fetch\" 来获取分支。\n" |
| 1183 | "\n" |
| 1184 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" |
| 1185 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" |
| 1186 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1187 | #: branch.c:265 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1188 | #, c-format |
| 1189 | msgid "Not a valid object name: '%s'." |
| 1190 | msgstr "不是一个有效的对象名:'%s'。" |
| 1191 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1192 | #: branch.c:285 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1193 | #, c-format |
| 1194 | msgid "Ambiguous object name: '%s'." |
| 1195 | msgstr "歧义的对象名:'%s'。" |
| 1196 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1197 | #: branch.c:290 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 1198 | #, c-format |
| 1199 | msgid "Not a valid branch point: '%s'." |
| 1200 | msgstr "无效的分支点:'%s'。" |
| 1201 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1202 | #: branch.c:344 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 1203 | #, c-format |
| 1204 | msgid "'%s' is already checked out at '%s'" |
| 1205 | msgstr "'%s' 已经检出到 '%s'" |
| 1206 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1207 | #: branch.c:363 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1208 | #, c-format |
| 1209 | msgid "HEAD of working tree %s is not updated" |
| 1210 | msgstr "工作区 %s 的 HEAD 指向没有被更新" |
| 1211 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1212 | #: bundle.c:34 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1213 | #, c-format |
| 1214 | msgid "'%s' does not look like a v2 bundle file" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1215 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1216 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1217 | #: bundle.c:61 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1218 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1219 | msgid "unrecognized header: %s%s (%d)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1220 | msgstr "未能识别的包头:%s%s (%d)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1221 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1222 | #: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1223 | #, c-format |
| 1224 | msgid "could not open '%s'" |
| 1225 | msgstr "不能打开 '%s'" |
| 1226 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1227 | #: bundle.c:139 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1228 | msgid "Repository lacks these prerequisite commits:" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 1229 | msgstr "仓库中缺少这些必备的提交:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1230 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1231 | #: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 |
| 1232 | #: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1233 | #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1234 | #: builtin/merge.c:360 builtin/shortlog.c:177 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1235 | msgid "revision walk setup failed" |
| 1236 | msgstr "版本遍历设置失败" |
| 1237 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1238 | #: bundle.c:185 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1239 | #, c-format |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 1240 | msgid "The bundle contains this ref:" |
| 1241 | msgid_plural "The bundle contains these %d refs:" |
| 1242 | msgstr[0] "这个包中含有这个引用:" |
| 1243 | msgstr[1] "这个包中含有 %d 个引用:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1244 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1245 | #: bundle.c:192 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 1246 | msgid "The bundle records a complete history." |
| 1247 | msgstr "这个包记录一个完整历史。" |
| 1248 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1249 | #: bundle.c:194 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1250 | #, c-format |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 1251 | msgid "The bundle requires this ref:" |
| 1252 | msgid_plural "The bundle requires these %d refs:" |
| 1253 | msgstr[0] "这个包需要这个引用:" |
| 1254 | msgstr[1] "这个包需要 %d 个引用:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1255 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 1256 | #: bundle.c:253 |
Jiang Xin | 9aeb4c2 | 2014-11-20 10:53:48 +0800 | [diff] [blame] | 1257 | msgid "Could not spawn pack-objects" |
| 1258 | msgstr "不能生成 pack-objects 进程" |
| 1259 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 1260 | #: bundle.c:264 |
Jiang Xin | 9aeb4c2 | 2014-11-20 10:53:48 +0800 | [diff] [blame] | 1261 | msgid "pack-objects died" |
| 1262 | msgstr "pack-objects 终止" |
| 1263 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 1264 | #: bundle.c:304 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1265 | msgid "rev-list died" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1266 | msgstr "rev-list 终止" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1267 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 1268 | #: bundle.c:353 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1269 | #, c-format |
| 1270 | msgid "ref '%s' is excluded by the rev-list options" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1271 | msgstr "引用 '%s' 被 rev-list 选项排除" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1272 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1273 | #: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 |
Jiang Xin | 9aeb4c2 | 2014-11-20 10:53:48 +0800 | [diff] [blame] | 1274 | #, c-format |
| 1275 | msgid "unrecognized argument: %s" |
| 1276 | msgstr "未能识别的参数:%s" |
| 1277 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1278 | #: bundle.c:451 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1279 | msgid "Refusing to create empty bundle." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1280 | msgstr "不能创建空包。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1281 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1282 | #: bundle.c:463 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1283 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1284 | msgid "cannot create '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1285 | msgstr "不能创建 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1286 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1287 | #: bundle.c:491 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1288 | msgid "index-pack died" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1289 | msgstr "index-pack 终止" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1290 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1291 | #: color.c:300 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1292 | #, c-format |
| 1293 | msgid "invalid color value: %.*s" |
| 1294 | msgstr "无效的颜色值:%.*s" |
| 1295 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1296 | #: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 |
| 1297 | #: builtin/am.c:1493 builtin/am.c:2127 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1298 | #, c-format |
| 1299 | msgid "could not parse %s" |
| 1300 | msgstr "不能解析 %s" |
| 1301 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 1302 | #: commit.c:42 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1303 | #, c-format |
| 1304 | msgid "%s %s is not a commit!" |
| 1305 | msgstr "%s %s 不是一个提交!" |
| 1306 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1307 | #: commit.c:1514 |
| 1308 | msgid "" |
| 1309 | "Warning: commit message did not conform to UTF-8.\n" |
| 1310 | "You may want to amend it after fixing the message, or set the config\n" |
| 1311 | "variable i18n.commitencoding to the encoding your project uses.\n" |
| 1312 | msgstr "" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 1313 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1314 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 1315 | "设置为您项目所用的字符编码。\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1316 | |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1317 | #: compat/obstack.c:406 compat/obstack.c:408 |
| 1318 | msgid "memory exhausted" |
| 1319 | msgstr "内存耗尽" |
| 1320 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1321 | #: config.c:518 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1322 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1323 | msgid "bad config line %d in blob %s" |
| 1324 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1325 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1326 | #: config.c:522 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1327 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1328 | msgid "bad config line %d in file %s" |
| 1329 | msgstr "文件 %2$s 中错误的配置行 %1$d" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1330 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1331 | #: config.c:526 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1332 | #, c-format |
| 1333 | msgid "bad config line %d in standard input" |
| 1334 | msgstr "标准输入中错误的配置行 %d" |
| 1335 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1336 | #: config.c:530 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1337 | #, c-format |
| 1338 | msgid "bad config line %d in submodule-blob %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1339 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1340 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1341 | #: config.c:534 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1342 | #, c-format |
| 1343 | msgid "bad config line %d in command line %s" |
| 1344 | msgstr "命令行 %2$s 中错误的配置行 %1$d" |
| 1345 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1346 | #: config.c:538 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1347 | #, c-format |
| 1348 | msgid "bad config line %d in %s" |
| 1349 | msgstr "在 %2$s 中错误的配置行 %1$d" |
| 1350 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1351 | #: config.c:657 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1352 | msgid "out of range" |
| 1353 | msgstr "超出范围" |
| 1354 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1355 | #: config.c:657 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1356 | msgid "invalid unit" |
| 1357 | msgstr "无效的单位" |
| 1358 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1359 | #: config.c:663 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1360 | #, c-format |
| 1361 | msgid "bad numeric config value '%s' for '%s': %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1362 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1363 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1364 | #: config.c:668 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1365 | #, c-format |
| 1366 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1367 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1368 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1369 | #: config.c:671 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1370 | #, c-format |
| 1371 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1372 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1373 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1374 | #: config.c:674 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1375 | #, c-format |
| 1376 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1377 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1378 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1379 | #: config.c:677 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1380 | #, c-format |
| 1381 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1382 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1383 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1384 | #: config.c:680 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1385 | #, c-format |
| 1386 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1387 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1388 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1389 | #: config.c:683 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1390 | #, c-format |
| 1391 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1392 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1393 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1394 | #: config.c:770 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1395 | #, c-format |
| 1396 | msgid "failed to expand user dir in: '%s'" |
| 1397 | msgstr "无法扩展 '%s' 中的用户目录" |
| 1398 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1399 | #: config.c:865 config.c:876 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1400 | #, c-format |
| 1401 | msgid "bad zlib compression level %d" |
| 1402 | msgstr "错误的 zlib 压缩级别 %d" |
| 1403 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1404 | #: config.c:993 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1405 | #, c-format |
| 1406 | msgid "invalid mode for object creation: %s" |
| 1407 | msgstr "无效的对象创建模式:%s" |
| 1408 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1409 | #: config.c:1149 |
| 1410 | #, c-format |
| 1411 | msgid "bad pack compression level %d" |
| 1412 | msgstr "错误的打包压缩级别 %d" |
| 1413 | |
| 1414 | #: config.c:1339 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1415 | msgid "unable to parse command-line config" |
| 1416 | msgstr "无法解析命令行中的配置" |
| 1417 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1418 | #: config.c:1389 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1419 | msgid "unknown error occurred while reading the configuration files" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1420 | msgstr "在读取配置文件时遇到未知错误" |
| 1421 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1422 | #: config.c:1743 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1423 | #, c-format |
| 1424 | msgid "unable to parse '%s' from command-line config" |
| 1425 | msgstr "无法解析命令行配置中的 '%s'" |
| 1426 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1427 | #: config.c:1745 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1428 | #, c-format |
| 1429 | msgid "bad config variable '%s' in file '%s' at line %d" |
| 1430 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" |
| 1431 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1432 | #: config.c:1804 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1433 | #, c-format |
| 1434 | msgid "%s has multiple values" |
| 1435 | msgstr "%s 有多个取值" |
| 1436 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1437 | #: config.c:2225 config.c:2450 |
| 1438 | #, c-format |
| 1439 | msgid "fstat on %s failed" |
| 1440 | msgstr "在 %s 上执行 fstat 失败" |
| 1441 | |
| 1442 | #: config.c:2343 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1443 | #, c-format |
| 1444 | msgid "could not set '%s' to '%s'" |
| 1445 | msgstr "不能设置 '%s' 为 '%s'" |
| 1446 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1447 | #: config.c:2345 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1448 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1449 | msgid "could not unset '%s'" |
| 1450 | msgstr "不能取消设置 '%s'" |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1451 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1452 | #: connect.c:49 |
| 1453 | msgid "The remote end hung up upon initial contact" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 1454 | msgstr "远端在连接发起时即挂断" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1455 | |
| 1456 | #: connect.c:51 |
| 1457 | msgid "" |
| 1458 | "Could not read from remote repository.\n" |
| 1459 | "\n" |
| 1460 | "Please make sure you have the correct access rights\n" |
| 1461 | "and the repository exists." |
| 1462 | msgstr "" |
| 1463 | "无法读取远程仓库。\n" |
| 1464 | "\n" |
| 1465 | "请确认您有正确的访问权限并且仓库存在。" |
| 1466 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1467 | #: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1468 | msgid "Checking connectivity" |
| 1469 | msgstr "检查连接中" |
| 1470 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1471 | #: connected.c:75 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1472 | msgid "Could not run 'git rev-list'" |
| 1473 | msgstr "不能执行 'git rev-list'" |
| 1474 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1475 | #: connected.c:95 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1476 | msgid "failed write to rev-list" |
| 1477 | msgstr "无法写入 rev-list" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1478 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1479 | #: connected.c:102 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1480 | msgid "failed to close rev-list's stdin" |
| 1481 | msgstr "无法关闭 rev-list 的标准输入" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1482 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1483 | #: convert.c:201 |
| 1484 | #, c-format |
| 1485 | msgid "" |
| 1486 | "CRLF will be replaced by LF in %s.\n" |
| 1487 | "The file will have its original line endings in your working directory." |
| 1488 | msgstr "" |
| 1489 | "文件 %s 中的 CRLF 将被 LF 替换。\n" |
| 1490 | "在工作区中该文件仍保持原有的换行符。" |
| 1491 | |
| 1492 | #: convert.c:205 |
| 1493 | #, c-format |
| 1494 | msgid "CRLF would be replaced by LF in %s." |
| 1495 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" |
| 1496 | |
| 1497 | #: convert.c:211 |
| 1498 | #, c-format |
| 1499 | msgid "" |
| 1500 | "LF will be replaced by CRLF in %s.\n" |
| 1501 | "The file will have its original line endings in your working directory." |
| 1502 | msgstr "" |
| 1503 | "文件 %s 中的 LF 将被 CRLF 替换。\n" |
| 1504 | "在工作区中该文件仍保持原有的换行符。" |
| 1505 | |
| 1506 | #: convert.c:215 |
| 1507 | #, c-format |
| 1508 | msgid "LF would be replaced by CRLF in %s" |
| 1509 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" |
| 1510 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1511 | #: date.c:97 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1512 | msgid "in the future" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1513 | msgstr "在将来" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1514 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1515 | #: date.c:103 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1516 | #, c-format |
| 1517 | msgid "%lu second ago" |
| 1518 | msgid_plural "%lu seconds ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1519 | msgstr[0] "%lu 秒钟前" |
| 1520 | msgstr[1] "%lu 秒钟前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1521 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1522 | #: date.c:110 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1523 | #, c-format |
| 1524 | msgid "%lu minute ago" |
| 1525 | msgid_plural "%lu minutes ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1526 | msgstr[0] "%lu 分钟前" |
| 1527 | msgstr[1] "%lu 分钟前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1528 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1529 | #: date.c:117 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1530 | #, c-format |
| 1531 | msgid "%lu hour ago" |
| 1532 | msgid_plural "%lu hours ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1533 | msgstr[0] "%lu 小时前" |
| 1534 | msgstr[1] "%lu 小时前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1535 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1536 | #: date.c:124 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1537 | #, c-format |
| 1538 | msgid "%lu day ago" |
| 1539 | msgid_plural "%lu days ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1540 | msgstr[0] "%lu 天前" |
| 1541 | msgstr[1] "%lu 天前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1542 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1543 | #: date.c:130 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1544 | #, c-format |
| 1545 | msgid "%lu week ago" |
| 1546 | msgid_plural "%lu weeks ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1547 | msgstr[0] "%lu 周前" |
| 1548 | msgstr[1] "%lu 周前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1549 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1550 | #: date.c:137 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1551 | #, c-format |
| 1552 | msgid "%lu month ago" |
| 1553 | msgid_plural "%lu months ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1554 | msgstr[0] "%lu 个月前" |
| 1555 | msgstr[1] "%lu 个月前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1556 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1557 | #: date.c:148 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1558 | #, c-format |
| 1559 | msgid "%lu year" |
| 1560 | msgid_plural "%lu years" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1561 | msgstr[0] "%lu 年" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 1562 | msgstr[1] "%lu 年" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1563 | |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1564 | #. TRANSLATORS: "%s" is "<n> years" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1565 | #: date.c:151 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1566 | #, c-format |
| 1567 | msgid "%s, %lu month ago" |
| 1568 | msgid_plural "%s, %lu months ago" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1569 | msgstr[0] "%s %lu 个月前" |
| 1570 | msgstr[1] "%s %lu 个月前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1571 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1572 | #: date.c:156 date.c:161 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1573 | #, c-format |
| 1574 | msgid "%lu year ago" |
| 1575 | msgid_plural "%lu years ago" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1576 | msgstr[0] "%lu 年前" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 1577 | msgstr[1] "%lu 年前" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1578 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 1579 | #: diffcore-order.c:24 |
| 1580 | #, c-format |
| 1581 | msgid "failed to read orderfile '%s'" |
| 1582 | msgstr "无法读取排序文件 '%s'" |
| 1583 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1584 | #: diffcore-rename.c:536 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 1585 | msgid "Performing inexact rename detection" |
| 1586 | msgstr "正在进行非精确的重命名检测" |
| 1587 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1588 | #: diff.c:62 |
| 1589 | #, c-format |
| 1590 | msgid "option '%s' requires a value" |
| 1591 | msgstr "选项 '%s' 需要一个值" |
| 1592 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 1593 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1594 | #: diff.c:124 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1595 | #, c-format |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1596 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
| 1597 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1598 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 1599 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1600 | #: diff.c:129 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1601 | #, c-format |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1602 | msgid " Unknown dirstat parameter '%s'\n" |
| 1603 | msgstr " 未知的 dirstat 参数 '%s'\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1604 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1605 | #: diff.c:281 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1606 | #, c-format |
| 1607 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
| 1608 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" |
| 1609 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1610 | #: diff.c:344 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1611 | #, c-format |
| 1612 | msgid "" |
| 1613 | "Found errors in 'diff.dirstat' config variable:\n" |
| 1614 | "%s" |
| 1615 | msgstr "" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 1616 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1617 | "%s" |
| 1618 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1619 | #: diff.c:3085 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 1620 | #, c-format |
| 1621 | msgid "external diff died, stopping at %s" |
| 1622 | msgstr "外部 diff 退出,停止在 %s" |
| 1623 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1624 | #: diff.c:3411 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1625 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
| 1626 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" |
| 1627 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1628 | #: diff.c:3501 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 1629 | msgid "--follow requires exactly one pathspec" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 1630 | msgstr "--follow 明确要求只跟一个路径规格" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 1631 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1632 | #: diff.c:3664 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1633 | #, c-format |
| 1634 | msgid "" |
| 1635 | "Failed to parse --dirstat/-X option parameter:\n" |
| 1636 | "%s" |
| 1637 | msgstr "" |
| 1638 | "无法解析 --dirstat/-X 选项的参数:\n" |
| 1639 | "%s" |
| 1640 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1641 | #: diff.c:3678 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1642 | #, c-format |
| 1643 | msgid "Failed to parse --submodule option parameter: '%s'" |
| 1644 | msgstr "无法解析 --submodule 选项的参数:'%s'" |
| 1645 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1646 | #: diff.c:4696 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1647 | msgid "inexact rename detection was skipped due to too many files." |
| 1648 | msgstr "因为文件太多,略过不严格的重命名检查。" |
| 1649 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1650 | #: diff.c:4699 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1651 | msgid "only found copies from modified paths due to too many files." |
| 1652 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" |
| 1653 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1654 | #: diff.c:4702 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1655 | #, c-format |
| 1656 | msgid "" |
| 1657 | "you may want to set your %s variable to at least %d and retry the command." |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 1658 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1659 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1660 | #: dir.c:1862 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 1661 | msgid "failed to get kernel name and information" |
| 1662 | msgstr "无法获得内核名称和信息" |
| 1663 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1664 | #: dir.c:1981 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 1665 | msgid "Untracked cache is disabled on this system or location." |
| 1666 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 1667 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1668 | #: dir.c:2759 |
| 1669 | #, c-format |
| 1670 | msgid "could not migrate git directory from '%s' to '%s'" |
| 1671 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" |
| 1672 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1673 | #: fetch-pack.c:213 |
| 1674 | msgid "git fetch-pack: expected shallow list" |
| 1675 | msgstr "git fetch-pack:应为 shallow 列表" |
| 1676 | |
| 1677 | #: fetch-pack.c:225 |
| 1678 | msgid "git fetch-pack: expected ACK/NAK, got EOF" |
| 1679 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" |
| 1680 | |
| 1681 | #: fetch-pack.c:243 |
| 1682 | #, c-format |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 1683 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1684 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
| 1685 | |
| 1686 | #: fetch-pack.c:295 |
| 1687 | msgid "--stateless-rpc requires multi_ack_detailed" |
| 1688 | msgstr "--stateless-rpc 需要 multi_ack_detailed" |
| 1689 | |
| 1690 | #: fetch-pack.c:381 |
| 1691 | #, c-format |
| 1692 | msgid "invalid shallow line: %s" |
| 1693 | msgstr "无效的 shallow 信息:%s" |
| 1694 | |
| 1695 | #: fetch-pack.c:387 |
| 1696 | #, c-format |
| 1697 | msgid "invalid unshallow line: %s" |
| 1698 | msgstr "无效的 unshallow 信息:%s" |
| 1699 | |
| 1700 | #: fetch-pack.c:389 |
| 1701 | #, c-format |
| 1702 | msgid "object not found: %s" |
| 1703 | msgstr "对象未找到:%s" |
| 1704 | |
| 1705 | #: fetch-pack.c:392 |
| 1706 | #, c-format |
| 1707 | msgid "error in object: %s" |
| 1708 | msgstr "对象中出错:%s" |
| 1709 | |
| 1710 | #: fetch-pack.c:394 |
| 1711 | #, c-format |
| 1712 | msgid "no shallow found: %s" |
| 1713 | msgstr "未发现 shallow:%s" |
| 1714 | |
| 1715 | #: fetch-pack.c:397 |
| 1716 | #, c-format |
| 1717 | msgid "expected shallow/unshallow, got %s" |
| 1718 | msgstr "应为 shallow/unshallow,却得到 %s" |
| 1719 | |
| 1720 | #: fetch-pack.c:436 |
| 1721 | #, c-format |
| 1722 | msgid "got %s %d %s" |
| 1723 | msgstr "得到 %s %d %s" |
| 1724 | |
| 1725 | #: fetch-pack.c:450 |
| 1726 | #, c-format |
| 1727 | msgid "invalid commit %s" |
| 1728 | msgstr "无效提交 %s" |
| 1729 | |
| 1730 | #: fetch-pack.c:483 |
| 1731 | msgid "giving up" |
| 1732 | msgstr "放弃" |
| 1733 | |
| 1734 | #: fetch-pack.c:493 progress.c:235 |
| 1735 | msgid "done" |
| 1736 | msgstr "完成" |
| 1737 | |
| 1738 | #: fetch-pack.c:505 |
| 1739 | #, c-format |
| 1740 | msgid "got %s (%d) %s" |
| 1741 | msgstr "得到 %s (%d) %s" |
| 1742 | |
| 1743 | #: fetch-pack.c:551 |
| 1744 | #, c-format |
| 1745 | msgid "Marking %s as complete" |
| 1746 | msgstr "标记 %s 为完成" |
| 1747 | |
| 1748 | #: fetch-pack.c:697 |
| 1749 | #, c-format |
| 1750 | msgid "already have %s (%s)" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 1751 | msgstr "已经有 %s(%s)" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1752 | |
| 1753 | #: fetch-pack.c:735 |
| 1754 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
| 1755 | msgstr "fetch-pack:无法派生 sideband 多路输出" |
| 1756 | |
| 1757 | #: fetch-pack.c:743 |
| 1758 | msgid "protocol error: bad pack header" |
| 1759 | msgstr "协议错误:坏的包头" |
| 1760 | |
| 1761 | #: fetch-pack.c:799 |
| 1762 | #, c-format |
| 1763 | msgid "fetch-pack: unable to fork off %s" |
| 1764 | msgstr "fetch-pack:无法派生进程 %s" |
| 1765 | |
| 1766 | #: fetch-pack.c:815 |
| 1767 | #, c-format |
| 1768 | msgid "%s failed" |
| 1769 | msgstr "%s 失败" |
| 1770 | |
| 1771 | #: fetch-pack.c:817 |
| 1772 | msgid "error in sideband demultiplexer" |
| 1773 | msgstr "sideband 多路输出出错" |
| 1774 | |
| 1775 | #: fetch-pack.c:844 |
| 1776 | msgid "Server does not support shallow clients" |
| 1777 | msgstr "服务器不支持 shalllow 客户端" |
| 1778 | |
| 1779 | #: fetch-pack.c:848 |
| 1780 | msgid "Server supports multi_ack_detailed" |
| 1781 | msgstr "服务器支持 multi_ack_detailed" |
| 1782 | |
| 1783 | #: fetch-pack.c:851 |
| 1784 | msgid "Server supports no-done" |
| 1785 | msgstr "服务器支持 no-done" |
| 1786 | |
| 1787 | #: fetch-pack.c:857 |
| 1788 | msgid "Server supports multi_ack" |
| 1789 | msgstr "服务器支持 multi_ack" |
| 1790 | |
| 1791 | #: fetch-pack.c:861 |
| 1792 | msgid "Server supports side-band-64k" |
| 1793 | msgstr "服务器支持 side-band-64k" |
| 1794 | |
| 1795 | #: fetch-pack.c:865 |
| 1796 | msgid "Server supports side-band" |
| 1797 | msgstr "服务器支持 side-band" |
| 1798 | |
| 1799 | #: fetch-pack.c:869 |
| 1800 | msgid "Server supports allow-tip-sha1-in-want" |
| 1801 | msgstr "服务器支持 allow-tip-sha1-in-want" |
| 1802 | |
| 1803 | #: fetch-pack.c:873 |
| 1804 | msgid "Server supports allow-reachable-sha1-in-want" |
| 1805 | msgstr "服务器支持 allow-reachable-sha1-in-want" |
| 1806 | |
| 1807 | #: fetch-pack.c:883 |
| 1808 | msgid "Server supports ofs-delta" |
| 1809 | msgstr "服务器支持 ofs-delta" |
| 1810 | |
| 1811 | #: fetch-pack.c:890 |
| 1812 | #, c-format |
| 1813 | msgid "Server version is %.*s" |
| 1814 | msgstr "服务器版本 %.*s" |
| 1815 | |
| 1816 | #: fetch-pack.c:896 |
| 1817 | msgid "Server does not support --shallow-since" |
| 1818 | msgstr "服务器不支持 --shallow-since" |
| 1819 | |
| 1820 | #: fetch-pack.c:900 |
| 1821 | msgid "Server does not support --shallow-exclude" |
| 1822 | msgstr "服务器不支持 --shallow-exclude" |
| 1823 | |
| 1824 | #: fetch-pack.c:902 |
| 1825 | msgid "Server does not support --deepen" |
| 1826 | msgstr "服务器不支持 --deepen" |
| 1827 | |
| 1828 | #: fetch-pack.c:913 |
| 1829 | msgid "no common commits" |
| 1830 | msgstr "没有共同的提交" |
| 1831 | |
| 1832 | #: fetch-pack.c:925 |
| 1833 | msgid "git fetch-pack: fetch failed." |
| 1834 | msgstr "git fetch-pack:获取失败。" |
| 1835 | |
| 1836 | #: fetch-pack.c:1087 |
| 1837 | msgid "no matching remote head" |
| 1838 | msgstr "没有匹配的远程分支" |
| 1839 | |
| 1840 | #: gpg-interface.c:185 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1841 | msgid "gpg failed to sign the data" |
| 1842 | msgstr "gpg 无法为数据签名" |
| 1843 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1844 | #: gpg-interface.c:215 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1845 | msgid "could not create temporary file" |
| 1846 | msgstr "不能创建临时文件" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 1847 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1848 | #: gpg-interface.c:217 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 1849 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1850 | msgid "failed writing detached signature to '%s'" |
| 1851 | msgstr "无法将分离式签名写入 '%s'" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 1852 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1853 | #: graph.c:96 |
| 1854 | #, c-format |
| 1855 | msgid "ignore invalid color '%.*s' in log.graphColors" |
| 1856 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" |
| 1857 | |
| 1858 | #: grep.c:1794 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 1859 | #, c-format |
| 1860 | msgid "'%s': unable to read %s" |
| 1861 | msgstr "'%s':无法读取 %s" |
| 1862 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1863 | #: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 1864 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1865 | msgid "failed to stat '%s'" |
| 1866 | msgstr "无法枚举 '%s' 状态" |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 1867 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1868 | #: grep.c:1822 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 1869 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1870 | msgid "'%s': short read" |
| 1871 | msgstr "'%s':读取不完整" |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 1872 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1873 | #: help.c:218 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1874 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1875 | msgid "available git commands in '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1876 | msgstr "在 '%s' 下可用的 git 命令" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1877 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1878 | #: help.c:225 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1879 | msgid "git commands available from elsewhere on your $PATH" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1880 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1881 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1882 | #: help.c:256 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 1883 | msgid "These are common Git commands used in various situations:" |
| 1884 | msgstr "这些是各种场合常见的 Git 命令:" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 1885 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1886 | #: help.c:321 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 1887 | #, c-format |
| 1888 | msgid "" |
| 1889 | "'%s' appears to be a git command, but we were not\n" |
| 1890 | "able to execute it. Maybe git-%s is broken?" |
| 1891 | msgstr "" |
| 1892 | "'%s' 像是一个 git 命令,但却无法运行。\n" |
| 1893 | "可能是 git-%s 受损?" |
| 1894 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1895 | #: help.c:376 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1896 | msgid "Uh oh. Your system reports no Git commands at all." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1897 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1898 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1899 | #: help.c:398 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1900 | #, c-format |
| 1901 | msgid "" |
| 1902 | "WARNING: You called a Git command named '%s', which does not exist.\n" |
| 1903 | "Continuing under the assumption that you meant '%s'" |
| 1904 | msgstr "" |
Jiang Xin | 7665d45 | 2016-09-05 23:26:21 +0800 | [diff] [blame] | 1905 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1906 | "是 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1907 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1908 | #: help.c:403 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1909 | #, c-format |
| 1910 | msgid "in %0.1f seconds automatically..." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1911 | msgstr "在 %0.1f 秒钟后自动运行..." |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1912 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1913 | #: help.c:410 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1914 | #, c-format |
| 1915 | msgid "git: '%s' is not a git command. See 'git --help'." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1916 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1917 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1918 | #: help.c:414 help.c:480 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1919 | msgid "" |
| 1920 | "\n" |
| 1921 | "Did you mean this?" |
| 1922 | msgid_plural "" |
| 1923 | "\n" |
| 1924 | "Did you mean one of these?" |
| 1925 | msgstr[0] "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 1926 | "\n" |
| 1927 | "您指的是这个么?" |
| 1928 | msgstr[1] "" |
| 1929 | "\n" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 1930 | "您指的是这其中的某一个么?" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 1931 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1932 | #: help.c:476 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 1933 | #, c-format |
| 1934 | msgid "%s: %s - %s" |
| 1935 | msgstr "%s:%s - %s" |
| 1936 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1937 | #: ident.c:334 |
| 1938 | msgid "" |
| 1939 | "\n" |
| 1940 | "*** Please tell me who you are.\n" |
| 1941 | "\n" |
| 1942 | "Run\n" |
| 1943 | "\n" |
| 1944 | " git config --global user.email \"you@example.com\"\n" |
| 1945 | " git config --global user.name \"Your Name\"\n" |
| 1946 | "\n" |
| 1947 | "to set your account's default identity.\n" |
| 1948 | "Omit --global to set the identity only in this repository.\n" |
| 1949 | "\n" |
| 1950 | msgstr "" |
| 1951 | "\n" |
| 1952 | "*** 请告诉我你是谁。\n" |
| 1953 | "\n" |
| 1954 | "运行\n" |
| 1955 | "\n" |
| 1956 | " git config --global user.email \"you@example.com\"\n" |
| 1957 | " git config --global user.name \"Your Name\"\n" |
| 1958 | "\n" |
| 1959 | "来设置您账号的缺省身份标识。\n" |
| 1960 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" |
| 1961 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 1962 | #: lockfile.c:152 |
| 1963 | #, c-format |
| 1964 | msgid "" |
| 1965 | "Unable to create '%s.lock': %s.\n" |
| 1966 | "\n" |
| 1967 | "Another git process seems to be running in this repository, e.g.\n" |
| 1968 | "an editor opened by 'git commit'. Please make sure all processes\n" |
| 1969 | "are terminated then try again. If it still fails, a git process\n" |
| 1970 | "may have crashed in this repository earlier:\n" |
| 1971 | "remove the file manually to continue." |
| 1972 | msgstr "" |
| 1973 | "无法创建 '%s.lock':%s。\n" |
| 1974 | "\n" |
| 1975 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" |
| 1976 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" |
| 1977 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" |
| 1978 | "手动删除这个文件再继续。" |
| 1979 | |
| 1980 | #: lockfile.c:160 |
| 1981 | #, c-format |
| 1982 | msgid "Unable to create '%s.lock': %s" |
| 1983 | msgstr "不能创建 '%s.lock':%s" |
| 1984 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 1985 | #: merge.c:41 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1986 | msgid "failed to read the cache" |
| 1987 | msgstr "无法读取缓存" |
| 1988 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 1989 | #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 |
| 1990 | #: builtin/checkout.c:588 builtin/clone.c:731 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 1991 | msgid "unable to write new index file" |
| 1992 | msgstr "无法写新的索引文件" |
| 1993 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 1994 | #: merge-recursive.c:209 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 1995 | msgid "(bad commit)\n" |
| 1996 | msgstr "(坏提交)\n" |
| 1997 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 1998 | #: merge-recursive.c:231 merge-recursive.c:239 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 1999 | #, c-format |
| 2000 | msgid "addinfo_cache failed for path '%s'" |
| 2001 | msgstr "为路径 '%s' addinfo_cache 失败" |
| 2002 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2003 | #: merge-recursive.c:303 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2004 | msgid "error building trees" |
| 2005 | msgstr "无法创建树" |
| 2006 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2007 | #: merge-recursive.c:727 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2008 | #, c-format |
| 2009 | msgid "failed to create path '%s'%s" |
| 2010 | msgstr "无法创建路径 '%s'%s" |
| 2011 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2012 | #: merge-recursive.c:738 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2013 | #, c-format |
| 2014 | msgid "Removing %s to make room for subdirectory\n" |
| 2015 | msgstr "删除 %s 以便为子目录留出空间\n" |
| 2016 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2017 | #: merge-recursive.c:752 merge-recursive.c:771 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2018 | msgid ": perhaps a D/F conflict?" |
| 2019 | msgstr ":可能是一个目录/文件冲突?" |
| 2020 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2021 | #: merge-recursive.c:761 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2022 | #, c-format |
| 2023 | msgid "refusing to lose untracked file at '%s'" |
| 2024 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" |
| 2025 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2026 | #: merge-recursive.c:803 builtin/cat-file.c:34 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2027 | #, c-format |
| 2028 | msgid "cannot read object %s '%s'" |
| 2029 | msgstr "不能读取对象 %s '%s'" |
| 2030 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2031 | #: merge-recursive.c:805 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2032 | #, c-format |
| 2033 | msgid "blob expected for %s '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2034 | msgstr "%s '%s' 应为数据对象" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2035 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2036 | #: merge-recursive.c:829 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2037 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 2038 | msgid "failed to open '%s': %s" |
| 2039 | msgstr "无法打开 '%s':%s" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2040 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2041 | #: merge-recursive.c:840 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2042 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 2043 | msgid "failed to symlink '%s': %s" |
| 2044 | msgstr "无法创建符号链接 '%s':%s" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2045 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2046 | #: merge-recursive.c:845 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2047 | #, c-format |
| 2048 | msgid "do not know what to do with %06o %s '%s'" |
| 2049 | msgstr "不知道如何处理 %06o %s '%s'" |
| 2050 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2051 | #: merge-recursive.c:985 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2052 | msgid "Failed to execute internal merge" |
| 2053 | msgstr "无法执行内部合并" |
| 2054 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2055 | #: merge-recursive.c:989 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2056 | #, c-format |
| 2057 | msgid "Unable to add %s to database" |
| 2058 | msgstr "不能添加 %s 至对象库" |
| 2059 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2060 | #: merge-recursive.c:1088 merge-recursive.c:1102 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2061 | #, c-format |
| 2062 | msgid "" |
| 2063 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 2064 | "in tree." |
| 2065 | msgstr "" |
| 2066 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" |
| 2067 | "的版本被保留。" |
| 2068 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2069 | #: merge-recursive.c:1094 merge-recursive.c:1107 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2070 | #, c-format |
| 2071 | msgid "" |
| 2072 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
| 2073 | "in tree at %s." |
| 2074 | msgstr "" |
| 2075 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" |
| 2076 | "的版本保留于 %8$s 中。" |
| 2077 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2078 | #: merge-recursive.c:1150 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2079 | msgid "rename" |
| 2080 | msgstr "重命名" |
| 2081 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2082 | #: merge-recursive.c:1150 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2083 | msgid "renamed" |
| 2084 | msgstr "重命名" |
| 2085 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2086 | #: merge-recursive.c:1207 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2087 | #, c-format |
| 2088 | msgid "%s is a directory in %s adding as %s instead" |
| 2089 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" |
| 2090 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2091 | #: merge-recursive.c:1232 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2092 | #, c-format |
| 2093 | msgid "" |
| 2094 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
| 2095 | "\"->\"%s\" in \"%s\"%s" |
| 2096 | msgstr "" |
| 2097 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
| 2098 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" |
| 2099 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2100 | #: merge-recursive.c:1237 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2101 | msgid " (left unresolved)" |
| 2102 | msgstr "(留下未解决)" |
| 2103 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2104 | #: merge-recursive.c:1299 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2105 | #, c-format |
| 2106 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
| 2107 | msgstr "" |
| 2108 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
| 2109 | "%5$s" |
| 2110 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2111 | #: merge-recursive.c:1332 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2112 | #, c-format |
| 2113 | msgid "Renaming %s to %s and %s to %s instead" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2114 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2115 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2116 | #: merge-recursive.c:1535 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2117 | #, c-format |
| 2118 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
| 2119 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" |
| 2120 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2121 | #: merge-recursive.c:1550 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2122 | #, c-format |
| 2123 | msgid "Adding merged %s" |
| 2124 | msgstr "添加合并后的 %s" |
| 2125 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2126 | #: merge-recursive.c:1557 merge-recursive.c:1771 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2127 | #, c-format |
| 2128 | msgid "Adding as %s instead" |
| 2129 | msgstr "而是以 %s 为名添加" |
| 2130 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2131 | #: merge-recursive.c:1614 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2132 | #, c-format |
| 2133 | msgid "cannot read object %s" |
| 2134 | msgstr "不能读取对象 %s" |
| 2135 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2136 | #: merge-recursive.c:1617 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2137 | #, c-format |
| 2138 | msgid "object %s is not a blob" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2139 | msgstr "对象 %s 不是一个数据对象" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2140 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2141 | #: merge-recursive.c:1670 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2142 | msgid "modify" |
| 2143 | msgstr "修改" |
| 2144 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2145 | #: merge-recursive.c:1670 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2146 | msgid "modified" |
| 2147 | msgstr "修改" |
| 2148 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2149 | #: merge-recursive.c:1680 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2150 | msgid "content" |
| 2151 | msgstr "内容" |
| 2152 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2153 | #: merge-recursive.c:1687 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2154 | msgid "add/add" |
| 2155 | msgstr "添加/添加" |
| 2156 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2157 | #: merge-recursive.c:1723 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2158 | #, c-format |
| 2159 | msgid "Skipped %s (merged same as existing)" |
| 2160 | msgstr "略过 %s(已经做过相同合并)" |
| 2161 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2162 | #: merge-recursive.c:1737 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2163 | #, c-format |
| 2164 | msgid "Auto-merging %s" |
| 2165 | msgstr "自动合并 %s" |
| 2166 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2167 | #: merge-recursive.c:1741 git-submodule.sh:930 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2168 | msgid "submodule" |
| 2169 | msgstr "子模组" |
| 2170 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2171 | #: merge-recursive.c:1742 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2172 | #, c-format |
| 2173 | msgid "CONFLICT (%s): Merge conflict in %s" |
| 2174 | msgstr "冲突(%s):合并冲突于 %s" |
| 2175 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2176 | #: merge-recursive.c:1836 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2177 | #, c-format |
| 2178 | msgid "Removing %s" |
| 2179 | msgstr "删除 %s" |
| 2180 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2181 | #: merge-recursive.c:1862 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2182 | msgid "file/directory" |
| 2183 | msgstr "文件/目录" |
| 2184 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2185 | #: merge-recursive.c:1868 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2186 | msgid "directory/file" |
| 2187 | msgstr "目录/文件" |
| 2188 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2189 | #: merge-recursive.c:1874 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2190 | #, c-format |
| 2191 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
| 2192 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" |
| 2193 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2194 | #: merge-recursive.c:1883 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2195 | #, c-format |
| 2196 | msgid "Adding %s" |
| 2197 | msgstr "添加 %s" |
| 2198 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2199 | #: merge-recursive.c:1920 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2200 | msgid "Already up-to-date!" |
| 2201 | msgstr "已经是最新的!" |
| 2202 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2203 | #: merge-recursive.c:1929 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2204 | #, c-format |
| 2205 | msgid "merging of trees %s and %s failed" |
| 2206 | msgstr "无法合并树 %s 和 %s" |
| 2207 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2208 | #: merge-recursive.c:2012 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2209 | msgid "Merging:" |
| 2210 | msgstr "合并:" |
| 2211 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2212 | #: merge-recursive.c:2025 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2213 | #, c-format |
Jiang Xin | e5e38ce | 2012-08-07 01:10:34 +0800 | [diff] [blame] | 2214 | msgid "found %u common ancestor:" |
| 2215 | msgid_plural "found %u common ancestors:" |
| 2216 | msgstr[0] "发现 %u 个共同祖先:" |
| 2217 | msgstr[1] "发现 %u 个共同祖先:" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2218 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2219 | #: merge-recursive.c:2064 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2220 | msgid "merge returned no commit" |
| 2221 | msgstr "合并未返回提交" |
| 2222 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2223 | #: merge-recursive.c:2127 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2224 | #, c-format |
| 2225 | msgid "Could not parse object '%s'" |
| 2226 | msgstr "不能解析对象 '%s'" |
| 2227 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2228 | #: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 2229 | msgid "Unable to write index." |
| 2230 | msgstr "不能写入索引。" |
| 2231 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2232 | #: notes-merge.c:273 |
| 2233 | #, c-format |
| 2234 | msgid "" |
| 2235 | "You have not concluded your previous notes merge (%s exists).\n" |
| 2236 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " |
| 2237 | "commit/abort the previous merge before you start a new notes merge." |
| 2238 | msgstr "" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 2239 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2240 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
| 2241 | "notes merge --abort' 来提交/终止前一次合并。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2242 | |
| 2243 | #: notes-merge.c:280 |
| 2244 | #, c-format |
| 2245 | msgid "You have not concluded your notes merge (%s exists)." |
| 2246 | msgstr "您尚未结束注释合并(存在 %s)。" |
| 2247 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 2248 | #: notes-utils.c:41 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2249 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
| 2250 | msgstr "不能提交未初始化/未引用的注解树" |
| 2251 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2252 | #: notes-utils.c:100 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2253 | #, c-format |
| 2254 | msgid "Bad notes.rewriteMode value: '%s'" |
| 2255 | msgstr "坏的 notes.rewriteMode 值:'%s'" |
| 2256 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2257 | #: notes-utils.c:110 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2258 | #, c-format |
| 2259 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
| 2260 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" |
| 2261 | |
| 2262 | #. TRANSLATORS: The first %s is the name of the |
| 2263 | #. environment variable, the second %s is its value |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2264 | #: notes-utils.c:137 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2265 | #, c-format |
| 2266 | msgid "Bad %s value: '%s'" |
| 2267 | msgstr "坏的 %s 值:'%s'" |
| 2268 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2269 | #: object.c:240 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 2270 | #, c-format |
| 2271 | msgid "unable to parse object: %s" |
| 2272 | msgstr "不能解析对象:%s" |
| 2273 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 2274 | #: parse-options.c:572 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2275 | msgid "..." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2276 | msgstr "..." |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2277 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 2278 | #: parse-options.c:590 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2279 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2280 | msgid "usage: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2281 | msgstr "用法:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2282 | |
| 2283 | #. TRANSLATORS: the colon here should align with the |
| 2284 | #. one in "usage: %s" translation |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 2285 | #: parse-options.c:594 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2286 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2287 | msgid " or: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2288 | msgstr " 或:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2289 | |
| 2290 | # 译者:为保证在输出中对齐,注意调整句中空格! |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 2291 | #: parse-options.c:597 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2292 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2293 | msgid " %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2294 | msgstr " %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2295 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 2296 | #: parse-options.c:631 |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 2297 | msgid "-NUM" |
| 2298 | msgstr "-数字" |
| 2299 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2300 | #: parse-options-cb.c:108 |
| 2301 | #, c-format |
| 2302 | msgid "malformed object name '%s'" |
| 2303 | msgstr "非法的对象名 '%s'" |
| 2304 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2305 | #: path.c:826 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2306 | #, c-format |
| 2307 | msgid "Could not make %s writable by group" |
| 2308 | msgstr "不能设置 %s 为组可写" |
| 2309 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2310 | #: pathspec.c:142 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2311 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2312 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 2313 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2314 | #: pathspec.c:149 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2315 | msgid "" |
| 2316 | "global 'literal' pathspec setting is incompatible with all other global " |
| 2317 | "pathspec settings" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2318 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 2319 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2320 | #: pathspec.c:188 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2321 | msgid "invalid parameter for pathspec magic 'prefix'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2322 | msgstr "路径规格包含无效的神奇前缀" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2323 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2324 | #: pathspec.c:201 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2325 | #, c-format |
| 2326 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2327 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2328 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2329 | #: pathspec.c:206 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2330 | #, c-format |
| 2331 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2332 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2333 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2334 | #: pathspec.c:238 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2335 | #, c-format |
| 2336 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2337 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2338 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2339 | #: pathspec.c:293 pathspec.c:315 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2340 | #, c-format |
| 2341 | msgid "Pathspec '%s' is in submodule '%.*s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2342 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2343 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2344 | #: pathspec.c:350 |
| 2345 | #, c-format |
| 2346 | msgid "%s: 'literal' and 'glob' are incompatible" |
| 2347 | msgstr "%s:'literal' 和 'glob' 不兼容" |
| 2348 | |
| 2349 | #: pathspec.c:363 |
| 2350 | #, c-format |
| 2351 | msgid "%s: '%s' is outside repository" |
| 2352 | msgstr "%s:'%s' 在仓库之外" |
| 2353 | |
| 2354 | #: pathspec.c:451 |
| 2355 | #, c-format |
| 2356 | msgid "'%s' (mnemonic: '%c')" |
| 2357 | msgstr "'%s'(助记符:'%c')" |
| 2358 | |
| 2359 | #: pathspec.c:461 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2360 | #, c-format |
| 2361 | msgid "%s: pathspec magic not supported by this command: %s" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2362 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2363 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2364 | #: pathspec.c:511 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2365 | msgid "" |
| 2366 | "empty strings as pathspecs will be made invalid in upcoming releases. please " |
| 2367 | "use . instead if you meant to match all paths" |
| 2368 | msgstr "" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 2369 | "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2370 | "请代之以 ." |
| 2371 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2372 | #: pathspec.c:535 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2373 | #, c-format |
| 2374 | msgid "pathspec '%s' is beyond a symbolic link" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2375 | msgstr "路径规格 '%s' 位于符号链接中" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2376 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2377 | #: pathspec.c:544 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 2378 | msgid "" |
| 2379 | "There is nothing to exclude from by :(exclude) patterns.\n" |
| 2380 | "Perhaps you forgot to add either ':/' or '.' ?" |
| 2381 | msgstr "" |
| 2382 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" |
| 2383 | "添加 ':/' 或 '.' ?" |
| 2384 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2385 | #: pretty.c:982 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 2386 | msgid "unable to parse --pretty format" |
| 2387 | msgstr "不能解析 --pretty 格式" |
| 2388 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2389 | #: read-cache.c:1307 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 2390 | #, c-format |
| 2391 | msgid "" |
| 2392 | "index.version set, but the value is invalid.\n" |
| 2393 | "Using version %i" |
| 2394 | msgstr "" |
| 2395 | "设置了 index.version,但是取值无效。\n" |
| 2396 | "使用版本 %i" |
| 2397 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2398 | #: read-cache.c:1317 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 2399 | #, c-format |
| 2400 | msgid "" |
| 2401 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
| 2402 | "Using version %i" |
| 2403 | msgstr "" |
| 2404 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
| 2405 | "使用版本 %i" |
| 2406 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2407 | #: refs.c:576 builtin/merge.c:844 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2408 | #, c-format |
| 2409 | msgid "Could not open '%s' for writing" |
| 2410 | msgstr "无法打开 '%s' 进行写入" |
| 2411 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2412 | #: refs/files-backend.c:2481 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2413 | #, c-format |
| 2414 | msgid "could not delete reference %s: %s" |
| 2415 | msgstr "无法删除引用 %s:%s" |
| 2416 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2417 | #: refs/files-backend.c:2484 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2418 | #, c-format |
| 2419 | msgid "could not delete references: %s" |
| 2420 | msgstr "无法删除引用:%s" |
| 2421 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2422 | #: refs/files-backend.c:2493 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2423 | #, c-format |
| 2424 | msgid "could not remove reference %s" |
| 2425 | msgstr "无法删除引用 %s" |
| 2426 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2427 | #: ref-filter.c:56 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2428 | #, c-format |
| 2429 | msgid "expected format: %%(color:<color>)" |
| 2430 | msgstr "期望的格式:%%(color:<color>)" |
| 2431 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2432 | #: ref-filter.c:58 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2433 | #, c-format |
| 2434 | msgid "unrecognized color: %%(color:%s)" |
| 2435 | msgstr "未能识别的颜色:%%(color:%s)" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2436 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2437 | #: ref-filter.c:72 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2438 | #, c-format |
| 2439 | msgid "unrecognized format: %%(%s)" |
| 2440 | msgstr "未能识别的格式:%%(%s)" |
| 2441 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2442 | #: ref-filter.c:78 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2443 | #, c-format |
| 2444 | msgid "%%(body) does not take arguments" |
| 2445 | msgstr "%%(body) 不带参数" |
| 2446 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2447 | #: ref-filter.c:85 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2448 | #, c-format |
| 2449 | msgid "%%(subject) does not take arguments" |
| 2450 | msgstr "%%(subject) 不带参数" |
| 2451 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2452 | #: ref-filter.c:92 |
| 2453 | #, c-format |
| 2454 | msgid "%%(trailers) does not take arguments" |
| 2455 | msgstr "%%(trailers) 不带参数" |
| 2456 | |
| 2457 | #: ref-filter.c:111 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2458 | #, c-format |
| 2459 | msgid "positive value expected contents:lines=%s" |
| 2460 | msgstr "要为 contents:lines=%s 提供一个正数" |
| 2461 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2462 | #: ref-filter.c:113 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2463 | #, c-format |
| 2464 | msgid "unrecognized %%(contents) argument: %s" |
| 2465 | msgstr "未能识别的 %%(contents) 参数:%s" |
| 2466 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2467 | #: ref-filter.c:123 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2468 | #, c-format |
| 2469 | msgid "unrecognized %%(objectname) argument: %s" |
| 2470 | msgstr "未能识别的 %%(objectname) 参数:%s" |
| 2471 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2472 | #: ref-filter.c:145 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2473 | #, c-format |
| 2474 | msgid "expected format: %%(align:<width>,<position>)" |
| 2475 | msgstr "期望的格式:%%(align:<width>,<position>)" |
| 2476 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2477 | #: ref-filter.c:157 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2478 | #, c-format |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2479 | msgid "unrecognized position:%s" |
| 2480 | msgstr "未能识别的位置:%s" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2481 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2482 | #: ref-filter.c:161 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2483 | #, c-format |
| 2484 | msgid "unrecognized width:%s" |
| 2485 | msgstr "未能识别的宽度:%s" |
| 2486 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2487 | #: ref-filter.c:167 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2488 | #, c-format |
| 2489 | msgid "unrecognized %%(align) argument: %s" |
| 2490 | msgstr "未能识别的 %%(align) 参数:%s" |
| 2491 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2492 | #: ref-filter.c:171 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2493 | #, c-format |
| 2494 | msgid "positive width expected with the %%(align) atom" |
| 2495 | msgstr "元素 %%(align) 需要一个正数的宽度" |
| 2496 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2497 | #: ref-filter.c:255 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2498 | #, c-format |
| 2499 | msgid "malformed field name: %.*s" |
| 2500 | msgstr "非法的字段名:%.*s" |
| 2501 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2502 | #: ref-filter.c:281 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2503 | #, c-format |
| 2504 | msgid "unknown field name: %.*s" |
| 2505 | msgstr "未知的字段名:%.*s" |
| 2506 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2507 | #: ref-filter.c:383 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 2508 | #, c-format |
| 2509 | msgid "format: %%(end) atom used without corresponding atom" |
| 2510 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" |
| 2511 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2512 | #: ref-filter.c:435 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2513 | #, c-format |
| 2514 | msgid "malformed format string %s" |
| 2515 | msgstr "非法的格式化字符串 %s" |
| 2516 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2517 | #: ref-filter.c:898 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2518 | msgid ":strip= requires a positive integer argument" |
| 2519 | msgstr ":strip= 需要一个正整型参数" |
| 2520 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2521 | #: ref-filter.c:903 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2522 | #, c-format |
| 2523 | msgid "ref '%s' does not have %ld components to :strip" |
Ray Chen | 26e4cbe | 2016-03-16 11:44:44 +0800 | [diff] [blame] | 2524 | msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2525 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2526 | #: ref-filter.c:1066 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2527 | #, c-format |
| 2528 | msgid "unknown %.*s format %s" |
Ray Chen | 26e4cbe | 2016-03-16 11:44:44 +0800 | [diff] [blame] | 2529 | msgstr "未知的 %.*s 格式 %s" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2530 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2531 | #: ref-filter.c:1086 ref-filter.c:1117 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2532 | #, c-format |
| 2533 | msgid "missing object %s for %s" |
Ray Chen | 26e4cbe | 2016-03-16 11:44:44 +0800 | [diff] [blame] | 2534 | msgstr "缺失 %2$s 的对象 %1$s" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2535 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2536 | #: ref-filter.c:1089 ref-filter.c:1120 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2537 | #, c-format |
| 2538 | msgid "parse_object_buffer failed on %s for %s" |
| 2539 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" |
| 2540 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2541 | #: ref-filter.c:1343 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2542 | #, c-format |
| 2543 | msgid "malformed object at '%s'" |
| 2544 | msgstr "非法的对象于 '%s'" |
| 2545 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2546 | #: ref-filter.c:1410 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2547 | #, c-format |
| 2548 | msgid "ignoring ref with broken name %s" |
| 2549 | msgstr "忽略带有错误名称 %s 的引用" |
| 2550 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2551 | #: ref-filter.c:1415 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 2552 | #, c-format |
| 2553 | msgid "ignoring broken ref %s" |
| 2554 | msgstr "忽略损坏的引用 %s" |
| 2555 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2556 | #: ref-filter.c:1670 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2557 | #, c-format |
| 2558 | msgid "format: %%(end) atom missing" |
| 2559 | msgstr "格式:缺少 %%(end) 元素" |
| 2560 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2561 | #: ref-filter.c:1734 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 2562 | #, c-format |
| 2563 | msgid "malformed object name %s" |
| 2564 | msgstr "非法的对象名 %s" |
| 2565 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2566 | #: remote.c:754 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 2567 | #, c-format |
| 2568 | msgid "Cannot fetch both %s and %s to %s" |
| 2569 | msgstr "不能同时获取 %s 和 %s 至 %s" |
| 2570 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2571 | #: remote.c:758 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 2572 | #, c-format |
| 2573 | msgid "%s usually tracks %s, not %s" |
| 2574 | msgstr "%s 通常跟踪 %s,而非 %s" |
| 2575 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2576 | #: remote.c:762 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 2577 | #, c-format |
| 2578 | msgid "%s tracks both %s and %s" |
| 2579 | msgstr "%s 同时跟踪 %s 和 %s" |
| 2580 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2581 | #: remote.c:770 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 2582 | msgid "Internal error" |
| 2583 | msgstr "内部错误" |
| 2584 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2585 | #: remote.c:1685 remote.c:1787 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2586 | msgid "HEAD does not point to a branch" |
| 2587 | msgstr "HEAD 没有指向一个分支" |
| 2588 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2589 | #: remote.c:1694 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2590 | #, c-format |
| 2591 | msgid "no such branch: '%s'" |
| 2592 | msgstr "没有此分支:'%s'" |
| 2593 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2594 | #: remote.c:1697 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2595 | #, c-format |
| 2596 | msgid "no upstream configured for branch '%s'" |
| 2597 | msgstr "尚未给分支 '%s' 设置上游" |
| 2598 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2599 | #: remote.c:1703 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2600 | #, c-format |
| 2601 | msgid "upstream branch '%s' not stored as a remote-tracking branch" |
| 2602 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" |
| 2603 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2604 | #: remote.c:1718 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2605 | #, c-format |
| 2606 | msgid "push destination '%s' on remote '%s' has no local tracking branch" |
| 2607 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" |
| 2608 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2609 | #: remote.c:1730 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2610 | #, c-format |
| 2611 | msgid "branch '%s' has no remote for pushing" |
| 2612 | msgstr "分支 '%s' 没有设置要推送的远程服务器" |
| 2613 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2614 | #: remote.c:1741 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2615 | #, c-format |
| 2616 | msgid "push refspecs for '%s' do not include '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 2617 | msgstr "向 '%s' 推送引用规格未包含 '%s'" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2618 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2619 | #: remote.c:1754 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2620 | msgid "push has no destination (push.default is 'nothing')" |
| 2621 | msgstr "推送无目标(push.default 是 'nothing')" |
| 2622 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2623 | #: remote.c:1776 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 2624 | msgid "cannot resolve 'simple' push to a single destination" |
| 2625 | msgstr "无法解析 'simple' 推送至一个单独的目标" |
| 2626 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2627 | #: remote.c:2081 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2628 | #, c-format |
| 2629 | msgid "Your branch is based on '%s', but the upstream is gone.\n" |
| 2630 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" |
| 2631 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2632 | #: remote.c:2085 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2633 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
| 2634 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" |
| 2635 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2636 | #: remote.c:2088 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 2637 | #, c-format |
| 2638 | msgid "Your branch is up-to-date with '%s'.\n" |
| 2639 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
| 2640 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2641 | #: remote.c:2092 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2642 | #, c-format |
| 2643 | msgid "Your branch is ahead of '%s' by %d commit.\n" |
| 2644 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" |
| 2645 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 2646 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2647 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2648 | #: remote.c:2098 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2649 | msgid " (use \"git push\" to publish your local commits)\n" |
| 2650 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" |
| 2651 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2652 | #: remote.c:2101 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2653 | #, c-format |
| 2654 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" |
| 2655 | msgid_plural "" |
| 2656 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 2657 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 2658 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2659 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2660 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2661 | #: remote.c:2109 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2662 | msgid " (use \"git pull\" to update your local branch)\n" |
| 2663 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" |
| 2664 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2665 | #: remote.c:2112 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2666 | #, c-format |
| 2667 | msgid "" |
| 2668 | "Your branch and '%s' have diverged,\n" |
| 2669 | "and have %d and %d different commit each, respectively.\n" |
| 2670 | msgid_plural "" |
| 2671 | "Your branch and '%s' have diverged,\n" |
| 2672 | "and have %d and %d different commits each, respectively.\n" |
| 2673 | msgstr[0] "" |
| 2674 | "您的分支和 '%s' 出现了偏离,\n" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 2675 | "并且分别有 %d 和 %d 处不同的提交。\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 2676 | msgstr[1] "" |
| 2677 | "您的分支和 '%s' 出现了偏离,\n" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 2678 | "并且分别有 %d 和 %d 处不同的提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2679 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2680 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2681 | #: remote.c:2122 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 2682 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
| 2683 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" |
| 2684 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2685 | #: revision.c:2158 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2686 | msgid "your current branch appears to be broken" |
| 2687 | msgstr "您的当前分支好像被损坏" |
| 2688 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2689 | #: revision.c:2161 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2690 | #, c-format |
| 2691 | msgid "your current branch '%s' does not have any commits yet" |
| 2692 | msgstr "您的当前分支 '%s' 尚无任何提交" |
| 2693 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2694 | #: revision.c:2355 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 2695 | msgid "--first-parent is incompatible with --bisect" |
| 2696 | msgstr "--first-parent 与 --bisect 不兼容" |
| 2697 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2698 | #: run-command.c:125 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2699 | msgid "open /dev/null failed" |
| 2700 | msgstr "不能打开 /dev/null" |
| 2701 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2702 | #: run-command.c:127 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 2703 | #, c-format |
| 2704 | msgid "dup2(%d,%d) failed" |
| 2705 | msgstr "不能调用 dup2(%d,%d)" |
| 2706 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2707 | #: send-pack.c:297 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 2708 | msgid "failed to sign the push certificate" |
| 2709 | msgstr "无法为推送证书签名" |
| 2710 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2711 | #: send-pack.c:410 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 2712 | msgid "the receiving end does not support --signed push" |
| 2713 | msgstr "接收端不支持签名推送" |
| 2714 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2715 | #: send-pack.c:412 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 2716 | msgid "" |
| 2717 | "not sending a push certificate since the receiving end does not support --" |
| 2718 | "signed push" |
| 2719 | msgstr "未发送推送证书,因为接收端不支持签名推送" |
| 2720 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2721 | #: send-pack.c:424 |
Jiang Xin | 44f518e | 2015-04-03 08:39:57 +0800 | [diff] [blame] | 2722 | msgid "the receiving end does not support --atomic push" |
| 2723 | msgstr "接收端不支持原子推送" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 2724 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2725 | #: send-pack.c:429 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 2726 | msgid "the receiving end does not support push options" |
| 2727 | msgstr "接收端不支持推送选项" |
| 2728 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2729 | #: sequencer.c:215 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2730 | msgid "revert" |
| 2731 | msgstr "还原" |
| 2732 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2733 | #: sequencer.c:217 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2734 | msgid "cherry-pick" |
| 2735 | msgstr "拣选" |
| 2736 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2737 | #: sequencer.c:219 |
| 2738 | msgid "rebase -i" |
| 2739 | msgstr "rebase -i" |
| 2740 | |
| 2741 | #: sequencer.c:221 |
| 2742 | #, c-format |
| 2743 | msgid "Unknown action: %d" |
| 2744 | msgstr "未知动作:%d" |
| 2745 | |
| 2746 | #: sequencer.c:278 |
Jiang Xin | 14c8bce | 2012-03-08 12:06:53 +0800 | [diff] [blame] | 2747 | msgid "" |
| 2748 | "after resolving the conflicts, mark the corrected paths\n" |
| 2749 | "with 'git add <paths>' or 'git rm <paths>'" |
| 2750 | msgstr "" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 2751 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
Jiang Xin | 14c8bce | 2012-03-08 12:06:53 +0800 | [diff] [blame] | 2752 | "命令标记修正后的文件" |
| 2753 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2754 | #: sequencer.c:281 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2755 | msgid "" |
| 2756 | "after resolving the conflicts, mark the corrected paths\n" |
| 2757 | "with 'git add <paths>' or 'git rm <paths>'\n" |
| 2758 | "and commit the result with 'git commit'" |
| 2759 | msgstr "" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 2760 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2761 | "对修正后的文件做标记,然后用 'git commit' 提交" |
| 2762 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2763 | #: sequencer.c:294 sequencer.c:1667 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2764 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2765 | msgid "could not lock '%s'" |
| 2766 | msgstr "不能锁定 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2767 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2768 | #: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2769 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2770 | msgid "could not write to '%s'" |
| 2771 | msgstr "不能写入 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2772 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2773 | #: sequencer.c:301 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2774 | #, c-format |
Jiang Xin | 72351d7 | 2016-11-20 20:26:17 +0800 | [diff] [blame] | 2775 | msgid "could not write eol to '%s'" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2776 | msgstr "不能将换行符写入 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2777 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2778 | #: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2779 | #, c-format |
| 2780 | msgid "failed to finalize '%s'." |
| 2781 | msgstr "无法完成 '%s'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2782 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2783 | #: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 |
| 2784 | #: builtin/commit.c:749 builtin/merge.c:1036 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2785 | #, c-format |
| 2786 | msgid "could not read '%s'" |
| 2787 | msgstr "不能读取 '%s'" |
| 2788 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2789 | #: sequencer.c:355 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2790 | #, c-format |
| 2791 | msgid "your local changes would be overwritten by %s." |
| 2792 | msgstr "您的本地修改将被%s覆盖。" |
| 2793 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2794 | #: sequencer.c:359 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2795 | msgid "commit your changes or stash them to proceed." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2796 | msgstr "提交您的修改或保存进度后再继续。" |
| 2797 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2798 | #: sequencer.c:388 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 2799 | #, c-format |
| 2800 | msgid "%s: fast-forward" |
| 2801 | msgstr "%s:快进" |
| 2802 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2803 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
| 2804 | #. * "rebase -i". |
| 2805 | #. |
| 2806 | #: sequencer.c:470 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2807 | #, c-format |
| 2808 | msgid "%s: Unable to write new index file" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 2809 | msgstr "%s:无法写入新索引文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2810 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2811 | #: sequencer.c:489 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2812 | msgid "could not resolve HEAD commit\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2813 | msgstr "不能解析 HEAD 提交\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2814 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2815 | #: sequencer.c:509 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2816 | msgid "unable to update cache tree\n" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 2817 | msgstr "不能更新缓存树\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2818 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2819 | #: sequencer.c:592 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2820 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2821 | msgid "" |
| 2822 | "you have staged changes in your working tree\n" |
| 2823 | "If these changes are meant to be squashed into the previous commit, run:\n" |
| 2824 | "\n" |
| 2825 | " git commit --amend %s\n" |
| 2826 | "\n" |
| 2827 | "If they are meant to go into a new commit, run:\n" |
| 2828 | "\n" |
| 2829 | " git commit %s\n" |
| 2830 | "\n" |
| 2831 | "In both cases, once you're done, continue with:\n" |
| 2832 | "\n" |
| 2833 | " git rebase --continue\n" |
| 2834 | msgstr "" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2835 | "您的工作区中存在已暂存的修改\n" |
| 2836 | "如果这些修改需要被并入前一个提交,执行:\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2837 | "\n" |
| 2838 | " git commit --amend %s\n" |
| 2839 | "\n" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 2840 | "如果这些修改要形成一个新提交,执行:\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2841 | "\n" |
| 2842 | " git commit %s\n" |
| 2843 | "\n" |
| 2844 | "无论哪种情况,当您完成提交,继续执行:\n" |
| 2845 | "\n" |
| 2846 | " git rebase --continue\n" |
| 2847 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2848 | #: sequencer.c:688 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2849 | #, c-format |
| 2850 | msgid "could not parse commit %s\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2851 | msgstr "不能解析提交 %s\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2852 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2853 | #: sequencer.c:693 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2854 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2855 | msgid "could not parse parent commit %s\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 2856 | msgstr "不能解析父提交 %s\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 2857 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2858 | #: sequencer.c:815 |
| 2859 | #, c-format |
| 2860 | msgid "" |
| 2861 | "unexpected 1st line of squash message:\n" |
| 2862 | "\n" |
| 2863 | "\t%.*s" |
| 2864 | msgstr "" |
| 2865 | "意外的压缩提交首行提交信息:\n" |
| 2866 | "\n" |
| 2867 | "\t%.*s" |
| 2868 | |
| 2869 | #: sequencer.c:821 |
| 2870 | #, c-format |
| 2871 | msgid "" |
| 2872 | "invalid 1st line of squash message:\n" |
| 2873 | "\n" |
| 2874 | "\t%.*s" |
| 2875 | msgstr "" |
| 2876 | "压缩提交的首行提交信息无效:\n" |
| 2877 | "\n" |
| 2878 | "\t%.*s" |
| 2879 | |
| 2880 | #: sequencer.c:827 sequencer.c:852 |
| 2881 | #, c-format |
| 2882 | msgid "This is a combination of %d commits." |
| 2883 | msgstr "这是一个 %d 个提交的组合。" |
| 2884 | |
| 2885 | #: sequencer.c:836 |
| 2886 | msgid "need a HEAD to fixup" |
| 2887 | msgstr "需要一个 HEAD 来修复" |
| 2888 | |
| 2889 | #: sequencer.c:838 |
| 2890 | msgid "could not read HEAD" |
| 2891 | msgstr "不能读取 HEAD" |
| 2892 | |
| 2893 | #: sequencer.c:840 |
| 2894 | msgid "could not read HEAD's commit message" |
| 2895 | msgstr "不能读取 HEAD 的提交说明" |
| 2896 | |
| 2897 | #: sequencer.c:846 |
| 2898 | #, c-format |
| 2899 | msgid "cannot write '%s'" |
| 2900 | msgstr "不能写 '%s'" |
| 2901 | |
| 2902 | #: sequencer.c:855 git-rebase--interactive.sh:445 |
| 2903 | msgid "This is the 1st commit message:" |
| 2904 | msgstr "这是第一个提交说明:" |
| 2905 | |
| 2906 | #: sequencer.c:863 |
| 2907 | #, c-format |
| 2908 | msgid "could not read commit message of %s" |
| 2909 | msgstr "不能读取 %s 的提交说明" |
| 2910 | |
| 2911 | #: sequencer.c:870 |
| 2912 | #, c-format |
| 2913 | msgid "This is the commit message #%d:" |
| 2914 | msgstr "这是提交说明 #%d:" |
| 2915 | |
| 2916 | #: sequencer.c:875 |
| 2917 | #, c-format |
| 2918 | msgid "The commit message #%d will be skipped:" |
| 2919 | msgstr "提交说明 #%d 将被跳过:" |
| 2920 | |
| 2921 | #: sequencer.c:880 |
| 2922 | #, c-format |
| 2923 | msgid "unknown command: %d" |
| 2924 | msgstr "未知命令:%d" |
| 2925 | |
| 2926 | #: sequencer.c:946 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2927 | msgid "your index file is unmerged." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 2928 | msgstr "您的索引文件未完成合并。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2929 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2930 | #: sequencer.c:964 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2931 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2932 | msgid "commit %s is a merge but no -m option was given." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2933 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" |
| 2934 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2935 | #: sequencer.c:972 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2936 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2937 | msgid "commit %s does not have parent %d" |
| 2938 | msgstr "提交 %s 没有第 %d 个父提交" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2939 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2940 | #: sequencer.c:976 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2941 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2942 | msgid "mainline was specified but commit %s is not a merge." |
| 2943 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2944 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2945 | #: sequencer.c:982 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2946 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2947 | msgid "cannot get commit message for %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2948 | msgstr "不能得到 %s 的提交说明" |
| 2949 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2950 | #. TRANSLATORS: The first %s will be a "todo" command like |
| 2951 | #. "revert" or "pick", the second %s a SHA1. |
| 2952 | #: sequencer.c:1001 |
| 2953 | #, c-format |
| 2954 | msgid "%s: cannot parse parent commit %s" |
| 2955 | msgstr "%s:不能解析父提交 %s" |
| 2956 | |
| 2957 | #: sequencer.c:1063 sequencer.c:1812 |
| 2958 | #, c-format |
| 2959 | msgid "could not rename '%s' to '%s'" |
| 2960 | msgstr "不能将 '%s' 重命名为 '%s'" |
| 2961 | |
| 2962 | #: sequencer.c:1114 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2963 | #, c-format |
| 2964 | msgid "could not revert %s... %s" |
| 2965 | msgstr "不能还原 %s... %s" |
| 2966 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2967 | #: sequencer.c:1115 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2968 | #, c-format |
| 2969 | msgid "could not apply %s... %s" |
| 2970 | msgstr "不能应用 %s... %s" |
| 2971 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2972 | #: sequencer.c:1157 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2973 | msgid "empty commit set passed" |
| 2974 | msgstr "提供了空的提交集" |
| 2975 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2976 | #: sequencer.c:1167 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2977 | #, c-format |
| 2978 | msgid "git %s: failed to read the index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 2979 | msgstr "git %s:无法读取索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2980 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2981 | #: sequencer.c:1174 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2982 | #, c-format |
| 2983 | msgid "git %s: failed to refresh the index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 2984 | msgstr "git %s:无法刷新索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2985 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2986 | #: sequencer.c:1294 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2987 | #, c-format |
| 2988 | msgid "invalid line %d: %.*s" |
| 2989 | msgstr "无效行 %d:%.*s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 2990 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2991 | #: sequencer.c:1302 |
| 2992 | #, c-format |
| 2993 | msgid "cannot '%s' without a previous commit" |
| 2994 | msgstr "没有父提交的情况下不能 '%s'" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 2995 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 2996 | #: sequencer.c:1334 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 2997 | #, c-format |
| 2998 | msgid "could not read '%s'." |
| 2999 | msgstr "不能读取 '%s'。" |
| 3000 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3001 | #: sequencer.c:1341 |
| 3002 | msgid "please fix this using 'git rebase --edit-todo'." |
| 3003 | msgstr "请用 'git rebase --edit-todo' 来修改。" |
| 3004 | |
| 3005 | #: sequencer.c:1343 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3006 | #, c-format |
| 3007 | msgid "unusable instruction sheet: '%s'" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 3008 | msgstr "不可用的指令清单:'%s'" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3009 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3010 | #: sequencer.c:1348 |
| 3011 | msgid "no commits parsed." |
| 3012 | msgstr "没有解析提交。" |
| 3013 | |
| 3014 | #: sequencer.c:1359 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3015 | msgid "cannot cherry-pick during a revert." |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3016 | msgstr "不能在回退中执行拣选。" |
| 3017 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3018 | #: sequencer.c:1361 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3019 | msgid "cannot revert during a cherry-pick." |
| 3020 | msgstr "不能在拣选中执行回退。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3021 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3022 | #: sequencer.c:1424 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3023 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3024 | msgid "invalid key: %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3025 | msgstr "无效键名:%s" |
| 3026 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3027 | #: sequencer.c:1427 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3028 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3029 | msgid "invalid value for %s: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 3030 | msgstr "%s 的值无效:%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3031 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3032 | #: sequencer.c:1484 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3033 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3034 | msgid "malformed options sheet: '%s'" |
| 3035 | msgstr "非法的选项清单:'%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3036 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3037 | #: sequencer.c:1522 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3038 | msgid "a cherry-pick or revert is already in progress" |
| 3039 | msgstr "一个拣选或还原操作已在进行" |
| 3040 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3041 | #: sequencer.c:1523 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3042 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
| 3043 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" |
| 3044 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3045 | #: sequencer.c:1526 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3046 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3047 | msgid "could not create sequencer directory '%s'" |
| 3048 | msgstr "不能创建序列目录 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3049 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3050 | #: sequencer.c:1540 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3051 | msgid "could not lock HEAD" |
| 3052 | msgstr "不能锁定 HEAD" |
| 3053 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3054 | #: sequencer.c:1596 sequencer.c:2150 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3055 | msgid "no cherry-pick or revert in progress" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 3056 | msgstr "拣选或还原操作并未进行" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3057 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3058 | #: sequencer.c:1598 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3059 | msgid "cannot resolve HEAD" |
| 3060 | msgstr "不能解析 HEAD" |
| 3061 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3062 | #: sequencer.c:1600 sequencer.c:1634 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3063 | msgid "cannot abort from a branch yet to be born" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3064 | msgstr "不能从尚未建立的分支终止" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3065 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3066 | #: sequencer.c:1620 builtin/grep.c:904 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3067 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3068 | msgid "cannot open '%s'" |
| 3069 | msgstr "不能打开 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3070 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3071 | #: sequencer.c:1622 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3072 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3073 | msgid "cannot read '%s': %s" |
| 3074 | msgstr "不能读取 '%s':%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3075 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3076 | #: sequencer.c:1623 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3077 | msgid "unexpected end of file" |
Thynson | 9aafc93 | 2012-08-07 17:25:21 +0800 | [diff] [blame] | 3078 | msgstr "意外的文件结束" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3079 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3080 | #: sequencer.c:1629 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3081 | #, c-format |
| 3082 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3083 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3084 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3085 | #: sequencer.c:1640 |
| 3086 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
| 3087 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" |
| 3088 | |
| 3089 | #: sequencer.c:1777 sequencer.c:2049 |
| 3090 | msgid "cannot read HEAD" |
| 3091 | msgstr "不能读取 HEAD" |
| 3092 | |
| 3093 | #: sequencer.c:1817 builtin/difftool.c:574 |
| 3094 | #, c-format |
| 3095 | msgid "could not copy '%s' to '%s'" |
| 3096 | msgstr "不能拷贝 '%s' 至 '%s'" |
| 3097 | |
| 3098 | #: sequencer.c:1833 |
| 3099 | msgid "could not read index" |
| 3100 | msgstr "不能读取索引" |
| 3101 | |
| 3102 | # 译者:注意保持前导空格 |
| 3103 | #: sequencer.c:1838 |
| 3104 | #, c-format |
| 3105 | msgid "" |
| 3106 | "execution failed: %s\n" |
| 3107 | "%sYou can fix the problem, and then run\n" |
| 3108 | "\n" |
| 3109 | " git rebase --continue\n" |
| 3110 | "\n" |
| 3111 | msgstr "" |
| 3112 | "执行失败:%s\n" |
| 3113 | "%s您可以改正该问题,然后运行\n" |
| 3114 | "\n" |
| 3115 | " git rebase --continue\n" |
| 3116 | "\n" |
| 3117 | |
| 3118 | #: sequencer.c:1844 |
| 3119 | msgid "and made changes to the index and/or the working tree\n" |
| 3120 | msgstr "并且修改索引和/或工作区\n" |
| 3121 | |
| 3122 | #: sequencer.c:1850 |
| 3123 | #, c-format |
| 3124 | msgid "" |
| 3125 | "execution succeeded: %s\n" |
| 3126 | "but left changes to the index and/or the working tree\n" |
| 3127 | "Commit or stash your changes, and then run\n" |
| 3128 | "\n" |
| 3129 | " git rebase --continue\n" |
| 3130 | "\n" |
| 3131 | msgstr "" |
| 3132 | "执行成功:%s\n" |
| 3133 | "但是在索引和/或工作区中存在变更\n" |
| 3134 | "提交或暂存修改,然后运行\n" |
| 3135 | "\n" |
| 3136 | " git rebase --continue\n" |
| 3137 | "\n" |
| 3138 | |
| 3139 | #: sequencer.c:1905 git-rebase.sh:168 |
| 3140 | #, c-format |
| 3141 | msgid "Applied autostash." |
| 3142 | msgstr "成功应用 autostash。" |
| 3143 | |
| 3144 | #: sequencer.c:1917 |
| 3145 | #, c-format |
| 3146 | msgid "cannot store %s" |
| 3147 | msgstr "不能存储 %s" |
| 3148 | |
| 3149 | #: sequencer.c:1919 git-rebase.sh:172 |
| 3150 | #, c-format |
| 3151 | msgid "" |
| 3152 | "Applying autostash resulted in conflicts.\n" |
| 3153 | "Your changes are safe in the stash.\n" |
| 3154 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
| 3155 | msgstr "" |
| 3156 | "应用 autostash 导致冲突。\n" |
| 3157 | "您的修改安全地保存在 stash 中。\n" |
| 3158 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
| 3159 | |
| 3160 | #: sequencer.c:2000 |
| 3161 | #, c-format |
| 3162 | msgid "stopped at %s... %.*s" |
| 3163 | msgstr "停止在 %s... %.*s" |
| 3164 | |
| 3165 | #: sequencer.c:2027 |
| 3166 | #, c-format |
| 3167 | msgid "unknown command %d" |
| 3168 | msgstr "未知命令 %d" |
| 3169 | |
| 3170 | #: sequencer.c:2057 |
| 3171 | msgid "could not read orig-head" |
| 3172 | msgstr "不能读取 orig-head" |
| 3173 | |
| 3174 | #: sequencer.c:2061 |
| 3175 | msgid "could not read 'onto'" |
| 3176 | msgstr "不能读取 'onto'" |
| 3177 | |
| 3178 | #: sequencer.c:2068 |
| 3179 | #, c-format |
| 3180 | msgid "could not update %s" |
| 3181 | msgstr "不能更新 %s" |
| 3182 | |
| 3183 | #: sequencer.c:2075 |
| 3184 | #, c-format |
| 3185 | msgid "could not update HEAD to %s" |
| 3186 | msgstr "不能更新 HEAD 为 %s" |
| 3187 | |
| 3188 | #: sequencer.c:2159 |
| 3189 | msgid "cannot rebase: You have unstaged changes." |
| 3190 | msgstr "不能变基:您有未暂存的变更。" |
| 3191 | |
| 3192 | #: sequencer.c:2164 |
| 3193 | msgid "could not remove CHERRY_PICK_HEAD" |
| 3194 | msgstr "不能删除 CHERRY_PICK_HEAD" |
| 3195 | |
| 3196 | #: sequencer.c:2173 |
| 3197 | msgid "cannot amend non-existing commit" |
| 3198 | msgstr "不能修补不存在的提交" |
| 3199 | |
| 3200 | #: sequencer.c:2175 |
| 3201 | #, c-format |
| 3202 | msgid "invalid file: '%s'" |
| 3203 | msgstr "无效文件:'%s'" |
| 3204 | |
| 3205 | #: sequencer.c:2177 |
| 3206 | #, c-format |
| 3207 | msgid "invalid contents: '%s'" |
| 3208 | msgstr "无效内容:'%s'" |
| 3209 | |
| 3210 | #: sequencer.c:2180 |
| 3211 | msgid "" |
| 3212 | "\n" |
| 3213 | "You have uncommitted changes in your working tree. Please, commit them\n" |
| 3214 | "first and then run 'git rebase --continue' again." |
| 3215 | msgstr "\n您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" |
| 3216 | |
| 3217 | #: sequencer.c:2190 |
| 3218 | msgid "could not commit staged changes." |
| 3219 | msgstr "不能提交暂存的修改。" |
| 3220 | |
| 3221 | #: sequencer.c:2270 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 3222 | #, c-format |
| 3223 | msgid "%s: can't cherry-pick a %s" |
| 3224 | msgstr "%s:不能拣选一个%s" |
| 3225 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3226 | #: sequencer.c:2274 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 3227 | #, c-format |
| 3228 | msgid "%s: bad revision" |
| 3229 | msgstr "%s:错误的版本" |
| 3230 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3231 | #: sequencer.c:2307 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3232 | msgid "can't revert as initial commit" |
| 3233 | msgstr "不能作为初始提交回退" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3234 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3235 | #: setup.c:160 |
| 3236 | #, c-format |
| 3237 | msgid "" |
| 3238 | "%s: no such path in the working tree.\n" |
| 3239 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." |
| 3240 | msgstr "" |
| 3241 | "%s:工作区中无此路径。\n" |
| 3242 | "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3243 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3244 | #: setup.c:173 |
| 3245 | #, c-format |
| 3246 | msgid "" |
| 3247 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" |
| 3248 | "Use '--' to separate paths from revisions, like this:\n" |
| 3249 | "'git <command> [<revision>...] -- [<file>...]'" |
| 3250 | msgstr "" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3251 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3252 | "使用 '--' 来分隔版本和路径,例如:\n" |
| 3253 | "'git <command> [<revision>...] -- [<file>...]'" |
| 3254 | |
| 3255 | #: setup.c:223 |
| 3256 | #, c-format |
| 3257 | msgid "" |
| 3258 | "ambiguous argument '%s': both revision and filename\n" |
| 3259 | "Use '--' to separate paths from revisions, like this:\n" |
| 3260 | "'git <command> [<revision>...] -- [<file>...]'" |
| 3261 | msgstr "" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3262 | "有歧义的参数 '%s':可同时是版本和文件\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3263 | "使用 '--' 来分隔版本和路径,例如:\n" |
| 3264 | "'git <command> [<revision>...] -- [<file>...]'" |
| 3265 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3266 | #: setup.c:470 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3267 | #, c-format |
| 3268 | msgid "Expected git repo version <= %d, found %d" |
| 3269 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" |
| 3270 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3271 | #: setup.c:478 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3272 | msgid "unknown repository extensions found:" |
| 3273 | msgstr "发现未知的仓库扩展:" |
| 3274 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3275 | #: setup.c:768 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3276 | #, c-format |
| 3277 | msgid "Not a git repository (or any of the parent directories): %s" |
| 3278 | msgstr "不是一个 git 仓库(或者任何父目录):%s" |
| 3279 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3280 | #: setup.c:770 setup.c:922 builtin/index-pack.c:1643 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3281 | msgid "Cannot come back to cwd" |
| 3282 | msgstr "无法返回当前工作目录" |
| 3283 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3284 | #: setup.c:852 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3285 | msgid "Unable to read current working directory" |
| 3286 | msgstr "不能读取当前工作目录" |
| 3287 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3288 | #: setup.c:927 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3289 | #, c-format |
| 3290 | msgid "" |
| 3291 | "Not a git repository (or any parent up to mount point %s)\n" |
| 3292 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
| 3293 | msgstr "" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3294 | "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3295 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
| 3296 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3297 | #: setup.c:934 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3298 | #, c-format |
| 3299 | msgid "Cannot change to '%s/..'" |
| 3300 | msgstr "不能切换到 '%s/..'" |
| 3301 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3302 | #: setup.c:996 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3303 | #, c-format |
| 3304 | msgid "" |
| 3305 | "Problem with core.sharedRepository filemode value (0%.3o).\n" |
| 3306 | "The owner of files must always have read and write permissions." |
| 3307 | msgstr "" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3308 | "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3309 | "文件属主必须始终拥有读写权限。" |
| 3310 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3311 | #: sha1_file.c:490 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3312 | #, c-format |
| 3313 | msgid "path '%s' does not exist" |
| 3314 | msgstr "路径 '%s' 不存在" |
| 3315 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3316 | #: sha1_file.c:516 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3317 | #, c-format |
| 3318 | msgid "reference repository '%s' as a linked checkout is not supported yet." |
| 3319 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" |
| 3320 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3321 | #: sha1_file.c:522 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3322 | #, c-format |
| 3323 | msgid "reference repository '%s' is not a local repository." |
| 3324 | msgstr "参考仓库 '%s' 不是一个本地仓库。" |
| 3325 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3326 | #: sha1_file.c:528 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3327 | #, c-format |
| 3328 | msgid "reference repository '%s' is shallow" |
| 3329 | msgstr "参考仓库 '%s' 是一个浅克隆" |
| 3330 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3331 | #: sha1_file.c:536 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3332 | #, c-format |
| 3333 | msgid "reference repository '%s' is grafted" |
| 3334 | msgstr "参考仓库 '%s' 已被嫁接" |
| 3335 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3336 | #: sha1_file.c:1176 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 3337 | msgid "offset before end of packfile (broken .idx?)" |
| 3338 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" |
| 3339 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3340 | #: sha1_file.c:2637 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 3341 | #, c-format |
| 3342 | msgid "offset before start of pack index for %s (corrupt index?)" |
| 3343 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" |
| 3344 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3345 | #: sha1_file.c:2641 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 3346 | #, c-format |
| 3347 | msgid "offset beyond end of pack index for %s (truncated index?)" |
Ray Chen | 26e4cbe | 2016-03-16 11:44:44 +0800 | [diff] [blame] | 3348 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 3349 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3350 | #: sha1_name.c:407 |
| 3351 | #, c-format |
| 3352 | msgid "short SHA1 %s is ambiguous" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 3353 | msgstr "短 SHA1 %s 存在歧义" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3354 | |
| 3355 | #: sha1_name.c:418 |
| 3356 | msgid "The candidates are:" |
| 3357 | msgstr "候选者有:" |
| 3358 | |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 3359 | #: sha1_name.c:578 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 3360 | msgid "" |
| 3361 | "Git normally never creates a ref that ends with 40 hex characters\n" |
| 3362 | "because it will be ignored when you just specify 40-hex. These refs\n" |
| 3363 | "may be created by mistake. For example,\n" |
| 3364 | "\n" |
| 3365 | " git checkout -b $br $(git rev-parse ...)\n" |
| 3366 | "\n" |
| 3367 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" |
| 3368 | "examine these refs and maybe delete them. Turn this message off by\n" |
Jiang Xin | b189438 | 2013-08-06 14:49:18 +0800 | [diff] [blame] | 3369 | "running \"git config advice.objectNameWarning false\"" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 3370 | msgstr "" |
| 3371 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" |
| 3372 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" |
| 3373 | "\n" |
| 3374 | " git checkout -b $br $(git rev-parse ...)\n" |
| 3375 | "\n" |
| 3376 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" |
Jiang Xin | b189438 | 2013-08-06 14:49:18 +0800 | [diff] [blame] | 3377 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 3378 | "命令关闭本消息通知。" |
| 3379 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3380 | #: submodule.c:65 submodule.c:99 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3381 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
| 3382 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" |
| 3383 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3384 | #: submodule.c:69 submodule.c:103 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3385 | #, c-format |
| 3386 | msgid "Could not find section in .gitmodules where path=%s" |
| 3387 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" |
| 3388 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3389 | #: submodule.c:77 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3390 | #, c-format |
| 3391 | msgid "Could not update .gitmodules entry %s" |
| 3392 | msgstr "不能更新 .gitmodules 条目 %s" |
| 3393 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3394 | #: submodule.c:110 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3395 | #, c-format |
| 3396 | msgid "Could not remove .gitmodules entry for %s" |
| 3397 | msgstr "无法移除 %s 的 .gitmodules 条目" |
| 3398 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3399 | #: submodule.c:121 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3400 | msgid "staging updated .gitmodules failed" |
| 3401 | msgstr "将更新后 .gitmodules 添加暂存区失败" |
| 3402 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3403 | #: submodule.c:159 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3404 | msgid "negative values not allowed for submodule.fetchJobs" |
| 3405 | msgstr "submodule.fetchJobs 不允许为负值" |
| 3406 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3407 | #: submodule.c:1184 |
| 3408 | #, c-format |
| 3409 | msgid "could not start 'git status in submodule '%s'" |
| 3410 | msgstr "无法在子模组 '%s' 中启动 git status" |
| 3411 | |
| 3412 | #: submodule.c:1197 |
| 3413 | #, c-format |
| 3414 | msgid "could not run 'git status in submodule '%s'" |
| 3415 | msgstr "无法在子模组 '%s' 中执行 git status" |
| 3416 | |
| 3417 | #: submodule.c:1398 |
| 3418 | #, c-format |
| 3419 | msgid "" |
| 3420 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" |
| 3421 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" |
| 3422 | |
| 3423 | #: submodule.c:1410 submodule.c:1471 |
| 3424 | #, c-format |
| 3425 | msgid "could not lookup name for submodule '%s'" |
| 3426 | msgstr "不能查询子模组 '%s' 的名称" |
| 3427 | |
| 3428 | #: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 |
| 3429 | #: builtin/submodule--helper.c:650 |
| 3430 | #, c-format |
| 3431 | msgid "could not create directory '%s'" |
| 3432 | msgstr "不能创建目录 '%s'" |
| 3433 | |
| 3434 | #: submodule.c:1420 |
| 3435 | #, c-format |
| 3436 | msgid "" |
| 3437 | "Migrating git directory of '%s%s' from\n" |
| 3438 | "'%s' to\n" |
| 3439 | "'%s'\n" |
| 3440 | msgstr "" |
| 3441 | "将 '%s%s' 的 git 目录从\n" |
| 3442 | "'%s' 迁移至\n" |
| 3443 | "'%s'\n" |
| 3444 | |
| 3445 | #: submodule.c:1512 |
| 3446 | #, c-format |
| 3447 | msgid "could not recurse into submodule '%s'" |
| 3448 | msgstr "无法递归进子模组路径 '%s'" |
| 3449 | |
| 3450 | #: submodule-config.c:360 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3451 | #, c-format |
| 3452 | msgid "invalid value for %s" |
| 3453 | msgstr "%s 的值无效" |
| 3454 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3455 | #: trailer.c:240 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 3456 | #, c-format |
| 3457 | msgid "running trailer command '%s' failed" |
| 3458 | msgstr "执行 trailer 命令 '%s' 失败" |
| 3459 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3460 | #: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 |
| 3461 | #: trailer.c:543 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3462 | #, c-format |
| 3463 | msgid "unknown value '%s' for key '%s'" |
| 3464 | msgstr "键 '%2$s' 的未知取值 '%1$s'" |
| 3465 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3466 | #: trailer.c:525 trailer.c:530 builtin/remote.c:289 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3467 | #, c-format |
| 3468 | msgid "more than one %s" |
| 3469 | msgstr "多于一个 %s" |
| 3470 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3471 | #: trailer.c:702 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3472 | #, c-format |
Jiang Xin | 9aeb4c2 | 2014-11-20 10:53:48 +0800 | [diff] [blame] | 3473 | msgid "empty trailer token in trailer '%.*s'" |
| 3474 | msgstr "签名 '%.*s' 的键为空" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3475 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3476 | #: trailer.c:722 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3477 | #, c-format |
| 3478 | msgid "could not read input file '%s'" |
| 3479 | msgstr "不能读取输入文件 '%s'" |
| 3480 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3481 | #: trailer.c:725 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3482 | msgid "could not read from stdin" |
| 3483 | msgstr "不能自标准输入读取" |
| 3484 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3485 | #: trailer.c:949 builtin/am.c:44 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 3486 | #, c-format |
| 3487 | msgid "could not stat %s" |
| 3488 | msgstr "不能获取 %s 的文件状态" |
| 3489 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3490 | #: trailer.c:951 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 3491 | #, c-format |
| 3492 | msgid "file %s is not a regular file" |
| 3493 | msgstr "文件 %s 不是一个正规文件" |
| 3494 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3495 | #: trailer.c:953 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 3496 | #, c-format |
| 3497 | msgid "file %s is not writable by user" |
| 3498 | msgstr "文件 %s 用户不可写" |
| 3499 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3500 | #: trailer.c:965 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 3501 | msgid "could not open temporary file" |
| 3502 | msgstr "不能打开临时文件" |
| 3503 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3504 | #: trailer.c:1001 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 3505 | #, c-format |
| 3506 | msgid "could not rename temporary file to %s" |
| 3507 | msgstr "不能重命名临时文件为 %s" |
| 3508 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3509 | #: transport.c:62 |
| 3510 | #, c-format |
| 3511 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" |
| 3512 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" |
| 3513 | |
| 3514 | #: transport.c:151 |
| 3515 | #, c-format |
| 3516 | msgid "transport: invalid depth option '%s'" |
| 3517 | msgstr "传输:无效的深度选项 '%s'" |
| 3518 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3519 | #: transport.c:885 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3520 | #, c-format |
| 3521 | msgid "" |
| 3522 | "The following submodule paths contain changes that can\n" |
| 3523 | "not be found on any remote:\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3524 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3525 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3526 | #: transport.c:889 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3527 | #, c-format |
| 3528 | msgid "" |
| 3529 | "\n" |
| 3530 | "Please try\n" |
| 3531 | "\n" |
| 3532 | "\tgit push --recurse-submodules=on-demand\n" |
| 3533 | "\n" |
| 3534 | "or cd to the path and use\n" |
| 3535 | "\n" |
| 3536 | "\tgit push\n" |
| 3537 | "\n" |
| 3538 | "to push them to a remote.\n" |
| 3539 | "\n" |
| 3540 | msgstr "" |
| 3541 | "\n" |
| 3542 | "请尝试\n" |
| 3543 | "\n" |
| 3544 | "\tgit push --recurse-submodules=on-demand\n" |
| 3545 | "\n" |
| 3546 | "或者进入到子目录执行\n" |
| 3547 | "\n" |
| 3548 | "\tgit push\n" |
| 3549 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 3550 | "以推送至远程。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3551 | "\n" |
| 3552 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3553 | #: transport.c:897 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3554 | msgid "Aborting." |
| 3555 | msgstr "正在终止。" |
| 3556 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3557 | #: transport-helper.c:1082 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 3558 | #, c-format |
| 3559 | msgid "Could not read ref %s" |
| 3560 | msgstr "不能读取引用 %s" |
| 3561 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3562 | #: tree-walk.c:31 |
| 3563 | msgid "too-short tree object" |
| 3564 | msgstr "太短的树对象" |
| 3565 | |
| 3566 | #: tree-walk.c:37 |
| 3567 | msgid "malformed mode in tree entry" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 3568 | msgstr "树对象中的条目模式错误" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3569 | |
| 3570 | #: tree-walk.c:41 |
| 3571 | msgid "empty filename in tree entry" |
| 3572 | msgstr "树对象条目中空的文件名" |
| 3573 | |
| 3574 | #: tree-walk.c:113 |
| 3575 | msgid "too-short tree file" |
| 3576 | msgstr "太短的树文件" |
| 3577 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3578 | #: unpack-trees.c:99 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3579 | #, c-format |
| 3580 | msgid "" |
| 3581 | "Your local changes to the following files would be overwritten by checkout:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3582 | "%%sPlease commit your changes or stash them before you switch branches." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3583 | msgstr "" |
| 3584 | "您对下列文件的本地修改将被检出操作覆盖:\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 3585 | "%%s请在切换分支前提交您的修改或者保存进度。" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3586 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3587 | #: unpack-trees.c:101 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3588 | #, c-format |
| 3589 | msgid "" |
| 3590 | "Your local changes to the following files would be overwritten by checkout:\n" |
| 3591 | "%%s" |
| 3592 | msgstr "" |
| 3593 | "您对下列文件的本地修改将被检出操作覆盖:\n" |
| 3594 | "%%s" |
| 3595 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3596 | #: unpack-trees.c:104 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3597 | #, c-format |
| 3598 | msgid "" |
| 3599 | "Your local changes to the following files would be overwritten by merge:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3600 | "%%sPlease commit your changes or stash them before you merge." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3601 | msgstr "" |
| 3602 | "您对下列文件的本地修改将被合并操作覆盖:\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 3603 | "%%s请在合并前提交您的修改或者保存进度。" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3604 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3605 | #: unpack-trees.c:106 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3606 | #, c-format |
| 3607 | msgid "" |
| 3608 | "Your local changes to the following files would be overwritten by merge:\n" |
| 3609 | "%%s" |
| 3610 | msgstr "" |
| 3611 | "您对下列文件的本地修改将被合并操作覆盖:\n" |
| 3612 | "%%s" |
| 3613 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3614 | #: unpack-trees.c:109 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3615 | #, c-format |
| 3616 | msgid "" |
| 3617 | "Your local changes to the following files would be overwritten by %s:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3618 | "%%sPlease commit your changes or stash them before you %s." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3619 | msgstr "" |
| 3620 | "您对下列文件的本地修改将被 %s 覆盖:\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 3621 | "%%s请在 %s 之前提交您的修改或者保存进度。" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3622 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3623 | #: unpack-trees.c:111 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3624 | #, c-format |
| 3625 | msgid "" |
| 3626 | "Your local changes to the following files would be overwritten by %s:\n" |
| 3627 | "%%s" |
| 3628 | msgstr "" |
| 3629 | "您对下列文件的本地修改将被 %s 覆盖:\n" |
| 3630 | "%%s" |
| 3631 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3632 | #: unpack-trees.c:116 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3633 | #, c-format |
| 3634 | msgid "" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3635 | "Updating the following directories would lose untracked files in them:\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3636 | "%s" |
| 3637 | msgstr "" |
| 3638 | "更新如下目录将会丢失其中未跟踪的文件:\n" |
| 3639 | "%s" |
| 3640 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3641 | #: unpack-trees.c:120 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3642 | #, c-format |
| 3643 | msgid "" |
| 3644 | "The following untracked working tree files would be removed by checkout:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3645 | "%%sPlease move or remove them before you switch branches." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3646 | msgstr "" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 3647 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" |
| 3648 | "%%s请在切换分支之前移动或删除。" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3649 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3650 | #: unpack-trees.c:122 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3651 | #, c-format |
| 3652 | msgid "" |
| 3653 | "The following untracked working tree files would be removed by checkout:\n" |
| 3654 | "%%s" |
| 3655 | msgstr "" |
| 3656 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" |
| 3657 | "%%s" |
| 3658 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3659 | #: unpack-trees.c:125 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3660 | #, c-format |
| 3661 | msgid "" |
| 3662 | "The following untracked working tree files would be removed by merge:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3663 | "%%sPlease move or remove them before you merge." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3664 | msgstr "" |
| 3665 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" |
| 3666 | "%%s请在合并前移动或删除。" |
| 3667 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3668 | #: unpack-trees.c:127 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3669 | #, c-format |
| 3670 | msgid "" |
| 3671 | "The following untracked working tree files would be removed by merge:\n" |
| 3672 | "%%s" |
| 3673 | msgstr "" |
| 3674 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" |
| 3675 | "%%s" |
| 3676 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3677 | #: unpack-trees.c:130 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3678 | #, c-format |
| 3679 | msgid "" |
| 3680 | "The following untracked working tree files would be removed by %s:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3681 | "%%sPlease move or remove them before you %s." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3682 | msgstr "" |
| 3683 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" |
| 3684 | "%%s请在 %s 前移动或删除。" |
| 3685 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3686 | #: unpack-trees.c:132 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3687 | #, c-format |
| 3688 | msgid "" |
| 3689 | "The following untracked working tree files would be removed by %s:\n" |
| 3690 | "%%s" |
| 3691 | msgstr "" |
| 3692 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" |
| 3693 | "%%s" |
| 3694 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3695 | #: unpack-trees.c:137 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3696 | #, c-format |
| 3697 | msgid "" |
| 3698 | "The following untracked working tree files would be overwritten by " |
| 3699 | "checkout:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3700 | "%%sPlease move or remove them before you switch branches." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3701 | msgstr "" |
| 3702 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
| 3703 | "%%s请在切换分支前移动或删除。" |
| 3704 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3705 | #: unpack-trees.c:139 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3706 | #, c-format |
| 3707 | msgid "" |
| 3708 | "The following untracked working tree files would be overwritten by " |
| 3709 | "checkout:\n" |
| 3710 | "%%s" |
| 3711 | msgstr "" |
| 3712 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
| 3713 | "%%s" |
| 3714 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3715 | #: unpack-trees.c:142 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3716 | #, c-format |
| 3717 | msgid "" |
| 3718 | "The following untracked working tree files would be overwritten by merge:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3719 | "%%sPlease move or remove them before you merge." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3720 | msgstr "" |
| 3721 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" |
| 3722 | "%%s请在合并前移动或删除。" |
| 3723 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3724 | #: unpack-trees.c:144 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3725 | #, c-format |
| 3726 | msgid "" |
| 3727 | "The following untracked working tree files would be overwritten by merge:\n" |
| 3728 | "%%s" |
| 3729 | msgstr "" |
| 3730 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" |
| 3731 | "%%s" |
| 3732 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3733 | #: unpack-trees.c:147 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3734 | #, c-format |
| 3735 | msgid "" |
| 3736 | "The following untracked working tree files would be overwritten by %s:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3737 | "%%sPlease move or remove them before you %s." |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3738 | msgstr "" |
| 3739 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" |
| 3740 | "%%s请在 %s 前移动或删除。" |
| 3741 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3742 | #: unpack-trees.c:149 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3743 | #, c-format |
| 3744 | msgid "" |
| 3745 | "The following untracked working tree files would be overwritten by %s:\n" |
| 3746 | "%%s" |
| 3747 | msgstr "" |
| 3748 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" |
| 3749 | "%%s" |
| 3750 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3751 | #: unpack-trees.c:156 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3752 | #, c-format |
| 3753 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
| 3754 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" |
| 3755 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3756 | #: unpack-trees.c:159 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3757 | #, c-format |
| 3758 | msgid "" |
| 3759 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" |
| 3760 | "%s" |
| 3761 | msgstr "" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 3762 | "无法更新稀疏检出:如下条目不是最新:\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3763 | "%s" |
| 3764 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3765 | #: unpack-trees.c:161 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3766 | #, c-format |
| 3767 | msgid "" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3768 | "The following working tree files would be overwritten by sparse checkout " |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3769 | "update:\n" |
| 3770 | "%s" |
| 3771 | msgstr "" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3772 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3773 | "%s" |
| 3774 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3775 | #: unpack-trees.c:163 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3776 | #, c-format |
| 3777 | msgid "" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3778 | "The following working tree files would be removed by sparse checkout " |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3779 | "update:\n" |
| 3780 | "%s" |
| 3781 | msgstr "" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3782 | "工作区中下列文件将被稀疏检出更新所删除:\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3783 | "%s" |
| 3784 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3785 | #: unpack-trees.c:240 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 3786 | #, c-format |
| 3787 | msgid "Aborting\n" |
| 3788 | msgstr "终止中\n" |
| 3789 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3790 | #: unpack-trees.c:270 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3791 | msgid "Checking out files" |
| 3792 | msgstr "正在检出文件" |
| 3793 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3794 | #: urlmatch.c:120 |
| 3795 | msgid "invalid URL scheme name or missing '://' suffix" |
| 3796 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" |
| 3797 | |
| 3798 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 |
| 3799 | #, c-format |
| 3800 | msgid "invalid %XX escape sequence" |
| 3801 | msgstr "无效的 %XX 转义序列" |
| 3802 | |
| 3803 | #: urlmatch.c:172 |
| 3804 | msgid "missing host and scheme is not 'file:'" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 3805 | msgstr "缺失主机名且 URL 方案不是 'file:'" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 3806 | |
| 3807 | #: urlmatch.c:189 |
| 3808 | msgid "a 'file:' URL may not have a port number" |
| 3809 | msgstr "一个 'file:' URL 不应该包含端口号" |
| 3810 | |
| 3811 | #: urlmatch.c:199 |
| 3812 | msgid "invalid characters in host name" |
| 3813 | msgstr "主机名中包含无效的字符" |
| 3814 | |
| 3815 | #: urlmatch.c:244 urlmatch.c:255 |
| 3816 | msgid "invalid port number" |
| 3817 | msgstr "无效的端口号" |
| 3818 | |
| 3819 | #: urlmatch.c:322 |
| 3820 | msgid "invalid '..' path segment" |
| 3821 | msgstr "无效的 '..' 路径片段" |
| 3822 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3823 | #: worktree.c:282 |
| 3824 | #, c-format |
| 3825 | msgid "failed to read '%s'" |
| 3826 | msgstr "无法读取 '%s'" |
| 3827 | |
| 3828 | #: wrapper.c:222 wrapper.c:392 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 3829 | #, c-format |
| 3830 | msgid "could not open '%s' for reading and writing" |
| 3831 | msgstr "无法打开 '%s' 进行读写" |
| 3832 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3833 | #: wrapper.c:224 wrapper.c:394 builtin/am.c:766 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 3834 | #, c-format |
| 3835 | msgid "could not open '%s' for writing" |
| 3836 | msgstr "无法打开 '%s' 进行写入" |
| 3837 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3838 | #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 3839 | #: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3840 | #: builtin/pull.c:341 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 3841 | #, c-format |
| 3842 | msgid "could not open '%s' for reading" |
| 3843 | msgstr "无法打开 '%s' 进行读取" |
| 3844 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3845 | #: wrapper.c:605 wrapper.c:626 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 3846 | #, c-format |
| 3847 | msgid "unable to access '%s'" |
| 3848 | msgstr "不能访问 '%s'" |
| 3849 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3850 | #: wrapper.c:634 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 3851 | msgid "unable to get current working directory" |
| 3852 | msgstr "不能获取当前工作目录" |
| 3853 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3854 | #: wrapper.c:658 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 3855 | #, c-format |
| 3856 | msgid "could not write to %s" |
| 3857 | msgstr "不能写入 %s" |
| 3858 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 3859 | #: wrapper.c:660 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 3860 | #, c-format |
| 3861 | msgid "could not close %s" |
| 3862 | msgstr "不能关闭 %s" |
| 3863 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3864 | #: wt-status.c:151 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3865 | msgid "Unmerged paths:" |
| 3866 | msgstr "未合并的路径:" |
| 3867 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3868 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3869 | #: wt-status.c:178 wt-status.c:205 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3870 | #, c-format |
| 3871 | msgid " (use \"git reset %s <file>...\" to unstage)" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 3872 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3873 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3874 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3875 | #: wt-status.c:180 wt-status.c:207 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3876 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 3877 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3878 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3879 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3880 | #: wt-status.c:184 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 3881 | msgid " (use \"git add <file>...\" to mark resolution)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3882 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 3883 | |
| 3884 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3885 | #: wt-status.c:186 wt-status.c:190 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3886 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3887 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3888 | |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 3889 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3890 | #: wt-status.c:188 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 3891 | msgid " (use \"git rm <file>...\" to mark resolution)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3892 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 3893 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3894 | #: wt-status.c:199 wt-status.c:945 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3895 | msgid "Changes to be committed:" |
| 3896 | msgstr "要提交的变更:" |
| 3897 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3898 | #: wt-status.c:217 wt-status.c:954 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3899 | msgid "Changes not staged for commit:" |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 3900 | msgstr "尚未暂存以备提交的变更:" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3901 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3902 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3903 | #: wt-status.c:221 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3904 | msgid " (use \"git add <file>...\" to update what will be committed)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3905 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3906 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3907 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3908 | #: wt-status.c:223 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3909 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3910 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3911 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3912 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3913 | #: wt-status.c:224 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3914 | msgid "" |
| 3915 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3916 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3917 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3918 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3919 | #: wt-status.c:226 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3920 | msgid " (commit or discard the untracked or modified content in submodules)" |
| 3921 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" |
| 3922 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3923 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3924 | #: wt-status.c:238 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3925 | #, c-format |
| 3926 | msgid " (use \"git %s <file>...\" to include in what will be committed)" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 3927 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3928 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3929 | #: wt-status.c:253 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3930 | msgid "both deleted:" |
| 3931 | msgstr "双方删除:" |
| 3932 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3933 | #: wt-status.c:255 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3934 | msgid "added by us:" |
| 3935 | msgstr "由我们添加:" |
| 3936 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3937 | #: wt-status.c:257 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3938 | msgid "deleted by them:" |
| 3939 | msgstr "由他们删除:" |
| 3940 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3941 | #: wt-status.c:259 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3942 | msgid "added by them:" |
| 3943 | msgstr "由他们添加:" |
| 3944 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3945 | #: wt-status.c:261 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3946 | msgid "deleted by us:" |
| 3947 | msgstr "由我们删除:" |
| 3948 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3949 | #: wt-status.c:263 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3950 | msgid "both added:" |
| 3951 | msgstr "双方添加:" |
| 3952 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3953 | #: wt-status.c:265 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3954 | msgid "both modified:" |
| 3955 | msgstr "双方修改:" |
| 3956 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3957 | #: wt-status.c:275 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3958 | msgid "new file:" |
| 3959 | msgstr "新文件:" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 3960 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3961 | #: wt-status.c:277 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3962 | msgid "copied:" |
| 3963 | msgstr "拷贝:" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 3964 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3965 | #: wt-status.c:279 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3966 | msgid "deleted:" |
| 3967 | msgstr "删除:" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 3968 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3969 | #: wt-status.c:281 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3970 | msgid "modified:" |
| 3971 | msgstr "修改:" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 3972 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3973 | #: wt-status.c:283 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3974 | msgid "renamed:" |
| 3975 | msgstr "重命名:" |
| 3976 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3977 | #: wt-status.c:285 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3978 | msgid "typechange:" |
| 3979 | msgstr "类型变更:" |
| 3980 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3981 | #: wt-status.c:287 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3982 | msgid "unknown:" |
| 3983 | msgstr "未知:" |
| 3984 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3985 | #: wt-status.c:289 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 3986 | msgid "unmerged:" |
| 3987 | msgstr "未合并:" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 3988 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3989 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3990 | #: wt-status.c:371 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3991 | msgid "new commits, " |
Jiang Xin | aa9565f | 2012-03-05 13:16:27 +0800 | [diff] [blame] | 3992 | msgstr "新提交, " |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3993 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3994 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 3995 | #: wt-status.c:373 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3996 | msgid "modified content, " |
Jiang Xin | aa9565f | 2012-03-05 13:16:27 +0800 | [diff] [blame] | 3997 | msgstr "修改的内容, " |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 3998 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 3999 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4000 | #: wt-status.c:375 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4001 | msgid "untracked content, " |
Jiang Xin | aa9565f | 2012-03-05 13:16:27 +0800 | [diff] [blame] | 4002 | msgstr "未跟踪的内容, " |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4003 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4004 | #: wt-status.c:818 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 4005 | msgid "Submodules changed but not updated:" |
| 4006 | msgstr "子模组已修改但尚未更新:" |
| 4007 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4008 | #: wt-status.c:820 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 4009 | msgid "Submodule changes to be committed:" |
| 4010 | msgstr "要提交的子模组变更:" |
| 4011 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4012 | #: wt-status.c:901 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 4013 | msgid "" |
| 4014 | "Do not touch the line above.\n" |
| 4015 | "Everything below will be removed." |
| 4016 | msgstr "" |
| 4017 | "不要改动上面的一行。\n" |
| 4018 | "下面的所有内容均将被删除。" |
| 4019 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4020 | #: wt-status.c:1013 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4021 | msgid "You have unmerged paths." |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 4022 | msgstr "您有尚未合并的路径。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4023 | |
| 4024 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4025 | #: wt-status.c:1016 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4026 | msgid " (fix conflicts and run \"git commit\")" |
| 4027 | msgstr " (解决冲突并运行 \"git commit\")" |
| 4028 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4029 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4030 | #: wt-status.c:1018 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4031 | msgid " (use \"git merge --abort\" to abort the merge)" |
| 4032 | msgstr " (使用 \"git merge --abort\" 终止合并)" |
| 4033 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4034 | #: wt-status.c:1023 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4035 | msgid "All conflicts fixed but you are still merging." |
| 4036 | msgstr "所有冲突已解决但您仍处于合并中。" |
| 4037 | |
| 4038 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4039 | #: wt-status.c:1026 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4040 | msgid " (use \"git commit\" to conclude merge)" |
| 4041 | msgstr " (使用 \"git commit\" 结束合并)" |
| 4042 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4043 | #: wt-status.c:1036 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4044 | msgid "You are in the middle of an am session." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4045 | msgstr "您正处于 am 操作过程中。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4046 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4047 | #: wt-status.c:1039 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4048 | msgid "The current patch is empty." |
| 4049 | msgstr "当前的补丁为空。" |
| 4050 | |
| 4051 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4052 | #: wt-status.c:1043 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4053 | msgid " (fix conflicts and then run \"git am --continue\")" |
| 4054 | msgstr " (解决冲突,然后运行 \"git am --continue\")" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4055 | |
| 4056 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4057 | #: wt-status.c:1045 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4058 | msgid " (use \"git am --skip\" to skip this patch)" |
| 4059 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" |
| 4060 | |
| 4061 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4062 | #: wt-status.c:1047 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4063 | msgid " (use \"git am --abort\" to restore the original branch)" |
| 4064 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" |
| 4065 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4066 | #: wt-status.c:1176 |
| 4067 | msgid "git-rebase-todo is missing." |
| 4068 | msgstr "git-rebase-todo 丢失。" |
| 4069 | |
| 4070 | #: wt-status.c:1178 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4071 | msgid "No commands done." |
| 4072 | msgstr "没有命令被执行。" |
| 4073 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4074 | #: wt-status.c:1181 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4075 | #, c-format |
| 4076 | msgid "Last command done (%d command done):" |
| 4077 | msgid_plural "Last commands done (%d commands done):" |
| 4078 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" |
| 4079 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" |
| 4080 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4081 | #: wt-status.c:1192 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4082 | #, c-format |
| 4083 | msgid " (see more in file %s)" |
| 4084 | msgstr " (更多参见文件 %s)" |
| 4085 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4086 | #: wt-status.c:1197 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4087 | msgid "No commands remaining." |
| 4088 | msgstr "未剩下任何命令。" |
| 4089 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4090 | #: wt-status.c:1200 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4091 | #, c-format |
| 4092 | msgid "Next command to do (%d remaining command):" |
| 4093 | msgid_plural "Next commands to do (%d remaining commands):" |
| 4094 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" |
| 4095 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" |
| 4096 | |
| 4097 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4098 | #: wt-status.c:1208 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4099 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
| 4100 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" |
| 4101 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4102 | #: wt-status.c:1221 |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4103 | #, c-format |
| 4104 | msgid "You are currently rebasing branch '%s' on '%s'." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4105 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4106 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4107 | #: wt-status.c:1226 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4108 | msgid "You are currently rebasing." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4109 | msgstr "您在执行变基操作。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4110 | |
| 4111 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4112 | #: wt-status.c:1240 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4113 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
| 4114 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" |
| 4115 | |
| 4116 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4117 | #: wt-status.c:1242 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4118 | msgid " (use \"git rebase --skip\" to skip this patch)" |
| 4119 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" |
| 4120 | |
| 4121 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4122 | #: wt-status.c:1244 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4123 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
| 4124 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" |
| 4125 | |
| 4126 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4127 | #: wt-status.c:1250 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4128 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
| 4129 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" |
| 4130 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4131 | #: wt-status.c:1254 |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4132 | #, c-format |
| 4133 | msgid "" |
| 4134 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4135 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4136 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4137 | #: wt-status.c:1259 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4138 | msgid "You are currently splitting a commit during a rebase." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4139 | msgstr "您在执行变基操作时拆分提交。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4140 | |
| 4141 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4142 | #: wt-status.c:1262 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4143 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
| 4144 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" |
| 4145 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4146 | #: wt-status.c:1266 |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4147 | #, c-format |
| 4148 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4149 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4150 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4151 | #: wt-status.c:1271 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4152 | msgid "You are currently editing a commit during a rebase." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4153 | msgstr "您在执行变基操作时编辑提交。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4154 | |
| 4155 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4156 | #: wt-status.c:1274 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4157 | msgid " (use \"git commit --amend\" to amend the current commit)" |
| 4158 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" |
| 4159 | |
| 4160 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4161 | #: wt-status.c:1276 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4162 | msgid "" |
| 4163 | " (use \"git rebase --continue\" once you are satisfied with your changes)" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 4164 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4165 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4166 | #: wt-status.c:1286 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 4167 | #, c-format |
| 4168 | msgid "You are currently cherry-picking commit %s." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4169 | msgstr "您在执行拣选提交 %s 的操作。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4170 | |
| 4171 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4172 | #: wt-status.c:1291 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4173 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
| 4174 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4175 | |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4176 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4177 | #: wt-status.c:1294 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4178 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
| 4179 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" |
| 4180 | |
| 4181 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4182 | #: wt-status.c:1296 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4183 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
| 4184 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" |
| 4185 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4186 | #: wt-status.c:1305 |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4187 | #, c-format |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4188 | msgid "You are currently reverting commit %s." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4189 | msgstr "您在执行反转提交 %s 的操作。" |
Jiang Xin | 63af42f | 2013-02-19 14:52:24 +0800 | [diff] [blame] | 4190 | |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4191 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4192 | #: wt-status.c:1310 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4193 | msgid " (fix conflicts and run \"git revert --continue\")" |
| 4194 | msgstr " (解决冲突并运行 \"git revert --continue\")" |
| 4195 | |
| 4196 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4197 | #: wt-status.c:1313 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4198 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
| 4199 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" |
| 4200 | |
| 4201 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4202 | #: wt-status.c:1315 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4203 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
| 4204 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" |
| 4205 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4206 | #: wt-status.c:1326 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4207 | #, c-format |
| 4208 | msgid "You are currently bisecting, started from branch '%s'." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4209 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4210 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4211 | #: wt-status.c:1330 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4212 | msgid "You are currently bisecting." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4213 | msgstr "您在执行二分查找操作。" |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4214 | |
| 4215 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4216 | #: wt-status.c:1333 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 4217 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
| 4218 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" |
| 4219 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4220 | #: wt-status.c:1530 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4221 | msgid "On branch " |
| 4222 | msgstr "位于分支 " |
| 4223 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4224 | #: wt-status.c:1536 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4225 | msgid "interactive rebase in progress; onto " |
| 4226 | msgstr "交互式变基操作正在进行中;至 " |
| 4227 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4228 | #: wt-status.c:1538 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4229 | msgid "rebase in progress; onto " |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 4230 | msgstr "变基操作正在进行中;至 " |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 4231 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4232 | #: wt-status.c:1543 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4233 | msgid "HEAD detached at " |
| 4234 | msgstr "头指针分离于 " |
| 4235 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4236 | #: wt-status.c:1545 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4237 | msgid "HEAD detached from " |
| 4238 | msgstr "头指针分离自 " |
| 4239 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4240 | #: wt-status.c:1548 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4241 | msgid "Not currently on any branch." |
| 4242 | msgstr "当前不在任何分支上。" |
| 4243 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4244 | #: wt-status.c:1566 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4245 | msgid "Initial commit" |
| 4246 | msgstr "初始提交" |
| 4247 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4248 | #: wt-status.c:1580 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4249 | msgid "Untracked files" |
| 4250 | msgstr "未跟踪的文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4251 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4252 | #: wt-status.c:1582 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4253 | msgid "Ignored files" |
| 4254 | msgstr "忽略的文件" |
| 4255 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4256 | #: wt-status.c:1586 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4257 | #, c-format |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4258 | msgid "" |
| 4259 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" |
| 4260 | "may speed it up, but you have to be careful not to forget to add\n" |
| 4261 | "new files yourself (see 'git help status')." |
| 4262 | msgstr "" |
| 4263 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" |
| 4264 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4265 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4266 | #: wt-status.c:1592 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4267 | #, c-format |
| 4268 | msgid "Untracked files not listed%s" |
| 4269 | msgstr "未跟踪的文件没有列出%s" |
| 4270 | |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 4271 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4272 | #: wt-status.c:1594 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4273 | msgid " (use -u option to show untracked files)" |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 4274 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4275 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4276 | #: wt-status.c:1600 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4277 | msgid "No changes" |
| 4278 | msgstr "没有修改" |
| 4279 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4280 | #: wt-status.c:1605 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4281 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4282 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4283 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4284 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4285 | #: wt-status.c:1608 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4286 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4287 | msgid "no changes added to commit\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4288 | msgstr "修改尚未加入提交\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4289 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4290 | #: wt-status.c:1611 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4291 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4292 | msgid "" |
| 4293 | "nothing added to commit but untracked files present (use \"git add\" to " |
| 4294 | "track)\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4295 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4296 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4297 | #: wt-status.c:1614 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4298 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4299 | msgid "nothing added to commit but untracked files present\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4300 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4301 | |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 4302 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4303 | #: wt-status.c:1617 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4304 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4305 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4306 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4307 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4308 | #: wt-status.c:1620 wt-status.c:1625 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4309 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4310 | msgid "nothing to commit\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4311 | msgstr "无文件要提交\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4312 | |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 4313 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4314 | #: wt-status.c:1623 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4315 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4316 | msgid "nothing to commit (use -u to show untracked files)\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4317 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4318 | |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 4319 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4320 | #: wt-status.c:1627 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4321 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4322 | msgid "nothing to commit, working tree clean\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4323 | msgstr "无文件要提交,干净的工作区\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4324 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4325 | # 译者:注意保持句尾空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4326 | #: wt-status.c:1734 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4327 | msgid "Initial commit on " |
| 4328 | msgstr "初始提交于 " |
| 4329 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4330 | #: wt-status.c:1738 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 4331 | msgid "HEAD (no branch)" |
| 4332 | msgstr "HEAD(非分支)" |
| 4333 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4334 | #: wt-status.c:1767 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 4335 | msgid "gone" |
| 4336 | msgstr "丢失" |
| 4337 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4338 | # 译者:注意保持句尾空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4339 | #: wt-status.c:1769 wt-status.c:1777 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4340 | msgid "behind " |
| 4341 | msgstr "落后 " |
| 4342 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4343 | #: wt-status.c:1772 wt-status.c:1775 |
Jiang Xin | 5c0c220 | 2016-03-16 00:27:40 +0800 | [diff] [blame] | 4344 | msgid "ahead " |
| 4345 | msgstr "领先 " |
| 4346 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4347 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4348 | #: wt-status.c:2277 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4349 | #, c-format |
| 4350 | msgid "cannot %s: You have unstaged changes." |
| 4351 | msgstr "不能%s:您有未暂存的变更。" |
| 4352 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4353 | #: wt-status.c:2283 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4354 | msgid "additionally, your index contains uncommitted changes." |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 4355 | msgstr "另外,您的索引中包含未提交的变更。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4356 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4357 | #: wt-status.c:2285 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4358 | #, c-format |
| 4359 | msgid "cannot %s: Your index contains uncommitted changes." |
| 4360 | msgstr "不能%s:您的索引中包含未提交的变更。" |
| 4361 | |
| 4362 | #: compat/precompose_utf8.c:57 builtin/clone.c:414 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 4363 | #, c-format |
| 4364 | msgid "failed to unlink '%s'" |
| 4365 | msgstr "无法删除 '%s'" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4366 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 4367 | #: builtin/add.c:22 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 4368 | msgid "git add [<options>] [--] <pathspec>..." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 4369 | msgstr "git add [<选项>] [--] <路径规格>..." |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 4370 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4371 | #: builtin/add.c:80 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4372 | #, c-format |
| 4373 | msgid "unexpected diff status %c" |
| 4374 | msgstr "意外的差异状态 %c" |
| 4375 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4376 | #: builtin/add.c:85 builtin/commit.c:291 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4377 | msgid "updating files failed" |
| 4378 | msgstr "更新文件失败" |
| 4379 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4380 | #: builtin/add.c:95 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4381 | #, c-format |
| 4382 | msgid "remove '%s'\n" |
| 4383 | msgstr "删除 '%s'\n" |
| 4384 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4385 | #: builtin/add.c:149 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4386 | msgid "Unstaged changes after refreshing the index:" |
| 4387 | msgstr "刷新索引之后尚未被暂存的变更:" |
| 4388 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4389 | #: builtin/add.c:209 builtin/rev-parse.c:845 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4390 | msgid "Could not read the index" |
| 4391 | msgstr "不能读取索引" |
| 4392 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4393 | #: builtin/add.c:220 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4394 | #, c-format |
| 4395 | msgid "Could not open '%s' for writing." |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4396 | msgstr "无法打开 '%s' 进行写入。" |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4397 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4398 | #: builtin/add.c:224 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4399 | msgid "Could not write patch" |
| 4400 | msgstr "不能生成补丁" |
| 4401 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4402 | #: builtin/add.c:227 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 4403 | msgid "editing patch failed" |
| 4404 | msgstr "编辑补丁失败" |
| 4405 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4406 | #: builtin/add.c:230 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4407 | #, c-format |
| 4408 | msgid "Could not stat '%s'" |
| 4409 | msgstr "不能查看文件状态 '%s'" |
| 4410 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4411 | #: builtin/add.c:232 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4412 | msgid "Empty patch. Aborted." |
| 4413 | msgstr "空补丁。异常终止。" |
| 4414 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4415 | #: builtin/add.c:237 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4416 | #, c-format |
| 4417 | msgid "Could not apply '%s'" |
| 4418 | msgstr "不能应用 '%s'" |
| 4419 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4420 | #: builtin/add.c:247 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4421 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
| 4422 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
| 4423 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4424 | #: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 |
| 4425 | #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 |
| 4426 | #: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4427 | msgid "dry run" |
| 4428 | msgstr "演习" |
| 4429 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4430 | #: builtin/add.c:269 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4431 | msgid "interactive picking" |
| 4432 | msgstr "交互式拣选" |
| 4433 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4434 | #: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4435 | msgid "select hunks interactively" |
| 4436 | msgstr "交互式挑选数据块" |
| 4437 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4438 | #: builtin/add.c:271 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4439 | msgid "edit current diff and apply" |
| 4440 | msgstr "编辑当前差异并应用" |
| 4441 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4442 | #: builtin/add.c:272 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4443 | msgid "allow adding otherwise ignored files" |
| 4444 | msgstr "允许添加忽略的文件" |
| 4445 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4446 | #: builtin/add.c:273 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4447 | msgid "update tracked files" |
| 4448 | msgstr "更新已跟踪的文件" |
| 4449 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4450 | #: builtin/add.c:274 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4451 | msgid "record only the fact that the path will be added later" |
| 4452 | msgstr "只记录,该路径稍后再添加" |
| 4453 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4454 | #: builtin/add.c:275 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4455 | msgid "add changes from all tracked and untracked files" |
| 4456 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
| 4457 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4458 | #: builtin/add.c:278 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4459 | msgid "ignore paths removed in the working tree (same as --no-all)" |
| 4460 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" |
| 4461 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4462 | #: builtin/add.c:280 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4463 | msgid "don't add, only refresh the index" |
| 4464 | msgstr "不添加,只刷新索引" |
| 4465 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4466 | #: builtin/add.c:281 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4467 | msgid "just skip files which cannot be added because of errors" |
| 4468 | msgstr "跳过因出错不能添加的文件" |
| 4469 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4470 | #: builtin/add.c:282 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4471 | msgid "check if - even missing - files are ignored in dry run" |
| 4472 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
| 4473 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4474 | #: builtin/add.c:283 builtin/update-index.c:947 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4475 | msgid "(+/-)x" |
| 4476 | msgstr "(+/-)x" |
| 4477 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4478 | #: builtin/add.c:283 builtin/update-index.c:948 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4479 | msgid "override the executable bit of the listed files" |
| 4480 | msgstr "覆盖列表里文件的可执行位" |
| 4481 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4482 | #: builtin/add.c:305 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4483 | #, c-format |
| 4484 | msgid "Use -f if you really want to add them.\n" |
| 4485 | msgstr "使用 -f 参数如果您确实要添加它们。\n" |
| 4486 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4487 | #: builtin/add.c:312 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 4488 | msgid "adding files failed" |
| 4489 | msgstr "添加文件失败" |
| 4490 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4491 | #: builtin/add.c:348 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4492 | msgid "-A and -u are mutually incompatible" |
| 4493 | msgstr "-A 和 -u 选项互斥" |
| 4494 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4495 | #: builtin/add.c:355 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4496 | msgid "Option --ignore-missing can only be used together with --dry-run" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 4497 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4498 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4499 | #: builtin/add.c:359 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4500 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4501 | msgid "--chmod param '%s' must be either -x or +x" |
| 4502 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" |
| 4503 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4504 | #: builtin/add.c:374 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 4505 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4506 | msgid "Nothing specified, nothing added.\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4507 | msgstr "没有指定文件,也没有文件被添加。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4508 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4509 | #: builtin/add.c:375 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4510 | #, c-format |
| 4511 | msgid "Maybe you wanted to say 'git add .'?\n" |
| 4512 | msgstr "也许您想要执行 'git add .'?\n" |
| 4513 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4514 | #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 |
| 4515 | #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4516 | #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4517 | #: builtin/submodule--helper.c:244 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4518 | msgid "index file corrupt" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4519 | msgstr "索引文件损坏" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4520 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4521 | #: builtin/am.c:414 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4522 | msgid "could not parse author script" |
| 4523 | msgstr "不能解析作者脚本" |
| 4524 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4525 | #: builtin/am.c:491 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4526 | #, c-format |
| 4527 | msgid "'%s' was deleted by the applypatch-msg hook" |
| 4528 | msgstr "'%s' 被 applypatch-msg 钩子删除" |
| 4529 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4530 | #: builtin/am.c:532 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4531 | #, c-format |
| 4532 | msgid "Malformed input line: '%s'." |
| 4533 | msgstr "非法的输入行:'%s'。" |
| 4534 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4535 | #: builtin/am.c:569 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4536 | #, c-format |
| 4537 | msgid "Failed to copy notes from '%s' to '%s'" |
| 4538 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" |
| 4539 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4540 | #: builtin/am.c:595 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4541 | msgid "fseek failed" |
| 4542 | msgstr "fseek 失败" |
| 4543 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4544 | #: builtin/am.c:775 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4545 | #, c-format |
| 4546 | msgid "could not parse patch '%s'" |
| 4547 | msgstr "无法解析补丁 '%s'" |
| 4548 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4549 | #: builtin/am.c:840 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4550 | msgid "Only one StGIT patch series can be applied at once" |
| 4551 | msgstr "一次只能有一个 StGIT 补丁队列被应用" |
| 4552 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4553 | #: builtin/am.c:887 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4554 | msgid "invalid timestamp" |
| 4555 | msgstr "无效的时间戳" |
| 4556 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4557 | #: builtin/am.c:890 builtin/am.c:898 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4558 | msgid "invalid Date line" |
| 4559 | msgstr "无效的日期行" |
| 4560 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4561 | #: builtin/am.c:895 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4562 | msgid "invalid timezone offset" |
| 4563 | msgstr "无效的时区偏移值" |
| 4564 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4565 | #: builtin/am.c:984 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4566 | msgid "Patch format detection failed." |
| 4567 | msgstr "补丁格式检测失败。" |
| 4568 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4569 | #: builtin/am.c:989 builtin/clone.c:379 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4570 | #, c-format |
| 4571 | msgid "failed to create directory '%s'" |
| 4572 | msgstr "无法创建目录 '%s'" |
| 4573 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4574 | #: builtin/am.c:993 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4575 | msgid "Failed to split patches." |
| 4576 | msgstr "无法拆分补丁。" |
| 4577 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4578 | #: builtin/am.c:1125 builtin/commit.c:376 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4579 | msgid "unable to write index file" |
| 4580 | msgstr "无法写入索引文件" |
| 4581 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4582 | #: builtin/am.c:1176 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4583 | #, c-format |
| 4584 | msgid "When you have resolved this problem, run \"%s --continue\"." |
| 4585 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" |
| 4586 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4587 | #: builtin/am.c:1177 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4588 | #, c-format |
| 4589 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
| 4590 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" |
| 4591 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4592 | #: builtin/am.c:1178 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4593 | #, c-format |
| 4594 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
| 4595 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" |
| 4596 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4597 | #: builtin/am.c:1316 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4598 | msgid "Patch is empty. Was it split wrong?" |
| 4599 | msgstr "补丁为空。是不是切分错误?" |
| 4600 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4601 | #: builtin/am.c:1390 builtin/log.c:1550 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4602 | #, c-format |
| 4603 | msgid "invalid ident line: %s" |
| 4604 | msgstr "包含无效的身份标识:%s" |
| 4605 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4606 | #: builtin/am.c:1417 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4607 | #, c-format |
| 4608 | msgid "unable to parse commit %s" |
| 4609 | msgstr "不能解析提交 %s" |
| 4610 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4611 | #: builtin/am.c:1610 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4612 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
| 4613 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" |
| 4614 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4615 | #: builtin/am.c:1612 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4616 | msgid "Using index info to reconstruct a base tree..." |
| 4617 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." |
| 4618 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4619 | #: builtin/am.c:1631 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4620 | msgid "" |
| 4621 | "Did you hand edit your patch?\n" |
| 4622 | "It does not apply to blobs recorded in its index." |
| 4623 | msgstr "" |
| 4624 | "您是否曾手动编辑过您的补丁?\n" |
| 4625 | "无法应用补丁到索引中的数据对象上。" |
| 4626 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4627 | #: builtin/am.c:1637 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4628 | msgid "Falling back to patching base and 3-way merge..." |
| 4629 | msgstr "回落到基础版本上打补丁及进行三方合并..." |
| 4630 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4631 | #: builtin/am.c:1662 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4632 | msgid "Failed to merge in the changes." |
| 4633 | msgstr "无法合并变更。" |
| 4634 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4635 | #: builtin/am.c:1686 builtin/merge.c:632 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4636 | msgid "git write-tree failed to write a tree" |
| 4637 | msgstr "git write-tree 无法写入一树对象" |
| 4638 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4639 | #: builtin/am.c:1693 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4640 | msgid "applying to an empty history" |
| 4641 | msgstr "正应用到一个空历史上" |
| 4642 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4643 | #: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 |
| 4644 | #: builtin/merge.c:827 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4645 | msgid "failed to write commit object" |
| 4646 | msgstr "无法写提交对象" |
| 4647 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4648 | #: builtin/am.c:1739 builtin/am.c:1743 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4649 | #, c-format |
| 4650 | msgid "cannot resume: %s does not exist." |
| 4651 | msgstr "无法继续:%s 不存在。" |
| 4652 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4653 | #: builtin/am.c:1759 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4654 | msgid "cannot be interactive without stdin connected to a terminal." |
| 4655 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
| 4656 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4657 | #: builtin/am.c:1764 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4658 | msgid "Commit Body is:" |
| 4659 | msgstr "提交内容为:" |
| 4660 | |
| 4661 | # 译者:注意保持句尾空格 |
| 4662 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
| 4663 | #. in your translation. The program will only accept English |
| 4664 | #. input at this point. |
| 4665 | #. |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4666 | #: builtin/am.c:1774 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4667 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
| 4668 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" |
| 4669 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4670 | #: builtin/am.c:1824 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4671 | #, c-format |
| 4672 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
| 4673 | msgstr "脏索引:不能应用补丁(脏文件:%s)" |
| 4674 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4675 | #: builtin/am.c:1861 builtin/am.c:1933 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4676 | #, c-format |
| 4677 | msgid "Applying: %.*s" |
| 4678 | msgstr "应用:%.*s" |
| 4679 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4680 | #: builtin/am.c:1877 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4681 | msgid "No changes -- Patch already applied." |
| 4682 | msgstr "没有变更 —— 补丁已经应用过。" |
| 4683 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4684 | #: builtin/am.c:1885 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4685 | #, c-format |
| 4686 | msgid "Patch failed at %s %.*s" |
| 4687 | msgstr "打补丁失败于 %s %.*s" |
| 4688 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4689 | #: builtin/am.c:1891 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4690 | #, c-format |
| 4691 | msgid "The copy of the patch that failed is found in: %s" |
| 4692 | msgstr "失败的补丁文件副本位于:%s" |
| 4693 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4694 | #: builtin/am.c:1936 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4695 | msgid "" |
| 4696 | "No changes - did you forget to use 'git add'?\n" |
| 4697 | "If there is nothing left to stage, chances are that something else\n" |
| 4698 | "already introduced the same changes; you might want to skip this patch." |
| 4699 | msgstr "" |
| 4700 | "没有变更 —— 您是不是忘了执行 'git add'?\n" |
| 4701 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" |
| 4702 | "您也许想要跳过这个补丁。" |
| 4703 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4704 | #: builtin/am.c:1943 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4705 | msgid "" |
| 4706 | "You still have unmerged paths in your index.\n" |
| 4707 | "Did you forget to use 'git add'?" |
| 4708 | msgstr "" |
| 4709 | "您的索引中仍有未合并的路径。\n" |
| 4710 | "您是否忘了执行 'git add'?" |
| 4711 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4712 | #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4713 | #: builtin/reset.c:316 |
| 4714 | #, c-format |
| 4715 | msgid "Could not parse object '%s'." |
| 4716 | msgstr "不能解析对象 '%s'。" |
| 4717 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4718 | #: builtin/am.c:2103 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4719 | msgid "failed to clean index" |
| 4720 | msgstr "无法清空索引" |
| 4721 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4722 | #: builtin/am.c:2137 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4723 | msgid "" |
| 4724 | "You seem to have moved HEAD since the last 'am' failure.\n" |
| 4725 | "Not rewinding to ORIG_HEAD" |
| 4726 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" |
| 4727 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4728 | #: builtin/am.c:2200 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4729 | #, c-format |
| 4730 | msgid "Invalid value for --patch-format: %s" |
| 4731 | msgstr "无效的 --patch-format 值:%s" |
| 4732 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4733 | #: builtin/am.c:2233 |
| 4734 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
| 4735 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4736 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4737 | #: builtin/am.c:2234 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 4738 | msgid "git am [<options>] (--continue | --skip | --abort)" |
| 4739 | msgstr "git am [<选项>] (--continue | --skip | --abort)" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4740 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4741 | #: builtin/am.c:2240 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4742 | msgid "run interactively" |
| 4743 | msgstr "以交互式方式运行" |
| 4744 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4745 | #: builtin/am.c:2242 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4746 | msgid "historical option -- no-op" |
| 4747 | msgstr "老的参数 —— 无作用" |
| 4748 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4749 | #: builtin/am.c:2244 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4750 | msgid "allow fall back on 3way merging if needed" |
| 4751 | msgstr "如果必要,允许使用三方合并。" |
| 4752 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4753 | #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4754 | #: builtin/repack.c:178 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4755 | msgid "be quiet" |
| 4756 | msgstr "静默模式" |
| 4757 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4758 | #: builtin/am.c:2247 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4759 | msgid "add a Signed-off-by line to the commit message" |
| 4760 | msgstr "在提交说明中添加一个 Signed-off-by 签名" |
| 4761 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4762 | #: builtin/am.c:2250 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4763 | msgid "recode into utf8 (default)" |
| 4764 | msgstr "使用 utf8 字符集(默认)" |
| 4765 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4766 | #: builtin/am.c:2252 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4767 | msgid "pass -k flag to git-mailinfo" |
| 4768 | msgstr "向 git-mailinfo 传递 -k 参数" |
| 4769 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4770 | #: builtin/am.c:2254 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4771 | msgid "pass -b flag to git-mailinfo" |
| 4772 | msgstr "向 git-mailinfo 传递 -b 参数" |
| 4773 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4774 | #: builtin/am.c:2256 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4775 | msgid "pass -m flag to git-mailinfo" |
| 4776 | msgstr "向 git-mailinfo 传递 -m 参数" |
| 4777 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4778 | #: builtin/am.c:2258 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4779 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
| 4780 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" |
| 4781 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4782 | #: builtin/am.c:2261 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4783 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
| 4784 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" |
| 4785 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4786 | #: builtin/am.c:2264 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4787 | msgid "strip everything before a scissors line" |
| 4788 | msgstr "丢弃裁切线前的所有内容" |
| 4789 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4790 | #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 |
| 4791 | #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 |
| 4792 | #: builtin/am.c:2293 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4793 | msgid "pass it through git-apply" |
| 4794 | msgstr "传递给 git-apply" |
| 4795 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4796 | #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4797 | #: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 |
| 4798 | #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 |
| 4799 | #: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4800 | #: parse-options.h:132 parse-options.h:134 parse-options.h:245 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4801 | msgid "n" |
| 4802 | msgstr "n" |
| 4803 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4804 | #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4805 | #: builtin/tag.c:387 builtin/verify-tag.c:38 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4806 | msgid "format" |
| 4807 | msgstr "格式" |
| 4808 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4809 | #: builtin/am.c:2290 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4810 | msgid "format the patch(es) are in" |
| 4811 | msgstr "补丁的格式" |
| 4812 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4813 | #: builtin/am.c:2296 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4814 | msgid "override error message when patch failure occurs" |
| 4815 | msgstr "打补丁失败时显示的错误信息" |
| 4816 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4817 | #: builtin/am.c:2298 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4818 | msgid "continue applying patches after resolving a conflict" |
| 4819 | msgstr "冲突解决后继续应用补丁" |
| 4820 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4821 | #: builtin/am.c:2301 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4822 | msgid "synonyms for --continue" |
| 4823 | msgstr "和 --continue 同义" |
| 4824 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4825 | #: builtin/am.c:2304 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4826 | msgid "skip the current patch" |
| 4827 | msgstr "跳过当前补丁" |
| 4828 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4829 | #: builtin/am.c:2307 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4830 | msgid "restore the original branch and abort the patching operation." |
| 4831 | msgstr "恢复原始分支并终止打补丁操作。" |
| 4832 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4833 | #: builtin/am.c:2311 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4834 | msgid "lie about committer date" |
| 4835 | msgstr "将作者日期作为提交日期" |
| 4836 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4837 | #: builtin/am.c:2313 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4838 | msgid "use current timestamp for author date" |
| 4839 | msgstr "用当前时间作为作者日期" |
| 4840 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4841 | #: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 |
| 4842 | #: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4843 | msgid "key-id" |
| 4844 | msgstr "key-id" |
| 4845 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4846 | #: builtin/am.c:2316 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4847 | msgid "GPG-sign commits" |
| 4848 | msgstr "使用 GPG 签名提交" |
| 4849 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4850 | #: builtin/am.c:2319 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4851 | msgid "(internal use for git-rebase)" |
| 4852 | msgstr "(内部使用,用于 git-rebase)" |
| 4853 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4854 | #: builtin/am.c:2334 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4855 | msgid "" |
| 4856 | "The -b/--binary option has been a no-op for long time, and\n" |
| 4857 | "it will be removed. Please do not use it anymore." |
| 4858 | msgstr "" |
| 4859 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" |
| 4860 | "请不要再使用它了。" |
| 4861 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4862 | #: builtin/am.c:2341 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4863 | msgid "failed to read the index" |
| 4864 | msgstr "无法读取索引" |
| 4865 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4866 | #: builtin/am.c:2356 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4867 | #, c-format |
| 4868 | msgid "previous rebase directory %s still exists but mbox given." |
| 4869 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" |
| 4870 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4871 | #: builtin/am.c:2380 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4872 | #, c-format |
| 4873 | msgid "" |
| 4874 | "Stray %s directory found.\n" |
| 4875 | "Use \"git am --abort\" to remove it." |
| 4876 | msgstr "" |
| 4877 | "发现了错误的 %s 目录。\n" |
| 4878 | "使用 \"git am --abort\" 删除它。" |
| 4879 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4880 | #: builtin/am.c:2386 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 4881 | msgid "Resolve operation not in progress, we are not resuming." |
| 4882 | msgstr "解决操作未进行,我们不会继续。" |
| 4883 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4884 | #: builtin/apply.c:8 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 4885 | msgid "git apply [<options>] [<patch>...]" |
| 4886 | msgstr "git apply [<选项>] [<补丁>...]" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 4887 | |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4888 | #: builtin/archive.c:17 |
| 4889 | #, c-format |
| 4890 | msgid "could not create archive file '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4891 | msgstr "不能创建归档文件 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4892 | |
| 4893 | #: builtin/archive.c:20 |
| 4894 | msgid "could not redirect output" |
Thynson | 195febd | 2012-08-07 17:39:30 +0800 | [diff] [blame] | 4895 | msgstr "不能重定向输出" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4896 | |
| 4897 | #: builtin/archive.c:37 |
| 4898 | msgid "git archive: Remote with no URL" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 4899 | msgstr "git archive:未提供远程 URL" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4900 | |
| 4901 | #: builtin/archive.c:58 |
| 4902 | msgid "git archive: expected ACK/NAK, got EOF" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 4903 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4904 | |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4905 | #: builtin/archive.c:61 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4906 | #, c-format |
| 4907 | msgid "git archive: NACK %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4908 | msgstr "git archive:NACK %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4909 | |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4910 | #: builtin/archive.c:63 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4911 | #, c-format |
| 4912 | msgid "remote error: %s" |
| 4913 | msgstr "远程错误:%s" |
| 4914 | |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4915 | #: builtin/archive.c:64 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4916 | msgid "git archive: protocol error" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 4917 | msgstr "git archive:协议错误" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4918 | |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 4919 | #: builtin/archive.c:68 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4920 | msgid "git archive: expected a flush" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 4921 | msgstr "git archive:应有一个 flush 刷新" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 4922 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4923 | #: builtin/bisect--helper.c:7 |
| 4924 | msgid "git bisect--helper --next-all [--no-checkout]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4925 | msgstr "git bisect--helper --next-all [--no-checkout]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4926 | |
| 4927 | #: builtin/bisect--helper.c:17 |
| 4928 | msgid "perform 'git bisect next'" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4929 | msgstr "执行 'git bisect next'" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4930 | |
| 4931 | #: builtin/bisect--helper.c:19 |
| 4932 | msgid "update BISECT_HEAD instead of checking out the current commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4933 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4934 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 4935 | #: builtin/blame.c:33 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 4936 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
| 4937 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4938 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 4939 | #: builtin/blame.c:38 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 4940 | msgid "<rev-opts> are documented in git-rev-list(1)" |
| 4941 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4942 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4943 | #: builtin/blame.c:1786 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 4944 | msgid "Blaming lines" |
| 4945 | msgstr "追踪代码行" |
| 4946 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4947 | #: builtin/blame.c:2582 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4948 | msgid "Show blame entries as we find them, incrementally" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4949 | msgstr "增量式地显示发现的 blame 条目" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4950 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4951 | #: builtin/blame.c:2583 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4952 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4953 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4954 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4955 | #: builtin/blame.c:2584 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4956 | msgid "Do not treat root commits as boundaries (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4957 | msgstr "不把根提交作为边界(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4958 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4959 | #: builtin/blame.c:2585 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4960 | msgid "Show work cost statistics" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4961 | msgstr "显示命令消耗统计" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4962 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4963 | #: builtin/blame.c:2586 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 4964 | msgid "Force progress reporting" |
| 4965 | msgstr "强制进度显示" |
| 4966 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4967 | #: builtin/blame.c:2587 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4968 | msgid "Show output score for blame entries" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4969 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4970 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4971 | #: builtin/blame.c:2588 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4972 | msgid "Show original filename (Default: auto)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4973 | msgstr "显示原始文件名(默认:自动)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4974 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4975 | #: builtin/blame.c:2589 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4976 | msgid "Show original linenumber (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4977 | msgstr "显示原始的行号(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4978 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4979 | #: builtin/blame.c:2590 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4980 | msgid "Show in a format designed for machine consumption" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4981 | msgstr "显示为一个适合机器读取的格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4982 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4983 | #: builtin/blame.c:2591 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4984 | msgid "Show porcelain format with per-line commit information" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4985 | msgstr "为每一行显示机器适用的提交信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4986 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4987 | #: builtin/blame.c:2592 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4988 | msgid "Use the same output mode as git-annotate (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4989 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4990 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4991 | #: builtin/blame.c:2593 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4992 | msgid "Show raw timestamp (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 4993 | msgstr "显示原始时间戳(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4994 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4995 | #: builtin/blame.c:2594 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4996 | msgid "Show long commit SHA1 (Default: off)" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 4997 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 4998 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 4999 | #: builtin/blame.c:2595 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5000 | msgid "Suppress author name and timestamp (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5001 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5002 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5003 | #: builtin/blame.c:2596 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5004 | msgid "Show author email instead of name (Default: off)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5005 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5006 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5007 | #: builtin/blame.c:2597 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5008 | msgid "Ignore whitespace differences" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5009 | msgstr "忽略空白差异" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5010 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5011 | #: builtin/blame.c:2604 |
| 5012 | msgid "Use an experimental heuristic to improve diffs" |
| 5013 | msgstr "使用一个试验性的启发式算法改进差异显示" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5014 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5015 | #: builtin/blame.c:2606 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5016 | msgid "Spend extra cycles to find better match" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5017 | msgstr "花费额外的循环来找到更好的匹配" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5018 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5019 | #: builtin/blame.c:2607 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5020 | msgid "Use revisions from <file> instead of calling git-rev-list" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 5021 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5022 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5023 | #: builtin/blame.c:2608 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5024 | msgid "Use <file>'s contents as the final image" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 5025 | msgstr "使用 <文件> 的内容作为最终的图片" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5026 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5027 | #: builtin/blame.c:2609 builtin/blame.c:2610 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5028 | msgid "score" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5029 | msgstr "得分" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5030 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5031 | #: builtin/blame.c:2609 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5032 | msgid "Find line copies within and across files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5033 | msgstr "找到文件内及跨文件的行拷贝" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5034 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5035 | #: builtin/blame.c:2610 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5036 | msgid "Find line movements within and across files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5037 | msgstr "找到文件内及跨文件的行移动" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5038 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5039 | #: builtin/blame.c:2611 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5040 | msgid "n,m" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5041 | msgstr "n,m" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5042 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5043 | #: builtin/blame.c:2611 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5044 | msgid "Process only line range n,m, counting from 1" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5045 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5046 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5047 | #: builtin/blame.c:2658 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5048 | msgid "--progress can't be used with --incremental or porcelain formats" |
| 5049 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" |
| 5050 | |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 5051 | #. TRANSLATORS: This string is used to tell us the maximum |
| 5052 | #. display width for a relative timestamp in "git blame" |
| 5053 | #. output. For C locale, "4 years, 11 months ago", which |
| 5054 | #. takes 22 places, is the longest among various forms of |
| 5055 | #. relative timestamps, but your language may need more or |
| 5056 | #. fewer display columns. |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5057 | #: builtin/blame.c:2706 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 5058 | msgid "4 years, 11 months ago" |
| 5059 | msgstr "4 年 11 个月前" |
| 5060 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5061 | #: builtin/blame.c:2786 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5062 | msgid "--contents and --reverse do not blend well." |
| 5063 | msgstr "--contents 和 --reverse 不能混用。" |
| 5064 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5065 | #: builtin/blame.c:2806 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5066 | msgid "cannot use --contents with final commit object name" |
| 5067 | msgstr "不能将 --contents 和最终的提交对象名共用" |
| 5068 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5069 | #: builtin/blame.c:2811 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5070 | msgid "--reverse and --first-parent together require specified latest commit" |
| 5071 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" |
| 5072 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5073 | #: builtin/blame.c:2838 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5074 | msgid "" |
| 5075 | "--reverse --first-parent together require range along first-parent chain" |
| 5076 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" |
| 5077 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5078 | #: builtin/blame.c:2849 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5079 | #, c-format |
| 5080 | msgid "no such path %s in %s" |
| 5081 | msgstr "在 %2$s 中无此路径 %1$s" |
| 5082 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5083 | #: builtin/blame.c:2860 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5084 | #, c-format |
| 5085 | msgid "cannot read blob %s for path %s" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 5086 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5087 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5088 | #: builtin/blame.c:2879 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5089 | #, c-format |
| 5090 | msgid "file %s has only %lu line" |
| 5091 | msgid_plural "file %s has only %lu lines" |
| 5092 | msgstr[0] "文件 %s 只有 %lu 行" |
| 5093 | msgstr[1] "文件 %s 只有 %lu 行" |
| 5094 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5095 | #: builtin/branch.c:26 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5096 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
| 5097 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5098 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5099 | #: builtin/branch.c:27 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5100 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
| 5101 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5102 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5103 | #: builtin/branch.c:28 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5104 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
| 5105 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5106 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5107 | #: builtin/branch.c:29 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5108 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
| 5109 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5110 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5111 | #: builtin/branch.c:30 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5112 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
| 5113 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" |
| 5114 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5115 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5116 | #: builtin/branch.c:143 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5117 | #, c-format |
| 5118 | msgid "" |
| 5119 | "deleting branch '%s' that has been merged to\n" |
| 5120 | " '%s', but not yet merged to HEAD." |
| 5121 | msgstr "" |
Thynson | 70fc47b | 2012-02-29 01:58:30 +0800 | [diff] [blame] | 5122 | "将要删除的分支 '%s' 已经被合并到\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5123 | " '%s',但未合并到 HEAD。" |
| 5124 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5125 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5126 | #: builtin/branch.c:147 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5127 | #, c-format |
| 5128 | msgid "" |
| 5129 | "not deleting branch '%s' that is not yet merged to\n" |
| 5130 | " '%s', even though it is merged to HEAD." |
| 5131 | msgstr "" |
Thynson | 70fc47b | 2012-02-29 01:58:30 +0800 | [diff] [blame] | 5132 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
| 5133 | " 然而却尚未被合并到分支 '%s' 。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5134 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5135 | #: builtin/branch.c:161 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5136 | #, c-format |
| 5137 | msgid "Couldn't look up commit object for '%s'" |
| 5138 | msgstr "无法查询 '%s' 指向的提交对象" |
| 5139 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5140 | #: builtin/branch.c:165 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5141 | #, c-format |
| 5142 | msgid "" |
| 5143 | "The branch '%s' is not fully merged.\n" |
| 5144 | "If you are sure you want to delete it, run 'git branch -D %s'." |
| 5145 | msgstr "" |
| 5146 | "分支 '%s' 没有完全合并。\n" |
| 5147 | "如果您确认要删除它,执行 'git branch -D %s'。" |
| 5148 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5149 | #: builtin/branch.c:178 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5150 | msgid "Update of config-file failed" |
| 5151 | msgstr "无法更新 config 文件" |
| 5152 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5153 | #: builtin/branch.c:206 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5154 | msgid "cannot use -a with -d" |
| 5155 | msgstr "不能将 -a 和 -d 同时使用" |
| 5156 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5157 | #: builtin/branch.c:212 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5158 | msgid "Couldn't look up commit object for HEAD" |
| 5159 | msgstr "无法查询 HEAD 指向的提交对象" |
| 5160 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5161 | #: builtin/branch.c:226 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5162 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5163 | msgid "Cannot delete branch '%s' checked out at '%s'" |
| 5164 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5165 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5166 | #: builtin/branch.c:241 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5167 | #, c-format |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5168 | msgid "remote-tracking branch '%s' not found." |
| 5169 | msgstr "未能找到远程跟踪分支 '%s'。" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5170 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5171 | #: builtin/branch.c:242 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5172 | #, c-format |
| 5173 | msgid "branch '%s' not found." |
| 5174 | msgstr "分支 '%s' 未发现。" |
| 5175 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5176 | #: builtin/branch.c:257 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5177 | #, c-format |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5178 | msgid "Error deleting remote-tracking branch '%s'" |
| 5179 | msgstr "无法删除远程跟踪分支 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5180 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5181 | #: builtin/branch.c:258 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5182 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5183 | msgid "Error deleting branch '%s'" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5184 | msgstr "无法删除分支 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5185 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5186 | #: builtin/branch.c:265 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5187 | #, c-format |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5188 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
| 5189 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5190 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5191 | #: builtin/branch.c:266 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5192 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5193 | msgid "Deleted branch %s (was %s).\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5194 | msgstr "已删除分支 %s(曾为 %s)。\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5195 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5196 | #: builtin/branch.c:312 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5197 | #, c-format |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5198 | msgid "[%s: gone]" |
| 5199 | msgstr "[%s: 丢失]" |
| 5200 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5201 | #: builtin/branch.c:317 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5202 | #, c-format |
| 5203 | msgid "[%s]" |
| 5204 | msgstr "[%s]" |
| 5205 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5206 | #: builtin/branch.c:322 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5207 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5208 | msgid "[%s: behind %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5209 | msgstr "[%s:落后 %d]" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5210 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5211 | #: builtin/branch.c:324 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5212 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5213 | msgid "[behind %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5214 | msgstr "[落后 %d]" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5215 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5216 | #: builtin/branch.c:328 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5217 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5218 | msgid "[%s: ahead %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5219 | msgstr "[%s:领先 %d]" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5220 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5221 | #: builtin/branch.c:330 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5222 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5223 | msgid "[ahead %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5224 | msgstr "[领先 %d]" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5225 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5226 | #: builtin/branch.c:333 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5227 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5228 | msgid "[%s: ahead %d, behind %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5229 | msgstr "[%s:领先 %d,落后 %d]" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5230 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5231 | #: builtin/branch.c:336 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5232 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5233 | msgid "[ahead %d, behind %d]" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5234 | msgstr "[领先 %d,落后 %d]" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5235 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5236 | #: builtin/branch.c:349 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5237 | msgid " **** invalid ref ****" |
| 5238 | msgstr " **** 无效引用 ****" |
| 5239 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5240 | #: builtin/branch.c:375 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5241 | #, c-format |
| 5242 | msgid "(no branch, rebasing %s)" |
| 5243 | msgstr "(非分支,正变基 %s)" |
| 5244 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5245 | #: builtin/branch.c:378 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5246 | #, c-format |
| 5247 | msgid "(no branch, bisect started on %s)" |
| 5248 | msgstr "(非分支,二分查找开始于 %s)" |
| 5249 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5250 | #. TRANSLATORS: make sure this matches |
| 5251 | #. "HEAD detached at " in wt-status.c |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5252 | #: builtin/branch.c:384 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5253 | #, c-format |
| 5254 | msgid "(HEAD detached at %s)" |
| 5255 | msgstr "(头指针分离于 %s)" |
| 5256 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5257 | #. TRANSLATORS: make sure this matches |
| 5258 | #. "HEAD detached from " in wt-status.c |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5259 | #: builtin/branch.c:389 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5260 | #, c-format |
| 5261 | msgid "(HEAD detached from %s)" |
| 5262 | msgstr "(头指针分离自 %s)" |
| 5263 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5264 | #: builtin/branch.c:393 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5265 | msgid "(no branch)" |
| 5266 | msgstr "(非分支)" |
| 5267 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5268 | #: builtin/branch.c:535 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5269 | #, c-format |
| 5270 | msgid "Branch %s is being rebased at %s" |
| 5271 | msgstr "分支 %s 正被变基到 %s" |
| 5272 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5273 | #: builtin/branch.c:539 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5274 | #, c-format |
| 5275 | msgid "Branch %s is being bisected at %s" |
| 5276 | msgstr "分支 %s 正被二分查找于 %s" |
| 5277 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5278 | #: builtin/branch.c:554 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5279 | msgid "cannot rename the current branch while not on any." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5280 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5281 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5282 | #: builtin/branch.c:564 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5283 | #, c-format |
| 5284 | msgid "Invalid branch name: '%s'" |
| 5285 | msgstr "无效的分支名:'%s'" |
| 5286 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5287 | #: builtin/branch.c:581 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5288 | msgid "Branch rename failed" |
| 5289 | msgstr "分支重命名失败" |
| 5290 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5291 | #: builtin/branch.c:585 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5292 | #, c-format |
| 5293 | msgid "Renamed a misnamed branch '%s' away" |
| 5294 | msgstr "重命名掉一个错误命名的旧分支 '%s'" |
| 5295 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5296 | #: builtin/branch.c:588 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5297 | #, c-format |
| 5298 | msgid "Branch renamed to %s, but HEAD is not updated!" |
| 5299 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" |
| 5300 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5301 | #: builtin/branch.c:595 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5302 | msgid "Branch is renamed, but update of config-file failed" |
| 5303 | msgstr "分支被重命名,但更新 config 文件失败" |
| 5304 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5305 | #: builtin/branch.c:611 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5306 | #, c-format |
| 5307 | msgid "" |
| 5308 | "Please edit the description for the branch\n" |
| 5309 | " %s\n" |
| 5310 | "Lines starting with '%c' will be stripped.\n" |
| 5311 | msgstr "" |
| 5312 | "请编辑分支的描述\n" |
| 5313 | " %s\n" |
| 5314 | "以 '%c' 开头的行将被过滤。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5315 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5316 | #: builtin/branch.c:643 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5317 | msgid "Generic options" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5318 | msgstr "通用选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5319 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5320 | #: builtin/branch.c:645 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5321 | msgid "show hash and subject, give twice for upstream branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5322 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5323 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5324 | #: builtin/branch.c:646 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5325 | msgid "suppress informational messages" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5326 | msgstr "不显示信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5327 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5328 | #: builtin/branch.c:647 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5329 | msgid "set up tracking mode (see git-pull(1))" |
| 5330 | msgstr "设置跟踪模式(参见 git-pull(1))" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5331 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5332 | #: builtin/branch.c:649 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5333 | msgid "change upstream info" |
| 5334 | msgstr "改变上游信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5335 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5336 | #: builtin/branch.c:651 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5337 | msgid "upstream" |
| 5338 | msgstr "上游" |
| 5339 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5340 | #: builtin/branch.c:651 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5341 | msgid "change the upstream info" |
| 5342 | msgstr "改变上游信息" |
| 5343 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5344 | #: builtin/branch.c:652 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5345 | msgid "Unset the upstream info" |
| 5346 | msgstr "取消上游信息的设置" |
| 5347 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5348 | #: builtin/branch.c:653 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5349 | msgid "use colored output" |
| 5350 | msgstr "使用彩色输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5351 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5352 | #: builtin/branch.c:654 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5353 | msgid "act on remote-tracking branches" |
| 5354 | msgstr "作用于远程跟踪分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5355 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5356 | #: builtin/branch.c:656 builtin/branch.c:657 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5357 | msgid "print only branches that contain the commit" |
| 5358 | msgstr "只打印包含该提交的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5359 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5360 | #: builtin/branch.c:660 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5361 | msgid "Specific git-branch actions:" |
| 5362 | msgstr "具体的 git-branch 动作:" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5363 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5364 | #: builtin/branch.c:661 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5365 | msgid "list both remote-tracking and local branches" |
| 5366 | msgstr "列出远程跟踪及本地分支" |
| 5367 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5368 | #: builtin/branch.c:663 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5369 | msgid "delete fully merged branch" |
| 5370 | msgstr "删除完全合并的分支" |
| 5371 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5372 | #: builtin/branch.c:664 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5373 | msgid "delete branch (even if not merged)" |
| 5374 | msgstr "删除分支(即使没有合并)" |
| 5375 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5376 | #: builtin/branch.c:665 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5377 | msgid "move/rename a branch and its reflog" |
| 5378 | msgstr "移动/重命名一个分支,以及它的引用日志" |
| 5379 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5380 | #: builtin/branch.c:666 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5381 | msgid "move/rename a branch, even if target exists" |
| 5382 | msgstr "移动/重命名一个分支,即使目标已存在" |
| 5383 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5384 | #: builtin/branch.c:667 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5385 | msgid "list branch names" |
| 5386 | msgstr "列出分支名" |
| 5387 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5388 | #: builtin/branch.c:668 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5389 | msgid "create the branch's reflog" |
| 5390 | msgstr "创建分支的引用日志" |
| 5391 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5392 | #: builtin/branch.c:670 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5393 | msgid "edit the description for the branch" |
| 5394 | msgstr "标记分支的描述" |
| 5395 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5396 | #: builtin/branch.c:671 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 5397 | msgid "force creation, move/rename, deletion" |
| 5398 | msgstr "强制创建、移动/重命名、删除" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5399 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5400 | #: builtin/branch.c:672 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5401 | msgid "print only branches that are merged" |
| 5402 | msgstr "只打印已经合并的分支" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5403 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5404 | #: builtin/branch.c:673 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5405 | msgid "print only branches that are not merged" |
| 5406 | msgstr "只打印尚未合并的分支" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5407 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5408 | #: builtin/branch.c:674 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5409 | msgid "list branches in columns" |
| 5410 | msgstr "以列的方式显示分支" |
| 5411 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5412 | #: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5413 | msgid "key" |
| 5414 | msgstr "key" |
| 5415 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5416 | #: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5417 | msgid "field name to sort on" |
| 5418 | msgstr "排序的字段名" |
| 5419 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5420 | #: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5421 | #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5422 | #: builtin/tag.c:384 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5423 | msgid "object" |
| 5424 | msgstr "对象" |
| 5425 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5426 | #: builtin/branch.c:679 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5427 | msgid "print only branches of the object" |
| 5428 | msgstr "只打印指向该对象的分支" |
| 5429 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5430 | #: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 |
| 5431 | msgid "sorting and filtering are case insensitive" |
| 5432 | msgstr "排序和过滤属于大小写不敏感" |
| 5433 | |
| 5434 | #: builtin/branch.c:698 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5435 | msgid "Failed to resolve HEAD as a valid ref." |
| 5436 | msgstr "无法将 HEAD 解析为有效引用。" |
| 5437 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5438 | #: builtin/branch.c:702 builtin/clone.c:706 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5439 | msgid "HEAD not found below refs/heads!" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5440 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5441 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5442 | #: builtin/branch.c:724 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5443 | msgid "--column and --verbose are incompatible" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 5444 | msgstr "--column 和 --verbose 不兼容" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 5445 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5446 | #: builtin/branch.c:735 builtin/branch.c:787 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5447 | msgid "branch name required" |
| 5448 | msgstr "必须提供分支名" |
| 5449 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5450 | #: builtin/branch.c:763 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5451 | msgid "Cannot give description to detached HEAD" |
| 5452 | msgstr "不能向分离头指针提供描述" |
| 5453 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5454 | #: builtin/branch.c:768 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5455 | msgid "cannot edit description of more than one branch" |
| 5456 | msgstr "不能为一个以上的分支编辑描述" |
| 5457 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5458 | #: builtin/branch.c:775 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5459 | #, c-format |
| 5460 | msgid "No commit on branch '%s' yet." |
| 5461 | msgstr "分支 '%s' 尚无提交。" |
| 5462 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5463 | #: builtin/branch.c:778 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5464 | #, c-format |
| 5465 | msgid "No branch named '%s'." |
| 5466 | msgstr "没有分支 '%s'。" |
| 5467 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5468 | #: builtin/branch.c:793 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5469 | msgid "too many branches for a rename operation" |
| 5470 | msgstr "为重命名操作提供了太多的分支名" |
| 5471 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5472 | #: builtin/branch.c:798 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5473 | msgid "too many branches to set new upstream" |
| 5474 | msgstr "为设置新上游提供了太多的分支名" |
| 5475 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5476 | #: builtin/branch.c:802 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5477 | #, c-format |
| 5478 | msgid "" |
| 5479 | "could not set upstream of HEAD to %s when it does not point to any branch." |
| 5480 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" |
| 5481 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5482 | #: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5483 | #, c-format |
| 5484 | msgid "no such branch '%s'" |
| 5485 | msgstr "没有此分支 '%s'" |
| 5486 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5487 | #: builtin/branch.c:809 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5488 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5489 | msgid "branch '%s' does not exist" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5490 | msgstr "分支 '%s' 不存在" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5491 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5492 | #: builtin/branch.c:821 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5493 | msgid "too many branches to unset upstream" |
| 5494 | msgstr "为取消上游设置操作提供了太多的分支名" |
| 5495 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5496 | #: builtin/branch.c:825 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5497 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
| 5498 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" |
| 5499 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5500 | #: builtin/branch.c:831 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5501 | #, c-format |
| 5502 | msgid "Branch '%s' has no upstream information" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5503 | msgstr "分支 '%s' 没有上游信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5504 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5505 | #: builtin/branch.c:845 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 5506 | msgid "it does not make sense to create 'HEAD' manually" |
| 5507 | msgstr "手工创建 'HEAD' 没有意义" |
| 5508 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5509 | #: builtin/branch.c:851 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5510 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
| 5511 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" |
| 5512 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5513 | #: builtin/branch.c:854 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5514 | #, c-format |
| 5515 | msgid "" |
| 5516 | "The --set-upstream flag is deprecated and will be removed. Consider using --" |
| 5517 | "track or --set-upstream-to\n" |
| 5518 | msgstr "" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5519 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5520 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5521 | #: builtin/branch.c:871 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5522 | #, c-format |
| 5523 | msgid "" |
| 5524 | "\n" |
| 5525 | "If you wanted to make '%s' track '%s', do this:\n" |
| 5526 | "\n" |
| 5527 | msgstr "" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5528 | "\n" |
| 5529 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" |
| 5530 | "\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5531 | |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5532 | #: builtin/bundle.c:51 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5533 | #, c-format |
| 5534 | msgid "%s is okay\n" |
| 5535 | msgstr "%s 可以\n" |
| 5536 | |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5537 | #: builtin/bundle.c:64 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5538 | msgid "Need a repository to create a bundle." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 5539 | msgstr "需要一个仓库来创建包。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5540 | |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5541 | #: builtin/bundle.c:68 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5542 | msgid "Need a repository to unbundle." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 5543 | msgstr "需要一个仓库来解包。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5544 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5545 | #: builtin/cat-file.c:513 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5546 | msgid "" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5547 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
| 5548 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 5549 | msgstr "" |
| 5550 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
| 5551 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5552 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5553 | #: builtin/cat-file.c:514 |
| 5554 | msgid "" |
| 5555 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" |
| 5556 | "filters]" |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 5557 | msgstr "" |
| 5558 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" |
| 5559 | "filters]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5560 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5561 | #: builtin/cat-file.c:551 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5562 | msgid "<type> can be one of: blob, tree, commit, tag" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5563 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5564 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5565 | #: builtin/cat-file.c:552 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5566 | msgid "show object type" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5567 | msgstr "显示对象类型" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5568 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5569 | #: builtin/cat-file.c:553 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5570 | msgid "show object size" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5571 | msgstr "显示对象大小" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5572 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5573 | #: builtin/cat-file.c:555 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5574 | msgid "exit with zero when there's no error" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5575 | msgstr "当没有错误时退出并返回零" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5576 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5577 | #: builtin/cat-file.c:556 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5578 | msgid "pretty-print object's content" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5579 | msgstr "美观地打印对象的内容" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5580 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5581 | #: builtin/cat-file.c:558 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5582 | msgid "for blob objects, run textconv on object's content" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5583 | msgstr "对于数据对象,对其内容做文本转换" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5584 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5585 | #: builtin/cat-file.c:560 |
| 5586 | msgid "for blob objects, run filters on object's content" |
| 5587 | msgstr "对于数据对象,对其内容做过滤" |
| 5588 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5589 | #: builtin/cat-file.c:561 git-submodule.sh:929 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5590 | msgid "blob" |
| 5591 | msgstr "数据对象" |
| 5592 | |
| 5593 | #: builtin/cat-file.c:562 |
| 5594 | msgid "use a specific path for --textconv/--filters" |
| 5595 | msgstr "对于 --textconv/--filters 使用一个特定的路径" |
| 5596 | |
| 5597 | #: builtin/cat-file.c:564 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5598 | msgid "allow -s and -t to work with broken/corrupt objects" |
| 5599 | msgstr "允许 -s 和 -t 对损坏的对象生效" |
| 5600 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5601 | #: builtin/cat-file.c:565 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5602 | msgid "buffer --batch output" |
| 5603 | msgstr "缓冲 --batch 的输出" |
| 5604 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5605 | #: builtin/cat-file.c:567 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5606 | msgid "show info and content of objects fed from the standard input" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5607 | msgstr "显示从标准输入提供的对象的信息和内容" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5608 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5609 | #: builtin/cat-file.c:570 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5610 | msgid "show info about objects fed from the standard input" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5611 | msgstr "显示从标准输入提供的对象的信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5612 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5613 | #: builtin/cat-file.c:573 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5614 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
| 5615 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" |
| 5616 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5617 | #: builtin/cat-file.c:575 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5618 | msgid "show all objects with --batch or --batch-check" |
| 5619 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" |
| 5620 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5621 | #: builtin/check-attr.c:11 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5622 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
| 5623 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5624 | |
| 5625 | #: builtin/check-attr.c:12 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5626 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
| 5627 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5628 | |
| 5629 | #: builtin/check-attr.c:19 |
| 5630 | msgid "report all attributes set on file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5631 | msgstr "报告设置在文件上的所有属性" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5632 | |
| 5633 | #: builtin/check-attr.c:20 |
| 5634 | msgid "use .gitattributes only from the index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5635 | msgstr "只使用索引中的 .gitattributes" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5636 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5637 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5638 | msgid "read file names from stdin" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5639 | msgstr "从标准输入读出文件名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5640 | |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5641 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5642 | msgid "terminate input and output records by a NUL character" |
| 5643 | msgstr "输入和输出的记录使用 NUL 字符终结" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5644 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5645 | #: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5646 | msgid "suppress progress reporting" |
| 5647 | msgstr "不显示进度报告" |
| 5648 | |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 5649 | #: builtin/check-ignore.c:26 |
| 5650 | msgid "show non-matching input paths" |
| 5651 | msgstr "显示未匹配的输入路径" |
| 5652 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5653 | #: builtin/check-ignore.c:28 |
| 5654 | msgid "ignore index when checking" |
| 5655 | msgstr "检查时忽略索引" |
| 5656 | |
| 5657 | #: builtin/check-ignore.c:154 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5658 | msgid "cannot specify pathnames with --stdin" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5659 | msgstr "不能同时指定路径及 --stdin 参数" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5660 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5661 | #: builtin/check-ignore.c:157 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5662 | msgid "-z only makes sense with --stdin" |
| 5663 | msgstr "-z 需要和 --stdin 参数共用才有意义" |
| 5664 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5665 | #: builtin/check-ignore.c:159 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5666 | msgid "no path specified" |
| 5667 | msgstr "未指定路径" |
| 5668 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5669 | #: builtin/check-ignore.c:163 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5670 | msgid "--quiet is only valid with a single pathname" |
| 5671 | msgstr "参数 --quiet 只在提供一个路径名时有效" |
| 5672 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5673 | #: builtin/check-ignore.c:165 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 5674 | msgid "cannot have both --quiet and --verbose" |
| 5675 | msgstr "不能同时提供 --quiet 和 --verbose 参数" |
| 5676 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5677 | #: builtin/check-ignore.c:168 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 5678 | msgid "--non-matching is only valid with --verbose" |
| 5679 | msgstr "--non-matching 选项只在使用 --verbose 时有效" |
| 5680 | |
| 5681 | #: builtin/check-mailmap.c:8 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5682 | msgid "git check-mailmap [<options>] <contact>..." |
| 5683 | msgstr "git check-mailmap [<选项>] <联系地址>..." |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 5684 | |
| 5685 | #: builtin/check-mailmap.c:13 |
| 5686 | msgid "also read contacts from stdin" |
| 5687 | msgstr "还从标准输入读取联系地址" |
| 5688 | |
| 5689 | #: builtin/check-mailmap.c:24 |
| 5690 | #, c-format |
| 5691 | msgid "unable to parse contact: %s" |
| 5692 | msgstr "不能解析联系地址:%s" |
| 5693 | |
| 5694 | #: builtin/check-mailmap.c:47 |
| 5695 | msgid "no contacts specified" |
| 5696 | msgstr "未指定联系地址" |
| 5697 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5698 | #: builtin/checkout-index.c:127 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5699 | msgid "git checkout-index [<options>] [--] [<file>...]" |
| 5700 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5701 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5702 | #: builtin/checkout-index.c:144 |
| 5703 | msgid "stage should be between 1 and 3 or all" |
| 5704 | msgstr "索引值应该取值 1 到 3 或者 all" |
| 5705 | |
| 5706 | #: builtin/checkout-index.c:160 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5707 | msgid "check out all files in the index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5708 | msgstr "检出索引区的所有文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5709 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5710 | #: builtin/checkout-index.c:161 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5711 | msgid "force overwrite of existing files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5712 | msgstr "强制覆盖现有的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5713 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5714 | #: builtin/checkout-index.c:163 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5715 | msgid "no warning for existing files and files not in index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5716 | msgstr "存在或不在索引中的文件都没有警告" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5717 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5718 | #: builtin/checkout-index.c:165 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5719 | msgid "don't checkout new files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5720 | msgstr "不检出新文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5721 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5722 | #: builtin/checkout-index.c:167 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5723 | msgid "update stat information in the index file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5724 | msgstr "更新索引中文件的状态信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5725 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5726 | #: builtin/checkout-index.c:171 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5727 | msgid "read list of paths from the standard input" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5728 | msgstr "从标准输入读取路径列表" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5729 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5730 | #: builtin/checkout-index.c:173 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5731 | msgid "write the content to temporary files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5732 | msgstr "将内容写入临时文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5733 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5734 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5735 | #: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 |
| 5736 | #: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 |
| 5737 | #: builtin/worktree.c:471 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5738 | msgid "string" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5739 | msgstr "字符串" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5740 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5741 | #: builtin/checkout-index.c:175 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5742 | msgid "when creating files, prepend <string>" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 5743 | msgstr "在创建文件时,在前面加上 <字符串>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5744 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 5745 | #: builtin/checkout-index.c:177 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5746 | msgid "copy out the files from named stage" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5747 | msgstr "从指定暂存区中拷出文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5748 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5749 | #: builtin/checkout.c:25 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5750 | msgid "git checkout [<options>] <branch>" |
| 5751 | msgstr "git checkout [<选项>] <分支>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5752 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5753 | #: builtin/checkout.c:26 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5754 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
| 5755 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5756 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5757 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5758 | #, c-format |
| 5759 | msgid "path '%s' does not have our version" |
| 5760 | msgstr "路径 '%s' 没有我们的版本" |
| 5761 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5762 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5763 | #, c-format |
| 5764 | msgid "path '%s' does not have their version" |
| 5765 | msgstr "路径 '%s' 没有他们的版本" |
| 5766 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5767 | #: builtin/checkout.c:152 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5768 | #, c-format |
| 5769 | msgid "path '%s' does not have all necessary versions" |
| 5770 | msgstr "路径 '%s' 没有全部必须的版本" |
| 5771 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5772 | #: builtin/checkout.c:196 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5773 | #, c-format |
| 5774 | msgid "path '%s' does not have necessary versions" |
| 5775 | msgstr "路径 '%s' 没有必须的版本" |
| 5776 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5777 | #: builtin/checkout.c:213 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5778 | #, c-format |
| 5779 | msgid "path '%s': cannot merge" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5780 | msgstr "path '%s':无法合并" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5781 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 5782 | #: builtin/checkout.c:230 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5783 | #, c-format |
| 5784 | msgid "Unable to add merge result for '%s'" |
| 5785 | msgstr "无法为 '%s' 添加合并结果" |
| 5786 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5787 | #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 |
| 5788 | #: builtin/checkout.c:259 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5789 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5790 | msgid "'%s' cannot be used with updating paths" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5791 | msgstr "'%s' 不能在更新路径时使用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5792 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5793 | #: builtin/checkout.c:262 builtin/checkout.c:265 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5794 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5795 | msgid "'%s' cannot be used with %s" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5796 | msgstr "'%s' 不能和 %s 同时使用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5797 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5798 | #: builtin/checkout.c:268 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5799 | #, c-format |
| 5800 | msgid "Cannot update paths and switch to branch '%s' at the same time." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5801 | msgstr "不能同时更新路径并切换到分支'%s'。" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5802 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 5803 | #: builtin/checkout.c:339 builtin/checkout.c:346 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5804 | #, c-format |
| 5805 | msgid "path '%s' is unmerged" |
| 5806 | msgstr "路径 '%s' 未合并" |
| 5807 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5808 | #: builtin/checkout.c:494 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5809 | msgid "you need to resolve your current index first" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5810 | msgstr "您需要先解决当前索引的冲突" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5811 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5812 | #: builtin/checkout.c:625 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5813 | #, c-format |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 5814 | msgid "Can not do reflog for '%s': %s\n" |
| 5815 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5816 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5817 | #: builtin/checkout.c:666 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5818 | msgid "HEAD is now at" |
| 5819 | msgstr "HEAD 目前位于" |
| 5820 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5821 | #: builtin/checkout.c:670 builtin/clone.c:660 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 5822 | msgid "unable to update HEAD" |
| 5823 | msgstr "不能更新 HEAD" |
| 5824 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5825 | #: builtin/checkout.c:674 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5826 | #, c-format |
| 5827 | msgid "Reset branch '%s'\n" |
| 5828 | msgstr "重置分支 '%s'\n" |
| 5829 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5830 | #: builtin/checkout.c:677 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5831 | #, c-format |
| 5832 | msgid "Already on '%s'\n" |
| 5833 | msgstr "已经位于 '%s'\n" |
| 5834 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5835 | #: builtin/checkout.c:681 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5836 | #, c-format |
| 5837 | msgid "Switched to and reset branch '%s'\n" |
| 5838 | msgstr "切换并重置分支 '%s'\n" |
| 5839 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5840 | #: builtin/checkout.c:683 builtin/checkout.c:1072 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5841 | #, c-format |
| 5842 | msgid "Switched to a new branch '%s'\n" |
| 5843 | msgstr "切换到一个新分支 '%s'\n" |
| 5844 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5845 | #: builtin/checkout.c:685 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5846 | #, c-format |
| 5847 | msgid "Switched to branch '%s'\n" |
| 5848 | msgstr "切换到分支 '%s'\n" |
| 5849 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5850 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5851 | #: builtin/checkout.c:736 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5852 | #, c-format |
| 5853 | msgid " ... and %d more.\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5854 | msgstr " ... 及其它 %d 个。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5855 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5856 | #: builtin/checkout.c:742 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5857 | #, c-format |
| 5858 | msgid "" |
| 5859 | "Warning: you are leaving %d commit behind, not connected to\n" |
| 5860 | "any of your branches:\n" |
| 5861 | "\n" |
| 5862 | "%s\n" |
| 5863 | msgid_plural "" |
| 5864 | "Warning: you are leaving %d commits behind, not connected to\n" |
| 5865 | "any of your branches:\n" |
| 5866 | "\n" |
| 5867 | "%s\n" |
| 5868 | msgstr[0] "" |
| 5869 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" |
| 5870 | "\n" |
| 5871 | "%s\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 5872 | msgstr[1] "" |
| 5873 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" |
| 5874 | "\n" |
| 5875 | "%s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5876 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5877 | #: builtin/checkout.c:761 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5878 | #, c-format |
| 5879 | msgid "" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5880 | "If you want to keep it by creating a new branch, this may be a good time\n" |
| 5881 | "to do so with:\n" |
| 5882 | "\n" |
| 5883 | " git branch <new-branch-name> %s\n" |
| 5884 | "\n" |
| 5885 | msgid_plural "" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5886 | "If you want to keep them by creating a new branch, this may be a good time\n" |
| 5887 | "to do so with:\n" |
| 5888 | "\n" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5889 | " git branch <new-branch-name> %s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5890 | "\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 5891 | msgstr[0] "" |
| 5892 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" |
| 5893 | "如下操作:\n" |
| 5894 | "\n" |
| 5895 | " git branch <新分支名> %s\n" |
| 5896 | "\n" |
| 5897 | msgstr[1] "" |
| 5898 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5899 | "如下操作:\n" |
| 5900 | "\n" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 5901 | " git branch <新分支名> %s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5902 | "\n" |
| 5903 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5904 | #: builtin/checkout.c:797 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5905 | msgid "internal error in revision walk" |
| 5906 | msgstr "在版本遍历时遇到内部错误" |
| 5907 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5908 | #: builtin/checkout.c:801 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5909 | msgid "Previous HEAD position was" |
| 5910 | msgstr "之前的 HEAD 位置是" |
| 5911 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5912 | #: builtin/checkout.c:828 builtin/checkout.c:1067 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5913 | msgid "You are on a branch yet to be born" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 5914 | msgstr "您位于一个尚未初始化的分支" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5915 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5916 | #: builtin/checkout.c:973 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5917 | #, c-format |
| 5918 | msgid "only one reference expected, %d given." |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 5919 | msgstr "应只有一个引用,却给出了 %d 个" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 5920 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5921 | #: builtin/checkout.c:1013 builtin/worktree.c:214 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5922 | #, c-format |
| 5923 | msgid "invalid reference: %s" |
| 5924 | msgstr "无效引用:%s" |
| 5925 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5926 | #: builtin/checkout.c:1042 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5927 | #, c-format |
| 5928 | msgid "reference is not a tree: %s" |
| 5929 | msgstr "引用不是一个树:%s" |
| 5930 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5931 | #: builtin/checkout.c:1081 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5932 | msgid "paths cannot be used with switching branches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5933 | msgstr "路径不能和切换分支同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5934 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5935 | #: builtin/checkout.c:1084 builtin/checkout.c:1088 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5936 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5937 | msgid "'%s' cannot be used with switching branches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5938 | msgstr "'%s' 不能和切换分支同时使用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5939 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5940 | #: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 |
| 5941 | #: builtin/checkout.c:1103 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5942 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5943 | msgid "'%s' cannot be used with '%s'" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5944 | msgstr "'%s' 不能和 '%s' 同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5945 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5946 | #: builtin/checkout.c:1108 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5947 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5948 | msgid "Cannot switch branch to a non-commit '%s'" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5949 | msgstr "不能切换分支到一个非提交 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 5950 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5951 | #: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5952 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 |
| 5953 | #: builtin/worktree.c:326 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5954 | msgid "branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5955 | msgstr "分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5956 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5957 | #: builtin/checkout.c:1142 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5958 | msgid "create and checkout a new branch" |
| 5959 | msgstr "创建并检出一个新的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5960 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5961 | #: builtin/checkout.c:1144 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5962 | msgid "create/reset and checkout a branch" |
| 5963 | msgstr "创建/重置并检出一个分支" |
| 5964 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5965 | #: builtin/checkout.c:1145 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5966 | msgid "create reflog for new branch" |
| 5967 | msgstr "为新的分支创建引用日志" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5968 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5969 | #: builtin/checkout.c:1146 builtin/worktree.c:328 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 5970 | msgid "detach HEAD at named commit" |
| 5971 | msgstr "HEAD 从指定的提交分离" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5972 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5973 | #: builtin/checkout.c:1147 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5974 | msgid "set upstream info for new branch" |
| 5975 | msgstr "为新的分支设置上游信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5976 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5977 | #: builtin/checkout.c:1149 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 5978 | msgid "new-branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5979 | msgstr "新分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5980 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5981 | #: builtin/checkout.c:1149 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5982 | msgid "new unparented branch" |
| 5983 | msgstr "新的没有父提交的分支" |
| 5984 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5985 | #: builtin/checkout.c:1150 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5986 | msgid "checkout our version for unmerged files" |
| 5987 | msgstr "对尚未合并的文件检出我们的版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5988 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5989 | #: builtin/checkout.c:1152 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5990 | msgid "checkout their version for unmerged files" |
| 5991 | msgstr "对尚未合并的文件检出他们的版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5992 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5993 | #: builtin/checkout.c:1154 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5994 | msgid "force checkout (throw away local modifications)" |
| 5995 | msgstr "强制检出(丢弃本地修改)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 5996 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 5997 | #: builtin/checkout.c:1155 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 5998 | msgid "perform a 3-way merge with the new branch" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 5999 | msgstr "和新的分支执行三方合并" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6000 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6001 | #: builtin/checkout.c:1156 builtin/merge.c:235 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6002 | msgid "update ignored files (default)" |
| 6003 | msgstr "更新忽略的文件(默认)" |
| 6004 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6005 | #: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6006 | msgid "style" |
| 6007 | msgstr "风格" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6008 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6009 | #: builtin/checkout.c:1158 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6010 | msgid "conflict style (merge or diff3)" |
| 6011 | msgstr "冲突输出风格(merge 或 diff3)" |
| 6012 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6013 | #: builtin/checkout.c:1161 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 6014 | msgid "do not limit pathspecs to sparse entries only" |
| 6015 | msgstr "对路径不做稀疏检出的限制" |
| 6016 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6017 | #: builtin/checkout.c:1163 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6018 | msgid "second guess 'git checkout <no-such-branch>'" |
| 6019 | msgstr "二次猜测'git checkout <无此分支>'" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6020 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6021 | #: builtin/checkout.c:1165 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6022 | msgid "do not check if another worktree is holding the given ref" |
| 6023 | msgstr "不检查指定的引用是否被其他工作区所占用" |
| 6024 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6025 | #: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 |
| 6026 | #: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6027 | #: builtin/send-pack.c:168 |
| 6028 | msgid "force progress reporting" |
| 6029 | msgstr "强制显示进度报告" |
| 6030 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6031 | #: builtin/checkout.c:1197 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6032 | msgid "-b, -B and --orphan are mutually exclusive" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6033 | msgstr "-b、-B 和 --orphan 是互斥的" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6034 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6035 | #: builtin/checkout.c:1214 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6036 | msgid "--track needs a branch name" |
| 6037 | msgstr "--track 需要一个分支名" |
| 6038 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6039 | #: builtin/checkout.c:1219 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6040 | msgid "Missing branch name; try -b" |
| 6041 | msgstr "缺少分支名;尝试 -b" |
| 6042 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6043 | #: builtin/checkout.c:1255 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6044 | msgid "invalid path specification" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6045 | msgstr "无效的路径规格" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6046 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6047 | #: builtin/checkout.c:1262 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6048 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6049 | msgid "" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6050 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6051 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
| 6052 | msgstr "" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6053 | "不能同时更新路径并切换到分支'%s'。\n" |
| 6054 | "您是想要检出 '%s' 但其未能解析为提交么?" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6055 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6056 | #: builtin/checkout.c:1267 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6057 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6058 | msgid "git checkout: --detach does not take a path argument '%s'" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6059 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6060 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6061 | #: builtin/checkout.c:1271 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6062 | msgid "" |
| 6063 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" |
| 6064 | "checking out of the index." |
| 6065 | msgstr "" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6066 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6067 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6068 | #: builtin/clean.c:25 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6069 | msgid "" |
| 6070 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." |
| 6071 | msgstr "" |
| 6072 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6073 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6074 | #: builtin/clean.c:29 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6075 | #, c-format |
| 6076 | msgid "Removing %s\n" |
| 6077 | msgstr "正删除 %s\n" |
| 6078 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6079 | #: builtin/clean.c:30 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6080 | #, c-format |
| 6081 | msgid "Would remove %s\n" |
| 6082 | msgstr "将删除 %s\n" |
| 6083 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6084 | #: builtin/clean.c:31 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6085 | #, c-format |
| 6086 | msgid "Skipping repository %s\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6087 | msgstr "忽略仓库 %s\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6088 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6089 | #: builtin/clean.c:32 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6090 | #, c-format |
| 6091 | msgid "Would skip repository %s\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6092 | msgstr "将忽略仓库 %s\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6093 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 6094 | #: builtin/clean.c:33 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6095 | #, c-format |
| 6096 | msgid "failed to remove %s" |
| 6097 | msgstr "无法删除 %s" |
| 6098 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6099 | #: builtin/clean.c:291 git-add--interactive.perl:623 |
| 6100 | #, c-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6101 | msgid "" |
| 6102 | "Prompt help:\n" |
| 6103 | "1 - select a numbered item\n" |
| 6104 | "foo - select item based on unique prefix\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6105 | " - (empty) select nothing\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6106 | msgstr "" |
| 6107 | "帮助:\n" |
| 6108 | "1 - 通过编号选择一个选项\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6109 | "foo - 通过唯一前缀选择一个选项\n" |
| 6110 | " - (空)什么也不选择\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6111 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6112 | #: builtin/clean.c:295 git-add--interactive.perl:632 |
| 6113 | #, c-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6114 | msgid "" |
| 6115 | "Prompt help:\n" |
| 6116 | "1 - select a single item\n" |
| 6117 | "3-5 - select a range of items\n" |
| 6118 | "2-3,6-9 - select multiple ranges\n" |
| 6119 | "foo - select item based on unique prefix\n" |
| 6120 | "-... - unselect specified items\n" |
| 6121 | "* - choose all items\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6122 | " - (empty) finish selecting\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6123 | msgstr "" |
| 6124 | "帮助:\n" |
| 6125 | "1 - 选择一个选项\n" |
| 6126 | "3-5 - 选择一个范围内的所有选项\n" |
| 6127 | "2-3,6-9 - 选择多个范围内的所有选项\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6128 | "foo - 通过唯一前缀选择一个选项\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6129 | "-... - 反选特定的选项\n" |
| 6130 | "* - 选择所有选项\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6131 | " - (空)结束选择\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6132 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6133 | #: builtin/clean.c:511 git-add--interactive.perl:598 |
| 6134 | #: git-add--interactive.perl:603 |
| 6135 | #, c-format, perl-format |
| 6136 | msgid "Huh (%s)?\n" |
| 6137 | msgstr "嗯(%s)?\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6138 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6139 | #: builtin/clean.c:653 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6140 | #, c-format |
| 6141 | msgid "Input ignore patterns>> " |
| 6142 | msgstr "输入模版以排除条目>> " |
| 6143 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6144 | #: builtin/clean.c:690 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6145 | #, c-format |
| 6146 | msgid "WARNING: Cannot find items matched by: %s" |
| 6147 | msgstr "警告:无法找到和 %s 匹配的条目" |
| 6148 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6149 | #: builtin/clean.c:711 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6150 | msgid "Select items to delete" |
| 6151 | msgstr "选择要删除的条目" |
| 6152 | |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6153 | #. TRANSLATORS: Make sure to keep [y/N] as is |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6154 | #: builtin/clean.c:752 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6155 | #, c-format |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6156 | msgid "Remove %s [y/N]? " |
| 6157 | msgstr "删除 %s [y/N]?" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6158 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6159 | #: builtin/clean.c:777 git-add--interactive.perl:1669 |
| 6160 | #, c-format |
| 6161 | msgid "Bye.\n" |
| 6162 | msgstr "再见。\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6163 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6164 | #: builtin/clean.c:785 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6165 | msgid "" |
| 6166 | "clean - start cleaning\n" |
| 6167 | "filter by pattern - exclude items from deletion\n" |
| 6168 | "select by numbers - select items to be deleted by numbers\n" |
| 6169 | "ask each - confirm each deletion (like \"rm -i\")\n" |
| 6170 | "quit - stop cleaning\n" |
| 6171 | "help - this screen\n" |
| 6172 | "? - help for prompt selection" |
| 6173 | msgstr "" |
| 6174 | "clean - 开始清理\n" |
| 6175 | "filter by pattern - 通过模版排除要删除的条目\n" |
| 6176 | "select by numbers - 通过数字选择要删除的条目\n" |
| 6177 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" |
| 6178 | "quit - 停止删除并退出\n" |
| 6179 | "help - 显示本帮助\n" |
| 6180 | "? - 显示如何在提示符下选择的帮助" |
| 6181 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6182 | #: builtin/clean.c:812 git-add--interactive.perl:1745 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6183 | msgid "*** Commands ***" |
| 6184 | msgstr "*** 命令 ***" |
| 6185 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6186 | #: builtin/clean.c:813 git-add--interactive.perl:1742 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6187 | msgid "What now" |
| 6188 | msgstr "请选择" |
| 6189 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6190 | #: builtin/clean.c:821 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6191 | msgid "Would remove the following item:" |
| 6192 | msgid_plural "Would remove the following items:" |
| 6193 | msgstr[0] "将删除如下条目:" |
| 6194 | msgstr[1] "将删除如下条目:" |
| 6195 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6196 | #: builtin/clean.c:838 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6197 | msgid "No more files to clean, exiting." |
| 6198 | msgstr "没有要清理的文件,退出。" |
| 6199 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6200 | #: builtin/clean.c:869 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6201 | msgid "do not print names of files removed" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6202 | msgstr "不打印删除文件的名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6203 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6204 | #: builtin/clean.c:871 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6205 | msgid "force" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6206 | msgstr "强制" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6207 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6208 | #: builtin/clean.c:872 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6209 | msgid "interactive cleaning" |
| 6210 | msgstr "交互式清除" |
| 6211 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6212 | #: builtin/clean.c:874 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6213 | msgid "remove whole directories" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6214 | msgstr "删除整个目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6215 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6216 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 |
| 6217 | #: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6218 | msgid "pattern" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6219 | msgstr "模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6220 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6221 | #: builtin/clean.c:876 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6222 | msgid "add <pattern> to ignore rules" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 6223 | msgstr "添加 <模式> 到忽略规则" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6224 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6225 | #: builtin/clean.c:877 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6226 | msgid "remove ignored files, too" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6227 | msgstr "也删除忽略的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6228 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6229 | #: builtin/clean.c:879 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6230 | msgid "remove only ignored files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6231 | msgstr "只删除忽略的文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6232 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6233 | #: builtin/clean.c:897 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6234 | msgid "-x and -X cannot be used together" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6235 | msgstr "-x 和 -X 不能同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6236 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6237 | #: builtin/clean.c:901 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6238 | msgid "" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 6239 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6240 | "clean" |
| 6241 | msgstr "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6242 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6243 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6244 | #: builtin/clean.c:904 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6245 | msgid "" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 6246 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6247 | "refusing to clean" |
| 6248 | msgstr "" |
| 6249 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
| 6250 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6251 | #: builtin/clone.c:37 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6252 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6253 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6254 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6255 | #: builtin/clone.c:65 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6256 | msgid "don't create a checkout" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6257 | msgstr "不创建一个检出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6258 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6259 | #: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6260 | msgid "create a bare repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6261 | msgstr "创建一个纯仓库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6262 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6263 | #: builtin/clone.c:70 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6264 | msgid "create a mirror repository (implies bare)" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6265 | msgstr "创建一个镜像仓库(也是纯仓库)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6266 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6267 | #: builtin/clone.c:72 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6268 | msgid "to clone from a local repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6269 | msgstr "从本地仓库克隆" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6270 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6271 | #: builtin/clone.c:74 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6272 | msgid "don't use local hardlinks, always copy" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6273 | msgstr "不使用本地硬链接,始终复制" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6274 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6275 | #: builtin/clone.c:76 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6276 | msgid "setup as shared repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6277 | msgstr "设置为共享仓库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6278 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6279 | #: builtin/clone.c:78 builtin/clone.c:80 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6280 | msgid "initialize submodules in the clone" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6281 | msgstr "在克隆时初始化子模组" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6282 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6283 | #: builtin/clone.c:82 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 6284 | msgid "number of submodules cloned in parallel" |
| 6285 | msgstr "并发克隆的子模组的数量" |
| 6286 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6287 | #: builtin/clone.c:83 builtin/init-db.c:475 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6288 | msgid "template-directory" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6289 | msgstr "模板目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6290 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6291 | #: builtin/clone.c:84 builtin/init-db.c:476 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6292 | msgid "directory from which templates will be used" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6293 | msgstr "模板目录将被使用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6294 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6295 | #: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 |
| 6296 | #: builtin/submodule--helper.c:970 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6297 | msgid "reference repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6298 | msgstr "参考仓库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6299 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6300 | #: builtin/clone.c:90 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 6301 | msgid "use --reference only while cloning" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6302 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 6303 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6304 | #: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6305 | msgid "name" |
| 6306 | msgstr "名称" |
| 6307 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6308 | #: builtin/clone.c:92 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6309 | msgid "use <name> instead of 'origin' to track upstream" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 6310 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6311 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6312 | #: builtin/clone.c:94 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6313 | msgid "checkout <branch> instead of the remote's HEAD" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 6314 | msgstr "检出 <分支> 而不是远程 HEAD" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6315 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6316 | #: builtin/clone.c:96 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6317 | msgid "path to git-upload-pack on the remote" |
| 6318 | msgstr "远程 git-upload-pack 路径" |
| 6319 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6320 | #: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6321 | #: builtin/pull.c:202 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6322 | msgid "depth" |
| 6323 | msgstr "深度" |
| 6324 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6325 | #: builtin/clone.c:98 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6326 | msgid "create a shallow clone of that depth" |
| 6327 | msgstr "创建一个指定深度的浅克隆" |
| 6328 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6329 | #: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6330 | #: parse-options.h:142 |
| 6331 | msgid "time" |
| 6332 | msgstr "时间" |
| 6333 | |
| 6334 | #: builtin/clone.c:100 |
| 6335 | msgid "create a shallow clone since a specific time" |
| 6336 | msgstr "从一个特定时间创建一个浅克隆" |
| 6337 | |
| 6338 | #: builtin/clone.c:101 builtin/fetch.c:124 |
| 6339 | msgid "revision" |
| 6340 | msgstr "版本" |
| 6341 | |
| 6342 | #: builtin/clone.c:102 builtin/fetch.c:125 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6343 | msgid "deepen history of shallow clone, excluding rev" |
| 6344 | msgstr "深化浅克隆的历史,除了特定版本" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6345 | |
| 6346 | #: builtin/clone.c:104 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 6347 | msgid "clone only one branch, HEAD or --branch" |
| 6348 | msgstr "只克隆一个分支、HEAD 或 --branch" |
| 6349 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6350 | #: builtin/clone.c:106 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 6351 | msgid "any cloned submodules will be shallow" |
| 6352 | msgstr "子模组将以浅下载模式克隆" |
| 6353 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6354 | #: builtin/clone.c:107 builtin/init-db.c:484 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6355 | msgid "gitdir" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6356 | msgstr "git目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6357 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6358 | #: builtin/clone.c:108 builtin/init-db.c:485 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6359 | msgid "separate git dir from working tree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6360 | msgstr "git目录和工作区分离" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6361 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6362 | #: builtin/clone.c:109 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6363 | msgid "key=value" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6364 | msgstr "key=value" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6365 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6366 | #: builtin/clone.c:110 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6367 | msgid "set config inside the new repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6368 | msgstr "在新仓库中设置配置信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6369 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6370 | #: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6371 | msgid "use IPv4 addresses only" |
| 6372 | msgstr "只使用 IPv4 地址" |
| 6373 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6374 | #: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 6375 | msgid "use IPv6 addresses only" |
| 6376 | msgstr "只使用 IPv6 地址" |
| 6377 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6378 | #: builtin/clone.c:250 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 6379 | msgid "" |
| 6380 | "No directory name could be guessed.\n" |
| 6381 | "Please specify a directory on the command line" |
| 6382 | msgstr "" |
| 6383 | "无法猜到目录名。\n" |
Ray Chen | 26e4cbe | 2016-03-16 11:44:44 +0800 | [diff] [blame] | 6384 | "请在命令行指定一个目录" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 6385 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6386 | #: builtin/clone.c:303 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6387 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6388 | msgid "info: Could not add alternate for '%s': %s\n" |
| 6389 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6390 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6391 | #: builtin/clone.c:375 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 6392 | #, c-format |
| 6393 | msgid "failed to open '%s'" |
| 6394 | msgstr "无法打开 '%s'" |
| 6395 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6396 | #: builtin/clone.c:383 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6397 | #, c-format |
| 6398 | msgid "%s exists and is not a directory" |
| 6399 | msgstr "%s 存在且不是一个目录" |
| 6400 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6401 | #: builtin/clone.c:397 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6402 | #, c-format |
| 6403 | msgid "failed to stat %s\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6404 | msgstr "无法枚举 %s 状态\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6405 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6406 | #: builtin/clone.c:419 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6407 | #, c-format |
| 6408 | msgid "failed to create link '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6409 | msgstr "无法创建链接 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6410 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6411 | #: builtin/clone.c:423 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6412 | #, c-format |
| 6413 | msgid "failed to copy file to '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6414 | msgstr "无法拷贝文件至 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6415 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6416 | #: builtin/clone.c:448 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6417 | #, c-format |
| 6418 | msgid "done.\n" |
| 6419 | msgstr "完成。\n" |
| 6420 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6421 | #: builtin/clone.c:460 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 6422 | msgid "" |
| 6423 | "Clone succeeded, but checkout failed.\n" |
| 6424 | "You can inspect what was checked out with 'git status'\n" |
| 6425 | "and retry the checkout with 'git checkout -f HEAD'\n" |
| 6426 | msgstr "" |
| 6427 | "克隆成功,但是检出失败。\n" |
| 6428 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" |
| 6429 | "'git checkout -f HEAD' 重试\n" |
| 6430 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6431 | #: builtin/clone.c:537 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6432 | #, c-format |
| 6433 | msgid "Could not find remote branch %s to clone." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6434 | msgstr "不能发现要克隆的远程分支 %s。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6435 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6436 | #: builtin/clone.c:632 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 6437 | msgid "remote did not send all necessary objects" |
| 6438 | msgstr "远程没有发送所有必须的对象" |
| 6439 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6440 | #: builtin/clone.c:648 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 6441 | #, c-format |
| 6442 | msgid "unable to update %s" |
| 6443 | msgstr "不能更新 %s" |
| 6444 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6445 | #: builtin/clone.c:697 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6446 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
| 6447 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" |
| 6448 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6449 | #: builtin/clone.c:728 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 6450 | msgid "unable to checkout working tree" |
| 6451 | msgstr "不能检出工作区" |
| 6452 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6453 | #: builtin/clone.c:768 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 6454 | msgid "unable to write parameters to config file" |
| 6455 | msgstr "无法将参数写入配置文件" |
| 6456 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6457 | #: builtin/clone.c:831 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 6458 | msgid "cannot repack to clean up" |
| 6459 | msgstr "无法执行 repack 来清理" |
| 6460 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6461 | #: builtin/clone.c:833 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 6462 | msgid "cannot unlink temporary alternates file" |
| 6463 | msgstr "无法删除临时的 alternates 文件" |
| 6464 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6465 | #: builtin/clone.c:866 builtin/receive-pack.c:1895 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6466 | msgid "Too many arguments." |
| 6467 | msgstr "太多参数。" |
| 6468 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6469 | #: builtin/clone.c:870 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6470 | msgid "You must specify a repository to clone." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6471 | msgstr "您必须指定一个仓库来克隆。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6472 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6473 | #: builtin/clone.c:883 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6474 | #, c-format |
| 6475 | msgid "--bare and --origin %s options are incompatible." |
| 6476 | msgstr "--bare 和 --origin %s 选项不兼容。" |
| 6477 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6478 | #: builtin/clone.c:886 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6479 | msgid "--bare and --separate-git-dir are incompatible." |
| 6480 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" |
| 6481 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6482 | #: builtin/clone.c:899 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6483 | #, c-format |
| 6484 | msgid "repository '%s' does not exist" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6485 | msgstr "仓库 '%s' 不存在" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6486 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6487 | #: builtin/clone.c:905 builtin/fetch.c:1335 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 6488 | #, c-format |
| 6489 | msgid "depth %s is not a positive number" |
| 6490 | msgstr "深度 %s 不是一个正数" |
| 6491 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6492 | #: builtin/clone.c:915 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6493 | #, c-format |
| 6494 | msgid "destination path '%s' already exists and is not an empty directory." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6495 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6496 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6497 | #: builtin/clone.c:925 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6498 | #, c-format |
| 6499 | msgid "working tree '%s' already exists." |
| 6500 | msgstr "工作区 '%s' 已经存在。" |
| 6501 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6502 | #: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 |
| 6503 | #: builtin/submodule--helper.c:659 builtin/worktree.c:222 |
| 6504 | #: builtin/worktree.c:249 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 6505 | #, c-format |
| 6506 | msgid "could not create leading directories of '%s'" |
| 6507 | msgstr "不能为 '%s' 创建先导目录" |
| 6508 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6509 | #: builtin/clone.c:943 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6510 | #, c-format |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6511 | msgid "could not create work tree dir '%s'" |
| 6512 | msgstr "不能创建工作区目录 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6513 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6514 | #: builtin/clone.c:955 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6515 | #, c-format |
| 6516 | msgid "Cloning into bare repository '%s'...\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6517 | msgstr "克隆到纯仓库 '%s'...\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6518 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6519 | #: builtin/clone.c:957 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6520 | #, c-format |
| 6521 | msgid "Cloning into '%s'...\n" |
| 6522 | msgstr "正克隆到 '%s'...\n" |
| 6523 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6524 | #: builtin/clone.c:963 |
| 6525 | msgid "" |
| 6526 | "clone --recursive is not compatible with both --reference and --reference-if-" |
| 6527 | "able" |
| 6528 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6529 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6530 | #: builtin/clone.c:1019 |
| 6531 | msgid "--depth is ignored in local clones; use file:// instead." |
| 6532 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
| 6533 | |
| 6534 | #: builtin/clone.c:1021 |
| 6535 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
| 6536 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" |
| 6537 | |
| 6538 | #: builtin/clone.c:1023 |
| 6539 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
| 6540 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" |
| 6541 | |
| 6542 | #: builtin/clone.c:1026 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6543 | msgid "source repository is shallow, ignoring --local" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6544 | msgstr "源仓库是浅克隆,忽略 --local" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6545 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6546 | #: builtin/clone.c:1031 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6547 | msgid "--local is ignored" |
| 6548 | msgstr "--local 被忽略" |
| 6549 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6550 | #: builtin/clone.c:1035 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6551 | #, c-format |
| 6552 | msgid "Don't know how to clone %s" |
| 6553 | msgstr "不知道如何克隆 %s" |
| 6554 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6555 | #: builtin/clone.c:1090 builtin/clone.c:1098 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6556 | #, c-format |
| 6557 | msgid "Remote branch %s not found in upstream %s" |
| 6558 | msgstr "远程分支 %s 在上游 %s 未发现" |
| 6559 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6560 | #: builtin/clone.c:1101 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6561 | msgid "You appear to have cloned an empty repository." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6562 | msgstr "您似乎克隆了一个空仓库。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6563 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6564 | #: builtin/column.c:9 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6565 | msgid "git column [<options>]" |
| 6566 | msgstr "git column [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6567 | |
| 6568 | #: builtin/column.c:26 |
| 6569 | msgid "lookup config vars" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6570 | msgstr "查找配置变量" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6571 | |
| 6572 | #: builtin/column.c:27 builtin/column.c:28 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6573 | msgid "layout to use" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6574 | msgstr "要使用的布局" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6575 | |
| 6576 | #: builtin/column.c:29 |
| 6577 | msgid "Maximum width" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6578 | msgstr "最大宽度" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6579 | |
| 6580 | #: builtin/column.c:30 |
| 6581 | msgid "Padding space on left border" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6582 | msgstr "左边框的填充空间" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6583 | |
| 6584 | #: builtin/column.c:31 |
| 6585 | msgid "Padding space on right border" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6586 | msgstr "右边框的填充空间" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6587 | |
| 6588 | #: builtin/column.c:32 |
| 6589 | msgid "Padding space between columns" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6590 | msgstr "两列之间的填充空间" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6591 | |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6592 | #: builtin/column.c:51 |
| 6593 | msgid "--command must be the first argument" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6594 | msgstr "--command 必须是第一个参数" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6595 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6596 | #: builtin/commit.c:38 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6597 | msgid "git commit [<options>] [--] <pathspec>..." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6598 | msgstr "git commit [<选项>] [--] <路径规格>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6599 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6600 | #: builtin/commit.c:43 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6601 | msgid "git status [<options>] [--] <pathspec>..." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 6602 | msgstr "git status [<选项>] [--] <路径规格>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6603 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6604 | #: builtin/commit.c:48 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6605 | msgid "" |
| 6606 | "Your name and email address were configured automatically based\n" |
| 6607 | "on your username and hostname. Please check that they are accurate.\n" |
| 6608 | "You can suppress this message by setting them explicitly. Run the\n" |
| 6609 | "following command and follow the instructions in your editor to edit\n" |
| 6610 | "your configuration file:\n" |
| 6611 | "\n" |
| 6612 | " git config --global --edit\n" |
| 6613 | "\n" |
| 6614 | "After doing this, you may fix the identity used for this commit with:\n" |
| 6615 | "\n" |
| 6616 | " git commit --amend --reset-author\n" |
| 6617 | msgstr "" |
| 6618 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
| 6619 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" |
| 6620 | "中编辑您的配置文件:\n" |
| 6621 | "\n" |
| 6622 | " git config --global --edit\n" |
| 6623 | "\n" |
| 6624 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
| 6625 | "\n" |
| 6626 | " git commit --amend --reset-author\n" |
| 6627 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6628 | #: builtin/commit.c:61 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6629 | msgid "" |
| 6630 | "Your name and email address were configured automatically based\n" |
| 6631 | "on your username and hostname. Please check that they are accurate.\n" |
| 6632 | "You can suppress this message by setting them explicitly:\n" |
| 6633 | "\n" |
| 6634 | " git config --global user.name \"Your Name\"\n" |
| 6635 | " git config --global user.email you@example.com\n" |
| 6636 | "\n" |
| 6637 | "After doing this, you may fix the identity used for this commit with:\n" |
| 6638 | "\n" |
| 6639 | " git commit --amend --reset-author\n" |
| 6640 | msgstr "" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6641 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6642 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6643 | "\n" |
| 6644 | " git config --global user.name \"Your Name\"\n" |
| 6645 | " git config --global user.email you@example.com\n" |
| 6646 | "\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6647 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6648 | "\n" |
| 6649 | " git commit --amend --reset-author\n" |
| 6650 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6651 | #: builtin/commit.c:73 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6652 | msgid "" |
| 6653 | "You asked to amend the most recent commit, but doing so would make\n" |
| 6654 | "it empty. You can repeat your command with --allow-empty, or you can\n" |
| 6655 | "remove the commit entirely with \"git reset HEAD^\".\n" |
| 6656 | msgstr "" |
Thynson | 1b150dc | 2012-02-29 02:08:22 +0800 | [diff] [blame] | 6657 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
| 6658 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6659 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6660 | #: builtin/commit.c:78 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6661 | msgid "" |
| 6662 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" |
| 6663 | "If you wish to commit it anyway, use:\n" |
| 6664 | "\n" |
| 6665 | " git commit --allow-empty\n" |
| 6666 | "\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6667 | msgstr "" |
Thynson | a9ce454 | 2012-02-29 02:03:39 +0800 | [diff] [blame] | 6668 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
| 6669 | "也要提交,使用命令:\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6670 | "\n" |
| 6671 | " git commit --allow-empty\n" |
| 6672 | "\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6673 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6674 | #: builtin/commit.c:85 |
Jiang Xin | b189438 | 2013-08-06 14:49:18 +0800 | [diff] [blame] | 6675 | msgid "Otherwise, please use 'git reset'\n" |
| 6676 | msgstr "否则,请使用命令 'git reset'\n" |
| 6677 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 6678 | #: builtin/commit.c:88 |
Jiang Xin | b189438 | 2013-08-06 14:49:18 +0800 | [diff] [blame] | 6679 | msgid "" |
| 6680 | "If you wish to skip this commit, use:\n" |
| 6681 | "\n" |
| 6682 | " git reset\n" |
| 6683 | "\n" |
| 6684 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" |
| 6685 | "the remaining commits.\n" |
| 6686 | msgstr "" |
| 6687 | "如果您想跳过这个提交,使用命令:\n" |
| 6688 | "\n" |
| 6689 | " git reset\n" |
| 6690 | "\n" |
| 6691 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" |
| 6692 | "操作。\n" |
| 6693 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6694 | #: builtin/commit.c:318 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6695 | msgid "failed to unpack HEAD tree object" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6696 | msgstr "无法解包 HEAD 树对象" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6697 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6698 | #: builtin/commit.c:359 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6699 | msgid "unable to create temporary index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6700 | msgstr "不能创建临时索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6701 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6702 | #: builtin/commit.c:365 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6703 | msgid "interactive add failed" |
| 6704 | msgstr "交互式添加失败" |
| 6705 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6706 | #: builtin/commit.c:378 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6707 | msgid "unable to update temporary index" |
| 6708 | msgstr "无法更新临时索引" |
| 6709 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6710 | #: builtin/commit.c:380 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6711 | msgid "Failed to update main cache tree" |
| 6712 | msgstr "不能更新树的主缓存" |
| 6713 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6714 | #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6715 | msgid "unable to write new_index file" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6716 | msgstr "无法写 new_index 文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6717 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6718 | #: builtin/commit.c:458 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6719 | msgid "cannot do a partial commit during a merge." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6720 | msgstr "在合并过程中不能做部分提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6721 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6722 | #: builtin/commit.c:460 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6723 | msgid "cannot do a partial commit during a cherry-pick." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6724 | msgstr "在拣选过程中不能做部分提交。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6725 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6726 | #: builtin/commit.c:469 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6727 | msgid "cannot read the index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6728 | msgstr "无法读取索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6729 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6730 | #: builtin/commit.c:488 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6731 | msgid "unable to write temporary index file" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6732 | msgstr "无法写临时索引文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6733 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6734 | #: builtin/commit.c:582 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6735 | #, c-format |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6736 | msgid "commit '%s' lacks author header" |
| 6737 | msgstr "提交 '%s' 缺少作者信息" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6738 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6739 | #: builtin/commit.c:584 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 6740 | #, c-format |
| 6741 | msgid "commit '%s' has malformed author line" |
| 6742 | msgstr "提交 '%s' 有非法的作者信息" |
| 6743 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6744 | #: builtin/commit.c:603 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6745 | msgid "malformed --author parameter" |
| 6746 | msgstr "非法的 --author 参数" |
| 6747 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6748 | #: builtin/commit.c:611 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6749 | #, c-format |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6750 | msgid "invalid date format: %s" |
| 6751 | msgstr "无效的日期格式:%s" |
| 6752 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6753 | #: builtin/commit.c:655 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6754 | msgid "" |
| 6755 | "unable to select a comment character that is not used\n" |
| 6756 | "in the current commit message" |
| 6757 | msgstr "无法选择一个未被当前提交说明使用的注释字符" |
| 6758 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6759 | #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6760 | #, c-format |
| 6761 | msgid "could not lookup commit %s" |
| 6762 | msgstr "不能查询提交 %s" |
| 6763 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6764 | #: builtin/commit.c:704 builtin/shortlog.c:295 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6765 | #, c-format |
| 6766 | msgid "(reading log message from standard input)\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6767 | msgstr "(正从标准输入中读取日志信息)\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6768 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6769 | #: builtin/commit.c:706 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6770 | msgid "could not read log from standard input" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6771 | msgstr "不能从标准输入中读取日志信息" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6772 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6773 | #: builtin/commit.c:710 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6774 | #, c-format |
| 6775 | msgid "could not read log file '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6776 | msgstr "不能读取日志文件 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6777 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6778 | #: builtin/commit.c:737 builtin/commit.c:745 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6779 | msgid "could not read SQUASH_MSG" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6780 | msgstr "不能读取 SQUASH_MSG" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6781 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6782 | #: builtin/commit.c:742 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 6783 | msgid "could not read MERGE_MSG" |
| 6784 | msgstr "不能读取 MERGE_MSG" |
| 6785 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6786 | #: builtin/commit.c:796 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6787 | msgid "could not write commit template" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6788 | msgstr "不能写提交模版" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6789 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6790 | #: builtin/commit.c:814 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6791 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6792 | msgid "" |
| 6793 | "\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6794 | "It looks like you may be committing a merge.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6795 | "If this is not correct, please remove the file\n" |
| 6796 | "\t%s\n" |
| 6797 | "and try again.\n" |
| 6798 | msgstr "" |
| 6799 | "\n" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6800 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6801 | "\t%s\n" |
| 6802 | "然后重试。\n" |
| 6803 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6804 | #: builtin/commit.c:819 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6805 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6806 | msgid "" |
| 6807 | "\n" |
| 6808 | "It looks like you may be committing a cherry-pick.\n" |
| 6809 | "If this is not correct, please remove the file\n" |
| 6810 | "\t%s\n" |
| 6811 | "and try again.\n" |
| 6812 | msgstr "" |
| 6813 | "\n" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6814 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6815 | "\t%s\n" |
| 6816 | "然后重试。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6817 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6818 | #: builtin/commit.c:832 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6819 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6820 | msgid "" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6821 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6822 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6823 | msgstr "" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6824 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6825 | "说明将会终止提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6826 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6827 | #: builtin/commit.c:839 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6828 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6829 | msgid "" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6830 | "Please enter the commit message for your changes. Lines starting\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6831 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6832 | "An empty message aborts the commit.\n" |
| 6833 | msgstr "" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 6834 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
| 6835 | "也可以删除它们。一个空的提交说明将会终止提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6836 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6837 | # 译者:为保证在输出中对齐,注意调整句中空格! |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6838 | #: builtin/commit.c:859 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6839 | #, c-format |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6840 | msgid "%sAuthor: %.*s <%.*s>" |
| 6841 | msgstr "%s作者: %.*s <%.*s>" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6842 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6843 | # 译者:为保证在输出中对齐,注意调整句中空格! |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6844 | #: builtin/commit.c:867 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6845 | #, c-format |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6846 | msgid "%sDate: %s" |
| 6847 | msgstr "%s日期: %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6848 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6849 | # 译者:为保证在输出中对齐,注意调整句中空格! |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6850 | #: builtin/commit.c:874 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 6851 | #, c-format |
| 6852 | msgid "%sCommitter: %.*s <%.*s>" |
| 6853 | msgstr "%s提交者:%.*s <%.*s>" |
| 6854 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6855 | #: builtin/commit.c:892 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6856 | msgid "Cannot read index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6857 | msgstr "无法读取索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6858 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6859 | #: builtin/commit.c:954 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6860 | msgid "Error building trees" |
| 6861 | msgstr "无法创建树对象" |
| 6862 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6863 | #: builtin/commit.c:968 builtin/tag.c:280 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6864 | #, c-format |
| 6865 | msgid "Please supply the message using either -m or -F option.\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6866 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6867 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6868 | #: builtin/commit.c:1071 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6869 | #, c-format |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 6870 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
| 6871 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6872 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6873 | #: builtin/commit.c:1086 builtin/commit.c:1325 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6874 | #, c-format |
| 6875 | msgid "Invalid untracked files mode '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6876 | msgstr "无效的未追踪文件参数 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6877 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6878 | #: builtin/commit.c:1124 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 6879 | msgid "--long and -z are incompatible" |
| 6880 | msgstr "--long 和 -z 选项不兼容" |
| 6881 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6882 | #: builtin/commit.c:1154 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6883 | msgid "Using both --reset-author and --author does not make sense" |
| 6884 | msgstr "同时使用 --reset-author 和 --author 没有意义" |
| 6885 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6886 | #: builtin/commit.c:1163 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6887 | msgid "You have nothing to amend." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6888 | msgstr "您没有可修补的提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6889 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6890 | #: builtin/commit.c:1166 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6891 | msgid "You are in the middle of a merge -- cannot amend." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6892 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6893 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6894 | #: builtin/commit.c:1168 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6895 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 6896 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 6897 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6898 | #: builtin/commit.c:1171 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6899 | msgid "Options --squash and --fixup cannot be used together" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6900 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6901 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6902 | #: builtin/commit.c:1181 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6903 | msgid "Only one of -c/-C/-F/--fixup can be used." |
| 6904 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" |
| 6905 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6906 | #: builtin/commit.c:1183 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6907 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6908 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6909 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6910 | #: builtin/commit.c:1191 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6911 | msgid "--reset-author can be used only with -C, -c or --amend." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6912 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6913 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6914 | #: builtin/commit.c:1208 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6915 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
| 6916 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" |
| 6917 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6918 | #: builtin/commit.c:1210 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6919 | msgid "No paths with --include/--only does not make sense." |
| 6920 | msgstr "参数 --include/--only 不跟路径没有意义。" |
| 6921 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6922 | #: builtin/commit.c:1212 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 6923 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
| 6924 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6925 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6926 | #: builtin/commit.c:1224 builtin/tag.c:495 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6927 | #, c-format |
| 6928 | msgid "Invalid cleanup mode %s" |
| 6929 | msgstr "无效的清理模式 %s" |
| 6930 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6931 | #: builtin/commit.c:1229 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6932 | msgid "Paths with -a does not make sense." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 6933 | msgstr "路径和 -a 选项同时使用没有意义。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6934 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6935 | #: builtin/commit.c:1339 builtin/commit.c:1612 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6936 | msgid "show status concisely" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6937 | msgstr "以简洁的格式显示状态" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6938 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6939 | #: builtin/commit.c:1341 builtin/commit.c:1614 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6940 | msgid "show branch information" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6941 | msgstr "显示分支信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6942 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6943 | #: builtin/commit.c:1343 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 6944 | msgid "version" |
| 6945 | msgstr "版本" |
| 6946 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6947 | #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 |
| 6948 | #: builtin/worktree.c:442 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6949 | msgid "machine-readable output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6950 | msgstr "机器可读的输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6951 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6952 | #: builtin/commit.c:1346 builtin/commit.c:1618 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6953 | msgid "show status in long format (default)" |
| 6954 | msgstr "以长格式显示状态(默认)" |
| 6955 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6956 | #: builtin/commit.c:1349 builtin/commit.c:1621 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6957 | msgid "terminate entries with NUL" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 6958 | msgstr "条目以 NUL 字符结尾" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6959 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6960 | #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 |
| 6961 | #: builtin/fast-export.c:984 builtin/tag.c:368 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6962 | msgid "mode" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6963 | msgstr "模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6964 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6965 | #: builtin/commit.c:1352 builtin/commit.c:1624 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6966 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6967 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6968 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6969 | #: builtin/commit.c:1355 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6970 | msgid "show ignored files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6971 | msgstr "显示忽略的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6972 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6973 | #: builtin/commit.c:1356 parse-options.h:155 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6974 | msgid "when" |
| 6975 | msgstr "何时" |
| 6976 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6977 | #: builtin/commit.c:1357 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6978 | msgid "" |
| 6979 | "ignore changes to submodules, optional when: all, dirty, untracked. " |
| 6980 | "(Default: all)" |
| 6981 | msgstr "" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6982 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6983 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6984 | #: builtin/commit.c:1359 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6985 | msgid "list untracked files in columns" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 6986 | msgstr "以列的方式显示未跟踪的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 6987 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6988 | #: builtin/commit.c:1435 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6989 | msgid "couldn't look up newly created commit" |
| 6990 | msgstr "无法找到新创建的提交" |
| 6991 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6992 | #: builtin/commit.c:1437 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6993 | msgid "could not parse newly created commit" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 6994 | msgstr "不能解析新创建的提交" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6995 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 6996 | #: builtin/commit.c:1482 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 6997 | msgid "detached HEAD" |
| 6998 | msgstr "分离头指针" |
| 6999 | |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 7000 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7001 | #: builtin/commit.c:1485 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7002 | msgid " (root-commit)" |
Jiang Xin | 7e238ab | 2012-03-30 10:55:34 +0800 | [diff] [blame] | 7003 | msgstr "(根提交)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7004 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7005 | #: builtin/commit.c:1582 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7006 | msgid "suppress summary after successful commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7007 | msgstr "提交成功后不显示概述信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7008 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7009 | #: builtin/commit.c:1583 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7010 | msgid "show diff in commit message template" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7011 | msgstr "在提交说明模板里显示差异" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7012 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7013 | #: builtin/commit.c:1585 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7014 | msgid "Commit message options" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7015 | msgstr "提交说明选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7016 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7017 | #: builtin/commit.c:1586 builtin/tag.c:366 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7018 | msgid "read message from file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7019 | msgstr "从文件中读取提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7020 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7021 | #: builtin/commit.c:1587 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7022 | msgid "author" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7023 | msgstr "作者" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7024 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7025 | #: builtin/commit.c:1587 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7026 | msgid "override author for commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7027 | msgstr "提交时覆盖作者" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7028 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7029 | #: builtin/commit.c:1588 builtin/gc.c:333 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7030 | msgid "date" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7031 | msgstr "日期" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7032 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7033 | #: builtin/commit.c:1588 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7034 | msgid "override date for commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7035 | msgstr "提交时覆盖日期" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7036 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7037 | #: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 |
| 7038 | #: builtin/notes.c:561 builtin/tag.c:364 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7039 | msgid "message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7040 | msgstr "说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7041 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7042 | #: builtin/commit.c:1589 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7043 | msgid "commit message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7044 | msgstr "提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7045 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7046 | #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 |
| 7047 | #: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7048 | msgid "commit" |
| 7049 | msgstr "提交" |
| 7050 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7051 | #: builtin/commit.c:1590 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7052 | msgid "reuse and edit message from specified commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7053 | msgstr "重用并编辑指定提交的提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7054 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7055 | #: builtin/commit.c:1591 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7056 | msgid "reuse message from specified commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7057 | msgstr "重用指定提交的提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7058 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7059 | #: builtin/commit.c:1592 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7060 | msgid "use autosquash formatted message to fixup specified commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7061 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7062 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7063 | #: builtin/commit.c:1593 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7064 | msgid "use autosquash formatted message to squash specified commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7065 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7066 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7067 | #: builtin/commit.c:1594 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7068 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7069 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7070 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7071 | #: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7072 | msgid "add Signed-off-by:" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7073 | msgstr "添加 Signed-off-by: 签名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7074 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7075 | #: builtin/commit.c:1596 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7076 | msgid "use specified template file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7077 | msgstr "使用指定的模板文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7078 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7079 | #: builtin/commit.c:1597 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7080 | msgid "force edit of commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7081 | msgstr "强制编辑提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7082 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7083 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7084 | #: builtin/commit.c:1598 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7085 | msgid "default" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7086 | msgstr "default" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7087 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7088 | #: builtin/commit.c:1598 builtin/tag.c:369 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7089 | msgid "how to strip spaces and #comments from message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7090 | msgstr "设置如何删除提交说明里的空格和#注释" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7091 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7092 | #: builtin/commit.c:1599 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7093 | msgid "include status in commit message template" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7094 | msgstr "在提交说明模板里包含状态信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7095 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7096 | #: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7097 | #: builtin/revert.c:93 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7098 | msgid "GPG sign commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7099 | msgstr "GPG 提交签名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7100 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7101 | #: builtin/commit.c:1604 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7102 | msgid "Commit contents options" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7103 | msgstr "提交内容选项" |
| 7104 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7105 | #: builtin/commit.c:1605 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7106 | msgid "commit all changed files" |
| 7107 | msgstr "提交所有改动的文件" |
| 7108 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7109 | #: builtin/commit.c:1606 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7110 | msgid "add specified files to index for commit" |
| 7111 | msgstr "添加指定的文件到索引区等待提交" |
| 7112 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7113 | #: builtin/commit.c:1607 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7114 | msgid "interactively add files" |
| 7115 | msgstr "交互式添加文件" |
| 7116 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7117 | #: builtin/commit.c:1608 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7118 | msgid "interactively add changes" |
| 7119 | msgstr "交互式添加变更" |
| 7120 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7121 | #: builtin/commit.c:1609 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7122 | msgid "commit only specified files" |
| 7123 | msgstr "只提交指定的文件" |
| 7124 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7125 | #: builtin/commit.c:1610 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7126 | msgid "bypass pre-commit and commit-msg hooks" |
| 7127 | msgstr "绕过 pre-commit 和 commit-msg 钩子" |
| 7128 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7129 | #: builtin/commit.c:1611 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7130 | msgid "show what would be committed" |
| 7131 | msgstr "显示将要提交的内容" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7132 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7133 | #: builtin/commit.c:1622 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7134 | msgid "amend previous commit" |
| 7135 | msgstr "修改先前的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7136 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7137 | #: builtin/commit.c:1623 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7138 | msgid "bypass post-rewrite hook" |
| 7139 | msgstr "绕过 post-rewrite 钩子" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7140 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7141 | #: builtin/commit.c:1628 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7142 | msgid "ok to record an empty change" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7143 | msgstr "允许一个空提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7144 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7145 | #: builtin/commit.c:1630 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7146 | msgid "ok to record a change with an empty message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7147 | msgstr "允许空的提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7148 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7149 | #: builtin/commit.c:1659 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7150 | msgid "could not parse HEAD commit" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7151 | msgstr "不能解析 HEAD 提交" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7152 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7153 | #: builtin/commit.c:1707 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7154 | #, c-format |
| 7155 | msgid "Corrupt MERGE_HEAD file (%s)" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7156 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7157 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7158 | #: builtin/commit.c:1714 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7159 | msgid "could not read MERGE_MODE" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7160 | msgstr "不能读取 MERGE_MODE" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7161 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7162 | #: builtin/commit.c:1733 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7163 | #, c-format |
| 7164 | msgid "could not read commit message: %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7165 | msgstr "不能读取提交说明:%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7166 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7167 | #: builtin/commit.c:1744 |
Jiang Xin | 73a60cd | 2012-04-28 22:42:41 +0800 | [diff] [blame] | 7168 | #, c-format |
| 7169 | msgid "Aborting commit; you did not edit the message.\n" |
| 7170 | msgstr "终止提交;您未更改来自模版的提交说明。\n" |
| 7171 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7172 | #: builtin/commit.c:1749 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7173 | #, c-format |
| 7174 | msgid "Aborting commit due to empty commit message.\n" |
| 7175 | msgstr "终止提交因为提交说明为空。\n" |
| 7176 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7177 | #: builtin/commit.c:1797 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7178 | msgid "" |
| 7179 | "Repository has been updated, but unable to write\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7180 | "new_index file. Check that disk is not full and quota is\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7181 | "not exceeded, and then \"git reset HEAD\" to recover." |
| 7182 | msgstr "" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7183 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7184 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7185 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 7186 | #: builtin/config.c:9 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 7187 | msgid "git config [<options>]" |
| 7188 | msgstr "git config [<选项>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7189 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7190 | #: builtin/config.c:55 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7191 | msgid "Config file location" |
| 7192 | msgstr "配置文件位置" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7193 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7194 | #: builtin/config.c:56 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7195 | msgid "use global config file" |
| 7196 | msgstr "使用全局配置文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7197 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7198 | #: builtin/config.c:57 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7199 | msgid "use system config file" |
| 7200 | msgstr "使用系统级配置文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7201 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7202 | #: builtin/config.c:58 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7203 | msgid "use repository config file" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7204 | msgstr "使用仓库级配置文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7205 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7206 | #: builtin/config.c:59 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7207 | msgid "use given config file" |
| 7208 | msgstr "使用指定的配置文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7209 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7210 | #: builtin/config.c:60 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 7211 | msgid "blob-id" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 7212 | msgstr "数据对象 ID" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 7213 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7214 | #: builtin/config.c:60 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 7215 | msgid "read config from given blob object" |
| 7216 | msgstr "从给定的数据对象读取配置" |
| 7217 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7218 | #: builtin/config.c:61 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7219 | msgid "Action" |
| 7220 | msgstr "操作" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7221 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7222 | #: builtin/config.c:62 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7223 | msgid "get value: name [value-regex]" |
| 7224 | msgstr "获取值:name [value-regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7225 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7226 | #: builtin/config.c:63 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7227 | msgid "get all values: key [value-regex]" |
| 7228 | msgstr "获得所有的值:key [value-regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7229 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7230 | #: builtin/config.c:64 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7231 | msgid "get values for regexp: name-regex [value-regex]" |
| 7232 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7233 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7234 | #: builtin/config.c:65 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 7235 | msgid "get value specific for the URL: section[.var] URL" |
| 7236 | msgstr "获得 URL 取值:section[.var] URL" |
| 7237 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7238 | #: builtin/config.c:66 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7239 | msgid "replace all matching variables: name value [value_regex]" |
| 7240 | msgstr "替换所有匹配的变量:name value [value_regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7241 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7242 | #: builtin/config.c:67 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7243 | msgid "add a new variable: name value" |
| 7244 | msgstr "添加一个新的变量:name value" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7245 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7246 | #: builtin/config.c:68 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7247 | msgid "remove a variable: name [value-regex]" |
| 7248 | msgstr "删除一个变量:name [value-regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7249 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7250 | #: builtin/config.c:69 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7251 | msgid "remove all matches: name [value-regex]" |
| 7252 | msgstr "删除所有匹配项:name [value-regex]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7253 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7254 | #: builtin/config.c:70 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7255 | msgid "rename section: old-name new-name" |
| 7256 | msgstr "重命名小节:old-name new-name" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7257 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7258 | #: builtin/config.c:71 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7259 | msgid "remove a section: name" |
| 7260 | msgstr "删除一个小节:name" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7261 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7262 | #: builtin/config.c:72 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7263 | msgid "list all" |
| 7264 | msgstr "列出所有" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7265 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7266 | #: builtin/config.c:73 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7267 | msgid "open an editor" |
| 7268 | msgstr "打开一个编辑器" |
| 7269 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7270 | #: builtin/config.c:74 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 7271 | msgid "find the color configured: slot [default]" |
| 7272 | msgstr "获得配置的颜色:配置 [默认]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7273 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7274 | #: builtin/config.c:75 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 7275 | msgid "find the color setting: slot [stdout-is-tty]" |
| 7276 | msgstr "获得颜色设置:配置 [stdout-is-tty]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7277 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7278 | #: builtin/config.c:76 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7279 | msgid "Type" |
| 7280 | msgstr "类型" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7281 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7282 | #: builtin/config.c:77 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7283 | msgid "value is \"true\" or \"false\"" |
| 7284 | msgstr "值是 \"true\" 或 \"false\"" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7285 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7286 | #: builtin/config.c:78 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7287 | msgid "value is decimal number" |
| 7288 | msgstr "值是十进制数" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7289 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7290 | #: builtin/config.c:79 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7291 | msgid "value is --bool or --int" |
| 7292 | msgstr "值是 --bool or --int" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7293 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7294 | #: builtin/config.c:80 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7295 | msgid "value is a path (file or directory name)" |
| 7296 | msgstr "值是一个路径(文件或目录名)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7297 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7298 | #: builtin/config.c:81 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7299 | msgid "Other" |
| 7300 | msgstr "其它" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7301 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7302 | #: builtin/config.c:82 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7303 | msgid "terminate values with NUL byte" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 7304 | msgstr "终止值是 NUL 字节" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7305 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7306 | #: builtin/config.c:83 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7307 | msgid "show variable names only" |
| 7308 | msgstr "只显示变量名" |
| 7309 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7310 | #: builtin/config.c:84 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7311 | msgid "respect include directives on lookup" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7312 | msgstr "查询时参照 include 指令递归查找" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7313 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7314 | #: builtin/config.c:85 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 7315 | msgid "show origin of config (file, standard input, blob, command line)" |
| 7316 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" |
| 7317 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7318 | #: builtin/config.c:327 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7319 | msgid "unable to parse default color value" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7320 | msgstr "不能解析默认颜色值" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7321 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7322 | #: builtin/config.c:471 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7323 | #, c-format |
| 7324 | msgid "" |
| 7325 | "# This is Git's per-user configuration file.\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 7326 | "[user]\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7327 | "# Please adapt and uncomment the following lines:\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 7328 | "#\tname = %s\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7329 | "#\temail = %s\n" |
| 7330 | msgstr "" |
| 7331 | "# This is Git's per-user configuration file.\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 7332 | "[user]\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7333 | "# Please adapt and uncomment the following lines:\n" |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 7334 | "#\tname = %s\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7335 | "#\temail = %s\n" |
| 7336 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7337 | #: builtin/config.c:613 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7338 | #, c-format |
| 7339 | msgid "cannot create configuration file %s" |
| 7340 | msgstr "不能创建配置文件 %s" |
| 7341 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7342 | #: builtin/config.c:625 |
| 7343 | #, c-format |
| 7344 | msgid "" |
| 7345 | "cannot overwrite multiple values with a single value\n" |
| 7346 | " Use a regexp, --add or --replace-all to change %s." |
| 7347 | msgstr "" |
| 7348 | "无法用一个值覆盖多个值\n" |
| 7349 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" |
| 7350 | |
| 7351 | #: builtin/count-objects.c:86 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 7352 | msgid "git count-objects [-v] [-H | --human-readable]" |
| 7353 | msgstr "git count-objects [-v] [-H | --human-readable]" |
| 7354 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7355 | #: builtin/count-objects.c:96 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 7356 | msgid "print sizes in human readable format" |
| 7357 | msgstr "以用户可读的格式显示大小" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7358 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7359 | #: builtin/describe.c:17 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 7360 | msgid "git describe [<options>] [<commit-ish>...]" |
| 7361 | msgstr "git describe [<选项>] [<提交号>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7362 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7363 | #: builtin/describe.c:18 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 7364 | msgid "git describe [<options>] --dirty" |
| 7365 | msgstr "git describe [<选项>] --dirty" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7366 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7367 | #: builtin/describe.c:217 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7368 | #, c-format |
| 7369 | msgid "annotated tag %s not available" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7370 | msgstr "附注标签 %s 无效" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7371 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7372 | #: builtin/describe.c:221 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7373 | #, c-format |
| 7374 | msgid "annotated tag %s has no embedded name" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7375 | msgstr "附注标签 %s 没有嵌入名称" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7376 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7377 | #: builtin/describe.c:223 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7378 | #, c-format |
| 7379 | msgid "tag '%s' is really '%s' here" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7380 | msgstr "标签 '%s' 的确是在 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7381 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7382 | #: builtin/describe.c:250 builtin/log.c:480 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7383 | #, c-format |
| 7384 | msgid "Not a valid object name %s" |
| 7385 | msgstr "不是一个有效的对象名 %s" |
| 7386 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7387 | #: builtin/describe.c:253 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7388 | #, c-format |
| 7389 | msgid "%s is not a valid '%s' object" |
| 7390 | msgstr "%s 不是一个有效的 '%s' 对象" |
| 7391 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7392 | #: builtin/describe.c:270 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7393 | #, c-format |
| 7394 | msgid "no tag exactly matches '%s'" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7395 | msgstr "没有标签准确匹配 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7396 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7397 | #: builtin/describe.c:272 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7398 | #, c-format |
| 7399 | msgid "searching to describe %s\n" |
| 7400 | msgstr "搜索描述 %s\n" |
| 7401 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7402 | #: builtin/describe.c:319 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7403 | #, c-format |
| 7404 | msgid "finished search at %s\n" |
| 7405 | msgstr "完成搜索 %s\n" |
| 7406 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7407 | #: builtin/describe.c:346 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7408 | #, c-format |
| 7409 | msgid "" |
| 7410 | "No annotated tags can describe '%s'.\n" |
| 7411 | "However, there were unannotated tags: try --tags." |
| 7412 | msgstr "" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7413 | "没有附注标签能描述 '%s'。\n" |
| 7414 | "然而,存在未附注标签:尝试 --tags。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7415 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7416 | #: builtin/describe.c:350 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7417 | #, c-format |
| 7418 | msgid "" |
| 7419 | "No tags can describe '%s'.\n" |
| 7420 | "Try --always, or create some tags." |
| 7421 | msgstr "" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7422 | "没有标签能描述 '%s'。\n" |
| 7423 | "尝试 --always,或者创建一些标签。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7424 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7425 | #: builtin/describe.c:371 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7426 | #, c-format |
| 7427 | msgid "traversed %lu commits\n" |
| 7428 | msgstr "已遍历 %lu 个提交\n" |
| 7429 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7430 | #: builtin/describe.c:374 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7431 | #, c-format |
| 7432 | msgid "" |
| 7433 | "more than %i tags found; listed %i most recent\n" |
| 7434 | "gave up search at %s\n" |
| 7435 | msgstr "" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7436 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7437 | "在 %s 放弃搜索\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7438 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7439 | #: builtin/describe.c:396 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7440 | msgid "find the tag that comes after the commit" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7441 | msgstr "寻找该提交之后的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7442 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7443 | #: builtin/describe.c:397 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7444 | msgid "debug search strategy on stderr" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7445 | msgstr "在标准错误上调试搜索策略" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7446 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7447 | #: builtin/describe.c:398 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 7448 | msgid "use any ref" |
| 7449 | msgstr "使用任意引用" |
| 7450 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7451 | #: builtin/describe.c:399 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 7452 | msgid "use any tag, even unannotated" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7453 | msgstr "使用任意标签,即使未附带注释" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7454 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7455 | #: builtin/describe.c:400 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7456 | msgid "always use long format" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7457 | msgstr "始终使用长提交号格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7458 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7459 | #: builtin/describe.c:401 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 7460 | msgid "only follow first parent" |
| 7461 | msgstr "只跟随第一个父提交" |
| 7462 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7463 | #: builtin/describe.c:404 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7464 | msgid "only output exact matches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7465 | msgstr "只输出精确匹配" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7466 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7467 | #: builtin/describe.c:406 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7468 | msgid "consider <n> most recent tags (default: 10)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7469 | msgstr "考虑最近 <n> 个标签(默认:10)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7470 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7471 | #: builtin/describe.c:408 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7472 | msgid "only consider tags matching <pattern>" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7473 | msgstr "只考虑匹配 <模式> 的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7474 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7475 | #: builtin/describe.c:410 builtin/name-rev.c:320 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7476 | msgid "show abbreviated commit object as fallback" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7477 | msgstr "显示简写的提交号作为后备" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7478 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7479 | #: builtin/describe.c:411 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7480 | msgid "mark" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7481 | msgstr "标记" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7482 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7483 | #: builtin/describe.c:412 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7484 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7485 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7486 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7487 | #: builtin/describe.c:430 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7488 | msgid "--long is incompatible with --abbrev=0" |
| 7489 | msgstr "--long 与 --abbrev=0 不兼容" |
| 7490 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7491 | #: builtin/describe.c:456 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7492 | msgid "No names found, cannot describe anything." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7493 | msgstr "没有发现名称,无法描述任何东西。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7494 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7495 | #: builtin/describe.c:476 |
Richard Hansen | a8a5406 | 2013-09-04 15:04:31 -0400 | [diff] [blame] | 7496 | msgid "--dirty is incompatible with commit-ishes" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 7497 | msgstr "--dirty 不能与提交同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7498 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7499 | #: builtin/diff.c:83 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7500 | #, c-format |
| 7501 | msgid "'%s': not a regular file or symlink" |
| 7502 | msgstr "'%s':不是一个正规文件或符号链接" |
| 7503 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7504 | #: builtin/diff.c:234 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7505 | #, c-format |
| 7506 | msgid "invalid option: %s" |
| 7507 | msgstr "无效选项:%s" |
| 7508 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7509 | #: builtin/diff.c:358 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7510 | msgid "Not a git repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7511 | msgstr "不是一个 git 仓库" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7512 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7513 | #: builtin/diff.c:401 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7514 | #, c-format |
| 7515 | msgid "invalid object '%s' given." |
| 7516 | msgstr "提供了无效对象 '%s'。" |
| 7517 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7518 | #: builtin/diff.c:410 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7519 | #, c-format |
| 7520 | msgid "more than two blobs given: '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7521 | msgstr "提供了超过两个数据对象:'%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7522 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7523 | #: builtin/diff.c:417 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7524 | #, c-format |
| 7525 | msgid "unhandled object '%s' given." |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 7526 | msgstr "无法处理的对象 '%s'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7527 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7528 | #: builtin/difftool.c:28 |
| 7529 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
| 7530 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" |
| 7531 | |
| 7532 | #: builtin/difftool.c:241 |
| 7533 | #, c-format |
| 7534 | msgid "failed: %d" |
| 7535 | msgstr "失败:%d" |
| 7536 | |
| 7537 | #: builtin/difftool.c:342 |
| 7538 | msgid "" |
| 7539 | "combined diff formats('-c' and '--cc') are not supported in\n" |
| 7540 | "directory diff mode('-d' and '--dir-diff')." |
| 7541 | msgstr "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--cc')。" |
| 7542 | |
| 7543 | #: builtin/difftool.c:567 |
| 7544 | #, c-format |
| 7545 | msgid "both files modified: '%s' and '%s'." |
| 7546 | msgstr "两个文件都被修改:'%s' 和 '%s'。" |
| 7547 | |
| 7548 | #: builtin/difftool.c:569 |
| 7549 | msgid "working tree file has been left." |
| 7550 | msgstr "工作区文件被留了下来。" |
| 7551 | |
| 7552 | #: builtin/difftool.c:580 |
| 7553 | #, c-format |
| 7554 | msgid "temporary files exist in '%s'." |
| 7555 | msgstr "临时文件存在于 '%s'。" |
| 7556 | |
| 7557 | #: builtin/difftool.c:581 |
| 7558 | msgid "you may want to cleanup or recover these." |
| 7559 | msgstr "您可能想要清理或者恢复它们。" |
| 7560 | |
| 7561 | #: builtin/difftool.c:626 |
| 7562 | msgid "use `diff.guitool` instead of `diff.tool`" |
| 7563 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" |
| 7564 | |
| 7565 | #: builtin/difftool.c:628 |
| 7566 | msgid "perform a full-directory diff" |
| 7567 | msgstr "执行一个全目录差异比较" |
| 7568 | |
| 7569 | #: builtin/difftool.c:630 |
| 7570 | msgid "do not prompt before launching a diff tool" |
| 7571 | msgstr "启动差异比较工具之前不提示" |
| 7572 | |
| 7573 | #: builtin/difftool.c:636 |
| 7574 | msgid "use symlinks in dir-diff mode" |
| 7575 | msgstr "在 dir-diff 模式中使用符号链接" |
| 7576 | |
| 7577 | #: builtin/difftool.c:637 |
| 7578 | msgid "<tool>" |
| 7579 | msgstr "<工具>" |
| 7580 | |
| 7581 | #: builtin/difftool.c:638 |
| 7582 | msgid "use the specified diff tool" |
| 7583 | msgstr "使用指定的差异比较工具" |
| 7584 | |
| 7585 | #: builtin/difftool.c:640 |
| 7586 | msgid "print a list of diff tools that may be used with `--tool`" |
| 7587 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" |
| 7588 | |
| 7589 | #: builtin/difftool.c:643 |
| 7590 | msgid "" |
| 7591 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " |
| 7592 | "code" |
| 7593 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" |
| 7594 | |
| 7595 | #: builtin/difftool.c:645 |
| 7596 | msgid "<command>" |
| 7597 | msgstr "<命令>" |
| 7598 | |
| 7599 | #: builtin/difftool.c:646 |
| 7600 | msgid "specify a custom command for viewing diffs" |
| 7601 | msgstr "指定一个用于查看差异的自定义命令" |
| 7602 | |
| 7603 | #: builtin/difftool.c:670 |
| 7604 | msgid "no <tool> given for --tool=<tool>" |
| 7605 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" |
| 7606 | |
| 7607 | #: builtin/difftool.c:677 |
| 7608 | msgid "no <cmd> given for --extcmd=<cmd>" |
| 7609 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" |
| 7610 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7611 | #: builtin/fast-export.c:25 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7612 | msgid "git fast-export [rev-list-opts]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7613 | msgstr "git fast-export [rev-list-opts]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7614 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7615 | #: builtin/fast-export.c:980 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7616 | msgid "show progress after <n> objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7617 | msgstr "在 <n> 个对象之后显示进度" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7618 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7619 | #: builtin/fast-export.c:982 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7620 | msgid "select handling of signed tags" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7621 | msgstr "选择如何处理签名标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7622 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7623 | #: builtin/fast-export.c:985 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7624 | msgid "select handling of tags that tag filtered objects" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7625 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7626 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7627 | #: builtin/fast-export.c:988 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7628 | msgid "Dump marks to this file" |
| 7629 | msgstr "把标记存储到这个文件" |
| 7630 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7631 | #: builtin/fast-export.c:990 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7632 | msgid "Import marks from this file" |
| 7633 | msgstr "从这个文件导入标记" |
| 7634 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7635 | #: builtin/fast-export.c:992 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7636 | msgid "Fake a tagger when tags lack one" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7637 | msgstr "当标签缺少标记者字段时,假装提供一个" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7638 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7639 | #: builtin/fast-export.c:994 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7640 | msgid "Output full tree for each commit" |
| 7641 | msgstr "每次提交都输出整个树" |
| 7642 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7643 | #: builtin/fast-export.c:996 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7644 | msgid "Use the done feature to terminate the stream" |
| 7645 | msgstr "使用 done 功能来终止流" |
| 7646 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7647 | #: builtin/fast-export.c:997 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7648 | msgid "Skip output of blob data" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7649 | msgstr "跳过数据对象的输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7650 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7651 | #: builtin/fast-export.c:998 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7652 | msgid "refspec" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7653 | msgstr "引用规格" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7654 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7655 | #: builtin/fast-export.c:999 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7656 | msgid "Apply refspec to exported refs" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7657 | msgstr "对导出的引用应用引用规格" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7658 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7659 | #: builtin/fast-export.c:1000 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 7660 | msgid "anonymize output" |
| 7661 | msgstr "匿名输出" |
| 7662 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7663 | #: builtin/fetch.c:21 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7664 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7665 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7666 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7667 | #: builtin/fetch.c:22 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7668 | msgid "git fetch [<options>] <group>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7669 | msgstr "git fetch [<选项>] <组>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7670 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7671 | #: builtin/fetch.c:23 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7672 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7673 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7674 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7675 | #: builtin/fetch.c:24 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7676 | msgid "git fetch --all [<options>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7677 | msgstr "git fetch --all [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7678 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7679 | #: builtin/fetch.c:95 builtin/pull.c:175 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7680 | msgid "fetch from all remotes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7681 | msgstr "从所有的远程抓取" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7682 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7683 | #: builtin/fetch.c:97 builtin/pull.c:178 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7684 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7685 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7686 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7687 | #: builtin/fetch.c:99 builtin/pull.c:181 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7688 | msgid "path to upload pack on remote end" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7689 | msgstr "上传包到远程的路径" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7690 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7691 | #: builtin/fetch.c:100 builtin/pull.c:183 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7692 | msgid "force overwrite of local branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7693 | msgstr "强制覆盖本地分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7694 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7695 | #: builtin/fetch.c:102 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7696 | msgid "fetch from multiple remotes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7697 | msgstr "从多个远程抓取" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7698 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7699 | #: builtin/fetch.c:104 builtin/pull.c:185 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7700 | msgid "fetch all tags and associated objects" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7701 | msgstr "抓取所有的标签和关联对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7702 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7703 | #: builtin/fetch.c:106 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7704 | msgid "do not fetch all tags (--no-tags)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7705 | msgstr "不抓取任何标签(--no-tags)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7706 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7707 | #: builtin/fetch.c:108 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 7708 | msgid "number of submodules fetched in parallel" |
| 7709 | msgstr "子模组获取的并发数" |
| 7710 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7711 | #: builtin/fetch.c:110 builtin/pull.c:188 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7712 | msgid "prune remote-tracking branches no longer on remote" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7713 | msgstr "清除远程已经不存在的分支的跟踪分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7714 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7715 | # 译者:可选值,不能翻译 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7716 | #: builtin/fetch.c:111 builtin/pull.c:191 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7717 | msgid "on-demand" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7718 | msgstr "on-demand" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7719 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7720 | #: builtin/fetch.c:112 builtin/pull.c:192 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7721 | msgid "control recursive fetching of submodules" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7722 | msgstr "控制子模组的递归抓取" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7723 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7724 | #: builtin/fetch.c:116 builtin/pull.c:200 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7725 | msgid "keep downloaded pack" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7726 | msgstr "保持下载包" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7727 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7728 | #: builtin/fetch.c:118 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7729 | msgid "allow updating of HEAD ref" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7730 | msgstr "允许更新 HEAD 引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7731 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7732 | #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7733 | msgid "deepen history of shallow clone" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7734 | msgstr "深化浅克隆的历史" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7735 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7736 | #: builtin/fetch.c:123 |
| 7737 | msgid "deepen history of shallow repository based on time" |
| 7738 | msgstr "基于时间来深化浅克隆的历史" |
| 7739 | |
| 7740 | #: builtin/fetch.c:129 builtin/pull.c:206 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 7741 | msgid "convert to a complete repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7742 | msgstr "转换为一个完整的仓库" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 7743 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7744 | #: builtin/fetch.c:131 builtin/log.c:1433 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7745 | msgid "dir" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7746 | msgstr "目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7747 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7748 | #: builtin/fetch.c:132 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7749 | msgid "prepend this to submodule path output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7750 | msgstr "在子模组路径输出的前面加上此目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7751 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7752 | #: builtin/fetch.c:135 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7753 | msgid "default mode for recursion" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7754 | msgstr "递归的默认模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7755 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7756 | #: builtin/fetch.c:137 builtin/pull.c:209 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 7757 | msgid "accept refs that update .git/shallow" |
| 7758 | msgstr "接受更新 .git/shallow 的引用" |
| 7759 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7760 | #: builtin/fetch.c:138 builtin/pull.c:211 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7761 | msgid "refmap" |
| 7762 | msgstr "引用映射" |
| 7763 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7764 | #: builtin/fetch.c:139 builtin/pull.c:212 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 7765 | msgid "specify fetch refmap" |
| 7766 | msgstr "指定获取操作的引用映射" |
| 7767 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7768 | #: builtin/fetch.c:395 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7769 | msgid "Couldn't find remote ref HEAD" |
| 7770 | msgstr "无法发现远程 HEAD 引用" |
| 7771 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7772 | #: builtin/fetch.c:511 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7773 | #, c-format |
| 7774 | msgid "configuration fetch.output contains invalid value %s" |
| 7775 | msgstr "配置变量 fetch.output 包含无效值 %s" |
| 7776 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7777 | #: builtin/fetch.c:604 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7778 | #, c-format |
| 7779 | msgid "object %s not found" |
| 7780 | msgstr "对象 %s 未发现" |
| 7781 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7782 | #: builtin/fetch.c:608 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7783 | msgid "[up to date]" |
| 7784 | msgstr "[最新]" |
| 7785 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7786 | #: builtin/fetch.c:621 builtin/fetch.c:701 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7787 | msgid "[rejected]" |
| 7788 | msgstr "[已拒绝]" |
| 7789 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7790 | #: builtin/fetch.c:622 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7791 | msgid "can't fetch in current branch" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 7792 | msgstr "当前分支下不能执行获取操作" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7793 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7794 | #: builtin/fetch.c:631 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7795 | msgid "[tag update]" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7796 | msgstr "[标签更新]" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7797 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7798 | #: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 |
| 7799 | #: builtin/fetch.c:696 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7800 | msgid "unable to update local ref" |
| 7801 | msgstr "不能更新本地引用" |
| 7802 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7803 | #: builtin/fetch.c:651 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7804 | msgid "[new tag]" |
| 7805 | msgstr "[新标签]" |
| 7806 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7807 | #: builtin/fetch.c:654 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7808 | msgid "[new branch]" |
| 7809 | msgstr "[新分支]" |
| 7810 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7811 | #: builtin/fetch.c:657 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7812 | msgid "[new ref]" |
| 7813 | msgstr "[新引用]" |
| 7814 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7815 | #: builtin/fetch.c:696 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7816 | msgid "forced update" |
| 7817 | msgstr "强制更新" |
| 7818 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7819 | #: builtin/fetch.c:701 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 7820 | msgid "non-fast-forward" |
| 7821 | msgstr "非快进" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7822 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7823 | #: builtin/fetch.c:746 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7824 | #, c-format |
| 7825 | msgid "%s did not send all necessary objects\n" |
| 7826 | msgstr "%s 未发送所有必须的对象\n" |
| 7827 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7828 | #: builtin/fetch.c:766 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 7829 | #, c-format |
| 7830 | msgid "reject %s because shallow roots are not allowed to be updated" |
| 7831 | msgstr "拒绝 %s 因为浅克隆不允许被更新" |
| 7832 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7833 | #: builtin/fetch.c:853 builtin/fetch.c:949 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7834 | #, c-format |
| 7835 | msgid "From %.*s\n" |
| 7836 | msgstr "来自 %.*s\n" |
| 7837 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7838 | #: builtin/fetch.c:864 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7839 | #, c-format |
| 7840 | msgid "" |
| 7841 | "some local refs could not be updated; try running\n" |
| 7842 | " 'git remote prune %s' to remove any old, conflicting branches" |
| 7843 | msgstr "" |
| 7844 | "一些本地引用不能被更新;尝试运行\n" |
| 7845 | " 'git remote prune %s' 来删除旧的、有冲突的分支" |
| 7846 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7847 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7848 | #: builtin/fetch.c:919 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 7849 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 7850 | msgid " (%s will become dangling)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7851 | msgstr " (%s 将成为摇摆状态)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7852 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 7853 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7854 | #: builtin/fetch.c:920 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 7855 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 7856 | msgid " (%s has become dangling)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7857 | msgstr " (%s 已成为摇摆状态)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7858 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7859 | #: builtin/fetch.c:952 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7860 | msgid "[deleted]" |
| 7861 | msgstr "[已删除]" |
| 7862 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7863 | #: builtin/fetch.c:953 builtin/remote.c:1020 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7864 | msgid "(none)" |
| 7865 | msgstr "(无)" |
| 7866 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7867 | #: builtin/fetch.c:976 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7868 | #, c-format |
| 7869 | msgid "Refusing to fetch into current branch %s of non-bare repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7870 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7871 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7872 | #: builtin/fetch.c:995 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7873 | #, c-format |
| 7874 | msgid "Option \"%s\" value \"%s\" is not valid for %s" |
| 7875 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" |
| 7876 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7877 | #: builtin/fetch.c:998 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7878 | #, c-format |
| 7879 | msgid "Option \"%s\" is ignored for %s\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 7880 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7881 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7882 | #: builtin/fetch.c:1074 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 7883 | #, c-format |
| 7884 | msgid "Don't know how to fetch from %s" |
| 7885 | msgstr "不知道如何从 %s 获取" |
| 7886 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7887 | #: builtin/fetch.c:1234 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7888 | #, c-format |
| 7889 | msgid "Fetching %s\n" |
Riku | d4a8e00 | 2012-02-02 16:40:12 +0800 | [diff] [blame] | 7890 | msgstr "正在获取 %s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7891 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7892 | #: builtin/fetch.c:1236 builtin/remote.c:96 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7893 | #, c-format |
| 7894 | msgid "Could not fetch %s" |
| 7895 | msgstr "不能获取 %s" |
| 7896 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7897 | #: builtin/fetch.c:1254 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7898 | msgid "" |
| 7899 | "No remote repository specified. Please, specify either a URL or a\n" |
| 7900 | "remote name from which new revisions should be fetched." |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 7901 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7902 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7903 | #: builtin/fetch.c:1277 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7904 | msgid "You need to specify a tag name." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 7905 | msgstr "您需要指定一个标签名称。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7906 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7907 | #: builtin/fetch.c:1319 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7908 | msgid "Negative depth in --deepen is not supported" |
| 7909 | msgstr "--deepen 不支持负数深度" |
| 7910 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7911 | #: builtin/fetch.c:1321 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7912 | msgid "--deepen and --depth are mutually exclusive" |
| 7913 | msgstr "--deepen 和 --depth 是互斥的" |
| 7914 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7915 | #: builtin/fetch.c:1326 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 7916 | msgid "--depth and --unshallow cannot be used together" |
| 7917 | msgstr "--depth 和 --unshallow 不能同时使用" |
| 7918 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7919 | #: builtin/fetch.c:1328 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 7920 | msgid "--unshallow on a complete repository does not make sense" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7921 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 7922 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7923 | #: builtin/fetch.c:1350 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7924 | msgid "fetch --all does not take a repository argument" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7925 | msgstr "fetch --all 不能带一个仓库参数" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7926 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7927 | #: builtin/fetch.c:1352 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7928 | msgid "fetch --all does not make sense with refspecs" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7929 | msgstr "fetch --all 带引用规格没有任何意义" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7930 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7931 | #: builtin/fetch.c:1363 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7932 | #, c-format |
| 7933 | msgid "No such remote or remote group: %s" |
| 7934 | msgstr "没有这样的远程或远程组:%s" |
| 7935 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 7936 | #: builtin/fetch.c:1371 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7937 | msgid "Fetching a group and specifying refspecs does not make sense" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 7938 | msgstr "获取组并指定引用规格没有意义" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 7939 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7940 | #: builtin/fmt-merge-msg.c:14 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 7941 | msgid "" |
| 7942 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" |
| 7943 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7944 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7945 | #: builtin/fmt-merge-msg.c:663 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7946 | msgid "populate log with at most <n> entries from shortlog" |
| 7947 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
| 7948 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7949 | #: builtin/fmt-merge-msg.c:666 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7950 | msgid "alias for --log (deprecated)" |
| 7951 | msgstr "参数 --log 的别名(已弃用)" |
| 7952 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7953 | #: builtin/fmt-merge-msg.c:669 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7954 | msgid "text" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7955 | msgstr "文本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7956 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7957 | #: builtin/fmt-merge-msg.c:670 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7958 | msgid "use <text> as start of message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7959 | msgstr "使用 <文本> 作为提交说明的开始" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7960 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 7961 | #: builtin/fmt-merge-msg.c:671 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7962 | msgid "file to read from" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7963 | msgstr "从文件中读取" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7964 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 7965 | #: builtin/for-each-ref.c:9 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 7966 | msgid "git for-each-ref [<options>] [<pattern>]" |
| 7967 | msgstr "git for-each-ref [<选项>] [<模式>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7968 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7969 | #: builtin/for-each-ref.c:10 |
| 7970 | msgid "git for-each-ref [--points-at <object>]" |
| 7971 | msgstr "git for-each-ref [--points-at <对象>]" |
| 7972 | |
| 7973 | #: builtin/for-each-ref.c:11 |
| 7974 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" |
| 7975 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" |
| 7976 | |
| 7977 | #: builtin/for-each-ref.c:12 |
| 7978 | msgid "git for-each-ref [--contains [<object>]]" |
| 7979 | msgstr "git for-each-ref [--contains [<对象>]]" |
| 7980 | |
| 7981 | #: builtin/for-each-ref.c:27 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7982 | msgid "quote placeholders suitably for shells" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7983 | msgstr "引用占位符适用于 shells" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7984 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7985 | #: builtin/for-each-ref.c:29 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7986 | msgid "quote placeholders suitably for perl" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7987 | msgstr "引用占位符适用于 perl" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7988 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7989 | #: builtin/for-each-ref.c:31 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7990 | msgid "quote placeholders suitably for python" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7991 | msgstr "引用占位符适用于 python" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7992 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7993 | #: builtin/for-each-ref.c:33 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 7994 | msgid "quote placeholders suitably for Tcl" |
| 7995 | msgstr "引用占位符适用于 Tcl" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7996 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 7997 | #: builtin/for-each-ref.c:36 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 7998 | msgid "show only <n> matched refs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 7999 | msgstr "只显示 <n> 个匹配的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8000 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8001 | #: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8002 | msgid "format to use for the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8003 | msgstr "输出格式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8004 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8005 | #: builtin/for-each-ref.c:41 |
| 8006 | msgid "print only refs which points at the given object" |
| 8007 | msgstr "只打印指向给定对象的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8008 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8009 | #: builtin/for-each-ref.c:43 |
| 8010 | msgid "print only refs that are merged" |
| 8011 | msgstr "只打印已经合并的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8012 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8013 | #: builtin/for-each-ref.c:44 |
| 8014 | msgid "print only refs that are not merged" |
| 8015 | msgstr "只打印没有合并的引用" |
| 8016 | |
| 8017 | #: builtin/for-each-ref.c:45 |
| 8018 | msgid "print only refs which contain the commit" |
| 8019 | msgstr "只打印包含该提交的引用" |
| 8020 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8021 | #: builtin/fsck.c:554 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8022 | msgid "Checking object directories" |
| 8023 | msgstr "检查对象目录中" |
| 8024 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8025 | #: builtin/fsck.c:646 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8026 | msgid "git fsck [<options>] [<object>...]" |
| 8027 | msgstr "git fsck [<选项>] [<对象>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8028 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8029 | #: builtin/fsck.c:652 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8030 | msgid "show unreachable objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8031 | msgstr "显示不可达的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8032 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8033 | #: builtin/fsck.c:653 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8034 | msgid "show dangling objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8035 | msgstr "显示摇摆的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8036 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8037 | #: builtin/fsck.c:654 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8038 | msgid "report tags" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 8039 | msgstr "报告标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8040 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8041 | #: builtin/fsck.c:655 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8042 | msgid "report root nodes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8043 | msgstr "报告根节点" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8044 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8045 | #: builtin/fsck.c:656 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8046 | msgid "make index objects head nodes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8047 | msgstr "将索引亦作为检查的头节点" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8048 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8049 | #: builtin/fsck.c:657 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8050 | msgid "make reflogs head nodes (default)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8051 | msgstr "将引用日志作为检查的头节点(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8052 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8053 | #: builtin/fsck.c:658 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8054 | msgid "also consider packs and alternate objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8055 | msgstr "也考虑包和备用对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8056 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8057 | #: builtin/fsck.c:659 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 8058 | msgid "check only connectivity" |
| 8059 | msgstr "仅检查连通性" |
| 8060 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8061 | #: builtin/fsck.c:660 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8062 | msgid "enable more strict checking" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8063 | msgstr "启用更严格的检查" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8064 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8065 | #: builtin/fsck.c:662 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8066 | msgid "write dangling objects in .git/lost-found" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8067 | msgstr "将摇摆对象写入 .git/lost-found 中" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8068 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8069 | #: builtin/fsck.c:663 builtin/prune.c:107 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8070 | msgid "show progress" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8071 | msgstr "显示进度" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8072 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8073 | #: builtin/fsck.c:664 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8074 | msgid "show verbose names for reachable objects" |
| 8075 | msgstr "显示可达对象的详细名称" |
| 8076 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8077 | #: builtin/fsck.c:725 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8078 | msgid "Checking objects" |
| 8079 | msgstr "检查对象中" |
| 8080 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 8081 | #: builtin/gc.c:25 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8082 | msgid "git gc [<options>]" |
| 8083 | msgstr "git gc [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8084 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8085 | #: builtin/gc.c:72 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8086 | #, c-format |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 8087 | msgid "Invalid %s: '%s'" |
| 8088 | msgstr "无效 %s:'%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8089 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8090 | #: builtin/gc.c:139 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8091 | #, c-format |
| 8092 | msgid "insanely long object directory %.*s" |
| 8093 | msgstr "不正常的长对象目录 %.*s" |
| 8094 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8095 | #: builtin/gc.c:297 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8096 | #, c-format |
| 8097 | msgid "" |
| 8098 | "The last gc run reported the following. Please correct the root cause\n" |
| 8099 | "and remove %s.\n" |
| 8100 | "Automatic cleanup will not be performed until the file is removed.\n" |
| 8101 | "\n" |
| 8102 | "%s" |
| 8103 | msgstr "" |
| 8104 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" |
| 8105 | "在该文件被删除之前,自动清理将不会执行。\n" |
| 8106 | "\n" |
| 8107 | "%s" |
| 8108 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8109 | #: builtin/gc.c:334 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8110 | msgid "prune unreferenced objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8111 | msgstr "清除未引用的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8112 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8113 | #: builtin/gc.c:336 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8114 | msgid "be more thorough (increased runtime)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8115 | msgstr "更彻底(增加运行时间)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8116 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8117 | #: builtin/gc.c:337 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8118 | msgid "enable auto-gc mode" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8119 | msgstr "启用自动垃圾回收模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8120 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8121 | #: builtin/gc.c:338 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 8122 | msgid "force running gc even if there may be another gc running" |
| 8123 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" |
| 8124 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8125 | #: builtin/gc.c:380 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8126 | #, c-format |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8127 | msgid "Auto packing the repository in background for optimum performance.\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 8128 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8129 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8130 | #: builtin/gc.c:382 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8131 | #, c-format |
| 8132 | msgid "Auto packing the repository for optimum performance.\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 8133 | msgstr "自动打包仓库以求最佳性能。\n" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8134 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8135 | #: builtin/gc.c:383 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 8136 | #, c-format |
| 8137 | msgid "See \"git help gc\" for manual housekeeping.\n" |
| 8138 | msgstr "手工维护参见 \"git help gc\"。\n" |
| 8139 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8140 | #: builtin/gc.c:404 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 8141 | #, c-format |
| 8142 | msgid "" |
| 8143 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" |
| 8144 | msgstr "" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 8145 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 8146 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8147 | #: builtin/gc.c:448 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8148 | msgid "" |
| 8149 | "There are too many unreachable loose objects; run 'git prune' to remove them." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 8150 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8151 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8152 | #: builtin/grep.c:25 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8153 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
| 8154 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8155 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8156 | #: builtin/grep.c:232 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8157 | #, c-format |
| 8158 | msgid "grep: failed to create thread: %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 8159 | msgstr "grep:无法创建线程:%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8160 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8161 | #: builtin/grep.c:290 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8162 | #, c-format |
| 8163 | msgid "invalid number of threads specified (%d) for %s" |
| 8164 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" |
| 8165 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8166 | #: builtin/grep.c:763 builtin/grep.c:804 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8167 | #, c-format |
| 8168 | msgid "unable to read tree (%s)" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 8169 | msgstr "无法读取树(%s)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8170 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8171 | #: builtin/grep.c:823 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8172 | #, c-format |
| 8173 | msgid "unable to grep from object of type %s" |
| 8174 | msgstr "无法抓取来自于 %s 类型的对象" |
| 8175 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8176 | #: builtin/grep.c:887 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8177 | #, c-format |
| 8178 | msgid "switch `%c' expects a numerical value" |
| 8179 | msgstr "开关 `%c' 期望一个数字值" |
| 8180 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8181 | #: builtin/grep.c:973 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8182 | msgid "search in index instead of in the work tree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8183 | msgstr "在索引区搜索而不是在工作区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8184 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8185 | #: builtin/grep.c:975 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8186 | msgid "find in contents not managed by git" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8187 | msgstr "在未被 git 管理的内容中查找" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8188 | |
| 8189 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8190 | #: builtin/grep.c:977 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8191 | msgid "search in both tracked and untracked files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8192 | msgstr "在跟踪和未跟踪的文件中搜索" |
| 8193 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8194 | #: builtin/grep.c:979 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8195 | msgid "ignore files specified via '.gitignore'" |
| 8196 | msgstr "忽略 '.gitignore' 包含的文件" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8197 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8198 | #: builtin/grep.c:981 |
| 8199 | msgid "recursivley search in each submodule" |
| 8200 | msgstr "在每一个子模组中递归搜索" |
| 8201 | |
| 8202 | #: builtin/grep.c:983 |
| 8203 | msgid "basename" |
| 8204 | msgstr "基本名" |
| 8205 | |
| 8206 | #: builtin/grep.c:984 |
| 8207 | msgid "prepend parent project's basename to output" |
| 8208 | msgstr "在输出中以父项目的基本名为前缀" |
| 8209 | |
| 8210 | #: builtin/grep.c:987 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8211 | msgid "show non-matching lines" |
| 8212 | msgstr "显示未匹配的行" |
| 8213 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8214 | #: builtin/grep.c:989 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8215 | msgid "case insensitive matching" |
| 8216 | msgstr "不区分大小写匹配" |
| 8217 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8218 | #: builtin/grep.c:991 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8219 | msgid "match patterns only at word boundaries" |
| 8220 | msgstr "只在单词边界匹配模式" |
| 8221 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8222 | #: builtin/grep.c:993 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8223 | msgid "process binary files as text" |
| 8224 | msgstr "把二进制文件当做文本处理" |
| 8225 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8226 | #: builtin/grep.c:995 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8227 | msgid "don't match patterns in binary files" |
| 8228 | msgstr "不在二进制文件中匹配模式" |
| 8229 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8230 | #: builtin/grep.c:998 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 8231 | msgid "process binary files with textconv filters" |
| 8232 | msgstr "用 textconv 过滤器处理二进制文件" |
| 8233 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8234 | #: builtin/grep.c:1000 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8235 | msgid "descend at most <depth> levels" |
| 8236 | msgstr "最多以指定的深度向下寻找" |
| 8237 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8238 | #: builtin/grep.c:1004 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8239 | msgid "use extended POSIX regular expressions" |
| 8240 | msgstr "使用扩展的 POSIX 正则表达式" |
| 8241 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8242 | #: builtin/grep.c:1007 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8243 | msgid "use basic POSIX regular expressions (default)" |
| 8244 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
| 8245 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8246 | #: builtin/grep.c:1010 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8247 | msgid "interpret patterns as fixed strings" |
| 8248 | msgstr "把模式解析为固定的字符串" |
| 8249 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8250 | #: builtin/grep.c:1013 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8251 | msgid "use Perl-compatible regular expressions" |
| 8252 | msgstr "使用 Perl 兼容的正则表达式" |
| 8253 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8254 | #: builtin/grep.c:1016 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8255 | msgid "show line numbers" |
| 8256 | msgstr "显示行号" |
| 8257 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8258 | #: builtin/grep.c:1017 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8259 | msgid "don't show filenames" |
| 8260 | msgstr "不显示文件名" |
| 8261 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8262 | #: builtin/grep.c:1018 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8263 | msgid "show filenames" |
| 8264 | msgstr "显示文件名" |
| 8265 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8266 | #: builtin/grep.c:1020 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8267 | msgid "show filenames relative to top directory" |
| 8268 | msgstr "显示相对于顶级目录的文件名" |
| 8269 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8270 | #: builtin/grep.c:1022 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8271 | msgid "show only filenames instead of matching lines" |
| 8272 | msgstr "只显示文件名而不显示匹配的行" |
| 8273 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8274 | #: builtin/grep.c:1024 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8275 | msgid "synonym for --files-with-matches" |
| 8276 | msgstr "和 --files-with-matches 同义" |
| 8277 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8278 | #: builtin/grep.c:1027 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8279 | msgid "show only the names of files without match" |
| 8280 | msgstr "只显示未匹配的文件名" |
| 8281 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8282 | #: builtin/grep.c:1029 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8283 | msgid "print NUL after filenames" |
| 8284 | msgstr "在文件名后输出 NUL 字符" |
| 8285 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8286 | #: builtin/grep.c:1031 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8287 | msgid "show the number of matches instead of matching lines" |
| 8288 | msgstr "显示总匹配行数,而不显示匹配的行" |
| 8289 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8290 | #: builtin/grep.c:1032 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8291 | msgid "highlight matches" |
| 8292 | msgstr "高亮显示匹配项" |
| 8293 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8294 | #: builtin/grep.c:1034 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8295 | msgid "print empty line between matches from different files" |
| 8296 | msgstr "在不同文件的匹配项之间打印空行" |
| 8297 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8298 | #: builtin/grep.c:1036 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8299 | msgid "show filename only once above matches from same file" |
| 8300 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
| 8301 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8302 | #: builtin/grep.c:1039 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8303 | msgid "show <n> context lines before and after matches" |
| 8304 | msgstr "显示匹配项前后的 <n> 行上下文" |
| 8305 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8306 | #: builtin/grep.c:1042 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8307 | msgid "show <n> context lines before matches" |
| 8308 | msgstr "显示匹配项前 <n> 行上下文" |
| 8309 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8310 | #: builtin/grep.c:1044 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8311 | msgid "show <n> context lines after matches" |
| 8312 | msgstr "显示匹配项后 <n> 行上下文" |
| 8313 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8314 | #: builtin/grep.c:1046 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8315 | msgid "use <n> worker threads" |
| 8316 | msgstr "使用 <n> 个工作线程" |
| 8317 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8318 | #: builtin/grep.c:1047 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8319 | msgid "shortcut for -C NUM" |
| 8320 | msgstr "快捷键 -C 数字" |
| 8321 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8322 | #: builtin/grep.c:1050 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8323 | msgid "show a line with the function name before matches" |
| 8324 | msgstr "在匹配的前面显示一行函数名" |
| 8325 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8326 | #: builtin/grep.c:1052 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8327 | msgid "show the surrounding function" |
| 8328 | msgstr "显示所在函数的前后内容" |
| 8329 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8330 | #: builtin/grep.c:1055 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8331 | msgid "read patterns from file" |
| 8332 | msgstr "从文件读取模式" |
| 8333 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8334 | #: builtin/grep.c:1057 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8335 | msgid "match <pattern>" |
| 8336 | msgstr "匹配 <模式>" |
| 8337 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8338 | #: builtin/grep.c:1059 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8339 | msgid "combine patterns specified with -e" |
| 8340 | msgstr "组合用 -e 参数设定的模式" |
| 8341 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8342 | #: builtin/grep.c:1071 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8343 | msgid "indicate hit with exit status without output" |
| 8344 | msgstr "不输出,而用退出码标识命中状态" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8345 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8346 | #: builtin/grep.c:1073 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8347 | msgid "show only matches from files that match all patterns" |
| 8348 | msgstr "只显示匹配所有模式的文件中的匹配" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8349 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8350 | #: builtin/grep.c:1075 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8351 | msgid "show parse tree for grep expression" |
| 8352 | msgstr "显示 grep 表达式的解析树" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8353 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8354 | #: builtin/grep.c:1079 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8355 | msgid "pager" |
| 8356 | msgstr "分页" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8357 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8358 | #: builtin/grep.c:1079 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8359 | msgid "show matching files in the pager" |
| 8360 | msgstr "分页显示匹配的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8361 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8362 | #: builtin/grep.c:1082 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8363 | msgid "allow calling of grep(1) (ignored by this build)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8364 | msgstr "允许调用 grep(1)(本次构建忽略)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8365 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8366 | #: builtin/grep.c:1146 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8367 | msgid "no pattern given." |
| 8368 | msgstr "未提供模式匹配。" |
| 8369 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8370 | #: builtin/grep.c:1178 builtin/index-pack.c:1482 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8371 | #, c-format |
| 8372 | msgid "invalid number of threads specified (%d)" |
| 8373 | msgstr "指定的线程数无效(%d)" |
| 8374 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8375 | #: builtin/grep.c:1215 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8376 | msgid "--open-files-in-pager only works on the worktree" |
| 8377 | msgstr "--open-files-in-pager 仅用于工作区" |
| 8378 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8379 | #: builtin/grep.c:1238 |
| 8380 | msgid "option not supported with --recurse-submodules." |
| 8381 | msgstr "选项不支持和 --recurse-submodules 共用。" |
| 8382 | |
| 8383 | #: builtin/grep.c:1244 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8384 | msgid "--cached or --untracked cannot be used with --no-index." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 8385 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8386 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8387 | #: builtin/grep.c:1249 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8388 | msgid "--no-index or --untracked cannot be used with revs." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 8389 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8390 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8391 | #: builtin/grep.c:1252 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8392 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 8393 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8394 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8395 | #: builtin/grep.c:1260 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8396 | msgid "both --cached and trees are given." |
| 8397 | msgstr "同时给出了 --cached 和树对象。" |
| 8398 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8399 | #: builtin/hash-object.c:81 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8400 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8401 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
| 8402 | "[--] <file>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8403 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8404 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
| 8405 | "[--] <文件>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8406 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8407 | #: builtin/hash-object.c:82 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 8408 | msgid "git hash-object --stdin-paths" |
| 8409 | msgstr "git hash-object --stdin-paths" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8410 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8411 | #: builtin/hash-object.c:94 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8412 | msgid "type" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8413 | msgstr "类型" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8414 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8415 | #: builtin/hash-object.c:94 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8416 | msgid "object type" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8417 | msgstr "对象类型" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8418 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8419 | #: builtin/hash-object.c:95 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8420 | msgid "write the object into the object database" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8421 | msgstr "将对象写入对象数据库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8422 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8423 | #: builtin/hash-object.c:97 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8424 | msgid "read the object from stdin" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8425 | msgstr "从标准输入读取对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8426 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8427 | #: builtin/hash-object.c:99 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8428 | msgid "store file as is without filters" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8429 | msgstr "原样存储文件不使用过滤器" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8430 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8431 | #: builtin/hash-object.c:100 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8432 | msgid "" |
| 8433 | "just hash any random garbage to create corrupt objects for debugging Git" |
| 8434 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" |
| 8435 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8436 | #: builtin/hash-object.c:101 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8437 | msgid "process file as it were from this path" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8438 | msgstr "处理文件并假设其来自于此路径" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8439 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8440 | #: builtin/help.c:42 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8441 | msgid "print all available commands" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8442 | msgstr "打印所有可用的命令" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8443 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8444 | #: builtin/help.c:43 |
| 8445 | msgid "exclude guides" |
| 8446 | msgstr "排除向导" |
| 8447 | |
| 8448 | #: builtin/help.c:44 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8449 | msgid "print list of useful guides" |
| 8450 | msgstr "显示有用的指南列表" |
| 8451 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8452 | #: builtin/help.c:45 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8453 | msgid "show man page" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8454 | msgstr "显示 man 手册" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8455 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8456 | #: builtin/help.c:46 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8457 | msgid "show manual in web browser" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8458 | msgstr "在 web 浏览器中显示手册" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8459 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8460 | #: builtin/help.c:48 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8461 | msgid "show info page" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8462 | msgstr "显示 info 手册" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8463 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8464 | #: builtin/help.c:54 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8465 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
| 8466 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8467 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8468 | #: builtin/help.c:66 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8469 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8470 | msgid "unrecognized help format '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8471 | msgstr "未能识别的帮助格式 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8472 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8473 | #: builtin/help.c:93 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8474 | msgid "Failed to start emacsclient." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8475 | msgstr "无法启动 emacsclient。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8476 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8477 | #: builtin/help.c:106 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8478 | msgid "Failed to parse emacsclient version." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8479 | msgstr "无法解析 emacsclient 版本。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8480 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8481 | #: builtin/help.c:114 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8482 | #, c-format |
| 8483 | msgid "emacsclient version '%d' too old (< 22)." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8484 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8485 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8486 | #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8487 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 8488 | msgid "failed to exec '%s'" |
| 8489 | msgstr "无法执行 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8490 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8491 | #: builtin/help.c:207 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8492 | #, c-format |
| 8493 | msgid "" |
| 8494 | "'%s': path for unsupported man viewer.\n" |
| 8495 | "Please consider using 'man.<tool>.cmd' instead." |
| 8496 | msgstr "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8497 | "'%s':不支持的 man 手册查看器的路径。\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 8498 | "请使用 'man.<工具>.cmd'。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8499 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8500 | #: builtin/help.c:219 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8501 | #, c-format |
| 8502 | msgid "" |
| 8503 | "'%s': cmd for supported man viewer.\n" |
| 8504 | "Please consider using 'man.<tool>.path' instead." |
| 8505 | msgstr "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8506 | "'%s': 支持的 man 手册查看器命令。\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 8507 | "请使用 'man.<工具>.path'。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8508 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8509 | #: builtin/help.c:336 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8510 | #, c-format |
| 8511 | msgid "'%s': unknown man viewer." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8512 | msgstr "'%s':未知的 man 查看器。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8513 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8514 | #: builtin/help.c:353 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8515 | msgid "no man viewer handled the request" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8516 | msgstr "没有 man 查看器处理此请求" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8517 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8518 | #: builtin/help.c:361 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8519 | msgid "no info viewer handled the request" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8520 | msgstr "没有 info 查看器处理此请求" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8521 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8522 | #: builtin/help.c:403 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8523 | msgid "Defining attributes per path" |
| 8524 | msgstr "定义路径的属性" |
| 8525 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8526 | #: builtin/help.c:404 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8527 | msgid "Everyday Git With 20 Commands Or So" |
| 8528 | msgstr "每一天 Git 常用的约 20 条命令" |
| 8529 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8530 | #: builtin/help.c:405 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8531 | msgid "A Git glossary" |
| 8532 | msgstr "Git 词汇表" |
| 8533 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8534 | #: builtin/help.c:406 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8535 | msgid "Specifies intentionally untracked files to ignore" |
| 8536 | msgstr "忽略指定的未跟踪文件" |
| 8537 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8538 | #: builtin/help.c:407 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8539 | msgid "Defining submodule properties" |
| 8540 | msgstr "定义子模组属性" |
| 8541 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8542 | #: builtin/help.c:408 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8543 | msgid "Specifying revisions and ranges for Git" |
| 8544 | msgstr "指定 Git 的版本和版本范围" |
| 8545 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8546 | #: builtin/help.c:409 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8547 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
| 8548 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" |
| 8549 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8550 | #: builtin/help.c:410 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8551 | msgid "An overview of recommended workflows with Git" |
| 8552 | msgstr "Git 推荐的工作流概览" |
| 8553 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8554 | #: builtin/help.c:422 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 8555 | msgid "The common Git guides are:\n" |
| 8556 | msgstr "最常用的 Git 向导有:\n" |
| 8557 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8558 | #: builtin/help.c:440 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8559 | #, c-format |
| 8560 | msgid "`git %s' is aliased to `%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8561 | msgstr "`git %s' 是 `%s' 的别名" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8562 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8563 | #: builtin/help.c:462 builtin/help.c:479 |
| 8564 | #, c-format |
| 8565 | msgid "usage: %s%s" |
| 8566 | msgstr "用法:%s%s" |
| 8567 | |
| 8568 | #: builtin/index-pack.c:154 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 8569 | #, c-format |
| 8570 | msgid "unable to open %s" |
| 8571 | msgstr "不能打开 %s" |
| 8572 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8573 | #: builtin/index-pack.c:204 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8574 | #, c-format |
| 8575 | msgid "object type mismatch at %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8576 | msgstr "%s 的对象类型不匹配" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8577 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8578 | #: builtin/index-pack.c:224 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 8579 | #, c-format |
| 8580 | msgid "did not receive expected object %s" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8581 | msgstr "未能获取预期的对象 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8582 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8583 | #: builtin/index-pack.c:227 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 8584 | #, c-format |
| 8585 | msgid "object %s: expected type %s, found %s" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8586 | msgstr "对象 %s:应为类型 %s,却是 %s" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 8587 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8588 | #: builtin/index-pack.c:269 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8589 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8590 | msgid "cannot fill %d byte" |
| 8591 | msgid_plural "cannot fill %d bytes" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8592 | msgstr[0] "无法填充 %d 字节" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 8593 | msgstr[1] "无法填充 %d 字节" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8594 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8595 | #: builtin/index-pack.c:279 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8596 | msgid "early EOF" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8597 | msgstr "过早的文件结束符(EOF)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8598 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8599 | #: builtin/index-pack.c:280 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8600 | msgid "read error on input" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8601 | msgstr "输入上的读错误" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8602 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8603 | #: builtin/index-pack.c:292 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8604 | msgid "used more bytes than were available" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8605 | msgstr "用掉了超过可用的字节" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8606 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8607 | #: builtin/index-pack.c:299 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8608 | msgid "pack too large for current definition of off_t" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8609 | msgstr "包太大超过了当前 off_t 的定义" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8610 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8611 | #: builtin/index-pack.c:302 builtin/unpack-objects.c:92 |
| 8612 | msgid "pack exceeds maximum allowed size" |
| 8613 | msgstr "包超过了最大允许值" |
| 8614 | |
| 8615 | #: builtin/index-pack.c:317 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8616 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8617 | msgid "unable to create '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8618 | msgstr "不能创建 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8619 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8620 | #: builtin/index-pack.c:322 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8621 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8622 | msgid "cannot open packfile '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8623 | msgstr "无法打开包文件 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8624 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8625 | #: builtin/index-pack.c:336 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8626 | msgid "pack signature mismatch" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8627 | msgstr "包签名不匹配" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8628 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8629 | #: builtin/index-pack.c:338 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8630 | #, c-format |
| 8631 | msgid "pack version %<PRIu32> unsupported" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8632 | msgstr "不支持包版本 %<PRIu32>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8633 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8634 | #: builtin/index-pack.c:356 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8635 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8636 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
| 8637 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8638 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8639 | #: builtin/index-pack.c:478 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8640 | #, c-format |
| 8641 | msgid "inflate returned %d" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8642 | msgstr "解压缩返回 %d" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8643 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8644 | #: builtin/index-pack.c:527 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8645 | msgid "offset value overflow for delta base object" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8646 | msgstr "偏移值覆盖了 delta 基准对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8647 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8648 | #: builtin/index-pack.c:535 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8649 | msgid "delta base offset is out of bound" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8650 | msgstr "delta 基准偏移越界" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8651 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8652 | #: builtin/index-pack.c:543 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8653 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8654 | msgid "unknown object type %d" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8655 | msgstr "未知对象类型 %d" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8656 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8657 | #: builtin/index-pack.c:574 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8658 | msgid "cannot pread pack file" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8659 | msgstr "无法读取包文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8660 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8661 | #: builtin/index-pack.c:576 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8662 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8663 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
| 8664 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" |
| 8665 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" |
| 8666 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8667 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8668 | #: builtin/index-pack.c:602 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8669 | msgid "serious inflate inconsistency" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8670 | msgstr "解压缩严重的不一致" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8671 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8672 | #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8673 | #: builtin/index-pack.c:813 builtin/index-pack.c:822 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8674 | #, c-format |
| 8675 | msgid "SHA1 COLLISION FOUND WITH %s !" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8676 | msgstr "发现 %s 出现 SHA1 冲突!" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8677 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8678 | #: builtin/index-pack.c:751 builtin/pack-objects.c:164 |
| 8679 | #: builtin/pack-objects.c:256 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 8680 | #, c-format |
| 8681 | msgid "unable to read %s" |
| 8682 | msgstr "不能读 %s" |
| 8683 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8684 | #: builtin/index-pack.c:819 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 8685 | #, c-format |
| 8686 | msgid "cannot read existing object %s" |
| 8687 | msgstr "不能读取现存对象 %s" |
| 8688 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8689 | #: builtin/index-pack.c:833 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8690 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8691 | msgid "invalid blob object %s" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 8692 | msgstr "无效的数据对象 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8693 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8694 | #: builtin/index-pack.c:847 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8695 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8696 | msgid "invalid %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8697 | msgstr "无效的 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8698 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8699 | #: builtin/index-pack.c:850 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8700 | msgid "Error in object" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8701 | msgstr "对象中出错" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8702 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8703 | #: builtin/index-pack.c:852 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8704 | #, c-format |
| 8705 | msgid "Not all child objects of %s are reachable" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8706 | msgstr "%s 的所有子对象并非都可达" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8707 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8708 | #: builtin/index-pack.c:924 builtin/index-pack.c:955 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8709 | msgid "failed to apply delta" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8710 | msgstr "无法应用 delta" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8711 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8712 | #: builtin/index-pack.c:1125 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8713 | msgid "Receiving objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8714 | msgstr "接收对象中" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8715 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8716 | #: builtin/index-pack.c:1125 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8717 | msgid "Indexing objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8718 | msgstr "索引对象中" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8719 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8720 | #: builtin/index-pack.c:1157 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8721 | msgid "pack is corrupted (SHA1 mismatch)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8722 | msgstr "包冲突(SHA1 不匹配)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8723 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8724 | #: builtin/index-pack.c:1162 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8725 | msgid "cannot fstat packfile" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8726 | msgstr "不能枚举包文件状态" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8727 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8728 | #: builtin/index-pack.c:1165 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8729 | msgid "pack has junk at the end" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8730 | msgstr "包的结尾有垃圾数据" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8731 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8732 | #: builtin/index-pack.c:1176 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 8733 | msgid "confusion beyond insanity in parse_pack_objects()" |
| 8734 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" |
| 8735 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8736 | #: builtin/index-pack.c:1199 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8737 | msgid "Resolving deltas" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8738 | msgstr "处理 delta 中" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8739 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8740 | #: builtin/index-pack.c:1210 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8741 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8742 | msgid "unable to create thread: %s" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8743 | msgstr "不能创建线程:%s" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8744 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8745 | #: builtin/index-pack.c:1252 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8746 | msgid "confusion beyond insanity" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8747 | msgstr "不可理喻" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8748 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8749 | #: builtin/index-pack.c:1258 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8750 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 8751 | msgid "completed with %d local object" |
| 8752 | msgid_plural "completed with %d local objects" |
| 8753 | msgstr[0] "完成 %d 个本地对象" |
| 8754 | msgstr[1] "完成 %d 个本地对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8755 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8756 | #: builtin/index-pack.c:1270 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8757 | #, c-format |
| 8758 | msgid "Unexpected tail checksum for %s (disk corruption?)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8759 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8760 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8761 | #: builtin/index-pack.c:1274 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8762 | #, c-format |
| 8763 | msgid "pack has %d unresolved delta" |
| 8764 | msgid_plural "pack has %d unresolved deltas" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8765 | msgstr[0] "包有 %d 个未解决的 delta" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 8766 | msgstr[1] "包有 %d 个未解决的 delta" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8767 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8768 | #: builtin/index-pack.c:1298 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8769 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8770 | msgid "unable to deflate appended object (%d)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8771 | msgstr "不能压缩附加对象(%d)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8772 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8773 | #: builtin/index-pack.c:1374 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8774 | #, c-format |
| 8775 | msgid "local object %s is corrupt" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8776 | msgstr "本地对象 %s 已损坏" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8777 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8778 | #: builtin/index-pack.c:1398 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8779 | msgid "error while closing pack file" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8780 | msgstr "关闭包文件时出错" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8781 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8782 | #: builtin/index-pack.c:1411 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8783 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8784 | msgid "cannot write keep file '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8785 | msgstr "无法写保留文件 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8786 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8787 | #: builtin/index-pack.c:1419 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8788 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8789 | msgid "cannot close written keep file '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8790 | msgstr "无法关闭保留文件 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8791 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8792 | #: builtin/index-pack.c:1432 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8793 | msgid "cannot store pack file" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8794 | msgstr "无法存储包文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8795 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8796 | #: builtin/index-pack.c:1443 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8797 | msgid "cannot store index file" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8798 | msgstr "无法存储索引文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8799 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8800 | #: builtin/index-pack.c:1476 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8801 | #, c-format |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8802 | msgid "bad pack.indexversion=%<PRIu32>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8803 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8804 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8805 | #: builtin/index-pack.c:1486 builtin/index-pack.c:1683 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8806 | #, c-format |
| 8807 | msgid "no threads support, ignoring %s" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8808 | msgstr "没有线程支持,忽略 %s" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8809 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8810 | #: builtin/index-pack.c:1544 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8811 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8812 | msgid "Cannot open existing pack file '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8813 | msgstr "无法打开现存包文件 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8814 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8815 | #: builtin/index-pack.c:1546 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8816 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8817 | msgid "Cannot open existing pack idx file for '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8818 | msgstr "无法为 %s 打开包索引文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8819 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8820 | #: builtin/index-pack.c:1593 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8821 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8822 | msgid "non delta: %d object" |
| 8823 | msgid_plural "non delta: %d objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8824 | msgstr[0] "非 delta:%d 个对象" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 8825 | msgstr[1] "非 delta:%d 个对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8826 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8827 | #: builtin/index-pack.c:1600 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8828 | #, c-format |
| 8829 | msgid "chain length = %d: %lu object" |
| 8830 | msgid_plural "chain length = %d: %lu objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 8831 | msgstr[0] "链长 = %d: %lu 对象" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 8832 | msgstr[1] "链长 = %d: %lu 对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8833 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8834 | #: builtin/index-pack.c:1613 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8835 | #, c-format |
| 8836 | msgid "packfile name '%s' does not end with '.pack'" |
Ray Chen | dbd6cce | 2015-07-28 13:26:41 +0800 | [diff] [blame] | 8837 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8838 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8839 | #: builtin/index-pack.c:1695 builtin/index-pack.c:1698 |
| 8840 | #: builtin/index-pack.c:1714 builtin/index-pack.c:1718 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 8841 | #, c-format |
| 8842 | msgid "bad %s" |
| 8843 | msgstr "错误选项 %s" |
| 8844 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8845 | #: builtin/index-pack.c:1734 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 8846 | msgid "--fix-thin cannot be used without --stdin" |
| 8847 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
| 8848 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 8849 | #: builtin/index-pack.c:1736 |
| 8850 | msgid "--stdin requires a git repository" |
| 8851 | msgstr "--stdin 需要一个 git 仓库" |
| 8852 | |
| 8853 | #: builtin/index-pack.c:1744 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8854 | msgid "--verify with no packfile name given" |
Ray Chen | dbd6cce | 2015-07-28 13:26:41 +0800 | [diff] [blame] | 8855 | msgstr "--verify 没有提供包文件名参数" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 8856 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8857 | #: builtin/init-db.c:54 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8858 | #, c-format |
| 8859 | msgid "cannot stat '%s'" |
| 8860 | msgstr "不能枚举 '%s' 状态" |
| 8861 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8862 | #: builtin/init-db.c:60 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8863 | #, c-format |
| 8864 | msgid "cannot stat template '%s'" |
| 8865 | msgstr "不能枚举模版 '%s' 状态" |
| 8866 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8867 | #: builtin/init-db.c:65 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8868 | #, c-format |
| 8869 | msgid "cannot opendir '%s'" |
| 8870 | msgstr "不能打开目录 '%s'" |
| 8871 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8872 | #: builtin/init-db.c:76 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8873 | #, c-format |
| 8874 | msgid "cannot readlink '%s'" |
| 8875 | msgstr "不能读取链接 '%s'" |
| 8876 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8877 | #: builtin/init-db.c:78 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8878 | #, c-format |
| 8879 | msgid "cannot symlink '%s' '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 8880 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8881 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8882 | #: builtin/init-db.c:84 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8883 | #, c-format |
| 8884 | msgid "cannot copy '%s' to '%s'" |
| 8885 | msgstr "不能拷贝 '%s' 至 '%s'" |
| 8886 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8887 | #: builtin/init-db.c:88 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8888 | #, c-format |
| 8889 | msgid "ignoring template %s" |
| 8890 | msgstr "忽略模版 %s" |
| 8891 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8892 | #: builtin/init-db.c:119 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8893 | #, c-format |
| 8894 | msgid "templates not found %s" |
| 8895 | msgstr "模版未找到 %s" |
| 8896 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8897 | #: builtin/init-db.c:134 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8898 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 8899 | msgid "not copying templates from '%s': %s" |
| 8900 | msgstr "没有从 '%s' 复制模版:%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8901 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8902 | #: builtin/init-db.c:327 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8903 | #, c-format |
| 8904 | msgid "unable to handle file type %d" |
| 8905 | msgstr "不能处理 %d 类型的文件" |
| 8906 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8907 | #: builtin/init-db.c:330 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8908 | #, c-format |
| 8909 | msgid "unable to move %s to %s" |
| 8910 | msgstr "不能移动 %s 至 %s" |
| 8911 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8912 | #: builtin/init-db.c:347 builtin/init-db.c:350 |
| 8913 | #, c-format |
| 8914 | msgid "%s already exists" |
| 8915 | msgstr "%s 已经存在" |
| 8916 | |
| 8917 | #: builtin/init-db.c:403 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8918 | #, c-format |
| 8919 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
| 8920 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" |
| 8921 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8922 | #: builtin/init-db.c:404 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8923 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8924 | msgid "Reinitialized existing Git repository in %s%s\n" |
| 8925 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8926 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8927 | #: builtin/init-db.c:408 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8928 | #, c-format |
| 8929 | msgid "Initialized empty shared Git repository in %s%s\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 8930 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8931 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8932 | #: builtin/init-db.c:409 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 8933 | #, c-format |
| 8934 | msgid "Initialized empty Git repository in %s%s\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 8935 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8936 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8937 | #: builtin/init-db.c:457 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8938 | msgid "" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 8939 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8940 | "shared[=<permissions>]] [<directory>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8941 | msgstr "" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8942 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 8943 | "[<目录>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8944 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8945 | #: builtin/init-db.c:480 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8946 | msgid "permissions" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 8947 | msgstr "权限" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8948 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8949 | #: builtin/init-db.c:481 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8950 | msgid "specify that the git repository is to be shared amongst several users" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 8951 | msgstr "指定 git 仓库是多个用户之间共享的" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 8952 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8953 | #: builtin/init-db.c:515 builtin/init-db.c:520 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8954 | #, c-format |
| 8955 | msgid "cannot mkdir %s" |
| 8956 | msgstr "不能创建目录 %s" |
| 8957 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8958 | #: builtin/init-db.c:524 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8959 | #, c-format |
| 8960 | msgid "cannot chdir to %s" |
| 8961 | msgstr "不能切换目录到 %s" |
| 8962 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8963 | #: builtin/init-db.c:545 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8964 | #, c-format |
| 8965 | msgid "" |
| 8966 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" |
| 8967 | "dir=<directory>)" |
Jiang Xin | 1e60744 | 2015-01-21 15:05:03 +0800 | [diff] [blame] | 8968 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8969 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 8970 | #: builtin/init-db.c:573 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 8971 | #, c-format |
| 8972 | msgid "Cannot access work tree '%s'" |
| 8973 | msgstr "不能访问工作区 '%s'" |
| 8974 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8975 | #: builtin/interpret-trailers.c:15 |
| 8976 | msgid "" |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8977 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
| 8978 | "<token>[(=|:)<value>])...] [<file>...]" |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 8979 | msgstr "" |
| 8980 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" |
| 8981 | ">])...] [<文件>...]" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8982 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8983 | #: builtin/interpret-trailers.c:26 |
| 8984 | msgid "edit files in place" |
| 8985 | msgstr "在原位编辑文件" |
| 8986 | |
| 8987 | #: builtin/interpret-trailers.c:27 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8988 | msgid "trim empty trailers" |
| 8989 | msgstr "删除空签名" |
| 8990 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8991 | #: builtin/interpret-trailers.c:28 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8992 | msgid "trailer" |
| 8993 | msgstr "签名" |
| 8994 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8995 | #: builtin/interpret-trailers.c:29 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 8996 | msgid "trailer(s) to add" |
| 8997 | msgstr "要添加的签名" |
| 8998 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 8999 | #: builtin/interpret-trailers.c:42 |
| 9000 | msgid "no input file given for in-place editing" |
| 9001 | msgstr "没有给出要原位编辑的文件" |
| 9002 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9003 | #: builtin/log.c:44 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 9004 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9005 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9006 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9007 | #: builtin/log.c:45 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9008 | msgid "git show [<options>] <object>..." |
| 9009 | msgstr "git show [<选项>] <对象>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9010 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9011 | #: builtin/log.c:84 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9012 | #, c-format |
| 9013 | msgid "invalid --decorate option: %s" |
| 9014 | msgstr "无效的 --decorate 选项:%s" |
| 9015 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9016 | #: builtin/log.c:139 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9017 | msgid "suppress diff output" |
| 9018 | msgstr "不显示差异输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9019 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9020 | #: builtin/log.c:140 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9021 | msgid "show source" |
| 9022 | msgstr "显示源" |
| 9023 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9024 | #: builtin/log.c:141 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9025 | msgid "Use mail map file" |
| 9026 | msgstr "使用邮件映射文件" |
| 9027 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9028 | #: builtin/log.c:142 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9029 | msgid "decorate options" |
| 9030 | msgstr "修饰选项" |
| 9031 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9032 | #: builtin/log.c:145 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9033 | msgid "Process line range n,m in file, counting from 1" |
| 9034 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" |
| 9035 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9036 | #: builtin/log.c:241 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9037 | #, c-format |
| 9038 | msgid "Final output: %d %s\n" |
| 9039 | msgstr "最终输出:%d %s\n" |
| 9040 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9041 | #: builtin/log.c:486 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9042 | #, c-format |
| 9043 | msgid "git show %s: bad file" |
| 9044 | msgstr "git show %s: 损坏的文件" |
| 9045 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9046 | #: builtin/log.c:500 builtin/log.c:594 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9047 | #, c-format |
| 9048 | msgid "Could not read object %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9049 | msgstr "不能读取对象 %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9050 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9051 | #: builtin/log.c:618 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9052 | #, c-format |
| 9053 | msgid "Unknown type: %d" |
| 9054 | msgstr "未知类型:%d" |
| 9055 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9056 | #: builtin/log.c:739 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9057 | msgid "format.headers without value" |
| 9058 | msgstr "format.headers 没有值" |
| 9059 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9060 | #: builtin/log.c:839 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9061 | msgid "name of output directory is too long" |
| 9062 | msgstr "输出目录名太长" |
| 9063 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9064 | #: builtin/log.c:854 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9065 | #, c-format |
| 9066 | msgid "Cannot open patch file %s" |
| 9067 | msgstr "无法打开补丁文件 %s" |
| 9068 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9069 | #: builtin/log.c:868 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9070 | msgid "Need exactly one range." |
| 9071 | msgstr "只需要一个范围。" |
| 9072 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9073 | #: builtin/log.c:878 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9074 | msgid "Not a range." |
| 9075 | msgstr "不是一个范围。" |
| 9076 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9077 | #: builtin/log.c:984 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9078 | msgid "Cover letter needs email format" |
| 9079 | msgstr "信封需要邮件地址格式" |
| 9080 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9081 | #: builtin/log.c:1063 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9082 | #, c-format |
| 9083 | msgid "insane in-reply-to: %s" |
| 9084 | msgstr "不正常的 in-reply-to:%s" |
| 9085 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9086 | #: builtin/log.c:1091 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9087 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
| 9088 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9089 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9090 | #: builtin/log.c:1141 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9091 | msgid "Two output directories?" |
| 9092 | msgstr "两个输出目录?" |
| 9093 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9094 | #: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9095 | #, c-format |
| 9096 | msgid "Unknown commit %s" |
| 9097 | msgstr "未知提交 %s" |
| 9098 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9099 | #: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9100 | #, c-format |
| 9101 | msgid "Failed to resolve '%s' as a valid ref." |
| 9102 | msgstr "无法解析 '%s' 为一个有效引用。" |
| 9103 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9104 | #: builtin/log.c:1263 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9105 | msgid "Could not find exact merge base." |
| 9106 | msgstr "不能找到准确的合并基线。" |
| 9107 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9108 | #: builtin/log.c:1267 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9109 | msgid "" |
| 9110 | "Failed to get upstream, if you want to record base commit automatically,\n" |
| 9111 | "please use git branch --set-upstream-to to track a remote branch.\n" |
| 9112 | "Or you could specify base commit by --base=<base-commit-id> manually." |
| 9113 | msgstr "" |
| 9114 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 9115 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9116 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
| 9117 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9118 | #: builtin/log.c:1287 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9119 | msgid "Failed to find exact merge base" |
| 9120 | msgstr "无法找到准确的合并基线" |
| 9121 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9122 | #: builtin/log.c:1298 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9123 | msgid "base commit should be the ancestor of revision list" |
| 9124 | msgstr "基线提交应该是版本列表的祖先" |
| 9125 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9126 | #: builtin/log.c:1302 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9127 | msgid "base commit shouldn't be in revision list" |
| 9128 | msgstr "基线提交不应该出现在版本列表中" |
| 9129 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9130 | #: builtin/log.c:1351 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9131 | msgid "cannot get patch id" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 9132 | msgstr "无法得到补丁 id" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9133 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9134 | #: builtin/log.c:1408 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9135 | msgid "use [PATCH n/m] even with a single patch" |
| 9136 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9137 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9138 | #: builtin/log.c:1411 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9139 | msgid "use [PATCH] even with multiple patches" |
| 9140 | msgstr "使用 [PATCH],即使有多个补丁" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9141 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9142 | #: builtin/log.c:1415 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9143 | msgid "print patches to standard out" |
| 9144 | msgstr "打印补丁到标准输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9145 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9146 | #: builtin/log.c:1417 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9147 | msgid "generate a cover letter" |
| 9148 | msgstr "生成一封附信" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9149 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9150 | #: builtin/log.c:1419 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9151 | msgid "use simple number sequence for output file names" |
| 9152 | msgstr "使用简单的数字序列作为输出文件名" |
| 9153 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9154 | #: builtin/log.c:1420 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9155 | msgid "sfx" |
| 9156 | msgstr "后缀" |
| 9157 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9158 | #: builtin/log.c:1421 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9159 | msgid "use <sfx> instead of '.patch'" |
| 9160 | msgstr "使用 <后缀> 代替 '.patch'" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9161 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9162 | #: builtin/log.c:1423 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9163 | msgid "start numbering patches at <n> instead of 1" |
| 9164 | msgstr "补丁以 <n> 开始编号,而不是1" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9165 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9166 | #: builtin/log.c:1425 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9167 | msgid "mark the series as Nth re-roll" |
| 9168 | msgstr "标记补丁系列是第几次重制" |
| 9169 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9170 | #: builtin/log.c:1427 |
| 9171 | msgid "Use [RFC PATCH] instead of [PATCH]" |
| 9172 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" |
| 9173 | |
| 9174 | #: builtin/log.c:1430 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9175 | msgid "Use [<prefix>] instead of [PATCH]" |
| 9176 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
| 9177 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9178 | #: builtin/log.c:1433 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9179 | msgid "store resulting files in <dir>" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9180 | msgstr "把结果文件存储在 <目录>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9181 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9182 | #: builtin/log.c:1436 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9183 | msgid "don't strip/add [PATCH]" |
| 9184 | msgstr "不删除/添加 [PATCH]" |
| 9185 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9186 | #: builtin/log.c:1439 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9187 | msgid "don't output binary diffs" |
| 9188 | msgstr "不输出二进制差异" |
| 9189 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9190 | #: builtin/log.c:1441 |
Jiang Xin | 89f80d7 | 2015-12-22 23:06:59 +0800 | [diff] [blame] | 9191 | msgid "output all-zero hash in From header" |
| 9192 | msgstr "在 From 头信息中输出全为零的哈希值" |
| 9193 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9194 | #: builtin/log.c:1443 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9195 | msgid "don't include a patch matching a commit upstream" |
| 9196 | msgstr "不包含已在上游提交中的补丁" |
| 9197 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9198 | #: builtin/log.c:1445 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9199 | msgid "show patch format instead of default (patch + stat)" |
| 9200 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
| 9201 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9202 | #: builtin/log.c:1447 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9203 | msgid "Messaging" |
| 9204 | msgstr "邮件发送" |
| 9205 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9206 | #: builtin/log.c:1448 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9207 | msgid "header" |
| 9208 | msgstr "header" |
| 9209 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9210 | #: builtin/log.c:1449 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9211 | msgid "add email header" |
| 9212 | msgstr "添加邮件头" |
| 9213 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9214 | #: builtin/log.c:1450 builtin/log.c:1452 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9215 | msgid "email" |
| 9216 | msgstr "邮件地址" |
| 9217 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9218 | #: builtin/log.c:1450 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9219 | msgid "add To: header" |
| 9220 | msgstr "添加收件人" |
| 9221 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9222 | #: builtin/log.c:1452 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9223 | msgid "add Cc: header" |
| 9224 | msgstr "添加抄送" |
| 9225 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9226 | #: builtin/log.c:1454 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9227 | msgid "ident" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9228 | msgstr "标识" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9229 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9230 | #: builtin/log.c:1455 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9231 | msgid "set From address to <ident> (or committer ident if absent)" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 9232 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9233 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9234 | #: builtin/log.c:1457 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9235 | msgid "message-id" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9236 | msgstr "邮件标识" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9237 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9238 | #: builtin/log.c:1458 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9239 | msgid "make first mail a reply to <message-id>" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9240 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9241 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9242 | #: builtin/log.c:1459 builtin/log.c:1462 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9243 | msgid "boundary" |
| 9244 | msgstr "边界" |
| 9245 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9246 | #: builtin/log.c:1460 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9247 | msgid "attach the patch" |
| 9248 | msgstr "附件方式添加补丁" |
| 9249 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9250 | #: builtin/log.c:1463 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9251 | msgid "inline the patch" |
| 9252 | msgstr "内联显示补丁" |
| 9253 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9254 | #: builtin/log.c:1467 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9255 | msgid "enable message threading, styles: shallow, deep" |
| 9256 | msgstr "启用邮件线索,风格:浅,深" |
| 9257 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9258 | #: builtin/log.c:1469 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9259 | msgid "signature" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9260 | msgstr "签名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9261 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9262 | #: builtin/log.c:1470 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9263 | msgid "add a signature" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9264 | msgstr "添加一个签名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9265 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9266 | #: builtin/log.c:1471 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9267 | msgid "base-commit" |
| 9268 | msgstr "基线提交" |
| 9269 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9270 | #: builtin/log.c:1472 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9271 | msgid "add prerequisite tree info to the patch series" |
| 9272 | msgstr "为补丁列表添加前置树信息" |
| 9273 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9274 | #: builtin/log.c:1474 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 9275 | msgid "add a signature from a file" |
| 9276 | msgstr "从文件添加一个签名" |
| 9277 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9278 | #: builtin/log.c:1475 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9279 | msgid "don't print the patch filenames" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9280 | msgstr "不要打印补丁文件名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9281 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9282 | #: builtin/log.c:1565 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9283 | msgid "-n and -k are mutually exclusive." |
| 9284 | msgstr "-n 和 -k 互斥。" |
| 9285 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9286 | #: builtin/log.c:1567 |
| 9287 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
| 9288 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9289 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9290 | #: builtin/log.c:1575 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9291 | msgid "--name-only does not make sense" |
| 9292 | msgstr "--name-only 无意义" |
| 9293 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9294 | #: builtin/log.c:1577 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9295 | msgid "--name-status does not make sense" |
| 9296 | msgstr "--name-status 无意义" |
| 9297 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9298 | #: builtin/log.c:1579 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9299 | msgid "--check does not make sense" |
| 9300 | msgstr "--check 无意义" |
| 9301 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9302 | #: builtin/log.c:1609 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9303 | msgid "standard output, or directory, which one?" |
| 9304 | msgstr "标准输出或目录,哪一个?" |
| 9305 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9306 | #: builtin/log.c:1611 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9307 | #, c-format |
| 9308 | msgid "Could not create directory '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9309 | msgstr "不能创建目录 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9310 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9311 | #: builtin/log.c:1705 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 9312 | #, c-format |
| 9313 | msgid "unable to read signature file '%s'" |
| 9314 | msgstr "无法读取签名文件 '%s'" |
| 9315 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9316 | #: builtin/log.c:1777 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9317 | msgid "Failed to create output files" |
| 9318 | msgstr "无法创建输出文件" |
| 9319 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9320 | #: builtin/log.c:1826 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9321 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9322 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9323 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9324 | #: builtin/log.c:1880 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9325 | #, c-format |
| 9326 | msgid "" |
| 9327 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9328 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9329 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9330 | #: builtin/ls-files.c:460 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9331 | msgid "git ls-files [<options>] [<file>...]" |
| 9332 | msgstr "git ls-files [<选项>] [<文件>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9333 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9334 | #: builtin/ls-files.c:509 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9335 | msgid "identify the file status with tags" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9336 | msgstr "用标签标识文件的状态" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9337 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9338 | #: builtin/ls-files.c:511 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9339 | msgid "use lowercase letters for 'assume unchanged' files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9340 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9341 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9342 | #: builtin/ls-files.c:513 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9343 | msgid "show cached files in the output (default)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9344 | msgstr "显示缓存的文件(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9345 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9346 | #: builtin/ls-files.c:515 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9347 | msgid "show deleted files in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9348 | msgstr "显示已删除的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9349 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9350 | #: builtin/ls-files.c:517 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9351 | msgid "show modified files in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9352 | msgstr "显示已修改的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9353 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9354 | #: builtin/ls-files.c:519 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9355 | msgid "show other files in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9356 | msgstr "显示其它文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9357 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9358 | #: builtin/ls-files.c:521 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9359 | msgid "show ignored files in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9360 | msgstr "显示忽略的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9361 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9362 | #: builtin/ls-files.c:524 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9363 | msgid "show staged contents' object name in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9364 | msgstr "显示暂存区内容的对象名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9365 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9366 | #: builtin/ls-files.c:526 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9367 | msgid "show files on the filesystem that need to be removed" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9368 | msgstr "显示文件系统需要删除的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9369 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9370 | #: builtin/ls-files.c:528 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9371 | msgid "show 'other' directories' names only" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9372 | msgstr "只显示“其他”目录的名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9373 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9374 | #: builtin/ls-files.c:530 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 9375 | msgid "show line endings of files" |
| 9376 | msgstr "显示文件换行符格式" |
| 9377 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9378 | #: builtin/ls-files.c:532 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9379 | msgid "don't show empty directories" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9380 | msgstr "不显示空目录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9381 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9382 | #: builtin/ls-files.c:535 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9383 | msgid "show unmerged files in the output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9384 | msgstr "显示未合并的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9385 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9386 | #: builtin/ls-files.c:537 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9387 | msgid "show resolve-undo information" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9388 | msgstr "显示 resolve-undo 信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9389 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9390 | #: builtin/ls-files.c:539 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9391 | msgid "skip files matching pattern" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9392 | msgstr "匹配排除文件的模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9393 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9394 | #: builtin/ls-files.c:542 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9395 | msgid "exclude patterns are read from <file>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9396 | msgstr "从 <文件> 中读取排除模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9397 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9398 | #: builtin/ls-files.c:545 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9399 | msgid "read additional per-directory exclude patterns in <file>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9400 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9401 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9402 | #: builtin/ls-files.c:547 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9403 | msgid "add the standard git exclusions" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9404 | msgstr "添加标准的 git 排除" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9405 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9406 | #: builtin/ls-files.c:550 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9407 | msgid "make the output relative to the project top directory" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9408 | msgstr "显示相对于顶级目录的文件名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9409 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9410 | #: builtin/ls-files.c:553 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9411 | msgid "recurse through submodules" |
| 9412 | msgstr "在子模组中递归" |
| 9413 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9414 | #: builtin/ls-files.c:555 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9415 | msgid "if any <file> is not in the index, treat this as an error" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9416 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9417 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9418 | #: builtin/ls-files.c:556 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9419 | msgid "tree-ish" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9420 | msgstr "树或提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9421 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9422 | #: builtin/ls-files.c:557 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9423 | msgid "pretend that paths removed since <tree-ish> are still present" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9424 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9425 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9426 | #: builtin/ls-files.c:559 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9427 | msgid "show debugging data" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9428 | msgstr "显示调试数据" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9429 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 9430 | #: builtin/ls-remote.c:7 |
| 9431 | msgid "" |
| 9432 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" |
| 9433 | " [-q | --quiet] [--exit-code] [--get-url]\n" |
| 9434 | " [--symref] [<repository> [<refs>...]]" |
| 9435 | msgstr "" |
| 9436 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" |
| 9437 | " [-q | --quiet] [--exit-code] [--get-url]\n" |
| 9438 | " [--symref] [<仓库> [<引用>...]]" |
| 9439 | |
| 9440 | #: builtin/ls-remote.c:50 |
| 9441 | msgid "do not print remote URL" |
| 9442 | msgstr "不打印远程 URL" |
| 9443 | |
| 9444 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 |
| 9445 | msgid "exec" |
| 9446 | msgstr "exec" |
| 9447 | |
| 9448 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 |
| 9449 | msgid "path of git-upload-pack on the remote host" |
| 9450 | msgstr "远程主机上的 git-upload-pack 路径" |
| 9451 | |
| 9452 | #: builtin/ls-remote.c:56 |
| 9453 | msgid "limit to tags" |
| 9454 | msgstr "仅限于标签" |
| 9455 | |
| 9456 | #: builtin/ls-remote.c:57 |
| 9457 | msgid "limit to heads" |
| 9458 | msgstr "仅限于分支" |
| 9459 | |
| 9460 | #: builtin/ls-remote.c:58 |
| 9461 | msgid "do not show peeled tags" |
| 9462 | msgstr "不显示已解析的标签" |
| 9463 | |
| 9464 | #: builtin/ls-remote.c:60 |
| 9465 | msgid "take url.<base>.insteadOf into account" |
| 9466 | msgstr "参考 url.<base>.insteadOf 设置" |
| 9467 | |
| 9468 | #: builtin/ls-remote.c:62 |
| 9469 | msgid "exit with exit code 2 if no matching refs are found" |
| 9470 | msgstr "若未找到匹配的引用则以退出码2退出" |
| 9471 | |
| 9472 | #: builtin/ls-remote.c:64 |
| 9473 | msgid "show underlying ref in addition to the object pointed by it" |
| 9474 | msgstr "除了显示指向的对象外,显示指向的引用名" |
| 9475 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 9476 | #: builtin/ls-tree.c:28 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9477 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9478 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9479 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9480 | #: builtin/ls-tree.c:126 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9481 | msgid "only show trees" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9482 | msgstr "只显示树" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9483 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9484 | #: builtin/ls-tree.c:128 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9485 | msgid "recurse into subtrees" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9486 | msgstr "递归到子树" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9487 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9488 | #: builtin/ls-tree.c:130 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9489 | msgid "show trees when recursing" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9490 | msgstr "当递归时显示树" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9491 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9492 | #: builtin/ls-tree.c:133 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9493 | msgid "terminate entries with NUL byte" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 9494 | msgstr "条目以 NUL 字符终止" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9495 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9496 | #: builtin/ls-tree.c:134 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9497 | msgid "include object size" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9498 | msgstr "包括对象大小" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9499 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9500 | #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9501 | msgid "list only filenames" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9502 | msgstr "只列出文件名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9503 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9504 | #: builtin/ls-tree.c:141 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9505 | msgid "use full path names" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9506 | msgstr "使用文件的全路径" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9507 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9508 | #: builtin/ls-tree.c:143 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9509 | msgid "list entire tree; not just current directory (implies --full-name)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9510 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9511 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9512 | #: builtin/merge.c:46 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9513 | msgid "git merge [<options>] [<commit>...]" |
| 9514 | msgstr "git merge [<选项>] [<提交>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9515 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9516 | #: builtin/merge.c:47 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9517 | msgid "git merge [<options>] <msg> HEAD <commit>" |
| 9518 | msgstr "git merge [<选项>] <说明> HEAD <提交>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9519 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9520 | #: builtin/merge.c:48 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9521 | msgid "git merge --abort" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9522 | msgstr "git merge --abort" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9523 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9524 | #: builtin/merge.c:49 |
| 9525 | msgid "git merge --continue" |
| 9526 | msgstr "git merge --continue" |
| 9527 | |
| 9528 | #: builtin/merge.c:104 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9529 | msgid "switch `m' requires a value" |
| 9530 | msgstr "开关 `m' 需要一个值" |
| 9531 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9532 | #: builtin/merge.c:141 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9533 | #, c-format |
| 9534 | msgid "Could not find merge strategy '%s'.\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9535 | msgstr "不能找到合并策略 '%s'。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9536 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9537 | #: builtin/merge.c:142 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9538 | #, c-format |
| 9539 | msgid "Available strategies are:" |
| 9540 | msgstr "可用的策略有:" |
| 9541 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9542 | #: builtin/merge.c:147 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9543 | #, c-format |
| 9544 | msgid "Available custom strategies are:" |
| 9545 | msgstr "可用的自定义策略有:" |
| 9546 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9547 | #: builtin/merge.c:197 builtin/pull.c:127 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9548 | msgid "do not show a diffstat at the end of the merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9549 | msgstr "在合并的最后不显示差异统计" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9550 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9551 | #: builtin/merge.c:200 builtin/pull.c:130 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9552 | msgid "show a diffstat at the end of the merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9553 | msgstr "在合并的最后显示差异统计" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9554 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9555 | #: builtin/merge.c:201 builtin/pull.c:133 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9556 | msgid "(synonym to --stat)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9557 | msgstr "(和 --stat 同义)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9558 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9559 | #: builtin/merge.c:203 builtin/pull.c:136 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9560 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9561 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9562 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9563 | #: builtin/merge.c:206 builtin/pull.c:139 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9564 | msgid "create a single commit instead of doing a merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9565 | msgstr "创建一个单独的提交而不是做一次合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9566 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9567 | #: builtin/merge.c:208 builtin/pull.c:142 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9568 | msgid "perform a commit if the merge succeeds (default)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9569 | msgstr "如果合并成功,执行一次提交(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9570 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9571 | #: builtin/merge.c:210 builtin/pull.c:145 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9572 | msgid "edit message before committing" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9573 | msgstr "在提交前编辑提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9574 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9575 | #: builtin/merge.c:211 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9576 | msgid "allow fast-forward (default)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9577 | msgstr "允许快进(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9578 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9579 | #: builtin/merge.c:213 builtin/pull.c:151 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9580 | msgid "abort if fast-forward is not possible" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9581 | msgstr "如果不能快进就放弃合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9582 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9583 | #: builtin/merge.c:217 builtin/pull.c:154 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9584 | msgid "verify that the named commit has a valid GPG signature" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 9585 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
| 9586 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9587 | #: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 9588 | #: builtin/revert.c:89 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9589 | msgid "strategy" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9590 | msgstr "策略" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9591 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9592 | #: builtin/merge.c:219 builtin/pull.c:159 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9593 | msgid "merge strategy to use" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9594 | msgstr "要使用的合并策略" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9595 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9596 | #: builtin/merge.c:220 builtin/pull.c:162 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9597 | msgid "option=value" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9598 | msgstr "option=value" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9599 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9600 | #: builtin/merge.c:221 builtin/pull.c:163 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9601 | msgid "option for selected merge strategy" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9602 | msgstr "所选的合并策略的选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9603 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9604 | #: builtin/merge.c:223 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9605 | msgid "merge commit message (for a non-fast-forward merge)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9606 | msgstr "合并的提交说明(针对非快进式合并)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9607 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9608 | #: builtin/merge.c:227 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9609 | msgid "abort the current in-progress merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9610 | msgstr "放弃当前正在进行的合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9611 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9612 | #: builtin/merge.c:229 |
| 9613 | msgid "continue the current in-progress merge" |
| 9614 | msgstr "继续当前正在进行的合并" |
| 9615 | |
| 9616 | #: builtin/merge.c:231 builtin/pull.c:170 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9617 | msgid "allow merging unrelated histories" |
| 9618 | msgstr "允许合并不相关的历史" |
| 9619 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9620 | #: builtin/merge.c:259 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9621 | msgid "could not run stash." |
| 9622 | msgstr "不能进行进度保存。" |
| 9623 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9624 | #: builtin/merge.c:264 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9625 | msgid "stash failed" |
| 9626 | msgstr "进度保存失败" |
| 9627 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9628 | #: builtin/merge.c:269 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9629 | #, c-format |
| 9630 | msgid "not a valid object: %s" |
| 9631 | msgstr "不是一个有效对象:%s" |
| 9632 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9633 | #: builtin/merge.c:288 builtin/merge.c:305 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9634 | msgid "read-tree failed" |
| 9635 | msgstr "读取树失败" |
| 9636 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9637 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9638 | #: builtin/merge.c:335 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9639 | msgid " (nothing to squash)" |
| 9640 | msgstr " (无可压缩)" |
| 9641 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9642 | #: builtin/merge.c:346 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9643 | #, c-format |
| 9644 | msgid "Squash commit -- not updating HEAD\n" |
| 9645 | msgstr "压缩提交 -- 未更新 HEAD\n" |
| 9646 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9647 | #: builtin/merge.c:396 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9648 | #, c-format |
| 9649 | msgid "No merge message -- not updating HEAD\n" |
| 9650 | msgstr "无合并信息 -- 未更新 HEAD\n" |
| 9651 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9652 | #: builtin/merge.c:447 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9653 | #, c-format |
| 9654 | msgid "'%s' does not point to a commit" |
| 9655 | msgstr "'%s' 没有指向一个提交" |
| 9656 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9657 | #: builtin/merge.c:537 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9658 | #, c-format |
| 9659 | msgid "Bad branch.%s.mergeoptions string: %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9660 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9661 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9662 | #: builtin/merge.c:656 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9663 | msgid "Not handling anything other than two heads merge." |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 9664 | msgstr "未处理两个头合并之外的任何操作。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9665 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9666 | #: builtin/merge.c:670 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9667 | #, c-format |
| 9668 | msgid "Unknown option for merge-recursive: -X%s" |
| 9669 | msgstr "merge-recursive 的未知选项:-X%s" |
| 9670 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9671 | #: builtin/merge.c:685 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9672 | #, c-format |
| 9673 | msgid "unable to write %s" |
| 9674 | msgstr "不能写 %s" |
| 9675 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9676 | #: builtin/merge.c:737 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9677 | #, c-format |
| 9678 | msgid "Could not read from '%s'" |
| 9679 | msgstr "不能从 '%s' 读取" |
| 9680 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9681 | #: builtin/merge.c:746 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9682 | #, c-format |
| 9683 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" |
| 9684 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" |
| 9685 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9686 | #: builtin/merge.c:752 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 9687 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9688 | msgid "" |
| 9689 | "Please enter a commit message to explain why this merge is necessary,\n" |
| 9690 | "especially if it merges an updated upstream into a topic branch.\n" |
| 9691 | "\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 9692 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9693 | "the commit.\n" |
| 9694 | msgstr "" |
| 9695 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" |
| 9696 | "合并到主题分支。\n" |
| 9697 | "\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 9698 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9699 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9700 | #: builtin/merge.c:776 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9701 | msgid "Empty commit message." |
| 9702 | msgstr "空提交信息。" |
| 9703 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9704 | #: builtin/merge.c:796 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9705 | #, c-format |
| 9706 | msgid "Wonderful.\n" |
| 9707 | msgstr "太棒了。\n" |
| 9708 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9709 | #: builtin/merge.c:851 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9710 | #, c-format |
| 9711 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" |
| 9712 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" |
| 9713 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9714 | #: builtin/merge.c:867 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9715 | #, c-format |
| 9716 | msgid "'%s' is not a commit" |
| 9717 | msgstr "'%s' 不是一个提交" |
| 9718 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9719 | #: builtin/merge.c:908 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9720 | msgid "No current branch." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9721 | msgstr "没有当前分支。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9722 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9723 | #: builtin/merge.c:910 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9724 | msgid "No remote for the current branch." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 9725 | msgstr "当前分支没有对应的远程仓库。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9726 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9727 | #: builtin/merge.c:912 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9728 | msgid "No default upstream defined for the current branch." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9729 | msgstr "当前分支没有定义默认的上游分支。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9730 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9731 | #: builtin/merge.c:917 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9732 | #, c-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9733 | msgid "No remote-tracking branch for %s from %s" |
| 9734 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9735 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9736 | #: builtin/merge.c:964 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9737 | #, c-format |
| 9738 | msgid "Bad value '%s' in environment '%s'" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 9739 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9740 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9741 | #: builtin/merge.c:1038 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 9742 | #, c-format |
| 9743 | msgid "could not close '%s'" |
| 9744 | msgstr "不能关闭 '%s'" |
| 9745 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9746 | #: builtin/merge.c:1065 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9747 | #, c-format |
| 9748 | msgid "not something we can merge in %s: %s" |
| 9749 | msgstr "不能在 %s 中合并:%s" |
| 9750 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9751 | #: builtin/merge.c:1099 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9752 | msgid "not something we can merge" |
| 9753 | msgstr "不能合并" |
| 9754 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9755 | #: builtin/merge.c:1167 |
| 9756 | msgid "--abort expects no arguments" |
| 9757 | msgstr "--abort 不带参数" |
| 9758 | |
| 9759 | #: builtin/merge.c:1171 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9760 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9761 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9762 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9763 | #: builtin/merge.c:1183 |
| 9764 | msgid "--continue expects no arguments" |
| 9765 | msgstr "--continue 不带参数" |
| 9766 | |
| 9767 | #: builtin/merge.c:1187 |
| 9768 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
| 9769 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" |
| 9770 | |
| 9771 | #: builtin/merge.c:1203 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9772 | msgid "" |
| 9773 | "You have not concluded your merge (MERGE_HEAD exists).\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9774 | "Please, commit your changes before you merge." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9775 | msgstr "" |
| 9776 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9777 | "请在合并前先提交您的修改。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9778 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9779 | #: builtin/merge.c:1210 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9780 | msgid "" |
| 9781 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 9782 | "Please, commit your changes before you merge." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9783 | msgstr "" |
| 9784 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9785 | "请在合并前先提交您的修改。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9786 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9787 | #: builtin/merge.c:1213 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9788 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
| 9789 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" |
| 9790 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9791 | #: builtin/merge.c:1222 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9792 | msgid "You cannot combine --squash with --no-ff." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 9793 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9794 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9795 | #: builtin/merge.c:1230 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9796 | msgid "No commit specified and merge.defaultToUpstream not set." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9797 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9798 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9799 | #: builtin/merge.c:1247 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9800 | msgid "Squash commit into empty head not supported yet" |
| 9801 | msgstr "尚不支持到空分支的压缩提交" |
| 9802 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9803 | #: builtin/merge.c:1249 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9804 | msgid "Non-fast-forward commit does not make sense into an empty head" |
| 9805 | msgstr "到空分支的非快进式提交没有意义" |
| 9806 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9807 | #: builtin/merge.c:1254 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 9808 | #, c-format |
| 9809 | msgid "%s - not something we can merge" |
| 9810 | msgstr "%s - 不能被合并" |
| 9811 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9812 | #: builtin/merge.c:1256 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 9813 | msgid "Can merge only exactly one commit into empty head" |
| 9814 | msgstr "只能将一个提交合并到空分支上" |
| 9815 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9816 | #: builtin/merge.c:1312 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 9817 | #, c-format |
| 9818 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." |
| 9819 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" |
| 9820 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9821 | #: builtin/merge.c:1315 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 9822 | #, c-format |
| 9823 | msgid "Commit %s has a bad GPG signature allegedly by %s." |
| 9824 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" |
| 9825 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9826 | #: builtin/merge.c:1318 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 9827 | #, c-format |
| 9828 | msgid "Commit %s does not have a GPG signature." |
| 9829 | msgstr "提交 %s 没有一个 GPG 签名。" |
| 9830 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9831 | #: builtin/merge.c:1321 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 9832 | #, c-format |
| 9833 | msgid "Commit %s has a good GPG signature by %s\n" |
| 9834 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" |
| 9835 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9836 | #: builtin/merge.c:1383 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 9837 | msgid "refusing to merge unrelated histories" |
| 9838 | msgstr "拒绝合并无关的历史" |
| 9839 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9840 | #: builtin/merge.c:1392 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9841 | msgid "Already up-to-date." |
| 9842 | msgstr "已经是最新的。" |
| 9843 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9844 | #: builtin/merge.c:1402 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9845 | #, c-format |
| 9846 | msgid "Updating %s..%s\n" |
| 9847 | msgstr "更新 %s..%s\n" |
| 9848 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9849 | #: builtin/merge.c:1443 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9850 | #, c-format |
| 9851 | msgid "Trying really trivial in-index merge...\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 9852 | msgstr "尝试非常小的索引内合并...\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9853 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9854 | #: builtin/merge.c:1450 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9855 | #, c-format |
| 9856 | msgid "Nope.\n" |
| 9857 | msgstr "无。\n" |
| 9858 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9859 | #: builtin/merge.c:1475 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 9860 | msgid "Already up-to-date. Yeeah!" |
| 9861 | msgstr "已经是最新的。耶!" |
| 9862 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9863 | #: builtin/merge.c:1481 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9864 | msgid "Not possible to fast-forward, aborting." |
Thynson | 1aabac6 | 2012-03-03 08:34:28 +0800 | [diff] [blame] | 9865 | msgstr "无法快进,终止。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9866 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9867 | #: builtin/merge.c:1504 builtin/merge.c:1583 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9868 | #, c-format |
| 9869 | msgid "Rewinding the tree to pristine...\n" |
| 9870 | msgstr "将树回滚至原始状态...\n" |
| 9871 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9872 | #: builtin/merge.c:1508 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9873 | #, c-format |
| 9874 | msgid "Trying merge strategy %s...\n" |
| 9875 | msgstr "尝试合并策略 %s...\n" |
| 9876 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9877 | #: builtin/merge.c:1574 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9878 | #, c-format |
| 9879 | msgid "No merge strategy handled the merge.\n" |
| 9880 | msgstr "没有合并策略处理此合并。\n" |
| 9881 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9882 | #: builtin/merge.c:1576 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9883 | #, c-format |
| 9884 | msgid "Merge with strategy %s failed.\n" |
| 9885 | msgstr "使用策略 %s 合并失败。\n" |
| 9886 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9887 | #: builtin/merge.c:1585 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9888 | #, c-format |
| 9889 | msgid "Using the %s to prepare resolving by hand.\n" |
| 9890 | msgstr "使用 %s 以准备手工解决。\n" |
| 9891 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 9892 | #: builtin/merge.c:1597 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 9893 | #, c-format |
| 9894 | msgid "Automatic merge went well; stopped before committing as requested\n" |
| 9895 | msgstr "自动合并进展顺利,按要求在提交前停止\n" |
| 9896 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9897 | #: builtin/merge-base.c:29 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9898 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
| 9899 | msgstr "git merge-base [-a | --all] <提交> <提交>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9900 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9901 | #: builtin/merge-base.c:30 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9902 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
| 9903 | msgstr "git merge-base [-a | --all] --octopus <提交>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9904 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9905 | #: builtin/merge-base.c:31 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9906 | msgid "git merge-base --independent <commit>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9907 | msgstr "git merge-base --independent <提交>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9908 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9909 | #: builtin/merge-base.c:32 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9910 | msgid "git merge-base --is-ancestor <commit> <commit>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9911 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9912 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9913 | #: builtin/merge-base.c:33 |
| 9914 | msgid "git merge-base --fork-point <ref> [<commit>]" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 9915 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9916 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9917 | #: builtin/merge-base.c:217 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9918 | msgid "output all common ancestors" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9919 | msgstr "输出所有共同的祖先" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9920 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9921 | #: builtin/merge-base.c:219 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9922 | msgid "find ancestors for a single n-way merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9923 | msgstr "查找一个多路合并的祖先提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9924 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9925 | #: builtin/merge-base.c:221 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9926 | msgid "list revs not reachable from others" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9927 | msgstr "显示不能被其他访问到的版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9928 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9929 | #: builtin/merge-base.c:223 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9930 | msgid "is the first one ancestor of the other?" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9931 | msgstr "第一个是其他的祖先提交么?" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9932 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9933 | #: builtin/merge-base.c:225 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9934 | msgid "find where <commit> forked from reflog of <ref>" |
Ray Chen | e397e7e | 2015-08-20 11:01:34 +0800 | [diff] [blame] | 9935 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 9936 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9937 | #: builtin/merge-file.c:8 |
| 9938 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9939 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
| 9940 | "<orig-file> <file2>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9941 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9942 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
| 9943 | "件> <文件2>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9944 | |
| 9945 | #: builtin/merge-file.c:33 |
| 9946 | msgid "send results to standard output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9947 | msgstr "将结果发送到标准输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9948 | |
| 9949 | #: builtin/merge-file.c:34 |
| 9950 | msgid "use a diff3 based merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9951 | msgstr "使用基于 diff3 的合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9952 | |
| 9953 | #: builtin/merge-file.c:35 |
| 9954 | msgid "for conflicts, use our version" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9955 | msgstr "如果冲突,使用我们的版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9956 | |
| 9957 | #: builtin/merge-file.c:37 |
| 9958 | msgid "for conflicts, use their version" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9959 | msgstr "如果冲突,使用他们的版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9960 | |
| 9961 | #: builtin/merge-file.c:39 |
| 9962 | msgid "for conflicts, use a union version" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9963 | msgstr "如果冲突,使用联合版本" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9964 | |
| 9965 | #: builtin/merge-file.c:42 |
| 9966 | msgid "for conflicts, use this marker size" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9967 | msgstr "如果冲突,使用指定长度的标记" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9968 | |
| 9969 | #: builtin/merge-file.c:43 |
| 9970 | msgid "do not warn about conflicts" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 9971 | msgstr "不要警告冲突" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9972 | |
| 9973 | #: builtin/merge-file.c:45 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 9974 | msgid "set labels for file1/orig-file/file2" |
| 9975 | msgstr "为 文件1/初始文件/文件2 设置标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 9976 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 9977 | #: builtin/merge-recursive.c:45 |
| 9978 | #, c-format |
| 9979 | msgid "unknown option %s" |
| 9980 | msgstr "未知选项 %s" |
| 9981 | |
| 9982 | #: builtin/merge-recursive.c:51 |
| 9983 | #, c-format |
| 9984 | msgid "could not parse object '%s'" |
| 9985 | msgstr "不能解析对象 '%s'" |
| 9986 | |
| 9987 | #: builtin/merge-recursive.c:55 |
| 9988 | #, c-format |
| 9989 | msgid "cannot handle more than %d base. Ignoring %s." |
| 9990 | msgid_plural "cannot handle more than %d bases. Ignoring %s." |
| 9991 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" |
| 9992 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" |
| 9993 | |
| 9994 | #: builtin/merge-recursive.c:63 |
| 9995 | msgid "not handling anything other than two heads merge." |
| 9996 | msgstr "不能处理两个头合并之外的任何操作。" |
| 9997 | |
| 9998 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 |
| 9999 | #, c-format |
| 10000 | msgid "could not resolve ref '%s'" |
| 10001 | msgstr "无法解析引用 '%s'" |
| 10002 | |
| 10003 | #: builtin/merge-recursive.c:77 |
| 10004 | #, c-format |
| 10005 | msgid "Merging %s with %s\n" |
| 10006 | msgstr "合并 %s 和 %s\n" |
| 10007 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10008 | #: builtin/mktree.c:65 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10009 | msgid "git mktree [-z] [--missing] [--batch]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10010 | msgstr "git mktree [-z] [--missing] [--batch]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10011 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10012 | #: builtin/mktree.c:152 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10013 | msgid "input is NUL terminated" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10014 | msgstr "输入以 NUL 字符终止" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10015 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10016 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10017 | msgid "allow missing objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10018 | msgstr "允许丢失的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10019 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10020 | #: builtin/mktree.c:154 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10021 | msgid "allow creation of more than one tree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10022 | msgstr "允许创建一个以上的树" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10023 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10024 | #: builtin/mv.c:16 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10025 | msgid "git mv [<options>] <source>... <destination>" |
| 10026 | msgstr "git mv [<选项>] <源>... <目标>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10027 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10028 | #: builtin/mv.c:82 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10029 | #, c-format |
| 10030 | msgid "Directory %s is in index and no submodule?" |
| 10031 | msgstr "目录 %s 在索引中并且不是子模组?" |
| 10032 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10033 | #: builtin/mv.c:84 builtin/rm.c:290 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10034 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 10035 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10036 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10037 | #: builtin/mv.c:102 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10038 | #, c-format |
| 10039 | msgid "%.*s is in index" |
| 10040 | msgstr "%.*s 在索引中" |
| 10041 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10042 | #: builtin/mv.c:124 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10043 | msgid "force move/rename even if target exists" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10044 | msgstr "强制移动/重命令,即使目标存在" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10045 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10046 | #: builtin/mv.c:125 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10047 | msgid "skip move/rename errors" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10048 | msgstr "跳过移动/重命名错误" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10049 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10050 | #: builtin/mv.c:167 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10051 | #, c-format |
| 10052 | msgid "destination '%s' is not a directory" |
| 10053 | msgstr "目标 '%s' 不是一个目录" |
| 10054 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10055 | #: builtin/mv.c:178 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10056 | #, c-format |
| 10057 | msgid "Checking rename of '%s' to '%s'\n" |
| 10058 | msgstr "检查 '%s' 到 '%s' 的重命名\n" |
| 10059 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10060 | #: builtin/mv.c:182 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10061 | msgid "bad source" |
| 10062 | msgstr "坏的源" |
| 10063 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10064 | #: builtin/mv.c:185 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10065 | msgid "can not move directory into itself" |
| 10066 | msgstr "不能将目录移动到自身" |
| 10067 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10068 | #: builtin/mv.c:188 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10069 | msgid "cannot move directory over file" |
| 10070 | msgstr "不能将目录移动到文件" |
| 10071 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10072 | #: builtin/mv.c:197 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10073 | msgid "source directory is empty" |
| 10074 | msgstr "源目录为空" |
| 10075 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10076 | #: builtin/mv.c:222 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10077 | msgid "not under version control" |
| 10078 | msgstr "不在版本控制之下" |
| 10079 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10080 | #: builtin/mv.c:225 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10081 | msgid "destination exists" |
| 10082 | msgstr "目标已存在" |
| 10083 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10084 | #: builtin/mv.c:233 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10085 | #, c-format |
| 10086 | msgid "overwriting '%s'" |
| 10087 | msgstr "覆盖 '%s'" |
| 10088 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10089 | #: builtin/mv.c:236 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10090 | msgid "Cannot overwrite" |
| 10091 | msgstr "不能覆盖" |
| 10092 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10093 | #: builtin/mv.c:239 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10094 | msgid "multiple sources for the same target" |
| 10095 | msgstr "同一目标具有多个源" |
| 10096 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10097 | #: builtin/mv.c:241 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 10098 | msgid "destination directory does not exist" |
| 10099 | msgstr "目标目录不存在" |
| 10100 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10101 | #: builtin/mv.c:248 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10102 | #, c-format |
| 10103 | msgid "%s, source=%s, destination=%s" |
| 10104 | msgstr "%s,源=%s,目标=%s" |
| 10105 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10106 | #: builtin/mv.c:269 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10107 | #, c-format |
| 10108 | msgid "Renaming %s to %s\n" |
| 10109 | msgstr "重命名 %s 至 %s\n" |
| 10110 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10111 | #: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10112 | #, c-format |
| 10113 | msgid "renaming '%s' failed" |
| 10114 | msgstr "重命名 '%s' 失败" |
| 10115 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10116 | #: builtin/name-rev.c:257 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10117 | msgid "git name-rev [<options>] <commit>..." |
| 10118 | msgstr "git name-rev [<选项>] <提交>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10119 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10120 | #: builtin/name-rev.c:258 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10121 | msgid "git name-rev [<options>] --all" |
| 10122 | msgstr "git name-rev [<选项>] --all" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10123 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10124 | #: builtin/name-rev.c:259 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10125 | msgid "git name-rev [<options>] --stdin" |
| 10126 | msgstr "git name-rev [<选项>] --stdin" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10127 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10128 | #: builtin/name-rev.c:311 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10129 | msgid "print only names (no SHA-1)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10130 | msgstr "只打印名称(无 SHA-1)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10131 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10132 | #: builtin/name-rev.c:312 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10133 | msgid "only use tags to name the commits" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 10134 | msgstr "只使用标签来命名提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10135 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10136 | #: builtin/name-rev.c:314 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10137 | msgid "only use refs matching <pattern>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10138 | msgstr "只使用和 <模式> 相匹配的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10139 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10140 | #: builtin/name-rev.c:316 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10141 | msgid "list all commits reachable from all refs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10142 | msgstr "列出可以从所有引用访问的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10143 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10144 | #: builtin/name-rev.c:317 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10145 | msgid "read from stdin" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10146 | msgstr "从标准输入读取" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10147 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10148 | #: builtin/name-rev.c:318 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 10149 | msgid "allow to print `undefined` names (default)" |
| 10150 | msgstr "允许打印 `未定义` 的名称(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10151 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10152 | #: builtin/name-rev.c:324 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 10153 | msgid "dereference tags in the input (internal use)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 10154 | msgstr "反向解析输入中的标签(内部使用)" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 10155 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10156 | #: builtin/notes.c:25 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10157 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10158 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10159 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10160 | #: builtin/notes.c:26 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10161 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10162 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10163 | "| (-c | -C) <object>] [<object>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10164 | msgstr "" |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10165 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
| 10166 | "| (-c | -C) <对象>] [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10167 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10168 | #: builtin/notes.c:27 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10169 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10170 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10171 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10172 | #: builtin/notes.c:28 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10173 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10174 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10175 | "(-c | -C) <object>] [<object>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10176 | msgstr "" |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10177 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
| 10178 | "(-c | -C) <对象>] [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10179 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10180 | #: builtin/notes.c:29 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10181 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10182 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10183 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10184 | #: builtin/notes.c:30 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10185 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10186 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10187 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10188 | #: builtin/notes.c:31 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10189 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10190 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10191 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10192 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10193 | #: builtin/notes.c:32 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10194 | msgid "git notes merge --commit [-v | -q]" |
| 10195 | msgstr "git notes merge --commit [-v | -q]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10196 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10197 | #: builtin/notes.c:33 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10198 | msgid "git notes merge --abort [-v | -q]" |
| 10199 | msgstr "git notes merge --abort [-v | -q]" |
| 10200 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10201 | #: builtin/notes.c:34 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10202 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10203 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
| 10204 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10205 | #: builtin/notes.c:35 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10206 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10207 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
| 10208 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10209 | #: builtin/notes.c:36 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10210 | msgid "git notes [--ref <notes-ref>] get-ref" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10211 | msgstr "git notes [--ref <注解引用>] get-ref" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10212 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10213 | #: builtin/notes.c:41 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10214 | msgid "git notes [list [<object>]]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10215 | msgstr "git notes [list [<对象>]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10216 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10217 | #: builtin/notes.c:46 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10218 | msgid "git notes add [<options>] [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10219 | msgstr "git notes add [<选项>] [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10220 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10221 | #: builtin/notes.c:51 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10222 | msgid "git notes copy [<options>] <from-object> <to-object>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10223 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10224 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10225 | #: builtin/notes.c:52 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10226 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10227 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10228 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10229 | #: builtin/notes.c:57 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10230 | msgid "git notes append [<options>] [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10231 | msgstr "git notes append [<选项>] [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10232 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10233 | #: builtin/notes.c:62 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10234 | msgid "git notes edit [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10235 | msgstr "git notes edit [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10236 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10237 | #: builtin/notes.c:67 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10238 | msgid "git notes show [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10239 | msgstr "git notes show [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10240 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10241 | #: builtin/notes.c:72 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10242 | msgid "git notes merge [<options>] <notes-ref>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10243 | msgstr "git notes merge [<选项>] <注解引用>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10244 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10245 | #: builtin/notes.c:73 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10246 | msgid "git notes merge --commit [<options>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10247 | msgstr "git notes merge --commit [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10248 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10249 | #: builtin/notes.c:74 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10250 | msgid "git notes merge --abort [<options>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10251 | msgstr "git notes merge --abort [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10252 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10253 | #: builtin/notes.c:79 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10254 | msgid "git notes remove [<object>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10255 | msgstr "git notes remove [<对象>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10256 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10257 | #: builtin/notes.c:84 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10258 | msgid "git notes prune [<options>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10259 | msgstr "git notes prune [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10260 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10261 | #: builtin/notes.c:89 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10262 | msgid "git notes get-ref" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10263 | msgstr "git notes get-ref" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10264 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10265 | #: builtin/notes.c:94 |
| 10266 | msgid "Write/edit the notes for the following object:" |
| 10267 | msgstr "为下面的对象写/编辑说明:" |
| 10268 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10269 | #: builtin/notes.c:147 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10270 | #, c-format |
| 10271 | msgid "unable to start 'show' for object '%s'" |
| 10272 | msgstr "不能为对象 '%s' 开始 'show'" |
| 10273 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10274 | #: builtin/notes.c:151 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 10275 | msgid "could not read 'show' output" |
| 10276 | msgstr "不能读取 'show' 的输出" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10277 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10278 | #: builtin/notes.c:159 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10279 | #, c-format |
| 10280 | msgid "failed to finish 'show' for object '%s'" |
| 10281 | msgstr "无法为对象 '%s' 完成 'show'" |
| 10282 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10283 | #: builtin/notes.c:194 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10284 | msgid "please supply the note contents using either -m or -F option" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10285 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
| 10286 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10287 | #: builtin/notes.c:203 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10288 | msgid "unable to write note object" |
| 10289 | msgstr "不能写注解对象" |
| 10290 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10291 | #: builtin/notes.c:205 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10292 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10293 | msgid "the note contents have been left in %s" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10294 | msgstr "注解内容被留在 %s 中" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10295 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10296 | #: builtin/notes.c:233 builtin/tag.c:460 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10297 | #, c-format |
| 10298 | msgid "cannot read '%s'" |
| 10299 | msgstr "不能读取 '%s'" |
| 10300 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10301 | #: builtin/notes.c:235 builtin/tag.c:463 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10302 | #, c-format |
| 10303 | msgid "could not open or read '%s'" |
| 10304 | msgstr "不能打开或读取 '%s'" |
| 10305 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10306 | #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 |
| 10307 | #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 |
| 10308 | #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 |
| 10309 | #, c-format |
| 10310 | msgid "failed to resolve '%s' as a valid ref." |
| 10311 | msgstr "无法解析 '%s' 为一个有效引用。" |
| 10312 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10313 | #: builtin/notes.c:257 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10314 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10315 | msgid "failed to read object '%s'." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10316 | msgstr "无法读取对象 '%s'。" |
| 10317 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10318 | #: builtin/notes.c:261 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10319 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10320 | msgid "cannot read note data from non-blob object '%s'." |
| 10321 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10322 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10323 | #: builtin/notes.c:301 |
| 10324 | #, c-format |
| 10325 | msgid "malformed input line: '%s'." |
| 10326 | msgstr "非法的输入行:'%s'。" |
| 10327 | |
| 10328 | #: builtin/notes.c:316 |
| 10329 | #, c-format |
| 10330 | msgid "failed to copy notes from '%s' to '%s'" |
| 10331 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" |
| 10332 | |
| 10333 | #. TRANSLATORS: the first %s will be replaced by a |
| 10334 | #. git notes command: 'add', 'merge', 'remove', etc. |
| 10335 | #: builtin/notes.c:345 |
| 10336 | #, c-format |
| 10337 | msgid "refusing to %s notes in %s (outside of refs/notes/)" |
| 10338 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" |
| 10339 | |
| 10340 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 |
| 10341 | #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 |
| 10342 | #: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10343 | msgid "too many parameters" |
| 10344 | msgstr "参数太多" |
| 10345 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10346 | #: builtin/notes.c:378 builtin/notes.c:665 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10347 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10348 | msgid "no note found for object %s." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10349 | msgstr "未发现对象 %s 的注解。" |
| 10350 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10351 | #: builtin/notes.c:399 builtin/notes.c:562 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10352 | msgid "note contents as a string" |
| 10353 | msgstr "注解内容作为一个字符串" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10354 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10355 | #: builtin/notes.c:402 builtin/notes.c:565 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10356 | msgid "note contents in a file" |
| 10357 | msgstr "注解内容到一个文件中" |
| 10358 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10359 | #: builtin/notes.c:405 builtin/notes.c:568 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10360 | msgid "reuse and edit specified note object" |
| 10361 | msgstr "重用和编辑指定的注解对象" |
| 10362 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10363 | #: builtin/notes.c:408 builtin/notes.c:571 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10364 | msgid "reuse specified note object" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10365 | msgstr "重用指定的注解对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10366 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10367 | #: builtin/notes.c:411 builtin/notes.c:574 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10368 | msgid "allow storing empty note" |
| 10369 | msgstr "允许保存空白注释" |
| 10370 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10371 | #: builtin/notes.c:412 builtin/notes.c:483 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10372 | msgid "replace existing notes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10373 | msgstr "替换已存在的注解" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10374 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10375 | #: builtin/notes.c:437 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10376 | #, c-format |
| 10377 | msgid "" |
| 10378 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 10379 | "existing notes" |
| 10380 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" |
| 10381 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10382 | #: builtin/notes.c:452 builtin/notes.c:531 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10383 | #, c-format |
| 10384 | msgid "Overwriting existing notes for object %s\n" |
| 10385 | msgstr "覆盖对象 %s 现存注解\n" |
| 10386 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10387 | #: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10388 | #, c-format |
| 10389 | msgid "Removing note for object %s\n" |
| 10390 | msgstr "删除对象 %s 的注解\n" |
| 10391 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10392 | #: builtin/notes.c:484 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10393 | msgid "read objects from stdin" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10394 | msgstr "从标准输入读取对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10395 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10396 | #: builtin/notes.c:486 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10397 | msgid "load rewriting config for <command> (implies --stdin)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10398 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10399 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10400 | #: builtin/notes.c:504 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10401 | msgid "too few parameters" |
| 10402 | msgstr "参数太少" |
| 10403 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10404 | #: builtin/notes.c:525 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10405 | #, c-format |
| 10406 | msgid "" |
| 10407 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " |
| 10408 | "existing notes" |
| 10409 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" |
| 10410 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10411 | #: builtin/notes.c:537 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10412 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10413 | msgid "missing notes on source object %s. Cannot copy." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10414 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
| 10415 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10416 | #: builtin/notes.c:589 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10417 | #, c-format |
| 10418 | msgid "" |
| 10419 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" |
| 10420 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" |
| 10421 | msgstr "" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 10422 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10423 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" |
| 10424 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10425 | #: builtin/notes.c:685 |
| 10426 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
| 10427 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" |
| 10428 | |
| 10429 | #: builtin/notes.c:687 |
| 10430 | msgid "failed to delete ref NOTES_MERGE_REF" |
| 10431 | msgstr "无法删除引用 NOTES_MERGE_REF" |
| 10432 | |
| 10433 | #: builtin/notes.c:689 |
| 10434 | msgid "failed to remove 'git notes merge' worktree" |
| 10435 | msgstr "无法删除 'git notes merge' 工作区" |
| 10436 | |
| 10437 | #: builtin/notes.c:709 |
| 10438 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
| 10439 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" |
| 10440 | |
| 10441 | #: builtin/notes.c:711 |
| 10442 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
| 10443 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" |
| 10444 | |
| 10445 | #: builtin/notes.c:713 |
| 10446 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
| 10447 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" |
| 10448 | |
| 10449 | #: builtin/notes.c:726 |
| 10450 | msgid "failed to resolve NOTES_MERGE_REF" |
| 10451 | msgstr "无法解析 NOTES_MERGE_REF" |
| 10452 | |
| 10453 | #: builtin/notes.c:729 |
| 10454 | msgid "failed to finalize notes merge" |
| 10455 | msgstr "无法完成注解合并" |
| 10456 | |
| 10457 | #: builtin/notes.c:755 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10458 | #, c-format |
| 10459 | msgid "unknown notes merge strategy %s" |
| 10460 | msgstr "未知的注解合并策略 %s" |
| 10461 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10462 | #: builtin/notes.c:771 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10463 | msgid "General options" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10464 | msgstr "通用选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10465 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10466 | #: builtin/notes.c:773 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10467 | msgid "Merge options" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10468 | msgstr "合并选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10469 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10470 | #: builtin/notes.c:775 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10471 | msgid "" |
| 10472 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" |
| 10473 | "cat_sort_uniq)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10474 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10475 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10476 | #: builtin/notes.c:777 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10477 | msgid "Committing unmerged notes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10478 | msgstr "提交未合并的注解" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10479 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10480 | #: builtin/notes.c:779 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10481 | msgid "finalize notes merge by committing unmerged notes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10482 | msgstr "通过提交未合并的注解来完成注解合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10483 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10484 | #: builtin/notes.c:781 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10485 | msgid "Aborting notes merge resolution" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10486 | msgstr "中止注解合并的方案" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10487 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10488 | #: builtin/notes.c:783 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10489 | msgid "abort notes merge" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10490 | msgstr "中止注解合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10491 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10492 | #: builtin/notes.c:794 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10493 | msgid "cannot mix --commit, --abort or -s/--strategy" |
| 10494 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" |
| 10495 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10496 | #: builtin/notes.c:799 |
| 10497 | msgid "must specify a notes ref to merge" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 10498 | msgstr "必须指定一个注解引用来合并" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10499 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10500 | #: builtin/notes.c:823 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10501 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10502 | msgid "unknown -s/--strategy: %s" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10503 | msgstr "未知的 -s/--strategy:%s" |
| 10504 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10505 | #: builtin/notes.c:860 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10506 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10507 | msgid "a notes merge into %s is already in-progress at %s" |
| 10508 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10509 | |
| 10510 | #: builtin/notes.c:863 |
| 10511 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10512 | msgid "failed to store link to current notes ref (%s)" |
| 10513 | msgstr "无法存储链接到当前的注解引用(%s)" |
| 10514 | |
| 10515 | #: builtin/notes.c:865 |
| 10516 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10517 | msgid "" |
| 10518 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " |
| 10519 | "'git notes merge --commit', or abort the merge with 'git notes merge --" |
| 10520 | "abort'.\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10521 | msgstr "" |
| 10522 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" |
| 10523 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10524 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10525 | #: builtin/notes.c:887 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10526 | #, c-format |
| 10527 | msgid "Object %s has no note\n" |
| 10528 | msgstr "对象 %s 没有注解\n" |
| 10529 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10530 | #: builtin/notes.c:899 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10531 | msgid "attempt to remove non-existent note is not an error" |
| 10532 | msgstr "尝试删除不存在的注解不是一个错误" |
| 10533 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10534 | #: builtin/notes.c:902 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10535 | msgid "read object names from the standard input" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10536 | msgstr "从标准输入读取对象名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10537 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10538 | #: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10539 | msgid "do not remove, show only" |
| 10540 | msgstr "不删除,只显示" |
| 10541 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10542 | #: builtin/notes.c:941 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10543 | msgid "report pruned notes" |
| 10544 | msgstr "报告清除的注解" |
| 10545 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10546 | #: builtin/notes.c:983 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10547 | msgid "notes-ref" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10548 | msgstr "注解引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10549 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10550 | #: builtin/notes.c:984 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10551 | msgid "use notes from <notes-ref>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10552 | msgstr "从 <注解引用> 使用注解" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10553 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10554 | #: builtin/notes.c:1019 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10555 | #, c-format |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10556 | msgid "unknown subcommand: %s" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10557 | msgstr "未知子命令:%s" |
| 10558 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10559 | #: builtin/pack-objects.c:29 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10560 | msgid "" |
| 10561 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" |
| 10562 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10563 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10564 | #: builtin/pack-objects.c:30 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10565 | msgid "" |
| 10566 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" |
| 10567 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10568 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10569 | #: builtin/pack-objects.c:177 builtin/pack-objects.c:180 |
Jiang Xin | 6792b93 | 2012-07-04 17:20:34 +0800 | [diff] [blame] | 10570 | #, c-format |
| 10571 | msgid "deflate error (%d)" |
| 10572 | msgstr "压缩错误 (%d)" |
| 10573 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10574 | #: builtin/pack-objects.c:766 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10575 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
| 10576 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" |
| 10577 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10578 | #: builtin/pack-objects.c:779 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10579 | msgid "Writing objects" |
| 10580 | msgstr "写入对象中" |
| 10581 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10582 | #: builtin/pack-objects.c:1068 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10583 | msgid "disabling bitmap writing, as some objects are not being packed" |
| 10584 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" |
| 10585 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10586 | #: builtin/pack-objects.c:2344 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10587 | msgid "Compressing objects" |
| 10588 | msgstr "压缩对象中" |
| 10589 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10590 | #: builtin/pack-objects.c:2747 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 10591 | #, c-format |
| 10592 | msgid "unsupported index version %s" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 10593 | msgstr "不支持的索引版本 %s" |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 10594 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10595 | #: builtin/pack-objects.c:2751 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 10596 | #, c-format |
| 10597 | msgid "bad index version '%s'" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 10598 | msgstr "坏的索引版本 '%s'" |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 10599 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10600 | #: builtin/pack-objects.c:2781 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10601 | msgid "do not show progress meter" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10602 | msgstr "不显示进度表" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10603 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10604 | #: builtin/pack-objects.c:2783 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10605 | msgid "show progress meter" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10606 | msgstr "显示进度表" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10607 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10608 | #: builtin/pack-objects.c:2785 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10609 | msgid "show progress meter during object writing phase" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10610 | msgstr "在对象写入阶段显示进度表" |
| 10611 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10612 | #: builtin/pack-objects.c:2788 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10613 | msgid "similar to --all-progress when progress meter is shown" |
| 10614 | msgstr "当进度表显示时类似于 --all-progress" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10615 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10616 | #: builtin/pack-objects.c:2789 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10617 | msgid "version[,offset]" |
| 10618 | msgstr "版本[,偏移]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10619 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10620 | #: builtin/pack-objects.c:2790 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10621 | msgid "write the pack index file in the specified idx format version" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10622 | msgstr "用指定的 idx 格式版本来写包索引文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10623 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10624 | #: builtin/pack-objects.c:2793 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10625 | msgid "maximum size of each output pack file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10626 | msgstr "每个输出包的最大尺寸" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10627 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10628 | #: builtin/pack-objects.c:2795 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10629 | msgid "ignore borrowed objects from alternate object store" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 10630 | msgstr "忽略从备用对象存储里借用对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10631 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10632 | #: builtin/pack-objects.c:2797 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10633 | msgid "ignore packed objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10634 | msgstr "忽略包对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10635 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10636 | #: builtin/pack-objects.c:2799 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10637 | msgid "limit pack window by objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10638 | msgstr "限制打包窗口的对象数" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10639 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10640 | #: builtin/pack-objects.c:2801 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10641 | msgid "limit pack window by memory in addition to object limit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10642 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10643 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10644 | #: builtin/pack-objects.c:2803 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10645 | msgid "maximum length of delta chain allowed in the resulting pack" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10646 | msgstr "打包允许的 delta 链的最大长度" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10647 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10648 | #: builtin/pack-objects.c:2805 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10649 | msgid "reuse existing deltas" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10650 | msgstr "重用已存在的 deltas" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10651 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10652 | #: builtin/pack-objects.c:2807 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10653 | msgid "reuse existing objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10654 | msgstr "重用已存在的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10655 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10656 | #: builtin/pack-objects.c:2809 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10657 | msgid "use OFS_DELTA objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10658 | msgstr "使用 OFS_DELTA 对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10659 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10660 | #: builtin/pack-objects.c:2811 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10661 | msgid "use threads when searching for best delta matches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10662 | msgstr "使用线程查询最佳 delta 匹配" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10663 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10664 | #: builtin/pack-objects.c:2813 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10665 | msgid "do not create an empty pack output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10666 | msgstr "不创建空的包输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10667 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10668 | #: builtin/pack-objects.c:2815 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10669 | msgid "read revision arguments from standard input" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 10670 | msgstr "从标准输入读取版本号参数" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10671 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10672 | #: builtin/pack-objects.c:2817 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10673 | msgid "limit the objects to those that are not yet packed" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10674 | msgstr "限制那些尚未打包的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10675 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10676 | #: builtin/pack-objects.c:2820 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10677 | msgid "include objects reachable from any reference" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10678 | msgstr "包括可以从任何引用访问到的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10679 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10680 | #: builtin/pack-objects.c:2823 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10681 | msgid "include objects referred by reflog entries" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10682 | msgstr "包括被引用日志引用到的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10683 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10684 | #: builtin/pack-objects.c:2826 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10685 | msgid "include objects referred to by the index" |
| 10686 | msgstr "包括被索引引用到的对象" |
| 10687 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10688 | #: builtin/pack-objects.c:2829 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10689 | msgid "output pack to stdout" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10690 | msgstr "输出包到标准输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10691 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10692 | #: builtin/pack-objects.c:2831 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10693 | msgid "include tag objects that refer to objects to be packed" |
Ray Chen | 53438e8 | 2015-07-27 14:55:00 +0800 | [diff] [blame] | 10694 | msgstr "包括那些引用了待打包对象的标签对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10695 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10696 | #: builtin/pack-objects.c:2833 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10697 | msgid "keep unreachable objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10698 | msgstr "维持不可达的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10699 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10700 | #: builtin/pack-objects.c:2835 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10701 | msgid "pack loose unreachable objects" |
| 10702 | msgstr "打包松散的不可达对象" |
| 10703 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10704 | #: builtin/pack-objects.c:2837 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10705 | msgid "unpack unreachable objects newer than <time>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10706 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10707 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10708 | #: builtin/pack-objects.c:2840 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10709 | msgid "create thin packs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10710 | msgstr "创建精简包" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10711 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10712 | #: builtin/pack-objects.c:2842 |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10713 | msgid "create packs suitable for shallow fetches" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 10714 | msgstr "创建适合浅克隆仓库获取的包" |
Jiang Xin | 04cb2f2 | 2015-01-04 12:27:38 +0800 | [diff] [blame] | 10715 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10716 | #: builtin/pack-objects.c:2844 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10717 | msgid "ignore packs that have companion .keep file" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10718 | msgstr "忽略配有 .keep 文件的包" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10719 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10720 | #: builtin/pack-objects.c:2846 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10721 | msgid "pack compression level" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10722 | msgstr "打包压缩级别" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10723 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10724 | #: builtin/pack-objects.c:2848 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10725 | msgid "do not hide commits by grafts" |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 10726 | msgstr "显示被嫁接隐藏的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10727 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10728 | #: builtin/pack-objects.c:2850 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10729 | msgid "use a bitmap index if available to speed up counting objects" |
| 10730 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" |
| 10731 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10732 | #: builtin/pack-objects.c:2852 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10733 | msgid "write a bitmap index together with the pack index" |
| 10734 | msgstr "在建立包索引的同时创建 bitmap 索引" |
| 10735 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10736 | #: builtin/pack-objects.c:2979 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10737 | msgid "Counting objects" |
| 10738 | msgstr "对象计数中" |
| 10739 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10740 | #: builtin/pack-refs.c:6 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10741 | msgid "git pack-refs [<options>]" |
| 10742 | msgstr "git pack-refs [<选项>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10743 | |
| 10744 | #: builtin/pack-refs.c:14 |
| 10745 | msgid "pack everything" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10746 | msgstr "打包一切" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10747 | |
| 10748 | #: builtin/pack-refs.c:15 |
| 10749 | msgid "prune loose refs (default)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10750 | msgstr "清除松散的引用(默认)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10751 | |
| 10752 | #: builtin/prune-packed.c:7 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 10753 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
| 10754 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10755 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 10756 | #: builtin/prune-packed.c:40 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 10757 | msgid "Removing duplicate objects" |
| 10758 | msgstr "正在删除重复对象" |
| 10759 | |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 10760 | #: builtin/prune.c:11 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10761 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10762 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10763 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10764 | #: builtin/prune.c:106 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10765 | msgid "report pruned objects" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10766 | msgstr "报告清除的对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10767 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10768 | #: builtin/prune.c:109 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10769 | msgid "expire objects older than <time>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 10770 | msgstr "使早于给定时间的对象过期" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10771 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 10772 | #: builtin/prune.c:123 |
| 10773 | msgid "cannot prune in a precious-objects repo" |
| 10774 | msgstr "不能在珍品仓库中执行清理操作" |
| 10775 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10776 | #: builtin/pull.c:51 builtin/pull.c:53 |
| 10777 | #, c-format |
| 10778 | msgid "Invalid value for %s: %s" |
| 10779 | msgstr "%s 的值无效:%s" |
| 10780 | |
| 10781 | #: builtin/pull.c:73 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 10782 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10783 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
| 10784 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10785 | #: builtin/pull.c:121 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10786 | msgid "Options related to merging" |
| 10787 | msgstr "和合并相关的选项" |
| 10788 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10789 | #: builtin/pull.c:124 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10790 | msgid "incorporate changes by rebasing rather than merging" |
| 10791 | msgstr "使用变基操作取代合并操作以合入修改" |
| 10792 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10793 | #: builtin/pull.c:148 builtin/revert.c:101 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10794 | msgid "allow fast-forward" |
| 10795 | msgstr "允许快进式" |
| 10796 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10797 | #: builtin/pull.c:157 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10798 | msgid "automatically stash/stash pop before and after rebase" |
| 10799 | msgstr "自动在变基操作前后执行 stash/stash pop" |
| 10800 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10801 | #: builtin/pull.c:173 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10802 | msgid "Options related to fetching" |
| 10803 | msgstr "和获取相关的参数" |
| 10804 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10805 | #: builtin/pull.c:195 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10806 | msgid "number of submodules pulled in parallel" |
| 10807 | msgstr "并发拉取的子模组的数量" |
| 10808 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10809 | #: builtin/pull.c:284 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10810 | #, c-format |
| 10811 | msgid "Invalid value for pull.ff: %s" |
| 10812 | msgstr "pull.ff 的取值无效:%s" |
| 10813 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10814 | #: builtin/pull.c:397 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10815 | msgid "" |
| 10816 | "There is no candidate for rebasing against among the refs that you just " |
| 10817 | "fetched." |
| 10818 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" |
| 10819 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10820 | #: builtin/pull.c:399 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10821 | msgid "" |
| 10822 | "There are no candidates for merging among the refs that you just fetched." |
| 10823 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" |
| 10824 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10825 | #: builtin/pull.c:400 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10826 | msgid "" |
| 10827 | "Generally this means that you provided a wildcard refspec which had no\n" |
| 10828 | "matches on the remote end." |
| 10829 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" |
| 10830 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10831 | #: builtin/pull.c:403 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10832 | #, c-format |
| 10833 | msgid "" |
| 10834 | "You asked to pull from the remote '%s', but did not specify\n" |
| 10835 | "a branch. Because this is not the default configured remote\n" |
| 10836 | "for your current branch, you must specify a branch on the command line." |
| 10837 | msgstr "" |
| 10838 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" |
| 10839 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" |
| 10840 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10841 | #: builtin/pull.c:408 git-parse-remote.sh:73 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10842 | msgid "You are not currently on a branch." |
| 10843 | msgstr "您当前不在一个分支上。" |
| 10844 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10845 | #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10846 | msgid "Please specify which branch you want to rebase against." |
| 10847 | msgstr "请指定您要变基到哪一个分支。" |
| 10848 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10849 | #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10850 | msgid "Please specify which branch you want to merge with." |
| 10851 | msgstr "请指定您要合并哪一个分支。" |
| 10852 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10853 | #: builtin/pull.c:413 builtin/pull.c:428 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10854 | msgid "See git-pull(1) for details." |
| 10855 | msgstr "详见 git-pull(1)。" |
| 10856 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10857 | #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10858 | #: git-parse-remote.sh:64 |
| 10859 | msgid "<remote>" |
| 10860 | msgstr "<远程>" |
| 10861 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 10862 | #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10863 | #: git-parse-remote.sh:65 |
| 10864 | msgid "<branch>" |
| 10865 | msgstr "<分支>" |
| 10866 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10867 | #: builtin/pull.c:423 git-parse-remote.sh:75 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10868 | msgid "There is no tracking information for the current branch." |
| 10869 | msgstr "当前分支没有跟踪信息。" |
| 10870 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10871 | #: builtin/pull.c:432 git-parse-remote.sh:95 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10872 | msgid "" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10873 | "If you wish to set tracking information for this branch you can do so with:" |
| 10874 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10875 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10876 | #: builtin/pull.c:437 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10877 | #, c-format |
| 10878 | msgid "" |
| 10879 | "Your configuration specifies to merge with the ref '%s'\n" |
| 10880 | "from the remote, but no such ref was fetched." |
| 10881 | msgstr "" |
| 10882 | "您的配置中指定要合并远程的引用 '%s',\n" |
| 10883 | "但是没有获取到这个引用。" |
| 10884 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10885 | #: builtin/pull.c:754 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 10886 | msgid "ignoring --verify-signatures for rebase" |
| 10887 | msgstr "为变基操作忽略 --verify-signatures" |
| 10888 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10889 | #: builtin/pull.c:801 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 10890 | msgid "--[no-]autostash option is only valid with --rebase." |
| 10891 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" |
| 10892 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10893 | #: builtin/pull.c:809 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10894 | msgid "Updating an unborn branch with changes added to the index." |
| 10895 | msgstr "更新尚未诞生的分支,变更添加至索引。" |
| 10896 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10897 | #: builtin/pull.c:812 |
| 10898 | msgid "pull with rebase" |
| 10899 | msgstr "变基式拉取" |
| 10900 | |
| 10901 | #: builtin/pull.c:813 |
| 10902 | msgid "please commit or stash them." |
| 10903 | msgstr "请提交或为它们保存进度。" |
| 10904 | |
| 10905 | #: builtin/pull.c:838 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10906 | #, c-format |
| 10907 | msgid "" |
| 10908 | "fetch updated the current branch head.\n" |
| 10909 | "fast-forwarding your working tree from\n" |
| 10910 | "commit %s." |
| 10911 | msgstr "" |
| 10912 | "fetch 更新了当前的分支。快进您的工作区\n" |
| 10913 | "至提交 %s。" |
| 10914 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10915 | #: builtin/pull.c:843 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10916 | #, c-format |
| 10917 | msgid "" |
| 10918 | "Cannot fast-forward your working tree.\n" |
| 10919 | "After making sure that you saved anything precious from\n" |
| 10920 | "$ git diff %s\n" |
| 10921 | "output, run\n" |
| 10922 | "$ git reset --hard\n" |
| 10923 | "to recover." |
| 10924 | msgstr "" |
| 10925 | "您当前的工作区无法执行快进操作。\n" |
| 10926 | "首先执行如下命令:\n" |
| 10927 | "$ git diff %s\n" |
| 10928 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" |
| 10929 | "$ git reset --hard\n" |
| 10930 | "恢复之前的状态。" |
| 10931 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10932 | #: builtin/pull.c:858 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10933 | msgid "Cannot merge multiple branches into empty head." |
| 10934 | msgstr "无法将多个分支合并到空分支。" |
| 10935 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 10936 | #: builtin/pull.c:862 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 10937 | msgid "Cannot rebase onto multiple branches." |
| 10938 | msgstr "无法变基到多个分支。" |
| 10939 | |
Jiang Xin | 89f80d7 | 2015-12-22 23:06:59 +0800 | [diff] [blame] | 10940 | #: builtin/push.c:16 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10941 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 10942 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 10943 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10944 | #: builtin/push.c:89 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10945 | msgid "tag shorthand without <tag>" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 10946 | msgstr "标签后面未提供 <标签> 参数" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10947 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10948 | #: builtin/push.c:99 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10949 | msgid "--delete only accepts plain target ref names" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 10950 | msgstr "--delete 只接受简单的目标引用名" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10951 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10952 | #: builtin/push.c:143 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 10953 | msgid "" |
| 10954 | "\n" |
| 10955 | "To choose either option permanently, see push.default in 'git help config'." |
| 10956 | msgstr "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 10957 | "\n" |
| 10958 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 10959 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10960 | #: builtin/push.c:146 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 10961 | #, c-format |
| 10962 | msgid "" |
| 10963 | "The upstream branch of your current branch does not match\n" |
| 10964 | "the name of your current branch. To push to the upstream branch\n" |
| 10965 | "on the remote, use\n" |
| 10966 | "\n" |
| 10967 | " git push %s HEAD:%s\n" |
| 10968 | "\n" |
| 10969 | "To push to the branch of the same name on the remote, use\n" |
| 10970 | "\n" |
| 10971 | " git push %s %s\n" |
| 10972 | "%s" |
| 10973 | msgstr "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 10974 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
| 10975 | "上游分支,使用\n" |
| 10976 | "\n" |
| 10977 | " git push %s HEAD:%s\n" |
| 10978 | "\n" |
| 10979 | "为推送至远程同名分支,使用\n" |
| 10980 | "\n" |
| 10981 | " git push %s %s\n" |
| 10982 | "%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 10983 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10984 | #: builtin/push.c:161 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10985 | #, c-format |
| 10986 | msgid "" |
| 10987 | "You are not currently on a branch.\n" |
| 10988 | "To push the history leading to the current (detached HEAD)\n" |
| 10989 | "state now, use\n" |
| 10990 | "\n" |
| 10991 | " git push %s HEAD:<name-of-remote-branch>\n" |
| 10992 | msgstr "" |
| 10993 | "您当前不在一个分支上。\n" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 10994 | "现在为推送当前(分离头指针)的历史,使用\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10995 | "\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 10996 | " git push %s HEAD:<远程分支名字>\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10997 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 10998 | #: builtin/push.c:175 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 10999 | #, c-format |
| 11000 | msgid "" |
| 11001 | "The current branch %s has no upstream branch.\n" |
| 11002 | "To push the current branch and set the remote as upstream, use\n" |
| 11003 | "\n" |
| 11004 | " git push --set-upstream %s %s\n" |
| 11005 | msgstr "" |
| 11006 | "当前分支 %s 没有对应的上游分支。\n" |
| 11007 | "为推送当前分支并建立与远程上游的跟踪,使用\n" |
| 11008 | "\n" |
| 11009 | " git push --set-upstream %s %s\n" |
| 11010 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11011 | #: builtin/push.c:183 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11012 | #, c-format |
| 11013 | msgid "The current branch %s has multiple upstream branches, refusing to push." |
| 11014 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" |
| 11015 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11016 | #: builtin/push.c:186 |
Jiang Xin | 73a60cd | 2012-04-28 22:42:41 +0800 | [diff] [blame] | 11017 | #, c-format |
| 11018 | msgid "" |
| 11019 | "You are pushing to remote '%s', which is not the upstream of\n" |
| 11020 | "your current branch '%s', without telling me what to push\n" |
| 11021 | "to update which remote branch." |
| 11022 | msgstr "" |
| 11023 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" |
| 11024 | "而没有告诉我要推送什么、更新哪个远程分支。" |
| 11025 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11026 | #: builtin/push.c:245 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11027 | msgid "" |
| 11028 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11029 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11030 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11031 | #: builtin/push.c:252 |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11032 | msgid "" |
| 11033 | "Updates were rejected because the tip of your current branch is behind\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11034 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
| 11035 | "'git pull ...') before pushing again.\n" |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11036 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 11037 | msgstr "" |
Jiang Xin | eff6d3a | 2012-05-15 11:53:26 +0800 | [diff] [blame] | 11038 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11039 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
Jiang Xin | eff6d3a | 2012-05-15 11:53:26 +0800 | [diff] [blame] | 11040 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11041 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11042 | #: builtin/push.c:258 |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11043 | msgid "" |
| 11044 | "Updates were rejected because a pushed branch tip is behind its remote\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11045 | "counterpart. Check out this branch and integrate the remote changes\n" |
| 11046 | "(e.g. 'git pull ...') before pushing again.\n" |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11047 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 11048 | msgstr "" |
Jiang Xin | eff6d3a | 2012-05-15 11:53:26 +0800 | [diff] [blame] | 11049 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11050 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
Jiang Xin | eff6d3a | 2012-05-15 11:53:26 +0800 | [diff] [blame] | 11051 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 11052 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11053 | #: builtin/push.c:264 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11054 | msgid "" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11055 | "Updates were rejected because the remote contains work that you do\n" |
| 11056 | "not have locally. This is usually caused by another repository pushing\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11057 | "to the same ref. You may want to first integrate the remote changes\n" |
| 11058 | "(e.g., 'git pull ...') before pushing again.\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11059 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
| 11060 | msgstr "" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11061 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
| 11062 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11063 | "(如 'git pull ...')。\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11064 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11065 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11066 | #: builtin/push.c:271 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11067 | msgid "Updates were rejected because the tag already exists in the remote." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11068 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11069 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11070 | #: builtin/push.c:274 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11071 | msgid "" |
| 11072 | "You cannot update a remote ref that points at a non-commit object,\n" |
| 11073 | "or update a remote ref to make it point at a non-commit object,\n" |
| 11074 | "without using the '--force' option.\n" |
| 11075 | msgstr "" |
| 11076 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" |
| 11077 | "也不能更新远程引用让其指向一个非提交对象。\n" |
| 11078 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11079 | #: builtin/push.c:334 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11080 | #, c-format |
| 11081 | msgid "Pushing to %s\n" |
| 11082 | msgstr "推送到 %s\n" |
| 11083 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11084 | #: builtin/push.c:338 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11085 | #, c-format |
| 11086 | msgid "failed to push some refs to '%s'" |
| 11087 | msgstr "无法推送一些引用到 '%s'" |
| 11088 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11089 | #: builtin/push.c:369 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11090 | #, c-format |
| 11091 | msgid "bad repository '%s'" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11092 | msgstr "坏的仓库 '%s'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11093 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11094 | #: builtin/push.c:370 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11095 | msgid "" |
| 11096 | "No configured push destination.\n" |
| 11097 | "Either specify the URL from the command-line or configure a remote " |
| 11098 | "repository using\n" |
| 11099 | "\n" |
| 11100 | " git remote add <name> <url>\n" |
| 11101 | "\n" |
| 11102 | "and then push using the remote name\n" |
| 11103 | "\n" |
| 11104 | " git push <name>\n" |
| 11105 | msgstr "" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 11106 | "没有配置推送目标。\n" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 11107 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11108 | "\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 11109 | " git remote add <名称> <地址>\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11110 | "\n" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11111 | "然后使用该远程仓库名执行推送\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11112 | "\n" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 11113 | " git push <名称>\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11114 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11115 | #: builtin/push.c:388 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11116 | msgid "--all and --tags are incompatible" |
| 11117 | msgstr "--all 和 --tags 不兼容" |
| 11118 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11119 | #: builtin/push.c:389 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11120 | msgid "--all can't be combined with refspecs" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11121 | msgstr "--all 不能和引用规格同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11122 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11123 | #: builtin/push.c:394 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11124 | msgid "--mirror and --tags are incompatible" |
| 11125 | msgstr "--mirror 和 --tags 不兼容" |
| 11126 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11127 | #: builtin/push.c:395 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11128 | msgid "--mirror can't be combined with refspecs" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11129 | msgstr "--mirror 不能和引用规格同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11130 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11131 | #: builtin/push.c:400 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11132 | msgid "--all and --mirror are incompatible" |
| 11133 | msgstr "--all 和 --mirror 不兼容" |
| 11134 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11135 | #: builtin/push.c:518 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11136 | msgid "repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11137 | msgstr "仓库" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11138 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11139 | #: builtin/push.c:519 builtin/send-pack.c:161 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11140 | msgid "push all refs" |
| 11141 | msgstr "推送所有引用" |
| 11142 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11143 | #: builtin/push.c:520 builtin/send-pack.c:163 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11144 | msgid "mirror all refs" |
| 11145 | msgstr "镜像所有引用" |
| 11146 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11147 | #: builtin/push.c:522 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11148 | msgid "delete refs" |
| 11149 | msgstr "删除引用" |
| 11150 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11151 | #: builtin/push.c:523 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11152 | msgid "push tags (can't be used with --all or --mirror)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11153 | msgstr "推送标签(不能使用 --all or --mirror)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11154 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11155 | #: builtin/push.c:526 builtin/send-pack.c:164 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11156 | msgid "force updates" |
| 11157 | msgstr "强制更新" |
| 11158 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11159 | #: builtin/push.c:528 builtin/send-pack.c:175 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11160 | msgid "refname>:<expect" |
| 11161 | msgstr "引用名>:<期望值" |
| 11162 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11163 | #: builtin/push.c:529 builtin/send-pack.c:176 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11164 | msgid "require old value of ref to be at this value" |
| 11165 | msgstr "要求引用旧的取值为设定值" |
| 11166 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11167 | #: builtin/push.c:532 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11168 | msgid "control recursive pushing of submodules" |
| 11169 | msgstr "控制子模组的递归推送" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11170 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11171 | #: builtin/push.c:534 builtin/send-pack.c:169 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11172 | msgid "use thin pack" |
| 11173 | msgstr "使用精简打包" |
| 11174 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11175 | #: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 11176 | #: builtin/send-pack.c:159 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11177 | msgid "receive pack program" |
| 11178 | msgstr "接收包程序" |
| 11179 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11180 | #: builtin/push.c:537 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11181 | msgid "set upstream for git pull/status" |
| 11182 | msgstr "设置 git pull/status 的上游" |
| 11183 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11184 | #: builtin/push.c:540 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11185 | msgid "prune locally removed refs" |
| 11186 | msgstr "清除本地删除的引用" |
| 11187 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11188 | #: builtin/push.c:542 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 11189 | msgid "bypass pre-push hook" |
| 11190 | msgstr "绕过 pre-push 钩子" |
| 11191 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11192 | #: builtin/push.c:543 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 11193 | msgid "push missing but relevant tags" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11194 | msgstr "推送缺失但有关的标签" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 11195 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11196 | #: builtin/push.c:546 builtin/send-pack.c:166 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11197 | msgid "GPG sign the push" |
| 11198 | msgstr "用 GPG 为推送签名" |
| 11199 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11200 | #: builtin/push.c:548 builtin/send-pack.c:170 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 11201 | msgid "request atomic transaction on remote side" |
| 11202 | msgstr "需要远端支持原子事务" |
| 11203 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11204 | #: builtin/push.c:549 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11205 | msgid "server-specific" |
| 11206 | msgstr "server-specific" |
| 11207 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11208 | #: builtin/push.c:549 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11209 | msgid "option to transmit" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 11210 | msgstr "传输选项" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11211 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11212 | #: builtin/push.c:563 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11213 | msgid "--delete is incompatible with --all, --mirror and --tags" |
| 11214 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" |
| 11215 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11216 | #: builtin/push.c:565 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 11217 | msgid "--delete doesn't make sense without any refs" |
| 11218 | msgstr "--delete 未接任何引用没有意义" |
| 11219 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11220 | #: builtin/push.c:584 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11221 | msgid "push options must not have new line characters" |
| 11222 | msgstr "推送选项不能有换行符" |
| 11223 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11224 | #: builtin/read-tree.c:37 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11225 | msgid "" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 11226 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11227 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
| 11228 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" |
| 11229 | msgstr "" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 11230 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11231 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 11232 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11233 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11234 | #: builtin/read-tree.c:110 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11235 | msgid "write resulting index to <file>" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 11236 | msgstr "将索引结果写入 <文件>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11237 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11238 | #: builtin/read-tree.c:113 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11239 | msgid "only empty the index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11240 | msgstr "只是清空索引" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11241 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11242 | #: builtin/read-tree.c:115 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11243 | msgid "Merging" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11244 | msgstr "合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11245 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11246 | #: builtin/read-tree.c:117 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11247 | msgid "perform a merge in addition to a read" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11248 | msgstr "读取之余再执行一个合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11249 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11250 | #: builtin/read-tree.c:119 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11251 | msgid "3-way merge if no file level merging required" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11252 | msgstr "如果没有文件级合并需要,执行三方合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11253 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11254 | #: builtin/read-tree.c:121 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11255 | msgid "3-way merge in presence of adds and removes" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11256 | msgstr "存在添加和删除时,也执行三方合并" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11257 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11258 | #: builtin/read-tree.c:123 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11259 | msgid "same as -m, but discard unmerged entries" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11260 | msgstr "类似于 -m,但丢弃未合并的条目" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11261 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11262 | #: builtin/read-tree.c:124 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11263 | msgid "<subdirectory>/" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11264 | msgstr "<子目录>/" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11265 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11266 | #: builtin/read-tree.c:125 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11267 | msgid "read the tree into the index under <subdirectory>/" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11268 | msgstr "读取树对象到索引的 <子目录>/ 下" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11269 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11270 | #: builtin/read-tree.c:128 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11271 | msgid "update working tree with merge result" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11272 | msgstr "用合并的结果更新工作区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11273 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11274 | #: builtin/read-tree.c:130 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11275 | msgid "gitignore" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11276 | msgstr "gitignore" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11277 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11278 | #: builtin/read-tree.c:131 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11279 | msgid "allow explicitly ignored files to be overwritten" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11280 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11281 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11282 | #: builtin/read-tree.c:134 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11283 | msgid "don't check the working tree after merging" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11284 | msgstr "合并后不检查工作区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11285 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11286 | #: builtin/read-tree.c:135 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11287 | msgid "don't update the index or the work tree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11288 | msgstr "不更新索引区和工作区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11289 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11290 | #: builtin/read-tree.c:137 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11291 | msgid "skip applying sparse checkout filter" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11292 | msgstr "跳过应用稀疏检出过滤器" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11293 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11294 | #: builtin/read-tree.c:139 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11295 | msgid "debug unpack-trees" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11296 | msgstr "调试 unpack-trees" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11297 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11298 | #: builtin/receive-pack.c:26 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 11299 | msgid "git receive-pack <git-dir>" |
| 11300 | msgstr "git receive-pack <git-dir>" |
| 11301 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11302 | #: builtin/receive-pack.c:793 |
| 11303 | msgid "" |
| 11304 | "By default, updating the current branch in a non-bare repository\n" |
| 11305 | "is denied, because it will make the index and work tree inconsistent\n" |
| 11306 | "with what you pushed, and will require 'git reset --hard' to match\n" |
| 11307 | "the work tree to HEAD.\n" |
| 11308 | "\n" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11309 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
| 11310 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11311 | "its current branch; however, this is not recommended unless you\n" |
| 11312 | "arranged to update its work tree to match what you pushed in some\n" |
| 11313 | "other way.\n" |
| 11314 | "\n" |
| 11315 | "To squelch this message and still keep the default behaviour, set\n" |
| 11316 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." |
| 11317 | msgstr "" |
| 11318 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" |
| 11319 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" |
| 11320 | "\n" |
| 11321 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" |
| 11322 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" |
| 11323 | "用某种方式将其工作区更新至您推送的状态。\n" |
| 11324 | "\n" |
| 11325 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" |
| 11326 | "配置变量为 'refuse'。" |
| 11327 | |
| 11328 | #: builtin/receive-pack.c:813 |
| 11329 | msgid "" |
| 11330 | "By default, deleting the current branch is denied, because the next\n" |
| 11331 | "'git clone' won't result in any file checked out, causing confusion.\n" |
| 11332 | "\n" |
| 11333 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" |
| 11334 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" |
| 11335 | "current branch, with or without a warning message.\n" |
| 11336 | "\n" |
| 11337 | "To squelch this message, you can set it to 'refuse'." |
| 11338 | msgstr "" |
| 11339 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 11340 | "导致困惑。\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11341 | "\n" |
| 11342 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 11343 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11344 | "\n" |
| 11345 | "若要屏蔽此信息,您可以设置它为 'refuse'。" |
| 11346 | |
| 11347 | #: builtin/receive-pack.c:1883 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 11348 | msgid "quiet" |
| 11349 | msgstr "静默模式" |
| 11350 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11351 | #: builtin/receive-pack.c:1897 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 11352 | msgid "You must specify a directory." |
| 11353 | msgstr "您必须指定一个目录。" |
| 11354 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11355 | #: builtin/reflog.c:423 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11356 | #, c-format |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 11357 | msgid "'%s' for '%s' is not a valid timestamp" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11358 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
| 11359 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11360 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 11361 | #, c-format |
| 11362 | msgid "'%s' is not a valid timestamp" |
| 11363 | msgstr "'%s' 不是一个有效的时间戳" |
| 11364 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11365 | #: builtin/remote.c:12 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11366 | msgid "git remote [-v | --verbose]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11367 | msgstr "git remote [-v | --verbose]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11368 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11369 | #: builtin/remote.c:13 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11370 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 11371 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11372 | "mirror=<fetch|push>] <name> <url>" |
| 11373 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 11374 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 11375 | "mirror=<fetch|push>] <名称> <地址>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11376 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11377 | #: builtin/remote.c:14 builtin/remote.c:34 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11378 | msgid "git remote rename <old> <new>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11379 | msgstr "git remote rename <旧名称> <新名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11380 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11381 | #: builtin/remote.c:15 builtin/remote.c:39 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11382 | msgid "git remote remove <name>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11383 | msgstr "git remote remove <名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11384 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11385 | #: builtin/remote.c:16 builtin/remote.c:44 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 11386 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
| 11387 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11388 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11389 | #: builtin/remote.c:17 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11390 | msgid "git remote [-v | --verbose] show [-n] <name>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11391 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11392 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11393 | #: builtin/remote.c:18 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11394 | msgid "git remote prune [-n | --dry-run] <name>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11395 | msgstr "git remote prune [-n | --dry-run] <名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11396 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11397 | #: builtin/remote.c:19 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11398 | msgid "" |
| 11399 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11400 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11401 | |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11402 | #: builtin/remote.c:20 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11403 | msgid "git remote set-branches [--add] <name> <branch>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11404 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11405 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11406 | #: builtin/remote.c:21 builtin/remote.c:70 |
| 11407 | msgid "git remote get-url [--push] [--all] <name>" |
| 11408 | msgstr "git remote get-url [--push] [--all] <名称>" |
| 11409 | |
| 11410 | #: builtin/remote.c:22 builtin/remote.c:75 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11411 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11412 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11413 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11414 | #: builtin/remote.c:23 builtin/remote.c:76 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11415 | msgid "git remote set-url --add <name> <newurl>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11416 | msgstr "git remote set-url --add <名称> <新的地址>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11417 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11418 | #: builtin/remote.c:24 builtin/remote.c:77 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11419 | msgid "git remote set-url --delete <name> <url>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11420 | msgstr "git remote set-url --delete <名称> <地址>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11421 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11422 | #: builtin/remote.c:29 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11423 | msgid "git remote add [<options>] <name> <url>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11424 | msgstr "git remote add [<选项>] <名称> <地址>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11425 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11426 | #: builtin/remote.c:49 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11427 | msgid "git remote set-branches <name> <branch>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11428 | msgstr "git remote set-branches <名称> <分支>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11429 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11430 | #: builtin/remote.c:50 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11431 | msgid "git remote set-branches --add <name> <branch>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11432 | msgstr "git remote set-branches --add <名称> <分支>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11433 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11434 | #: builtin/remote.c:55 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11435 | msgid "git remote show [<options>] <name>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11436 | msgstr "git remote show [<选项>] <名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11437 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11438 | #: builtin/remote.c:60 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11439 | msgid "git remote prune [<options>] <name>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11440 | msgstr "git remote prune [<选项>] <名称>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11441 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11442 | #: builtin/remote.c:65 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11443 | msgid "git remote update [<options>] [<group> | <remote>]..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11444 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11445 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11446 | #: builtin/remote.c:94 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11447 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11448 | msgid "Updating %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11449 | msgstr "更新 %s 中" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11450 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11451 | #: builtin/remote.c:126 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11452 | msgid "" |
| 11453 | "--mirror is dangerous and deprecated; please\n" |
| 11454 | "\t use --mirror=fetch or --mirror=push instead" |
| 11455 | msgstr "" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11456 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
| 11457 | "\t 或 --mirror=push" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11458 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11459 | #: builtin/remote.c:143 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11460 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11461 | msgid "unknown mirror argument: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11462 | msgstr "未知的镜像参数:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11463 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11464 | #: builtin/remote.c:159 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11465 | msgid "fetch the remote branches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11466 | msgstr "抓取远程的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11467 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11468 | #: builtin/remote.c:161 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11469 | msgid "import all tags and associated objects when fetching" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11470 | msgstr "抓取时导入所有的标签和关联对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11471 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11472 | #: builtin/remote.c:164 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11473 | msgid "or do not fetch any tag at all (--no-tags)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11474 | msgstr "或不抓取任何标签(--no-tags)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11475 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11476 | #: builtin/remote.c:166 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11477 | msgid "branch(es) to track" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11478 | msgstr "跟踪的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11479 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11480 | #: builtin/remote.c:167 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11481 | msgid "master branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11482 | msgstr "主线分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11483 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11484 | #: builtin/remote.c:168 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11485 | msgid "push|fetch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11486 | msgstr "push|fetch" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11487 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11488 | #: builtin/remote.c:169 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11489 | msgid "set up remote as a mirror to push to or fetch from" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11490 | msgstr "把远程设置为用以推送或抓取的镜像" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11491 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11492 | #: builtin/remote.c:181 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11493 | msgid "specifying a master branch makes no sense with --mirror" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11494 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11495 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11496 | #: builtin/remote.c:183 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11497 | msgid "specifying branches to track makes sense only with fetch mirrors" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 11498 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11499 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11500 | #: builtin/remote.c:190 builtin/remote.c:629 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11501 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11502 | msgid "remote %s already exists." |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11503 | msgstr "远程 %s 已经存在。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11504 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11505 | #: builtin/remote.c:194 builtin/remote.c:633 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11506 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11507 | msgid "'%s' is not a valid remote name" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11508 | msgstr "'%s' 不是一个有效的远程名称" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11509 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11510 | #: builtin/remote.c:234 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11511 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11512 | msgid "Could not setup master '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11513 | msgstr "无法设置 master '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11514 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11515 | #: builtin/remote.c:336 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11516 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11517 | msgid "Could not get fetch map for refspec %s" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11518 | msgstr "无法得到引用规格 %s 的获取列表" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11519 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11520 | #: builtin/remote.c:437 builtin/remote.c:445 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11521 | msgid "(matching)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11522 | msgstr "(匹配)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11523 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11524 | #: builtin/remote.c:449 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11525 | msgid "(delete)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11526 | msgstr "(删除)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11527 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11528 | #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11529 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11530 | msgid "No such remote: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11531 | msgstr "没有这样的远程:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11532 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11533 | #: builtin/remote.c:639 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11534 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11535 | msgid "Could not rename config section '%s' to '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11536 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11537 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11538 | #: builtin/remote.c:659 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11539 | #, c-format |
| 11540 | msgid "" |
Jiang Xin | d691f47 | 2012-06-02 17:12:59 +0800 | [diff] [blame] | 11541 | "Not updating non-default fetch refspec\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11542 | "\t%s\n" |
| 11543 | "\tPlease update the configuration manually if necessary." |
| 11544 | msgstr "" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 11545 | "没有更新非默认的获取引用规格\n" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11546 | "\t%s\n" |
| 11547 | "\t如果必要请手动更新配置。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11548 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11549 | #: builtin/remote.c:695 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11550 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11551 | msgid "deleting '%s' failed" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11552 | msgstr "删除 '%s' 失败" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11553 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11554 | #: builtin/remote.c:729 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11555 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11556 | msgid "creating '%s' failed" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11557 | msgstr "创建 '%s' 失败" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11558 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11559 | #: builtin/remote.c:792 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11560 | msgid "" |
| 11561 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" |
| 11562 | "to delete it, use:" |
| 11563 | msgid_plural "" |
| 11564 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" |
| 11565 | "to delete them, use:" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 11566 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
| 11567 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11568 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11569 | #: builtin/remote.c:806 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11570 | #, c-format |
| 11571 | msgid "Could not remove config section '%s'" |
| 11572 | msgstr "不能移除配置小节 '%s'" |
| 11573 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11574 | #: builtin/remote.c:907 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11575 | #, c-format |
| 11576 | msgid " new (next fetch will store in remotes/%s)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11577 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11578 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11579 | #: builtin/remote.c:910 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11580 | msgid " tracked" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11581 | msgstr " 已跟踪" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11582 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11583 | #: builtin/remote.c:912 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11584 | msgid " stale (use 'git remote prune' to remove)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11585 | msgstr " 过时(使用 'git remote prune' 来移除)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11586 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11587 | #: builtin/remote.c:914 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11588 | msgid " ???" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11589 | msgstr " ???" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11590 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11591 | #: builtin/remote.c:955 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11592 | #, c-format |
| 11593 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11594 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11595 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11596 | #: builtin/remote.c:963 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11597 | #, c-format |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 11598 | msgid "rebases interactively onto remote %s" |
| 11599 | msgstr "交互式变基到远程 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11600 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11601 | #: builtin/remote.c:964 |
| 11602 | #, c-format |
| 11603 | msgid "rebases onto remote %s" |
| 11604 | msgstr "变基到远程 %s" |
| 11605 | |
| 11606 | #: builtin/remote.c:967 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11607 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11608 | msgid " merges with remote %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11609 | msgstr " 与远程 %s 合并" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11610 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11611 | #: builtin/remote.c:970 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11612 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11613 | msgid "merges with remote %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11614 | msgstr "与远程 %s 合并" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11615 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11616 | #: builtin/remote.c:973 |
| 11617 | #, c-format |
| 11618 | msgid "%-*s and with remote %s\n" |
| 11619 | msgstr "%-*s 以及和远程 %s\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11620 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11621 | #: builtin/remote.c:1016 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11622 | msgid "create" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11623 | msgstr "创建" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11624 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11625 | #: builtin/remote.c:1019 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11626 | msgid "delete" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11627 | msgstr "删除" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11628 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11629 | #: builtin/remote.c:1023 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11630 | msgid "up to date" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11631 | msgstr "最新" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11632 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11633 | #: builtin/remote.c:1026 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11634 | msgid "fast-forwardable" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11635 | msgstr "可快进" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11636 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11637 | #: builtin/remote.c:1029 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11638 | msgid "local out of date" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11639 | msgstr "本地已过时" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11640 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11641 | #: builtin/remote.c:1036 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11642 | #, c-format |
| 11643 | msgid " %-*s forces to %-*s (%s)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11644 | msgstr " %-*s 强制推送至 %-*s (%s)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11645 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11646 | #: builtin/remote.c:1039 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11647 | #, c-format |
| 11648 | msgid " %-*s pushes to %-*s (%s)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11649 | msgstr " %-*s 推送至 %-*s (%s)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11650 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11651 | #: builtin/remote.c:1043 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11652 | #, c-format |
| 11653 | msgid " %-*s forces to %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11654 | msgstr " %-*s 强制推送至 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11655 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11656 | #: builtin/remote.c:1046 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11657 | #, c-format |
| 11658 | msgid " %-*s pushes to %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11659 | msgstr " %-*s 推送至 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11660 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11661 | #: builtin/remote.c:1114 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11662 | msgid "do not query remotes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11663 | msgstr "不查询远程" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11664 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11665 | #: builtin/remote.c:1141 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11666 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11667 | msgid "* remote %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11668 | msgstr "* 远程 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11669 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11670 | #: builtin/remote.c:1142 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11671 | #, c-format |
| 11672 | msgid " Fetch URL: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11673 | msgstr " 获取地址:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11674 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11675 | #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11676 | msgid "(no URL)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11677 | msgstr "(无 URL)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11678 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 11679 | #. TRANSLATORS: the colon ':' should align with |
| 11680 | #. the one in " Fetch URL: %s" translation |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11681 | #: builtin/remote.c:1154 builtin/remote.c:1156 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11682 | #, c-format |
| 11683 | msgid " Push URL: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11684 | msgstr " 推送地址:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11685 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11686 | #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11687 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11688 | msgid " HEAD branch: %s" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 11689 | msgstr " HEAD 分支:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11690 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11691 | # 译者:中文字符串拼接,可删除前导空格 |
| 11692 | #: builtin/remote.c:1158 |
| 11693 | msgid "(not queried)" |
| 11694 | msgstr "(未查询)" |
| 11695 | |
| 11696 | #: builtin/remote.c:1160 |
| 11697 | msgid "(unknown)" |
| 11698 | msgstr "(未知)" |
| 11699 | |
| 11700 | #: builtin/remote.c:1164 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11701 | #, c-format |
| 11702 | msgid "" |
| 11703 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 11704 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11705 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11706 | #: builtin/remote.c:1176 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11707 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11708 | msgid " Remote branch:%s" |
| 11709 | msgid_plural " Remote branches:%s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11710 | msgstr[0] " 远程分支:%s" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 11711 | msgstr[1] " 远程分支:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11712 | |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11713 | # 译者:中文字符串拼接,可删除前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11714 | #: builtin/remote.c:1179 builtin/remote.c:1205 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11715 | msgid " (status not queried)" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11716 | msgstr "(状态未查询)" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11717 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11718 | #: builtin/remote.c:1188 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11719 | msgid " Local branch configured for 'git pull':" |
| 11720 | msgid_plural " Local branches configured for 'git pull':" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11721 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 11722 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11723 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11724 | #: builtin/remote.c:1196 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11725 | msgid " Local refs will be mirrored by 'git push'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11726 | msgstr " 本地引用将在 'git push' 时被镜像" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11727 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11728 | #: builtin/remote.c:1202 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11729 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11730 | msgid " Local ref configured for 'git push'%s:" |
| 11731 | msgid_plural " Local refs configured for 'git push'%s:" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11732 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
Jiang Xin | 5ae481e | 2012-05-31 17:35:59 +0800 | [diff] [blame] | 11733 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11734 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11735 | #: builtin/remote.c:1223 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11736 | msgid "set refs/remotes/<name>/HEAD according to remote" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11737 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11738 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11739 | #: builtin/remote.c:1225 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11740 | msgid "delete refs/remotes/<name>/HEAD" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11741 | msgstr "删除 refs/remotes/<名称>/HEAD" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11742 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11743 | #: builtin/remote.c:1240 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11744 | msgid "Cannot determine remote HEAD" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11745 | msgstr "无法确定远程 HEAD" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11746 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11747 | #: builtin/remote.c:1242 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11748 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11749 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11750 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11751 | #: builtin/remote.c:1252 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11752 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11753 | msgid "Could not delete %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11754 | msgstr "无法删除 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11755 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11756 | #: builtin/remote.c:1260 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11757 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11758 | msgid "Not a valid ref: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11759 | msgstr "不是一个有效引用:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11760 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11761 | #: builtin/remote.c:1262 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11762 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11763 | msgid "Could not setup %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11764 | msgstr "不能设置 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11765 | |
| 11766 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11767 | #: builtin/remote.c:1280 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11768 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11769 | msgid " %s will become dangling!" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11770 | msgstr " %s 将成为摇摆状态!" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11771 | |
| 11772 | # 译者:注意保持前导空格 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11773 | #: builtin/remote.c:1281 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11774 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11775 | msgid " %s has become dangling!" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11776 | msgstr " %s 已成为摇摆状态!" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11777 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11778 | #: builtin/remote.c:1291 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11779 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11780 | msgid "Pruning %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11781 | msgstr "修剪 %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11782 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11783 | #: builtin/remote.c:1292 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11784 | #, c-format |
| 11785 | msgid "URL: %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11786 | msgstr "URL:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11787 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11788 | #: builtin/remote.c:1308 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11789 | #, c-format |
| 11790 | msgid " * [would prune] %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11791 | msgstr " * [将删除] %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11792 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11793 | #: builtin/remote.c:1311 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11794 | #, c-format |
| 11795 | msgid " * [pruned] %s" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11796 | msgstr " * [已删除] %s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11797 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11798 | #: builtin/remote.c:1356 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11799 | msgid "prune remotes after fetching" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11800 | msgstr "抓取后清除远程" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11801 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11802 | #: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11803 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11804 | msgid "No such remote '%s'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11805 | msgstr "没有此远程 '%s'" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11806 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11807 | #: builtin/remote.c:1435 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11808 | msgid "add branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11809 | msgstr "添加分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11810 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11811 | #: builtin/remote.c:1442 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11812 | msgid "no remote specified" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11813 | msgstr "未指定远程" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11814 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11815 | #: builtin/remote.c:1459 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11816 | msgid "query push URLs rather than fetch URLs" |
| 11817 | msgstr "查询推送 URL 地址,而非获取 URL 地址" |
| 11818 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11819 | #: builtin/remote.c:1461 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11820 | msgid "return all URLs" |
| 11821 | msgstr "返回所有 URL 地址" |
| 11822 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11823 | #: builtin/remote.c:1489 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11824 | #, c-format |
| 11825 | msgid "no URLs configured for remote '%s'" |
| 11826 | msgstr "没有给远程仓库 '%s' 设定 URL" |
| 11827 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11828 | #: builtin/remote.c:1515 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11829 | msgid "manipulate push URLs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11830 | msgstr "操作推送 URLS" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11831 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11832 | #: builtin/remote.c:1517 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11833 | msgid "add URL" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11834 | msgstr "添加 URL" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11835 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11836 | #: builtin/remote.c:1519 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11837 | msgid "delete URLs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11838 | msgstr "删除 URLS" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11839 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11840 | #: builtin/remote.c:1526 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11841 | msgid "--add --delete doesn't make sense" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11842 | msgstr "--add --delete 无意义" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11843 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11844 | #: builtin/remote.c:1567 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11845 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11846 | msgid "Invalid old URL pattern: %s" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 11847 | msgstr "无效的旧 URL 匹配模版:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11848 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11849 | #: builtin/remote.c:1575 |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 11850 | #, c-format |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11851 | msgid "No such URL found: %s" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 11852 | msgstr "未找到此 URL:%s" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11853 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11854 | #: builtin/remote.c:1577 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11855 | msgid "Will not delete all non-push URLs" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 11856 | msgstr "将不会删除所有非推送 URL 地址" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 11857 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11858 | #: builtin/remote.c:1591 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11859 | msgid "be verbose; must be placed before a subcommand" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11860 | msgstr "冗长输出;必须置于子命令之前" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11861 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 11862 | #: builtin/remote.c:1622 |
| 11863 | #, c-format |
| 11864 | msgid "Unknown subcommand: %s" |
| 11865 | msgstr "未知子命令:%s" |
| 11866 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11867 | #: builtin/repack.c:17 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 11868 | msgid "git repack [<options>]" |
| 11869 | msgstr "git repack [<选项>]" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11870 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11871 | #: builtin/repack.c:22 |
| 11872 | msgid "" |
| 11873 | "Incremental repacks are incompatible with bitmap indexes. Use\n" |
| 11874 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." |
| 11875 | msgstr "" |
| 11876 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" |
| 11877 | "或禁用 pack.writebitmaps 配置。" |
| 11878 | |
| 11879 | #: builtin/repack.c:166 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11880 | msgid "pack everything in a single pack" |
| 11881 | msgstr "所有内容打包到一个包文件中" |
| 11882 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11883 | #: builtin/repack.c:168 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11884 | msgid "same as -a, and turn unreachable objects loose" |
| 11885 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" |
| 11886 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11887 | #: builtin/repack.c:171 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11888 | msgid "remove redundant packs, and run git-prune-packed" |
| 11889 | msgstr "删除多余的包,运行 git-prune-packed" |
| 11890 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11891 | #: builtin/repack.c:173 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11892 | msgid "pass --no-reuse-delta to git-pack-objects" |
| 11893 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" |
| 11894 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11895 | #: builtin/repack.c:175 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11896 | msgid "pass --no-reuse-object to git-pack-objects" |
| 11897 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" |
| 11898 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11899 | #: builtin/repack.c:177 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11900 | msgid "do not run git-update-server-info" |
| 11901 | msgstr "不运行 git-update-server-info" |
| 11902 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11903 | #: builtin/repack.c:180 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11904 | msgid "pass --local to git-pack-objects" |
| 11905 | msgstr "向 git-pack-objects 传递参数 --local" |
| 11906 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11907 | #: builtin/repack.c:182 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 11908 | msgid "write bitmap index" |
| 11909 | msgstr "写 bitmap 索引" |
| 11910 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11911 | #: builtin/repack.c:183 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11912 | msgid "approxidate" |
| 11913 | msgstr "近似日期" |
| 11914 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11915 | #: builtin/repack.c:184 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11916 | msgid "with -A, do not loosen objects older than this" |
| 11917 | msgstr "使用 -A,不要将早于给定时间的对象过期" |
| 11918 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11919 | #: builtin/repack.c:186 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11920 | msgid "with -a, repack unreachable objects" |
| 11921 | msgstr "使用 -a ,重新对不可达对象打包" |
| 11922 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11923 | #: builtin/repack.c:188 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11924 | msgid "size of the window used for delta compression" |
| 11925 | msgstr "用于增量压缩的窗口值" |
| 11926 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11927 | #: builtin/repack.c:189 builtin/repack.c:193 |
Jiang Xin | 8376b58 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 11928 | msgid "bytes" |
| 11929 | msgstr "字节" |
| 11930 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11931 | #: builtin/repack.c:190 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11932 | msgid "same as the above, but limit memory size instead of entries count" |
| 11933 | msgstr "和上面的相似,但限制内存大小而非条目数" |
| 11934 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11935 | #: builtin/repack.c:192 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11936 | msgid "limits the maximum delta depth" |
| 11937 | msgstr "限制最大增量深度" |
| 11938 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11939 | #: builtin/repack.c:194 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11940 | msgid "maximum size of each packfile" |
Ray Chen | dbd6cce | 2015-07-28 13:26:41 +0800 | [diff] [blame] | 11941 | msgstr "每个包文件的最大尺寸" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11942 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11943 | #: builtin/repack.c:196 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 11944 | msgid "repack objects in packs marked with .keep" |
| 11945 | msgstr "对标记为 .keep 的包中的对象重新打包" |
| 11946 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11947 | #: builtin/repack.c:206 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 11948 | msgid "cannot delete packs in a precious-objects repo" |
| 11949 | msgstr "不能删除珍品仓库中的打包文件" |
| 11950 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11951 | #: builtin/repack.c:210 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11952 | msgid "--keep-unreachable and -A are incompatible" |
| 11953 | msgstr "--keep-unreachable 和 -A 不兼容" |
| 11954 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 11955 | #: builtin/repack.c:400 builtin/worktree.c:115 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11956 | #, c-format |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 11957 | msgid "failed to remove '%s'" |
| 11958 | msgstr "无法删除 '%s'" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 11959 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11960 | #: builtin/replace.c:19 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11961 | msgid "git replace [-f] <object> <replacement>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11962 | msgstr "git replace [-f] <对象> <替换物>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11963 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11964 | #: builtin/replace.c:20 |
| 11965 | msgid "git replace [-f] --edit <object>" |
| 11966 | msgstr "git replace [-f] --edit <对象>" |
| 11967 | |
| 11968 | #: builtin/replace.c:21 |
| 11969 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
| 11970 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" |
| 11971 | |
| 11972 | #: builtin/replace.c:22 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11973 | msgid "git replace -d <object>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 11974 | msgstr "git replace -d <对象>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11975 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11976 | #: builtin/replace.c:23 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 11977 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
| 11978 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 11979 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11980 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11981 | #, c-format |
| 11982 | msgid "Not a valid object name: '%s'" |
| 11983 | msgstr "不是一个有效的对象名:'%s'" |
| 11984 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11985 | #: builtin/replace.c:355 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11986 | #, c-format |
| 11987 | msgid "bad mergetag in commit '%s'" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11988 | msgstr "提交 '%s' 中含有损坏的合并标签" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11989 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11990 | #: builtin/replace.c:357 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11991 | #, c-format |
| 11992 | msgid "malformed mergetag in commit '%s'" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 11993 | msgstr "提交 '%s' 中含有非法的合并标签" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11994 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 11995 | #: builtin/replace.c:368 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 11996 | #, c-format |
| 11997 | msgid "" |
| 11998 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " |
| 11999 | "instead of --graft" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12000 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12001 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12002 | #: builtin/replace.c:401 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12003 | #, c-format |
| 12004 | msgid "the original commit '%s' has a gpg signature." |
| 12005 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" |
| 12006 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12007 | #: builtin/replace.c:402 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12008 | msgid "the signature will be removed in the replacement commit!" |
| 12009 | msgstr "在替换的提交中签名将被移除!" |
| 12010 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12011 | #: builtin/replace.c:408 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12012 | #, c-format |
| 12013 | msgid "could not write replacement commit for: '%s'" |
| 12014 | msgstr "不能为 '%s' 写替换提交" |
| 12015 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12016 | #: builtin/replace.c:432 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12017 | msgid "list replace refs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12018 | msgstr "列出替换的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12019 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12020 | #: builtin/replace.c:433 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12021 | msgid "delete replace refs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12022 | msgstr "删除替换的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12023 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12024 | #: builtin/replace.c:434 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12025 | msgid "edit existing object" |
| 12026 | msgstr "编辑现存的对象" |
| 12027 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12028 | #: builtin/replace.c:435 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12029 | msgid "change a commit's parents" |
| 12030 | msgstr "修改一个提交的父提交" |
| 12031 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12032 | #: builtin/replace.c:436 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12033 | msgid "replace the ref if it exists" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12034 | msgstr "如果存在则替换引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12035 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12036 | #: builtin/replace.c:437 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12037 | msgid "do not pretty-print contents for --edit" |
| 12038 | msgstr "不要为 --edit 操作美观显示内容" |
| 12039 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12040 | #: builtin/replace.c:438 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 12041 | msgid "use this format" |
| 12042 | msgstr "使用此格式" |
| 12043 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12044 | #: builtin/rerere.c:12 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12045 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
| 12046 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12047 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12048 | #: builtin/rerere.c:58 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12049 | msgid "register clean resolutions in index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12050 | msgstr "在索引中注册干净的解决方案" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12051 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12052 | #: builtin/reset.c:26 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12053 | msgid "" |
| 12054 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12055 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12056 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12057 | #: builtin/reset.c:27 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12058 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
| 12059 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12060 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12061 | #: builtin/reset.c:28 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12062 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
| 12063 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12064 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12065 | #: builtin/reset.c:34 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12066 | msgid "mixed" |
| 12067 | msgstr "混杂" |
| 12068 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12069 | #: builtin/reset.c:34 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12070 | msgid "soft" |
| 12071 | msgstr "软性" |
| 12072 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12073 | #: builtin/reset.c:34 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12074 | msgid "hard" |
| 12075 | msgstr "硬性" |
| 12076 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12077 | #: builtin/reset.c:34 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 12078 | msgid "merge" |
| 12079 | msgstr "合并" |
| 12080 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12081 | #: builtin/reset.c:34 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12082 | msgid "keep" |
| 12083 | msgstr "保持" |
| 12084 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12085 | #: builtin/reset.c:74 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12086 | msgid "You do not have a valid HEAD." |
| 12087 | msgstr "您没有一个有效的 HEAD。" |
| 12088 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12089 | #: builtin/reset.c:76 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12090 | msgid "Failed to find tree of HEAD." |
| 12091 | msgstr "无法找到 HEAD 指向的树。" |
| 12092 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12093 | #: builtin/reset.c:82 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12094 | #, c-format |
| 12095 | msgid "Failed to find tree of %s." |
| 12096 | msgstr "无法找到 %s 指向的树。" |
| 12097 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12098 | #: builtin/reset.c:100 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12099 | #, c-format |
| 12100 | msgid "HEAD is now at %s" |
| 12101 | msgstr "HEAD 现在位于 %s" |
| 12102 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 12103 | # 译者:汉字之间无空格,故删除%s前后空格 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12104 | #: builtin/reset.c:183 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12105 | #, c-format |
| 12106 | msgid "Cannot do a %s reset in the middle of a merge." |
| 12107 | msgstr "在合并过程中不能做%s重置操作。" |
| 12108 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12109 | #: builtin/reset.c:276 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12110 | msgid "be quiet, only report errors" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12111 | msgstr "安静模式,只报告错误" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12112 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12113 | #: builtin/reset.c:278 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12114 | msgid "reset HEAD and index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12115 | msgstr "重置 HEAD 和索引" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12116 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12117 | #: builtin/reset.c:279 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12118 | msgid "reset only HEAD" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12119 | msgstr "只重置 HEAD" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12120 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12121 | #: builtin/reset.c:281 builtin/reset.c:283 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12122 | msgid "reset HEAD, index and working tree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12123 | msgstr "重置 HEAD、索引和工作区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12124 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12125 | #: builtin/reset.c:285 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12126 | msgid "reset HEAD but keep local changes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12127 | msgstr "重置 HEAD 但保存本地变更" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12128 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12129 | #: builtin/reset.c:288 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 12130 | msgid "record only the fact that removed paths will be added later" |
| 12131 | msgstr "将删除的路径标记为稍后添加" |
| 12132 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12133 | #: builtin/reset.c:305 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12134 | #, c-format |
| 12135 | msgid "Failed to resolve '%s' as a valid revision." |
| 12136 | msgstr "无法将 '%s' 解析为一个有效的版本。" |
| 12137 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12138 | #: builtin/reset.c:313 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12139 | #, c-format |
| 12140 | msgid "Failed to resolve '%s' as a valid tree." |
| 12141 | msgstr "无法将 '%s' 解析为一个有效的树对象。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12142 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12143 | #: builtin/reset.c:322 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12144 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
| 12145 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
| 12146 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12147 | #: builtin/reset.c:331 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12148 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 12149 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12150 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 12151 | # 译者:汉字之间无空格,故删除%s前后空格 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12152 | #: builtin/reset.c:333 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12153 | #, c-format |
| 12154 | msgid "Cannot do %s reset with paths." |
| 12155 | msgstr "不能带路径进行%s重置。" |
| 12156 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 12157 | # 译者:汉字之间无空格,故删除%s前后空格 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12158 | #: builtin/reset.c:343 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12159 | #, c-format |
| 12160 | msgid "%s reset is not allowed in a bare repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 12161 | msgstr "不能对纯仓库进行%s重置" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12162 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12163 | #: builtin/reset.c:347 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 12164 | msgid "-N can only be used with --mixed" |
| 12165 | msgstr "-N 只能和 --mixed 同时使用" |
| 12166 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12167 | #: builtin/reset.c:364 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12168 | msgid "Unstaged changes after reset:" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 12169 | msgstr "重置后取消暂存的变更:" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12170 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12171 | #: builtin/reset.c:370 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12172 | #, c-format |
| 12173 | msgid "Could not reset index file to revision '%s'." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 12174 | msgstr "不能重置索引文件至版本 '%s'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12175 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 12176 | #: builtin/reset.c:374 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12177 | msgid "Could not write new index file." |
| 12178 | msgstr "不能写入新的索引文件。" |
| 12179 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12180 | #: builtin/rev-list.c:354 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 12181 | msgid "rev-list does not support display of notes" |
| 12182 | msgstr "rev-list 不支持显示注解" |
| 12183 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12184 | #: builtin/rev-parse.c:391 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12185 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
| 12186 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12187 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12188 | #: builtin/rev-parse.c:396 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12189 | msgid "keep the `--` passed as an arg" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12190 | msgstr "保持 `--` 作为一个参数传递" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12191 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12192 | #: builtin/rev-parse.c:398 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12193 | msgid "stop parsing after the first non-option argument" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12194 | msgstr "遇到第一个非选项参数后停止解析" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12195 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12196 | #: builtin/rev-parse.c:401 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 12197 | msgid "output in stuck long form" |
| 12198 | msgstr "以固定长格式输出" |
| 12199 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12200 | #: builtin/rev-parse.c:532 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12201 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12202 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12203 | " or: git rev-parse --sq-quote [<arg>...]\n" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12204 | " or: git rev-parse [<options>] [<arg>...]\n" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12205 | "\n" |
| 12206 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." |
| 12207 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12208 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12209 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12210 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12211 | "\n" |
| 12212 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12213 | |
| 12214 | #: builtin/revert.c:22 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12215 | msgid "git revert [<options>] <commit-ish>..." |
| 12216 | msgstr "git revert [<选项>] <提交号>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12217 | |
| 12218 | #: builtin/revert.c:23 |
| 12219 | msgid "git revert <subcommand>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12220 | msgstr "git revert <子命令>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12221 | |
| 12222 | #: builtin/revert.c:28 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12223 | msgid "git cherry-pick [<options>] <commit-ish>..." |
| 12224 | msgstr "git cherry-pick [<选项>] <提交号>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12225 | |
| 12226 | #: builtin/revert.c:29 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12227 | msgid "git cherry-pick <subcommand>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12228 | msgstr "git cherry-pick <子命令>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12229 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12230 | #: builtin/revert.c:71 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12231 | #, c-format |
| 12232 | msgid "%s: %s cannot be used with %s" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 12233 | msgstr "%s:%s 不能和 %s 同时使用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12234 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12235 | #: builtin/revert.c:80 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12236 | msgid "end revert or cherry-pick sequence" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12237 | msgstr "终止反转或拣选操作" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12238 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12239 | #: builtin/revert.c:81 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12240 | msgid "resume revert or cherry-pick sequence" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12241 | msgstr "继续反转或拣选操作" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12242 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12243 | #: builtin/revert.c:82 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12244 | msgid "cancel revert or cherry-pick sequence" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12245 | msgstr "取消反转或拣选操作" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12246 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12247 | #: builtin/revert.c:83 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12248 | msgid "don't automatically commit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12249 | msgstr "不要自动提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12250 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12251 | #: builtin/revert.c:84 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12252 | msgid "edit the commit message" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12253 | msgstr "编辑提交说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12254 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12255 | #: builtin/revert.c:87 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12256 | msgid "parent number" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12257 | msgstr "父编号" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12258 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12259 | #: builtin/revert.c:89 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12260 | msgid "merge strategy" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12261 | msgstr "合并策略" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12262 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12263 | #: builtin/revert.c:90 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12264 | msgid "option" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12265 | msgstr "选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12266 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12267 | #: builtin/revert.c:91 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12268 | msgid "option for merge strategy" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12269 | msgstr "合并策略的选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12270 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12271 | #: builtin/revert.c:100 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12272 | msgid "append commit name" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12273 | msgstr "追加提交名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12274 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12275 | #: builtin/revert.c:102 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12276 | msgid "preserve initially empty commits" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12277 | msgstr "保留初始化的空提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12278 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12279 | #: builtin/revert.c:103 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12280 | msgid "allow commits with empty messages" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12281 | msgstr "允许提交说明为空" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12282 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12283 | #: builtin/revert.c:104 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12284 | msgid "keep redundant, empty commits" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12285 | msgstr "保持多余的、空的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12286 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12287 | #: builtin/revert.c:192 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12288 | msgid "revert failed" |
| 12289 | msgstr "还原失败" |
| 12290 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12291 | #: builtin/revert.c:205 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12292 | msgid "cherry-pick failed" |
| 12293 | msgstr "拣选失败" |
| 12294 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 12295 | #: builtin/rm.c:17 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12296 | msgid "git rm [<options>] [--] <file>..." |
| 12297 | msgstr "git rm [<选项>] [--] <文件>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12298 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12299 | #: builtin/rm.c:205 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12300 | msgid "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12301 | "the following file has staged content different from both the\n" |
| 12302 | "file and the HEAD:" |
| 12303 | msgid_plural "" |
| 12304 | "the following files have staged content different from both the\n" |
| 12305 | "file and the HEAD:" |
| 12306 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" |
| 12307 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" |
| 12308 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12309 | #: builtin/rm.c:210 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12310 | msgid "" |
| 12311 | "\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12312 | "(use -f to force removal)" |
| 12313 | msgstr "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12314 | "\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12315 | "(使用 -f 强制删除)" |
| 12316 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12317 | #: builtin/rm.c:214 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12318 | msgid "the following file has changes staged in the index:" |
| 12319 | msgid_plural "the following files have changes staged in the index:" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 12320 | msgstr[0] "下列文件索引中有变更" |
| 12321 | msgstr[1] "下列文件索引中有变更" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12322 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12323 | #: builtin/rm.c:218 builtin/rm.c:227 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12324 | msgid "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12325 | "\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12326 | "(use --cached to keep the file, or -f to force removal)" |
| 12327 | msgstr "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12328 | "\n" |
| 12329 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12330 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12331 | #: builtin/rm.c:224 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12332 | msgid "the following file has local modifications:" |
| 12333 | msgid_plural "the following files have local modifications:" |
| 12334 | msgstr[0] "如下文件有本地修改:" |
| 12335 | msgstr[1] "如下文件有本地修改:" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12336 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12337 | #: builtin/rm.c:242 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12338 | msgid "do not list removed files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12339 | msgstr "不列出删除的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12340 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12341 | #: builtin/rm.c:243 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12342 | msgid "only remove from the index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12343 | msgstr "只从索引区删除" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12344 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12345 | #: builtin/rm.c:244 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12346 | msgid "override the up-to-date check" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12347 | msgstr "忽略文件更新状态检查" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12348 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12349 | #: builtin/rm.c:245 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12350 | msgid "allow recursive removal" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12351 | msgstr "允许递归删除" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12352 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12353 | #: builtin/rm.c:247 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12354 | msgid "exit with a zero status even if nothing matched" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12355 | msgstr "即使没有匹配,也以零状态退出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12356 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12357 | #: builtin/rm.c:308 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12358 | #, c-format |
| 12359 | msgid "not removing '%s' recursively without -r" |
| 12360 | msgstr "未提供 -r 选项不会递归删除 '%s'" |
| 12361 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12362 | #: builtin/rm.c:347 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12363 | #, c-format |
| 12364 | msgid "git rm: unable to remove %s" |
| 12365 | msgstr "git rm:不能删除 %s" |
| 12366 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12367 | #: builtin/rm.c:370 |
| 12368 | #, c-format |
| 12369 | msgid "could not remove '%s'" |
| 12370 | msgstr "无法删除 '%s'" |
| 12371 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 12372 | #: builtin/send-pack.c:18 |
| 12373 | msgid "" |
| 12374 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" |
| 12375 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " |
| 12376 | "[<ref>...]\n" |
| 12377 | " --all and explicit <ref> specification are mutually exclusive." |
| 12378 | msgstr "" |
| 12379 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" |
| 12380 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" |
| 12381 | " --all 和明确的 <引用> 互斥。" |
| 12382 | |
| 12383 | #: builtin/send-pack.c:160 |
| 12384 | msgid "remote name" |
| 12385 | msgstr "远程名称" |
| 12386 | |
| 12387 | #: builtin/send-pack.c:171 |
| 12388 | msgid "use stateless RPC protocol" |
| 12389 | msgstr "使用无状态的 RPC 协议" |
| 12390 | |
| 12391 | #: builtin/send-pack.c:172 |
| 12392 | msgid "read refs from stdin" |
| 12393 | msgstr "从标准输入读取引用" |
| 12394 | |
| 12395 | #: builtin/send-pack.c:173 |
| 12396 | msgid "print status from remote helper" |
| 12397 | msgstr "打印来自远程 helper 的状态" |
| 12398 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12399 | #: builtin/shortlog.c:13 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12400 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 12401 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12402 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12403 | #: builtin/shortlog.c:249 |
| 12404 | msgid "Group by committer rather than author" |
| 12405 | msgstr "按照提交者分组而不是作者" |
| 12406 | |
| 12407 | #: builtin/shortlog.c:251 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12408 | msgid "sort output according to the number of commits per author" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12409 | msgstr "根据每个作者的提交数量排序" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12410 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12411 | #: builtin/shortlog.c:253 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12412 | msgid "Suppress commit descriptions, only provides commit count" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12413 | msgstr "隐藏提交说明,只提供提交数量" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12414 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12415 | #: builtin/shortlog.c:255 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12416 | msgid "Show the email address of each author" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12417 | msgstr "显示每个作者的电子邮件地址" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12418 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12419 | #: builtin/shortlog.c:256 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12420 | msgid "w[,i1[,i2]]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12421 | msgstr "w[,i1[,i2]]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12422 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12423 | #: builtin/shortlog.c:257 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12424 | msgid "Linewrap output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12425 | msgstr "折行输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12426 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12427 | #: builtin/show-branch.c:10 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12428 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12429 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
Jiang Xin | 1e60744 | 2015-01-21 15:05:03 +0800 | [diff] [blame] | 12430 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
| 12431 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" |
| 12432 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12433 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12434 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
Jiang Xin | 1e60744 | 2015-01-21 15:05:03 +0800 | [diff] [blame] | 12435 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
| 12436 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" |
| 12437 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12438 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12439 | #: builtin/show-branch.c:14 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12440 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
| 12441 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12442 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12443 | #: builtin/show-branch.c:375 |
| 12444 | #, c-format |
| 12445 | msgid "ignoring %s; cannot handle more than %d ref" |
| 12446 | msgid_plural "ignoring %s; cannot handle more than %d refs" |
| 12447 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" |
| 12448 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" |
| 12449 | |
| 12450 | #: builtin/show-branch.c:541 |
| 12451 | #, c-format |
| 12452 | msgid "no matching refs with %s" |
| 12453 | msgstr "没有和 %s 匹配的引用" |
| 12454 | |
| 12455 | #: builtin/show-branch.c:639 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12456 | msgid "show remote-tracking and local branches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12457 | msgstr "显示远程跟踪的和本地的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12458 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12459 | #: builtin/show-branch.c:641 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12460 | msgid "show remote-tracking branches" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12461 | msgstr "显示远程跟踪的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12462 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12463 | #: builtin/show-branch.c:643 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12464 | msgid "color '*!+-' corresponding to the branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12465 | msgstr "着色 '*!+-' 到相应的分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12466 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12467 | #: builtin/show-branch.c:645 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12468 | msgid "show <n> more commits after the common ancestor" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12469 | msgstr "显示共同祖先后的 <n> 个提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12470 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12471 | #: builtin/show-branch.c:647 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12472 | msgid "synonym to more=-1" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12473 | msgstr "和 more=-1 同义" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12474 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12475 | #: builtin/show-branch.c:648 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12476 | msgid "suppress naming strings" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12477 | msgstr "不显示字符串命名" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12478 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12479 | #: builtin/show-branch.c:650 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12480 | msgid "include the current branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12481 | msgstr "包括当前分支" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12482 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12483 | #: builtin/show-branch.c:652 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12484 | msgid "name commits with their object names" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12485 | msgstr "以对象名字命名提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12486 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12487 | #: builtin/show-branch.c:654 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12488 | msgid "show possible merge bases" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12489 | msgstr "显示可能合并的基线" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12490 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12491 | #: builtin/show-branch.c:656 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12492 | msgid "show refs unreachable from any other ref" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12493 | msgstr "显示没有任何引用的的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12494 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12495 | #: builtin/show-branch.c:658 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12496 | msgid "show commits in topological order" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12497 | msgstr "以拓扑顺序显示提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12498 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12499 | #: builtin/show-branch.c:661 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12500 | msgid "show only commits not on the first branch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12501 | msgstr "只显示不在第一个分支上的提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12502 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12503 | #: builtin/show-branch.c:663 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12504 | msgid "show merges reachable from only one tip" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12505 | msgstr "显示仅一个分支可访问的合并提交" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12506 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12507 | #: builtin/show-branch.c:665 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12508 | msgid "topologically sort, maintaining date order where possible" |
| 12509 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12510 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12511 | #: builtin/show-branch.c:668 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12512 | msgid "<n>[,<base>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12513 | msgstr "<n>[,<base>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12514 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12515 | #: builtin/show-branch.c:669 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12516 | msgid "show <n> most recent ref-log entries starting at base" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12517 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12518 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12519 | #: builtin/show-branch.c:703 |
| 12520 | msgid "" |
| 12521 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" |
| 12522 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" |
| 12523 | |
| 12524 | #: builtin/show-branch.c:727 |
| 12525 | msgid "no branches given, and HEAD is not valid" |
| 12526 | msgstr "未提供分支,且 HEAD 无效" |
| 12527 | |
| 12528 | #: builtin/show-branch.c:730 |
| 12529 | msgid "--reflog option needs one branch name" |
| 12530 | msgstr "选项 --reflog 需要一个分支名" |
| 12531 | |
| 12532 | #: builtin/show-branch.c:733 |
| 12533 | #, c-format |
| 12534 | msgid "only %d entry can be shown at one time." |
| 12535 | msgid_plural "only %d entries can be shown at one time." |
| 12536 | msgstr[0] "一次只能显示 %d 个条目。" |
| 12537 | msgstr[1] "一次只能显示 %d 个条目。" |
| 12538 | |
| 12539 | #: builtin/show-branch.c:737 |
| 12540 | #, c-format |
| 12541 | msgid "no such ref %s" |
| 12542 | msgstr "无此引用 %s" |
| 12543 | |
| 12544 | #: builtin/show-branch.c:829 |
| 12545 | #, c-format |
| 12546 | msgid "cannot handle more than %d rev." |
| 12547 | msgid_plural "cannot handle more than %d revs." |
| 12548 | msgstr[0] "不能处理 %d 个以上的版本。" |
| 12549 | msgstr[1] "不能处理 %d 个以上的版本。" |
| 12550 | |
| 12551 | #: builtin/show-branch.c:833 |
| 12552 | #, c-format |
| 12553 | msgid "'%s' is not a valid ref." |
| 12554 | msgstr "'%s' 不是一个有效的引用。" |
| 12555 | |
| 12556 | #: builtin/show-branch.c:836 |
| 12557 | #, c-format |
| 12558 | msgid "cannot find commit %s (%s)" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 12559 | msgstr "不能找到提交 %s(%s)" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12560 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12561 | #: builtin/show-ref.c:10 |
| 12562 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12563 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
| 12564 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12565 | msgstr "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12566 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
| 12567 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12568 | |
| 12569 | #: builtin/show-ref.c:11 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12570 | msgid "git show-ref --exclude-existing[=<pattern>]" |
| 12571 | msgstr "git show-ref --exclude-existing[=<模式>]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12572 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12573 | #: builtin/show-ref.c:159 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12574 | msgid "only show tags (can be combined with heads)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12575 | msgstr "只显示标签(可以和头共用)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12576 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12577 | #: builtin/show-ref.c:160 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12578 | msgid "only show heads (can be combined with tags)" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12579 | msgstr "只显示头(可以和标签共用)" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12580 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12581 | #: builtin/show-ref.c:161 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12582 | msgid "stricter reference checking, requires exact ref path" |
| 12583 | msgstr "更严格的引用检测,需要精确的引用路径" |
| 12584 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12585 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 12586 | msgid "show the HEAD reference, even if it would be filtered out" |
| 12587 | msgstr "显示 HEAD 引用,即使被过滤掉" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12588 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12589 | #: builtin/show-ref.c:168 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12590 | msgid "dereference tags into object IDs" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 12591 | msgstr "转换标签到对象 ID" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12592 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12593 | #: builtin/show-ref.c:170 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12594 | msgid "only show SHA1 hash using <n> digits" |
| 12595 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
| 12596 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12597 | #: builtin/show-ref.c:174 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12598 | msgid "do not print results to stdout (useful with --verify)" |
| 12599 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12600 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12601 | #: builtin/show-ref.c:176 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12602 | msgid "show refs from stdin that aren't in local repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 12603 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12604 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12605 | #: builtin/stripspace.c:17 |
| 12606 | msgid "git stripspace [-s | --strip-comments]" |
| 12607 | msgstr "git stripspace [-s | --strip-comments]" |
| 12608 | |
| 12609 | #: builtin/stripspace.c:18 |
| 12610 | msgid "git stripspace [-c | --comment-lines]" |
| 12611 | msgstr "git stripspace [-c | --comment-lines]" |
| 12612 | |
| 12613 | #: builtin/stripspace.c:35 |
| 12614 | msgid "skip and remove all lines starting with comment character" |
| 12615 | msgstr "跳过和移除所有的注释行" |
| 12616 | |
| 12617 | #: builtin/stripspace.c:38 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 12618 | msgid "prepend comment character and space to each line" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12619 | msgstr "为每一行的行首添加注释符和空格" |
| 12620 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12621 | #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12622 | #, c-format |
| 12623 | msgid "No such ref: %s" |
| 12624 | msgstr "没有这样的引用:%s" |
| 12625 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12626 | #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12627 | #, c-format |
| 12628 | msgid "Expecting a full ref name, got %s" |
| 12629 | msgstr "期望一个完整的引用名称,却得到 %s" |
| 12630 | |
| 12631 | #: builtin/submodule--helper.c:71 |
| 12632 | #, c-format |
| 12633 | msgid "cannot strip one component off url '%s'" |
| 12634 | msgstr "无法从 url '%s' 剥离一个组件" |
| 12635 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12636 | #: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12637 | msgid "alternative anchor for relative paths" |
| 12638 | msgstr "相对路径的替代锚记(anchor)" |
| 12639 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12640 | #: builtin/submodule--helper.c:287 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12641 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
| 12642 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" |
| 12643 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12644 | #: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12645 | #, c-format |
| 12646 | msgid "No url found for submodule path '%s' in .gitmodules" |
| 12647 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" |
| 12648 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12649 | #: builtin/submodule--helper.c:373 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12650 | #, c-format |
| 12651 | msgid "Failed to register url for submodule path '%s'" |
| 12652 | msgstr "无法为子模组 '%s' 注册 url" |
| 12653 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12654 | #: builtin/submodule--helper.c:377 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12655 | #, c-format |
| 12656 | msgid "Submodule '%s' (%s) registered for path '%s'\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 12657 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12658 | |
| 12659 | # |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12660 | #: builtin/submodule--helper.c:387 |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 12661 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12662 | msgid "warning: command update mode suggested for submodule '%s'\n" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 12663 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12664 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12665 | #: builtin/submodule--helper.c:394 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12666 | #, c-format |
| 12667 | msgid "Failed to register update mode for submodule path '%s'" |
| 12668 | msgstr "无法为子模组 '%s' 注册更新模式" |
| 12669 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12670 | #: builtin/submodule--helper.c:410 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12671 | msgid "Suppress output for initializing a submodule" |
| 12672 | msgstr "初始化子模组时抑制输出" |
| 12673 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12674 | #: builtin/submodule--helper.c:415 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12675 | msgid "git submodule--helper init [<path>]" |
| 12676 | msgstr "git submodule--helper init [<路径>]" |
| 12677 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12678 | #: builtin/submodule--helper.c:436 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12679 | msgid "git submodule--helper name <path>" |
| 12680 | msgstr "git submodule--helper name <路径>" |
| 12681 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12682 | #: builtin/submodule--helper.c:442 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12683 | #, c-format |
| 12684 | msgid "no submodule mapping found in .gitmodules for path '%s'" |
| 12685 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" |
| 12686 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12687 | #: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12688 | #, c-format |
| 12689 | msgid "submodule '%s' cannot add alternate: %s" |
| 12690 | msgstr "子模组 '%s' 不能添加仓库备选:%s" |
| 12691 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12692 | #: builtin/submodule--helper.c:564 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12693 | #, c-format |
| 12694 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" |
| 12695 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" |
| 12696 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12697 | #: builtin/submodule--helper.c:571 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12698 | #, c-format |
| 12699 | msgid "Value '%s' for submodule.alternateLocation is not recognized" |
| 12700 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" |
| 12701 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12702 | #: builtin/submodule--helper.c:595 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12703 | msgid "where the new submodule will be cloned to" |
| 12704 | msgstr "新的子模组将要克隆的路径" |
| 12705 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12706 | #: builtin/submodule--helper.c:598 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12707 | msgid "name of the new submodule" |
| 12708 | msgstr "新子模组的名称" |
| 12709 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12710 | #: builtin/submodule--helper.c:601 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12711 | msgid "url where to clone the submodule from" |
| 12712 | msgstr "克隆子模组的 url 地址" |
| 12713 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12714 | #: builtin/submodule--helper.c:607 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12715 | msgid "depth for shallow clones" |
| 12716 | msgstr "浅克隆的深度" |
| 12717 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12718 | #: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12719 | msgid "force cloning progress" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 12720 | msgstr "强制显示克隆进度" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 12721 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12722 | #: builtin/submodule--helper.c:615 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12723 | msgid "" |
| 12724 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12725 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12726 | msgstr "" |
| 12727 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " |
| 12728 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12729 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12730 | #: builtin/submodule--helper.c:646 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12731 | #, c-format |
| 12732 | msgid "clone of '%s' into submodule path '%s' failed" |
| 12733 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" |
| 12734 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12735 | #: builtin/submodule--helper.c:662 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12736 | #, c-format |
| 12737 | msgid "cannot open file '%s'" |
| 12738 | msgstr "无法打开文件 '%s'" |
| 12739 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12740 | #: builtin/submodule--helper.c:667 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12741 | #, c-format |
| 12742 | msgid "could not close file %s" |
| 12743 | msgstr "无法关闭文件 %s" |
| 12744 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12745 | #: builtin/submodule--helper.c:674 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12746 | #, c-format |
| 12747 | msgid "could not get submodule directory for '%s'" |
| 12748 | msgstr "无法得到 '%s' 的子模组目录" |
| 12749 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12750 | #: builtin/submodule--helper.c:742 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12751 | #, c-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12752 | msgid "Submodule path '%s' not initialized" |
| 12753 | msgstr "子模组 '%s' 尚未初始化" |
| 12754 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12755 | #: builtin/submodule--helper.c:746 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12756 | msgid "Maybe you want to use 'update --init'?" |
| 12757 | msgstr "也许您想要执行 'update --init'?" |
| 12758 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12759 | #: builtin/submodule--helper.c:772 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12760 | #, c-format |
| 12761 | msgid "Skipping unmerged submodule %s" |
| 12762 | msgstr "略过未合并的子模组 %s" |
| 12763 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12764 | #: builtin/submodule--helper.c:793 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12765 | #, c-format |
| 12766 | msgid "Skipping submodule '%s'" |
| 12767 | msgstr "略过子模组 '%s'" |
| 12768 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12769 | #: builtin/submodule--helper.c:929 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12770 | #, c-format |
| 12771 | msgid "Failed to clone '%s'. Retry scheduled" |
| 12772 | msgstr "克隆 '%s' 失败。按计划重试" |
| 12773 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12774 | #: builtin/submodule--helper.c:940 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12775 | #, c-format |
| 12776 | msgid "Failed to clone '%s' a second time, aborting" |
| 12777 | msgstr "第二次尝试克隆 '%s' 失败,退出" |
| 12778 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12779 | #: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12780 | msgid "path into the working tree" |
| 12781 | msgstr "到工作区的路径" |
| 12782 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12783 | #: builtin/submodule--helper.c:964 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12784 | msgid "path into the working tree, across nested submodule boundaries" |
| 12785 | msgstr "工作区中的路径,递归嵌套子模组" |
| 12786 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12787 | #: builtin/submodule--helper.c:968 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12788 | msgid "rebase, merge, checkout or none" |
| 12789 | msgstr "rebase、merge、checkout 或 none" |
| 12790 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12791 | #: builtin/submodule--helper.c:972 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12792 | msgid "Create a shallow clone truncated to the specified number of revisions" |
| 12793 | msgstr "创建一个指定深度的浅克隆" |
| 12794 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12795 | #: builtin/submodule--helper.c:975 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12796 | msgid "parallel jobs" |
| 12797 | msgstr "并发任务" |
| 12798 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12799 | #: builtin/submodule--helper.c:977 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12800 | msgid "whether the initial clone should follow the shallow recommendation" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 12801 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12802 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12803 | #: builtin/submodule--helper.c:978 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12804 | msgid "don't print cloning progress" |
| 12805 | msgstr "不要输出克隆进度" |
| 12806 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12807 | #: builtin/submodule--helper.c:985 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12808 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
| 12809 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" |
| 12810 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12811 | #: builtin/submodule--helper.c:995 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12812 | msgid "bad value for update parameter" |
| 12813 | msgstr "update 参数取值错误" |
| 12814 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12815 | #: builtin/submodule--helper.c:1066 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 12816 | #, c-format |
| 12817 | msgid "" |
| 12818 | "Submodule (%s) branch configured to inherit branch from superproject, but " |
| 12819 | "the superproject is not on any branch" |
| 12820 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" |
| 12821 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12822 | #: builtin/submodule--helper.c:1106 |
| 12823 | msgid "recurse into submodules" |
| 12824 | msgstr "在子模组中递归" |
| 12825 | |
| 12826 | #: builtin/submodule--helper.c:1112 |
| 12827 | msgid "git submodule--helper embed-git-dir [<path>...]" |
| 12828 | msgstr "git submodule--helper embed-git-dir [<路径>...]" |
| 12829 | |
| 12830 | #: builtin/submodule--helper.c:1157 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12831 | msgid "submodule--helper subcommand must be called with a subcommand" |
| 12832 | msgstr "submodule-helper 子命令必须由另外的子命令调用" |
| 12833 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12834 | #: builtin/submodule--helper.c:1164 |
| 12835 | #, c-format |
| 12836 | msgid "%s doesn't support --super-prefix" |
| 12837 | msgstr "%s 不支持 --super-prefix" |
| 12838 | |
| 12839 | #: builtin/submodule--helper.c:1170 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 12840 | #, c-format |
| 12841 | msgid "'%s' is not a valid submodule--helper subcommand" |
| 12842 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12843 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12844 | #: builtin/symbolic-ref.c:7 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12845 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
| 12846 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12847 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12848 | #: builtin/symbolic-ref.c:8 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12849 | msgid "git symbolic-ref -d [-q] <name>" |
| 12850 | msgstr "git symbolic-ref -d [-q] <名称>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12851 | |
| 12852 | #: builtin/symbolic-ref.c:40 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12853 | msgid "suppress error message for non-symbolic (detached) refs" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12854 | msgstr "不显示非符号(分离的)引用的错误信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12855 | |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12856 | #: builtin/symbolic-ref.c:41 |
| 12857 | msgid "delete symbolic ref" |
| 12858 | msgstr "删除符号引用" |
| 12859 | |
| 12860 | #: builtin/symbolic-ref.c:42 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12861 | msgid "shorten ref output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12862 | msgstr "简短的引用输出" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12863 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 12864 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12865 | msgid "reason" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12866 | msgstr "原因" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12867 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 12868 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12869 | msgid "reason of the update" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12870 | msgstr "更新的原因" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12871 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12872 | #: builtin/tag.c:23 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12873 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12874 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
| 12875 | "[<head>]" |
| 12876 | msgstr "" |
| 12877 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12878 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12879 | #: builtin/tag.c:24 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12880 | msgid "git tag -d <tagname>..." |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 12881 | msgstr "git tag -d <标签名>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12882 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12883 | #: builtin/tag.c:25 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12884 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 12885 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12886 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12887 | msgstr "" |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12888 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" |
| 12889 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12890 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 12891 | #: builtin/tag.c:27 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12892 | msgid "git tag -v [--format=<format>] <tagname>..." |
| 12893 | msgstr "git tag -v [--format=<格式>] <标签名>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12894 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12895 | #: builtin/tag.c:82 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12896 | #, c-format |
| 12897 | msgid "tag name too long: %.*s..." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12898 | msgstr "标签名称太长:%.*s..." |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12899 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12900 | #: builtin/tag.c:87 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12901 | #, c-format |
| 12902 | msgid "tag '%s' not found." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12903 | msgstr "未发现标签 '%s'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12904 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12905 | #: builtin/tag.c:102 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12906 | #, c-format |
| 12907 | msgid "Deleted tag '%s' (was %s)\n" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12908 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12909 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12910 | #: builtin/tag.c:131 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12911 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12912 | msgid "" |
| 12913 | "\n" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12914 | "Write a message for tag:\n" |
| 12915 | " %s\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12916 | "Lines starting with '%c' will be ignored.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12917 | msgstr "" |
| 12918 | "\n" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12919 | "输入一个标签说明:\n" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12920 | " %s\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12921 | "以 '%c' 开头的行将被忽略。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12922 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12923 | #: builtin/tag.c:135 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12924 | #, c-format |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12925 | msgid "" |
| 12926 | "\n" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12927 | "Write a message for tag:\n" |
| 12928 | " %s\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12929 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12930 | "want to.\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12931 | msgstr "" |
| 12932 | "\n" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12933 | "输入一个标签说明:\n" |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 12934 | " %s\n" |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 12935 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12936 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12937 | #: builtin/tag.c:213 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12938 | msgid "unable to sign the tag" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12939 | msgstr "无法签署标签" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12940 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12941 | #: builtin/tag.c:215 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12942 | msgid "unable to write tag file" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12943 | msgstr "无法写标签文件" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12944 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12945 | #: builtin/tag.c:240 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12946 | msgid "bad object type." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 12947 | msgstr "坏的对象类型。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12948 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12949 | #: builtin/tag.c:253 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12950 | msgid "tag header too big." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12951 | msgstr "标签头信息太大。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12952 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12953 | #: builtin/tag.c:289 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12954 | msgid "no tag message?" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12955 | msgstr "无标签说明?" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12956 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12957 | #: builtin/tag.c:295 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12958 | #, c-format |
| 12959 | msgid "The tag message has been left in %s\n" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12960 | msgstr "标签说明被保留在 %s\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 12961 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12962 | #: builtin/tag.c:354 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12963 | msgid "list tag names" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12964 | msgstr "列出标签名称" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12965 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12966 | #: builtin/tag.c:356 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12967 | msgid "print <n> lines of each tag message" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12968 | msgstr "每个标签信息打印 <n> 行" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12969 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12970 | #: builtin/tag.c:358 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12971 | msgid "delete tags" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12972 | msgstr "删除标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12973 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12974 | #: builtin/tag.c:359 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12975 | msgid "verify tags" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12976 | msgstr "验证标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12977 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12978 | #: builtin/tag.c:361 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12979 | msgid "Tag creation options" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12980 | msgstr "标签创建选项" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12981 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12982 | #: builtin/tag.c:363 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12983 | msgid "annotated tag, needs a message" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12984 | msgstr "附注标签,需要一个说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12985 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12986 | #: builtin/tag.c:365 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12987 | msgid "tag message" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12988 | msgstr "标签说明" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12989 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12990 | #: builtin/tag.c:367 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12991 | msgid "annotated and GPG-signed tag" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12992 | msgstr "附注并附加 GPG 签名的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12993 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12994 | #: builtin/tag.c:371 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12995 | msgid "use another key to sign the tag" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 12996 | msgstr "使用另外的私钥签名该标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12997 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 12998 | #: builtin/tag.c:372 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 12999 | msgid "replace the tag if exists" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13000 | msgstr "如果存在,替换现有的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13001 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13002 | #: builtin/tag.c:373 builtin/update-ref.c:368 |
Jiang Xin | 03ea332 | 2015-09-15 21:51:26 +0800 | [diff] [blame] | 13003 | msgid "create a reflog" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13004 | msgstr "创建引用日志" |
| 13005 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13006 | #: builtin/tag.c:375 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13007 | msgid "Tag listing options" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13008 | msgstr "标签列表选项" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13009 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13010 | #: builtin/tag.c:376 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13011 | msgid "show tag list in columns" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13012 | msgstr "以列的方式显示标签列表" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13013 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13014 | #: builtin/tag.c:377 builtin/tag.c:378 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13015 | msgid "print only tags that contain the commit" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13016 | msgstr "只打印包含提交的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13017 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13018 | #: builtin/tag.c:379 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13019 | msgid "print only tags that are merged" |
| 13020 | msgstr "只打印已经合并的标签" |
| 13021 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13022 | #: builtin/tag.c:380 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13023 | msgid "print only tags that are not merged" |
| 13024 | msgstr "只打印尚未合并的标签" |
| 13025 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13026 | #: builtin/tag.c:385 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13027 | msgid "print only tags of the object" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13028 | msgstr "只打印对象的标签" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13029 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13030 | #: builtin/tag.c:415 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13031 | msgid "--column and -n are incompatible" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13032 | msgstr "--column 和 -n 不兼容" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13033 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13034 | #: builtin/tag.c:437 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13035 | msgid "-n option is only allowed with -l." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13036 | msgstr "-n 选项只允许和 -l 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13037 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13038 | #: builtin/tag.c:439 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13039 | msgid "--contains option is only allowed with -l." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13040 | msgstr "--contains 选项只允许和 -l 同时使用。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13041 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13042 | #: builtin/tag.c:441 |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 13043 | msgid "--points-at option is only allowed with -l." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13044 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
Jiang Xin | 7ac1c0a | 2012-02-28 12:24:54 +0800 | [diff] [blame] | 13045 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13046 | #: builtin/tag.c:443 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13047 | msgid "--merged and --no-merged option are only allowed with -l" |
| 13048 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" |
| 13049 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13050 | #: builtin/tag.c:454 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13051 | msgid "only one -F or -m option is allowed." |
| 13052 | msgstr "只允许一个 -F 或 -m 选项。" |
| 13053 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13054 | #: builtin/tag.c:473 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13055 | msgid "too many params" |
| 13056 | msgstr "太多参数" |
| 13057 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13058 | #: builtin/tag.c:479 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13059 | #, c-format |
| 13060 | msgid "'%s' is not a valid tag name." |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13061 | msgstr "'%s' 不是一个有效的标签名称。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13062 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13063 | #: builtin/tag.c:484 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13064 | #, c-format |
| 13065 | msgid "tag '%s' already exists" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13066 | msgstr "标签 '%s' 已存在" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13067 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13068 | #: builtin/tag.c:512 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13069 | #, c-format |
| 13070 | msgid "Updated tag '%s' (was %s)\n" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13071 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13072 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13073 | #: builtin/unpack-objects.c:493 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 13074 | msgid "Unpacking objects" |
| 13075 | msgstr "展开对象中" |
| 13076 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13077 | #: builtin/update-index.c:79 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13078 | #, c-format |
| 13079 | msgid "failed to create directory %s" |
| 13080 | msgstr "无法创建目录 %s" |
| 13081 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13082 | #: builtin/update-index.c:85 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13083 | #, c-format |
| 13084 | msgid "failed to stat %s" |
| 13085 | msgstr "无法枚举 %s 状态" |
| 13086 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13087 | #: builtin/update-index.c:95 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13088 | #, c-format |
| 13089 | msgid "failed to create file %s" |
| 13090 | msgstr "无法创建文件 %s" |
| 13091 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13092 | #: builtin/update-index.c:103 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13093 | #, c-format |
| 13094 | msgid "failed to delete file %s" |
| 13095 | msgstr "无法删除文件 %s" |
| 13096 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13097 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13098 | #, c-format |
| 13099 | msgid "failed to delete directory %s" |
| 13100 | msgstr "无法删除目录 %s" |
| 13101 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13102 | #: builtin/update-index.c:133 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13103 | #, c-format |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13104 | msgid "Testing mtime in '%s' " |
| 13105 | msgstr "在 '%s' 中测试 mtime " |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13106 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13107 | #: builtin/update-index.c:145 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13108 | msgid "directory stat info does not change after adding a new file" |
| 13109 | msgstr "添加一个新文件后,目录的状态信息未改变" |
| 13110 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13111 | #: builtin/update-index.c:158 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13112 | msgid "directory stat info does not change after adding a new directory" |
| 13113 | msgstr "添加一个新目录后,目录的状态信息未改变" |
| 13114 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13115 | #: builtin/update-index.c:171 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13116 | msgid "directory stat info changes after updating a file" |
| 13117 | msgstr "更新一个文件后,目录的状态信息被修改" |
| 13118 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13119 | #: builtin/update-index.c:182 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13120 | msgid "directory stat info changes after adding a file inside subdirectory" |
| 13121 | msgstr "在子目录中添加文件后,目录的状态信息被修改" |
| 13122 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13123 | #: builtin/update-index.c:193 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13124 | msgid "directory stat info does not change after deleting a file" |
| 13125 | msgstr "删除一个文件后,目录的状态信息未改变" |
| 13126 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13127 | #: builtin/update-index.c:206 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13128 | msgid "directory stat info does not change after deleting a directory" |
| 13129 | msgstr "删除一个目录后,目录的状态信息未改变" |
| 13130 | |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13131 | #: builtin/update-index.c:213 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13132 | msgid " OK" |
| 13133 | msgstr " OK" |
| 13134 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13135 | #: builtin/update-index.c:564 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13136 | msgid "git update-index [<options>] [--] [<file>...]" |
| 13137 | msgstr "git update-index [<选项>] [--] [<文件>...]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13138 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13139 | #: builtin/update-index.c:919 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13140 | msgid "continue refresh even when index needs update" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13141 | msgstr "当索引需要更新时继续刷新" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13142 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13143 | #: builtin/update-index.c:922 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13144 | msgid "refresh: ignore submodules" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13145 | msgstr "刷新:忽略子模组" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13146 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13147 | #: builtin/update-index.c:925 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13148 | msgid "do not ignore new files" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13149 | msgstr "不忽略新的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13150 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13151 | #: builtin/update-index.c:927 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13152 | msgid "let files replace directories and vice-versa" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13153 | msgstr "让文件替换目录(反之亦然)" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13154 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13155 | #: builtin/update-index.c:929 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13156 | msgid "notice files missing from worktree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13157 | msgstr "通知文件从工作区丢失" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13158 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13159 | #: builtin/update-index.c:931 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13160 | msgid "refresh even if index contains unmerged entries" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13161 | msgstr "即使索引区包含未合并的条目也执行刷新" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13162 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13163 | #: builtin/update-index.c:934 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13164 | msgid "refresh stat information" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13165 | msgstr "刷新统计信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13166 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13167 | #: builtin/update-index.c:938 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13168 | msgid "like --refresh, but ignore assume-unchanged setting" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13169 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13170 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13171 | #: builtin/update-index.c:942 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 13172 | msgid "<mode>,<object>,<path>" |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 13173 | msgstr "<存取模式>,<对象>,<路径>" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13174 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13175 | #: builtin/update-index.c:943 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13176 | msgid "add the specified entry to the index" |
| 13177 | msgstr "添加指定的条目到索引区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13178 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13179 | #: builtin/update-index.c:952 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13180 | msgid "mark files as \"not changing\"" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13181 | msgstr "把文件标记为 \"没有变更\"" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13182 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13183 | #: builtin/update-index.c:955 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13184 | msgid "clear assumed-unchanged bit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13185 | msgstr "清除 assumed-unchanged 位" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13186 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13187 | #: builtin/update-index.c:958 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13188 | msgid "mark files as \"index-only\"" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13189 | msgstr "把文件标记为 \"仅索引\"" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13190 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13191 | #: builtin/update-index.c:961 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13192 | msgid "clear skip-worktree bit" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13193 | msgstr "清除 skip-worktree 位" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13194 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13195 | #: builtin/update-index.c:964 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13196 | msgid "add to index only; do not add content to object database" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13197 | msgstr "只添加到索引区;不添加对象到对象库" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13198 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13199 | #: builtin/update-index.c:966 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13200 | msgid "remove named paths even if present in worktree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13201 | msgstr "即使存在工作区里,也删除路径" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13202 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13203 | #: builtin/update-index.c:968 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13204 | msgid "with --stdin: input lines are terminated by null bytes" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13205 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13206 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13207 | #: builtin/update-index.c:970 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13208 | msgid "read list of paths to be updated from standard input" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13209 | msgstr "从标准输入中读取需要更新的路径列表" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13210 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13211 | #: builtin/update-index.c:974 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13212 | msgid "add entries from standard input to the index" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13213 | msgstr "从标准输入添加条目到索引区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13214 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13215 | #: builtin/update-index.c:978 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13216 | msgid "repopulate stages #2 and #3 for the listed paths" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13217 | msgstr "为指定文件重新生成第2和第3暂存区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13218 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13219 | #: builtin/update-index.c:982 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13220 | msgid "only update entries that differ from HEAD" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13221 | msgstr "只更新与 HEAD 不同的条目" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13222 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13223 | #: builtin/update-index.c:986 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13224 | msgid "ignore files missing from worktree" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13225 | msgstr "忽略工作区丢失的文件" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13226 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13227 | #: builtin/update-index.c:989 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13228 | msgid "report actions to standard output" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13229 | msgstr "在标准输出显示操作" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13230 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13231 | #: builtin/update-index.c:991 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13232 | msgid "(for porcelains) forget saved unresolved conflicts" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13233 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13234 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13235 | #: builtin/update-index.c:995 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13236 | msgid "write index in this format" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13237 | msgstr "以这种格式写入索引区" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13238 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13239 | #: builtin/update-index.c:997 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 13240 | msgid "enable or disable split index" |
| 13241 | msgstr "启用或禁用索引拆分" |
| 13242 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13243 | #: builtin/update-index.c:999 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13244 | msgid "enable/disable untracked cache" |
| 13245 | msgstr "启用/禁用对未跟踪文件的缓存" |
| 13246 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13247 | #: builtin/update-index.c:1001 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13248 | msgid "test if the filesystem supports untracked cache" |
| 13249 | msgstr "测试文件系统是否支持未跟踪文件缓存" |
| 13250 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13251 | #: builtin/update-index.c:1003 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13252 | msgid "enable untracked cache without testing the filesystem" |
| 13253 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" |
| 13254 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13255 | #: builtin/update-index.c:1120 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13256 | msgid "" |
| 13257 | "core.untrackedCache is set to true; remove or change it, if you really want " |
| 13258 | "to disable the untracked cache" |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 13259 | msgstr "" |
| 13260 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" |
| 13261 | "改它。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13262 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13263 | #: builtin/update-index.c:1124 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13264 | msgid "Untracked cache disabled" |
| 13265 | msgstr "缓存未跟踪文件被禁用" |
| 13266 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13267 | #: builtin/update-index.c:1132 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13268 | msgid "" |
| 13269 | "core.untrackedCache is set to false; remove or change it, if you really want " |
| 13270 | "to enable the untracked cache" |
Jiang Xin | 275588f | 2016-11-22 22:24:59 +0800 | [diff] [blame] | 13271 | msgstr "" |
| 13272 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" |
| 13273 | "修改它。" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13274 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13275 | #: builtin/update-index.c:1136 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13276 | #, c-format |
| 13277 | msgid "Untracked cache enabled for '%s'" |
| 13278 | msgstr "缓存未跟踪文件在 '%s' 启用" |
| 13279 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13280 | #: builtin/update-ref.c:9 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13281 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
| 13282 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13283 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13284 | #: builtin/update-ref.c:10 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13285 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
| 13286 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13287 | |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13288 | #: builtin/update-ref.c:11 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13289 | msgid "git update-ref [<options>] --stdin [-z]" |
| 13290 | msgstr "git update-ref [<选项>] --stdin [-z]" |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13291 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13292 | #: builtin/update-ref.c:363 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13293 | msgid "delete the reference" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13294 | msgstr "删除引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13295 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13296 | #: builtin/update-ref.c:365 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13297 | msgid "update <refname> not the one it points to" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13298 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13299 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13300 | #: builtin/update-ref.c:366 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13301 | msgid "stdin has NUL-terminated arguments" |
| 13302 | msgstr "标准输入有以 NUL 字符终止的参数" |
| 13303 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13304 | #: builtin/update-ref.c:367 |
Jiang Xin | 9031479 | 2013-09-17 23:37:05 +0800 | [diff] [blame] | 13305 | msgid "read updates from stdin" |
| 13306 | msgstr "从标准输入读取更新" |
| 13307 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13308 | #: builtin/update-server-info.c:6 |
| 13309 | msgid "git update-server-info [--force]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13310 | msgstr "git update-server-info [--force]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13311 | |
| 13312 | #: builtin/update-server-info.c:14 |
| 13313 | msgid "update the info files from scratch" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13314 | msgstr "从头开始更新文件信息" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13315 | |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 13316 | #: builtin/verify-commit.c:17 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13317 | msgid "git verify-commit [-v | --verbose] <commit>..." |
| 13318 | msgstr "git verify-commit [-v | --verbose] <提交>..." |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 13319 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13320 | #: builtin/verify-commit.c:72 |
Jiang Xin | 6acbf03 | 2014-08-04 16:23:15 +0800 | [diff] [blame] | 13321 | msgid "print commit contents" |
| 13322 | msgstr "打印提交内容" |
| 13323 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13324 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:37 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13325 | msgid "print raw gpg status output" |
| 13326 | msgstr "打印原始 gpg 状态输出" |
| 13327 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13328 | #: builtin/verify-pack.c:54 |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13329 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
| 13330 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13331 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13332 | #: builtin/verify-pack.c:64 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13333 | msgid "verbose" |
| 13334 | msgstr "冗长输出" |
| 13335 | |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13336 | #: builtin/verify-pack.c:66 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13337 | msgid "show statistics only" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13338 | msgstr "只显示统计" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13339 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13340 | #: builtin/verify-tag.c:18 |
| 13341 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
| 13342 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13343 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13344 | #: builtin/verify-tag.c:36 |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13345 | msgid "print tag contents" |
Ray Chen | 55a16ee | 2015-07-28 12:52:28 +0800 | [diff] [blame] | 13346 | msgstr "打印标签内容" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13347 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13348 | #: builtin/worktree.c:15 |
| 13349 | msgid "git worktree add [<options>] <path> [<branch>]" |
| 13350 | msgstr "git worktree add [<选项>] <路径> [<分支>]" |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13351 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13352 | #: builtin/worktree.c:16 |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13353 | msgid "git worktree list [<options>]" |
| 13354 | msgstr "git worktree list [<选项>]" |
| 13355 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13356 | #: builtin/worktree.c:17 |
| 13357 | msgid "git worktree lock [<options>] <path>" |
| 13358 | msgstr "git worktree lock [<选项>] <路径>" |
| 13359 | |
| 13360 | #: builtin/worktree.c:18 |
| 13361 | msgid "git worktree prune [<options>]" |
| 13362 | msgstr "git worktree prune [<选项>]" |
| 13363 | |
| 13364 | #: builtin/worktree.c:19 |
| 13365 | msgid "git worktree unlock <path>" |
| 13366 | msgstr "git worktree unlock <路径>" |
| 13367 | |
| 13368 | #: builtin/worktree.c:42 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13369 | #, c-format |
| 13370 | msgid "Removing worktrees/%s: not a valid directory" |
| 13371 | msgstr "删除工作区/%s:不是一个有效的目录" |
| 13372 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13373 | #: builtin/worktree.c:48 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13374 | #, c-format |
| 13375 | msgid "Removing worktrees/%s: gitdir file does not exist" |
| 13376 | msgstr "删除 worktrees/%s:gitdir 文件不存在" |
| 13377 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13378 | #: builtin/worktree.c:53 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13379 | #, c-format |
| 13380 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" |
| 13381 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" |
| 13382 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13383 | #: builtin/worktree.c:64 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13384 | #, c-format |
| 13385 | msgid "Removing worktrees/%s: invalid gitdir file" |
| 13386 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" |
| 13387 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13388 | #: builtin/worktree.c:80 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13389 | #, c-format |
| 13390 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" |
| 13391 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" |
| 13392 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13393 | #: builtin/worktree.c:128 |
| 13394 | msgid "report pruned working trees" |
| 13395 | msgstr "报告清除的工作区" |
| 13396 | |
| 13397 | #: builtin/worktree.c:130 |
| 13398 | msgid "expire working trees older than <time>" |
| 13399 | msgstr "将早于 <time> 的工作区过期" |
| 13400 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13401 | #: builtin/worktree.c:204 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13402 | #, c-format |
| 13403 | msgid "'%s' already exists" |
| 13404 | msgstr "'%s' 已经存在" |
| 13405 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13406 | #: builtin/worktree.c:236 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13407 | #, c-format |
| 13408 | msgid "could not create directory of '%s'" |
| 13409 | msgstr "不能创建目录 '%s'" |
| 13410 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13411 | #: builtin/worktree.c:272 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13412 | #, c-format |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13413 | msgid "Preparing %s (identifier %s)" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 13414 | msgstr "准备 %s(标识符 %s)" |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13415 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13416 | #: builtin/worktree.c:323 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13417 | msgid "checkout <branch> even if already checked out in other worktree" |
| 13418 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" |
| 13419 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13420 | #: builtin/worktree.c:325 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13421 | msgid "create a new branch" |
| 13422 | msgstr "创建一个新分支" |
| 13423 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13424 | #: builtin/worktree.c:327 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13425 | msgid "create or reset a branch" |
| 13426 | msgstr "创建或重置一个分支" |
| 13427 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13428 | #: builtin/worktree.c:329 |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 13429 | msgid "populate the new working tree" |
| 13430 | msgstr "生成新的工作区" |
| 13431 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13432 | #: builtin/worktree.c:337 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13433 | msgid "-b, -B, and --detach are mutually exclusive" |
| 13434 | msgstr "-b、-B 和 --detach 是互斥的" |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13435 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13436 | #: builtin/worktree.c:472 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13437 | msgid "reason for locking" |
| 13438 | msgstr "锁定原因" |
| 13439 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13440 | #: builtin/worktree.c:484 builtin/worktree.c:517 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13441 | #, c-format |
| 13442 | msgid "'%s' is not a working tree" |
| 13443 | msgstr "'%s' 不是一个工作区" |
| 13444 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13445 | #: builtin/worktree.c:486 builtin/worktree.c:519 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13446 | msgid "The main working tree cannot be locked or unlocked" |
| 13447 | msgstr "主工作区无法被加锁或解锁" |
| 13448 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13449 | #: builtin/worktree.c:491 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13450 | #, c-format |
| 13451 | msgid "'%s' is already locked, reason: %s" |
| 13452 | msgstr "'%s' 已被锁定,原因:%s" |
| 13453 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13454 | #: builtin/worktree.c:493 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13455 | #, c-format |
| 13456 | msgid "'%s' is already locked" |
| 13457 | msgstr "'%s' 已被锁定" |
| 13458 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13459 | #: builtin/worktree.c:521 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13460 | #, c-format |
| 13461 | msgid "'%s' is not locked" |
| 13462 | msgstr "'%s' 未被锁定" |
| 13463 | |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13464 | #: builtin/write-tree.c:13 |
| 13465 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13466 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13467 | |
| 13468 | #: builtin/write-tree.c:26 |
| 13469 | msgid "<prefix>/" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13470 | msgstr "<前缀>/" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13471 | |
| 13472 | #: builtin/write-tree.c:27 |
| 13473 | msgid "write tree object for a subdirectory <prefix>" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13474 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13475 | |
| 13476 | #: builtin/write-tree.c:30 |
| 13477 | msgid "only useful for debugging" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13478 | msgstr "只对调试有用" |
Jiang Xin | ef317cd | 2012-09-15 11:17:00 +0800 | [diff] [blame] | 13479 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13480 | #: upload-pack.c:22 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13481 | msgid "git upload-pack [<options>] <dir>" |
| 13482 | msgstr "git upload-pack [<选项>] <目录>" |
| 13483 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13484 | #: upload-pack.c:1036 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13485 | msgid "quit after a single request/response exchange" |
| 13486 | msgstr "在一次单独的请求/响应(request/response)交换后退出" |
| 13487 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13488 | #: upload-pack.c:1038 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13489 | msgid "exit immediately after initial ref advertisement" |
| 13490 | msgstr "在初始的引用广告后立即退出" |
| 13491 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13492 | #: upload-pack.c:1040 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13493 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
| 13494 | msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" |
| 13495 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13496 | #: upload-pack.c:1042 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13497 | msgid "interrupt transfer after <n> seconds of inactivity" |
| 13498 | msgstr "不活动 <n> 秒钟后终止传输" |
| 13499 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13500 | #: credential-cache--daemon.c:223 |
| 13501 | #, c-format |
| 13502 | msgid "" |
| 13503 | "The permissions on your socket directory are too loose; other\n" |
| 13504 | "users may be able to read your cached credentials. Consider running:\n" |
| 13505 | "\n" |
| 13506 | "\tchmod 0700 %s" |
| 13507 | msgstr "" |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13508 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
| 13509 | "行:\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13510 | "\n" |
| 13511 | "\tchmod 0700 %s" |
| 13512 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 13513 | #: credential-cache--daemon.c:271 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13514 | msgid "print debugging messages to stderr" |
| 13515 | msgstr "调试信息输出到标准错误" |
| 13516 | |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 13517 | #: git.c:14 |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 13518 | msgid "" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13519 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
Jiang Xin | 4dcdc3d | 2013-04-13 10:02:43 +0800 | [diff] [blame] | 13520 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
| 13521 | "to read about a specific subcommand or concept." |
| 13522 | msgstr "" |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13523 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
| 13524 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" |
| 13525 | "帮助。" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13526 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13527 | #: http.c:344 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13528 | msgid "Delegation control is not supported with cURL < 7.22.0" |
| 13529 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" |
| 13530 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13531 | #: http.c:353 |
Jiang Xin | 276ceea | 2016-02-28 20:35:55 +0800 | [diff] [blame] | 13532 | msgid "Public key pinning not supported with cURL < 7.44.0" |
| 13533 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" |
| 13534 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13535 | #: http.c:1713 |
| 13536 | #, c-format |
| 13537 | msgid "" |
| 13538 | "unable to update url base from redirection:\n" |
| 13539 | " asked for: %s\n" |
| 13540 | " redirect: %s" |
| 13541 | msgstr "" |
| 13542 | "不能更新重定向的 url base:\n" |
| 13543 | " 请求:%s\n" |
| 13544 | " 重定向:%s" |
| 13545 | |
| 13546 | #: remote-curl.c:319 |
| 13547 | #, c-format |
| 13548 | msgid "redirecting to %s" |
| 13549 | msgstr "重定向到 %s" |
| 13550 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13551 | #: common-cmds.h:9 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13552 | msgid "start a working area (see also: git help tutorial)" |
| 13553 | msgstr "开始一个工作区(参见:git help tutorial)" |
| 13554 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13555 | #: common-cmds.h:10 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13556 | msgid "work on the current change (see also: git help everyday)" |
| 13557 | msgstr "在当前变更上工作(参见:git help everyday)" |
| 13558 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13559 | #: common-cmds.h:11 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13560 | msgid "examine the history and state (see also: git help revisions)" |
| 13561 | msgstr "检查历史和状态(参见:git help revisions)" |
| 13562 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13563 | #: common-cmds.h:12 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13564 | msgid "grow, mark and tweak your common history" |
| 13565 | msgstr "扩展、标记和调校您的历史记录" |
| 13566 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13567 | #: common-cmds.h:13 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 13568 | msgid "collaborate (see also: git help workflows)" |
| 13569 | msgstr "协同(参见:git help workflows)" |
| 13570 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13571 | #: common-cmds.h:17 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13572 | msgid "Add file contents to the index" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13573 | msgstr "添加文件内容至索引" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13574 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13575 | #: common-cmds.h:18 |
| 13576 | msgid "Use binary search to find the commit that introduced a bug" |
| 13577 | msgstr "通过二分查找定位引入 bug 的提交" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13578 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13579 | #: common-cmds.h:19 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13580 | msgid "List, create, or delete branches" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13581 | msgstr "列出、创建或删除分支" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13582 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13583 | #: common-cmds.h:20 |
Jiang Xin | 5bb01d4 | 2015-07-14 07:33:09 +0800 | [diff] [blame] | 13584 | msgid "Switch branches or restore working tree files" |
| 13585 | msgstr "切换分支或恢复工作区文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13586 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13587 | #: common-cmds.h:21 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13588 | msgid "Clone a repository into a new directory" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 13589 | msgstr "克隆一个仓库到一个新目录" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13590 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13591 | #: common-cmds.h:22 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13592 | msgid "Record changes to the repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 13593 | msgstr "记录变更到仓库" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13594 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13595 | #: common-cmds.h:23 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13596 | msgid "Show changes between commits, commit and working tree, etc" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13597 | msgstr "显示提交之间、提交和工作区之间等的差异" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13598 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13599 | #: common-cmds.h:24 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13600 | msgid "Download objects and refs from another repository" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 13601 | msgstr "从另外一个仓库下载对象和引用" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13602 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13603 | #: common-cmds.h:25 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13604 | msgid "Print lines matching a pattern" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13605 | msgstr "输出和模式匹配的行" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13606 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13607 | #: common-cmds.h:26 |
Jiang Xin | a77c07d | 2013-02-14 17:47:45 +0800 | [diff] [blame] | 13608 | msgid "Create an empty Git repository or reinitialize an existing one" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 13609 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13610 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13611 | #: common-cmds.h:27 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13612 | msgid "Show commit logs" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13613 | msgstr "显示提交日志" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13614 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13615 | #: common-cmds.h:28 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13616 | msgid "Join two or more development histories together" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13617 | msgstr "合并两个或更多开发历史" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13618 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13619 | #: common-cmds.h:29 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13620 | msgid "Move or rename a file, a directory, or a symlink" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13621 | msgstr "移动或重命名一个文件、目录或符号链接" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13622 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13623 | #: common-cmds.h:30 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 13624 | msgid "Fetch from and integrate with another repository or a local branch" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 13625 | msgstr "获取并整合另外的仓库或一个本地分支" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13626 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13627 | #: common-cmds.h:31 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13628 | msgid "Update remote refs along with associated objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13629 | msgstr "更新远程引用和相关的对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13630 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13631 | #: common-cmds.h:32 |
Jiang Xin | 3495628 | 2016-03-12 22:09:24 +0800 | [diff] [blame] | 13632 | msgid "Reapply commits on top of another base tip" |
| 13633 | msgstr "在另一个分支上重新应用提交" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13634 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13635 | #: common-cmds.h:33 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13636 | msgid "Reset current HEAD to the specified state" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 13637 | msgstr "重置当前 HEAD 到指定状态" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13638 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13639 | #: common-cmds.h:34 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13640 | msgid "Remove files from the working tree and from the index" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13641 | msgstr "从工作区和索引中删除文件" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13642 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13643 | #: common-cmds.h:35 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13644 | msgid "Show various types of objects" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13645 | msgstr "显示各种类型的对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13646 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13647 | #: common-cmds.h:36 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13648 | msgid "Show the working tree status" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13649 | msgstr "显示工作区状态" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13650 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13651 | #: common-cmds.h:37 |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13652 | msgid "Create, list, delete or verify a tag object signed with GPG" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 13653 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
Jiang Xin | 8ada959 | 2012-05-21 09:35:47 +0800 | [diff] [blame] | 13654 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13655 | #: parse-options.h:145 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13656 | msgid "expiry-date" |
| 13657 | msgstr "到期时间" |
| 13658 | |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13659 | #: parse-options.h:160 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13660 | msgid "no-op (backward compatibility)" |
| 13661 | msgstr "空操作(向后兼容)" |
| 13662 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13663 | #: parse-options.h:238 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13664 | msgid "be more verbose" |
| 13665 | msgstr "更加详细" |
| 13666 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13667 | #: parse-options.h:240 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13668 | msgid "be more quiet" |
| 13669 | msgstr "更加安静" |
| 13670 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13671 | #: parse-options.h:246 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13672 | msgid "use <n> digits to display SHA-1s" |
| 13673 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" |
| 13674 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 13675 | #: rerere.h:40 |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 13676 | msgid "update the index with reused conflict resolution if possible" |
| 13677 | msgstr "如果可能,重用冲突解决更新索引" |
| 13678 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13679 | #: git-bisect.sh:54 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13680 | msgid "You need to start by \"git bisect start\"" |
| 13681 | msgstr "您需要执行 \"git bisect start\" 来开始" |
| 13682 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 13683 | # 译者:注意保持句尾空格 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13684 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 13685 | #. translation. The program will only accept English input |
| 13686 | #. at this point. |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13687 | #: git-bisect.sh:60 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13688 | msgid "Do you want me to do it for you [Y/n]? " |
| 13689 | msgstr "您想让我为您这样做么[Y/n]? " |
| 13690 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13691 | #: git-bisect.sh:121 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13692 | #, sh-format |
| 13693 | msgid "unrecognised option: '$arg'" |
Jiang Xin | 81809b9 | 2012-05-30 12:19:47 +0800 | [diff] [blame] | 13694 | msgstr "未能识别的选项:'$arg'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13695 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13696 | #: git-bisect.sh:125 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13697 | #, sh-format |
| 13698 | msgid "'$arg' does not appear to be a valid revision" |
| 13699 | msgstr "'$arg' 看起来不像是一个有效的版本" |
| 13700 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13701 | #: git-bisect.sh:154 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13702 | msgid "Bad HEAD - I need a HEAD" |
| 13703 | msgstr "坏的 HEAD - 我需要一个 HEAD" |
| 13704 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13705 | #: git-bisect.sh:167 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13706 | #, sh-format |
| 13707 | msgid "" |
Jiang Xin | 814ff31 | 2015-02-16 21:34:19 +0800 | [diff] [blame] | 13708 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
Jiang Xin | d9d56b2 | 2015-01-18 20:37:57 +0800 | [diff] [blame] | 13709 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13710 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13711 | #: git-bisect.sh:177 |
Jiang Xin | cfff71a | 2014-01-18 11:04:21 +0800 | [diff] [blame] | 13712 | msgid "won't bisect on cg-seek'ed tree" |
| 13713 | msgstr "不会在做了 cg-seek 的树上做二分查找" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13714 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13715 | #: git-bisect.sh:181 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13716 | msgid "Bad HEAD - strange symbolic ref" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 13717 | msgstr "坏的 HEAD - 奇怪的符号引用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13718 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13719 | #: git-bisect.sh:233 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13720 | #, sh-format |
| 13721 | msgid "Bad bisect_write argument: $state" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 13722 | msgstr "坏的 bisect_write 参数:$state" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13723 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13724 | #: git-bisect.sh:262 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13725 | #, sh-format |
| 13726 | msgid "Bad rev input: $arg" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 13727 | msgstr "坏的输入版本:$arg" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13728 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13729 | #: git-bisect.sh:281 |
| 13730 | #, sh-format |
| 13731 | msgid "Bad rev input: $bisected_head" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 13732 | msgstr "坏的输入版本:$bisected_head" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13733 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13734 | #: git-bisect.sh:290 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13735 | #, sh-format |
| 13736 | msgid "Bad rev input: $rev" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 13737 | msgstr "坏的输入版本:$rev" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13738 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13739 | #: git-bisect.sh:299 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13740 | #, sh-format |
| 13741 | msgid "'git bisect $TERM_BAD' can take only one argument." |
| 13742 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" |
| 13743 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13744 | #: git-bisect.sh:322 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13745 | #, sh-format |
| 13746 | msgid "Warning: bisecting only with a $TERM_BAD commit." |
| 13747 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13748 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 13749 | # 译者:注意保持句尾空格 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13750 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
| 13751 | #. translation. The program will only accept English input |
| 13752 | #. at this point. |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13753 | #: git-bisect.sh:328 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13754 | msgid "Are you sure [Y/n]? " |
| 13755 | msgstr "您确认么[Y/n]? " |
| 13756 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13757 | #: git-bisect.sh:340 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13758 | #, sh-format |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13759 | msgid "" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13760 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
| 13761 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13762 | msgstr "" |
| 13763 | "您需要给我至少一个好版本和一个坏版本。\n" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13764 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13765 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13766 | #: git-bisect.sh:343 |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13767 | #, sh-format |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13768 | msgid "" |
| 13769 | "You need to start by \"git bisect start\".\n" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13770 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
| 13771 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13772 | msgstr "" |
| 13773 | "您需要执行 \"git bisect start\" 来开始。\n" |
| 13774 | "然后需要提供我至少一个好版本和一个坏版本。\n" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13775 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13776 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13777 | #: git-bisect.sh:414 git-bisect.sh:546 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13778 | msgid "We are not bisecting." |
| 13779 | msgstr "我们没有在二分查找。" |
| 13780 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13781 | #: git-bisect.sh:421 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13782 | #, sh-format |
| 13783 | msgid "'$invalid' is not a valid commit" |
| 13784 | msgstr "'$invalid' 不是一个有效的提交" |
| 13785 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13786 | #: git-bisect.sh:430 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13787 | #, sh-format |
| 13788 | msgid "" |
| 13789 | "Could not check out original HEAD '$branch'.\n" |
| 13790 | "Try 'git bisect reset <commit>'." |
| 13791 | msgstr "" |
| 13792 | "不能检出原始 HEAD '$branch'。\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13793 | "尝试 'git bisect reset <提交>'。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13794 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13795 | #: git-bisect.sh:458 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13796 | msgid "No logfile given" |
| 13797 | msgstr "未提供日志文件" |
| 13798 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13799 | #: git-bisect.sh:459 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13800 | #, sh-format |
| 13801 | msgid "cannot read $file for replaying" |
| 13802 | msgstr "不能读取 $file 来重放" |
| 13803 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13804 | #: git-bisect.sh:480 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13805 | msgid "?? what are you talking about?" |
| 13806 | msgstr "?? 您在说什么?" |
| 13807 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13808 | #: git-bisect.sh:492 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13809 | #, sh-format |
| 13810 | msgid "running $command" |
| 13811 | msgstr "运行 $command" |
| 13812 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13813 | #: git-bisect.sh:499 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13814 | #, sh-format |
| 13815 | msgid "" |
| 13816 | "bisect run failed:\n" |
| 13817 | "exit code $res from '$command' is < 0 or >= 128" |
| 13818 | msgstr "" |
| 13819 | "二分查找运行失败:\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13820 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13821 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13822 | #: git-bisect.sh:525 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13823 | msgid "bisect run cannot continue any more" |
| 13824 | msgstr "二分查找不能继续运行" |
| 13825 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13826 | #: git-bisect.sh:531 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13827 | #, sh-format |
| 13828 | msgid "" |
| 13829 | "bisect run failed:\n" |
| 13830 | "'bisect_state $state' exited with error code $res" |
| 13831 | msgstr "" |
| 13832 | "二分查找运行失败:\n" |
| 13833 | "'bisect_state $state' 退出码为 $res" |
| 13834 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13835 | #: git-bisect.sh:538 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13836 | msgid "bisect run success" |
| 13837 | msgstr "二分查找运行成功" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13838 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13839 | #: git-bisect.sh:565 |
| 13840 | msgid "please use two different terms" |
| 13841 | msgstr "请使用两个不同的术语" |
| 13842 | |
| 13843 | #: git-bisect.sh:575 |
| 13844 | #, sh-format |
| 13845 | msgid "'$term' is not a valid term" |
| 13846 | msgstr "'$term' 不是一个有效的名称" |
| 13847 | |
| 13848 | #: git-bisect.sh:578 |
| 13849 | #, sh-format |
| 13850 | msgid "can't use the builtin command '$term' as a term" |
| 13851 | msgstr "不能使用内置命令 '$term' 作为术语" |
| 13852 | |
| 13853 | #: git-bisect.sh:587 git-bisect.sh:593 |
| 13854 | #, sh-format |
| 13855 | msgid "can't change the meaning of term '$term'" |
| 13856 | msgstr "不能修改术语 '$term' 的含义" |
| 13857 | |
| 13858 | #: git-bisect.sh:606 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 13859 | #, sh-format |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 13860 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
| 13861 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 13862 | |
Jiang Xin | 94550ed | 2015-11-16 07:02:11 +0800 | [diff] [blame] | 13863 | #: git-bisect.sh:636 |
| 13864 | msgid "no terms defined" |
| 13865 | msgstr "未定义术语" |
| 13866 | |
| 13867 | #: git-bisect.sh:653 |
| 13868 | #, sh-format |
| 13869 | msgid "" |
| 13870 | "invalid argument $arg for 'git bisect terms'.\n" |
| 13871 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." |
| 13872 | msgstr "" |
| 13873 | "参数 $arg 对命令 'git bisect terms' 无效。\n" |
| 13874 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" |
| 13875 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13876 | #: git-merge-octopus.sh:46 |
| 13877 | msgid "" |
| 13878 | "Error: Your local changes to the following files would be overwritten by " |
| 13879 | "merge" |
| 13880 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" |
| 13881 | |
| 13882 | #: git-merge-octopus.sh:61 |
| 13883 | msgid "Automated merge did not work." |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 13884 | msgstr "自动合并未生效。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13885 | |
| 13886 | #: git-merge-octopus.sh:62 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 13887 | msgid "Should not be doing an octopus." |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13888 | msgstr "不应该执行章鱼式合并。" |
| 13889 | |
| 13890 | #: git-merge-octopus.sh:73 |
| 13891 | #, sh-format |
| 13892 | msgid "Unable to find common commit with $pretty_name" |
| 13893 | msgstr "无法找到和 $pretty_name 的基线提交" |
| 13894 | |
| 13895 | #: git-merge-octopus.sh:77 |
| 13896 | #, sh-format |
| 13897 | msgid "Already up-to-date with $pretty_name" |
| 13898 | msgstr "已经和 $pretty_name 保持一致" |
| 13899 | |
| 13900 | #: git-merge-octopus.sh:89 |
| 13901 | #, sh-format |
| 13902 | msgid "Fast-forwarding to: $pretty_name" |
| 13903 | msgstr "快进至:$pretty_name" |
| 13904 | |
| 13905 | #: git-merge-octopus.sh:97 |
| 13906 | #, sh-format |
| 13907 | msgid "Trying simple merge with $pretty_name" |
| 13908 | msgstr "尝试和 $pretty_name 的简单合并" |
| 13909 | |
| 13910 | #: git-merge-octopus.sh:102 |
| 13911 | msgid "Simple merge did not work, trying automatic merge." |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 13912 | msgstr "简单合并未生效,尝试自动合并。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13913 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13914 | #: git-rebase.sh:57 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13915 | msgid "" |
| 13916 | "When you have resolved this problem, run \"git rebase --continue\".\n" |
| 13917 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" |
| 13918 | "To check out the original branch and stop rebasing, run \"git rebase --abort" |
| 13919 | "\"." |
| 13920 | msgstr "" |
| 13921 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" |
| 13922 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" |
| 13923 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" |
| 13924 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13925 | #: git-rebase.sh:157 git-rebase.sh:396 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 13926 | #, sh-format |
| 13927 | msgid "Could not move back to $head_name" |
| 13928 | msgstr "无法移回 $head_name" |
| 13929 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13930 | #: git-rebase.sh:171 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 13931 | #, sh-format |
| 13932 | msgid "Cannot store $stash_sha1" |
| 13933 | msgstr "无法保存 $stash_sha1" |
| 13934 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13935 | #: git-rebase.sh:211 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13936 | msgid "The pre-rebase hook refused to rebase." |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 13937 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13938 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13939 | #: git-rebase.sh:216 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13940 | msgid "It looks like git-am is in progress. Cannot rebase." |
| 13941 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" |
| 13942 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13943 | #: git-rebase.sh:357 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13944 | msgid "No rebase in progress?" |
| 13945 | msgstr "没有正在进行的变基?" |
| 13946 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13947 | #: git-rebase.sh:368 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 13948 | msgid "The --edit-todo action can only be used during interactive rebase." |
| 13949 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" |
| 13950 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13951 | #: git-rebase.sh:375 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13952 | msgid "Cannot read HEAD" |
| 13953 | msgstr "不能读取 HEAD" |
| 13954 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13955 | #: git-rebase.sh:378 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13956 | msgid "" |
| 13957 | "You must edit all merge conflicts and then\n" |
| 13958 | "mark them as resolved using git add" |
| 13959 | msgstr "" |
| 13960 | "您必须编辑所有的合并冲突,然后通过 git add\n" |
| 13961 | "命令将它们标记为已解决" |
| 13962 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13963 | #: git-rebase.sh:418 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13964 | #, sh-format |
| 13965 | msgid "" |
| 13966 | "It seems that there is already a $state_dir_base directory, and\n" |
| 13967 | "I wonder if you are in the middle of another rebase. If that is the\n" |
| 13968 | "case, please try\n" |
| 13969 | "\t$cmd_live_rebase\n" |
| 13970 | "If that is not the case, please\n" |
| 13971 | "\t$cmd_clear_stale_rebase\n" |
| 13972 | "and run me again. I am stopping in case you still have something\n" |
| 13973 | "valuable there." |
| 13974 | msgstr "" |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 13975 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
| 13976 | "过程中。 如果是这样,请执行\n" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13977 | "\t$cmd_live_rebase\n" |
| 13978 | "如果不是这样,请执行\n" |
| 13979 | "\t$cmd_clear_stale_rebase\n" |
Jiang Xin | 98b2761 | 2014-02-02 20:46:58 +0800 | [diff] [blame] | 13980 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13981 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13982 | #: git-rebase.sh:469 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13983 | #, sh-format |
| 13984 | msgid "invalid upstream $upstream_name" |
| 13985 | msgstr "无效的上游 $upstream_name" |
| 13986 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13987 | #: git-rebase.sh:493 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13988 | #, sh-format |
| 13989 | msgid "$onto_name: there are more than one merge bases" |
| 13990 | msgstr "$onto_name: 有一个以上的合并基准" |
| 13991 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13992 | #: git-rebase.sh:496 git-rebase.sh:500 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13993 | #, sh-format |
| 13994 | msgid "$onto_name: there is no merge base" |
| 13995 | msgstr "$onto_name: 没有合并基准" |
| 13996 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 13997 | #: git-rebase.sh:505 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 13998 | #, sh-format |
| 13999 | msgid "Does not point to a valid commit: $onto_name" |
| 14000 | msgstr "没有指向一个有效的提交:$onto_name" |
| 14001 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14002 | #: git-rebase.sh:528 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14003 | #, sh-format |
| 14004 | msgid "fatal: no such branch: $branch_name" |
| 14005 | msgstr "严重错误:无此分支:$branch_name" |
| 14006 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14007 | #: git-rebase.sh:561 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14008 | msgid "Cannot autostash" |
| 14009 | msgstr "无法 autostash" |
| 14010 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14011 | #: git-rebase.sh:566 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14012 | #, sh-format |
| 14013 | msgid "Created autostash: $stash_abbrev" |
| 14014 | msgstr "创建了 autostash: $stash_abbrev" |
| 14015 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14016 | #: git-rebase.sh:570 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14017 | msgid "Please commit or stash them." |
| 14018 | msgstr "请提交或为它们保存进度。" |
| 14019 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14020 | #: git-rebase.sh:590 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14021 | #, sh-format |
| 14022 | msgid "Current branch $branch_name is up to date." |
| 14023 | msgstr "当前分支 $branch_name 是最新的。" |
| 14024 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14025 | #: git-rebase.sh:594 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14026 | #, sh-format |
| 14027 | msgid "Current branch $branch_name is up to date, rebase forced." |
| 14028 | msgstr "当前分支 $branch_name 是最新的,强制变基。" |
| 14029 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14030 | #: git-rebase.sh:605 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14031 | #, sh-format |
| 14032 | msgid "Changes from $mb to $onto:" |
| 14033 | msgstr "变更从 $mb 到 $onto:" |
| 14034 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14035 | #: git-rebase.sh:614 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14036 | msgid "First, rewinding head to replay your work on top of it..." |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 14037 | msgstr "首先,回退分支以便在上面重放您的工作..." |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14038 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14039 | #: git-rebase.sh:624 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14040 | #, sh-format |
| 14041 | msgid "Fast-forwarded $branch_name to $onto_name." |
| 14042 | msgstr "快进 $branch_name 至 $onto_name。" |
| 14043 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14044 | #: git-stash.sh:50 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14045 | msgid "git stash clear with parameters is unimplemented" |
| 14046 | msgstr "git stash clear 不支持参数" |
| 14047 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14048 | #: git-stash.sh:73 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14049 | msgid "You do not have the initial commit yet" |
| 14050 | msgstr "您尚未建立初始提交" |
| 14051 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14052 | #: git-stash.sh:88 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14053 | msgid "Cannot save the current index state" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14054 | msgstr "无法保存当前索引状态" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14055 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14056 | #: git-stash.sh:103 |
| 14057 | msgid "Cannot save the untracked files" |
| 14058 | msgstr "无法保存未跟踪文件" |
| 14059 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14060 | #: git-stash.sh:123 git-stash.sh:136 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14061 | msgid "Cannot save the current worktree state" |
| 14062 | msgstr "无法保存当前工作区状态" |
| 14063 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14064 | #: git-stash.sh:140 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14065 | msgid "No changes selected" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14066 | msgstr "没有选择变更" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14067 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14068 | #: git-stash.sh:143 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14069 | msgid "Cannot remove temporary index (can't happen)" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14070 | msgstr "无法删除临时索引(不应发生)" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14071 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14072 | #: git-stash.sh:156 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14073 | msgid "Cannot record working tree state" |
| 14074 | msgstr "不能记录工作区状态" |
| 14075 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14076 | #: git-stash.sh:188 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14077 | #, sh-format |
| 14078 | msgid "Cannot update $ref_stash with $w_commit" |
| 14079 | msgstr "无法用 $w_commit 更新 $ref_stash" |
| 14080 | |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14081 | #. TRANSLATORS: $option is an invalid option, like |
| 14082 | #. `--blah-blah'. The 7 spaces at the beginning of the |
| 14083 | #. second line correspond to "error: ". So you should line |
| 14084 | #. up the second line with however many characters the |
| 14085 | #. translation of "error: " takes in your language. E.g. in |
| 14086 | #. English this is: |
| 14087 | #. |
| 14088 | #. $ git stash save --blah-blah 2>&1 | head -n 2 |
| 14089 | #. error: unknown option for 'stash save': --blah-blah |
| 14090 | #. To provide a message, use git stash save -- '--blah-blah' |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14091 | #: git-stash.sh:238 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14092 | #, sh-format |
| 14093 | msgid "" |
| 14094 | "error: unknown option for 'stash save': $option\n" |
| 14095 | " To provide a message, use git stash save -- '$option'" |
| 14096 | msgstr "" |
| 14097 | "错误:'stash save' 的未知选项:$option\n" |
| 14098 | " 要提供一个描述信息,使用 git stash save -- '$option'" |
| 14099 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14100 | #: git-stash.sh:251 |
| 14101 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
| 14102 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" |
| 14103 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14104 | #: git-stash.sh:259 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14105 | msgid "No local changes to save" |
| 14106 | msgstr "没有要保存的本地修改" |
| 14107 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14108 | #: git-stash.sh:263 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14109 | msgid "Cannot initialize stash" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14110 | msgstr "无法初始化 stash" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14111 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14112 | #: git-stash.sh:267 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14113 | msgid "Cannot save the current status" |
| 14114 | msgstr "无法保存当前状态" |
| 14115 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14116 | #: git-stash.sh:268 |
| 14117 | #, sh-format |
| 14118 | msgid "Saved working directory and index state $stash_msg" |
| 14119 | msgstr "保存工作目录和索引状态 $stash_msg" |
| 14120 | |
| 14121 | #: git-stash.sh:285 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14122 | msgid "Cannot remove worktree changes" |
| 14123 | msgstr "无法删除工作区变更" |
| 14124 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14125 | #: git-stash.sh:403 |
Jiang Xin | 7aea43f | 2015-05-31 08:42:31 +0800 | [diff] [blame] | 14126 | #, sh-format |
| 14127 | msgid "unknown option: $opt" |
| 14128 | msgstr "未知选项: $opt" |
| 14129 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14130 | #: git-stash.sh:416 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14131 | msgid "No stash found." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14132 | msgstr "未发现 stash。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14133 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14134 | #: git-stash.sh:423 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14135 | #, sh-format |
| 14136 | msgid "Too many revisions specified: $REV" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14137 | msgstr "指定了太多的版本:$REV" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14138 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14139 | #: git-stash.sh:438 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14140 | #, sh-format |
Jiang Xin | 220c313 | 2014-10-08 10:55:14 +0800 | [diff] [blame] | 14141 | msgid "$reference is not a valid reference" |
| 14142 | msgstr "$reference 不是一个有效的引用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14143 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14144 | #: git-stash.sh:466 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14145 | #, sh-format |
| 14146 | msgid "'$args' is not a stash-like commit" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14147 | msgstr "'$args' 不是 stash 样提交" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14148 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14149 | #: git-stash.sh:477 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14150 | #, sh-format |
| 14151 | msgid "'$args' is not a stash reference" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14152 | msgstr "'$args' 不是一个 stash 引用" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14153 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14154 | #: git-stash.sh:485 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14155 | msgid "unable to refresh index" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14156 | msgstr "无法刷新索引" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14157 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14158 | #: git-stash.sh:489 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14159 | msgid "Cannot apply a stash in the middle of a merge" |
| 14160 | msgstr "无法在合并过程中恢复进度" |
| 14161 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14162 | #: git-stash.sh:497 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14163 | msgid "Conflicts in index. Try without --index." |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14164 | msgstr "索引中有冲突。尝试不使用 --index。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14165 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14166 | #: git-stash.sh:499 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14167 | msgid "Could not save index tree" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14168 | msgstr "不能保存索引树" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14169 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14170 | #: git-stash.sh:508 |
| 14171 | msgid "Could not restore untracked files from stash" |
| 14172 | msgstr "无法从进度保存中恢复未跟踪文件" |
| 14173 | |
| 14174 | #: git-stash.sh:533 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14175 | msgid "Cannot unstage modified files" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 14176 | msgstr "无法将修改的文件取消暂存" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14177 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14178 | #: git-stash.sh:548 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14179 | msgid "Index was not unstashed." |
| 14180 | msgstr "索引的进度没有被恢复。" |
| 14181 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14182 | #: git-stash.sh:562 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14183 | msgid "The stash is kept in case you need it again." |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14184 | msgstr "暂存被保留以备您再次需要。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14185 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14186 | #: git-stash.sh:571 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14187 | #, sh-format |
| 14188 | msgid "Dropped ${REV} ($s)" |
| 14189 | msgstr "丢弃了 ${REV} ($s)" |
| 14190 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14191 | #: git-stash.sh:572 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14192 | #, sh-format |
| 14193 | msgid "${REV}: Could not drop stash entry" |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14194 | msgstr "${REV}:不能丢弃进度条目" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14195 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14196 | #: git-stash.sh:580 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14197 | msgid "No branch name specified" |
| 14198 | msgstr "未指定分支名" |
| 14199 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14200 | #: git-stash.sh:652 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14201 | msgid "(To restore them type \"git stash apply\")" |
| 14202 | msgstr "(为恢复数据输入 \"git stash apply\")" |
| 14203 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14204 | #: git-submodule.sh:181 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14205 | msgid "Relative path can only be used from the toplevel of the working tree" |
| 14206 | msgstr "只能在工作区的顶级目录中使用相对路径" |
| 14207 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14208 | #: git-submodule.sh:191 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14209 | #, sh-format |
| 14210 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" |
Ray Chen | 4375c10 | 2015-08-10 18:03:29 +0800 | [diff] [blame] | 14211 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14212 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14213 | #: git-submodule.sh:210 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14214 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14215 | msgid "'$sm_path' already exists in the index" |
| 14216 | msgstr "'$sm_path' 已经存在于索引中" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14217 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14218 | #: git-submodule.sh:213 |
| 14219 | #, sh-format |
| 14220 | msgid "'$sm_path' already exists in the index and is not a submodule" |
| 14221 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" |
| 14222 | |
| 14223 | #: git-submodule.sh:218 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14224 | #, sh-format |
| 14225 | msgid "" |
| 14226 | "The following path is ignored by one of your .gitignore files:\n" |
| 14227 | "$sm_path\n" |
| 14228 | "Use -f if you really want to add it." |
| 14229 | msgstr "" |
| 14230 | "以下路径被您的一个 .gitignore 文件所忽略:\n" |
| 14231 | "$sm_path\n" |
| 14232 | "如果您确实想添加它,使用 -f 参数。" |
| 14233 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14234 | #: git-submodule.sh:236 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14235 | #, sh-format |
| 14236 | msgid "Adding existing repo at '$sm_path' to the index" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 14237 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14238 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14239 | #: git-submodule.sh:238 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14240 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14241 | msgid "'$sm_path' already exists and is not a valid git repo" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 14242 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14243 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14244 | #: git-submodule.sh:246 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14245 | #, sh-format |
| 14246 | msgid "A git directory for '$sm_name' is found locally with remote(s):" |
Jiang Xin | 160fb2b | 2015-08-02 21:47:30 +0800 | [diff] [blame] | 14247 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14248 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14249 | #: git-submodule.sh:248 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14250 | #, sh-format |
| 14251 | msgid "" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14252 | "If you want to reuse this local git directory instead of cloning again from\n" |
| 14253 | " $realrepo\n" |
| 14254 | "use the '--force' option. If the local git directory is not the correct " |
| 14255 | "repo\n" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14256 | "or you are unsure what this means choose another name with the '--name' " |
| 14257 | "option." |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14258 | msgstr "" |
| 14259 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" |
| 14260 | " $realrepo\n" |
| 14261 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" |
| 14262 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14263 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14264 | #: git-submodule.sh:254 |
Wang Sheng | 07432ce | 2013-01-30 17:23:08 +0800 | [diff] [blame] | 14265 | #, sh-format |
| 14266 | msgid "Reactivating local git directory for submodule '$sm_name'." |
| 14267 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" |
| 14268 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14269 | #: git-submodule.sh:266 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14270 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14271 | msgid "Unable to checkout submodule '$sm_path'" |
| 14272 | msgstr "不能检出子模组 '$sm_path'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14273 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14274 | #: git-submodule.sh:271 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14275 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14276 | msgid "Failed to add submodule '$sm_path'" |
| 14277 | msgstr "无法添加子模组 '$sm_path'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14278 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14279 | #: git-submodule.sh:280 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14280 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14281 | msgid "Failed to register submodule '$sm_path'" |
| 14282 | msgstr "无法注册子模组 '$sm_path'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14283 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14284 | #: git-submodule.sh:327 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14285 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14286 | msgid "Entering '$displaypath'" |
| 14287 | msgstr "正在进入 '$displaypath'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14288 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14289 | #: git-submodule.sh:347 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14290 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14291 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 14292 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14293 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14294 | #: git-submodule.sh:418 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14295 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14296 | msgid "pathspec and --all are incompatible" |
| 14297 | msgstr "pathspec 和 --all 不兼容" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14298 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14299 | #: git-submodule.sh:423 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14300 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14301 | msgid "Use '--all' if you really want to deinitialize all submodules" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 14302 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14303 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14304 | #: git-submodule.sh:443 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14305 | #, sh-format |
| 14306 | msgid "" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14307 | "Submodule work tree '$displaypath' contains a .git directory\n" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14308 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14309 | msgstr "" |
| 14310 | "子模组工作区 '$displaypath' 包含一个 .git 目录\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14311 | "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14312 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14313 | #: git-submodule.sh:451 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14314 | #, sh-format |
| 14315 | msgid "" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14316 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14317 | "discard them" |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14318 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14319 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14320 | #: git-submodule.sh:454 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14321 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14322 | msgid "Cleared directory '$displaypath'" |
| 14323 | msgstr "已清除目录 '$displaypath'" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14324 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14325 | #: git-submodule.sh:455 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14326 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14327 | msgid "Could not remove submodule work tree '$displaypath'" |
| 14328 | msgstr "无法移除子模组工作区 '$displaypath'" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14329 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14330 | #: git-submodule.sh:458 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14331 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14332 | msgid "Could not create empty submodule directory '$displaypath'" |
| 14333 | msgstr "不能创建空的子模组目录 '$displaypath'" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14334 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14335 | #: git-submodule.sh:467 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14336 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14337 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
| 14338 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14339 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14340 | #: git-submodule.sh:623 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14341 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14342 | msgid "Unable to find current revision in submodule path '$displaypath'" |
| 14343 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14344 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14345 | #: git-submodule.sh:633 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14346 | #, sh-format |
Jiang Xin | 170e989 | 2012-04-30 00:06:55 +0800 | [diff] [blame] | 14347 | msgid "Unable to fetch in submodule path '$sm_path'" |
| 14348 | msgstr "无法在子模组路径 '$sm_path' 中获取" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14349 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14350 | #: git-submodule.sh:638 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14351 | #, sh-format |
| 14352 | msgid "" |
| 14353 | "Unable to find current ${remote_name}/${branch} revision in submodule path " |
| 14354 | "'$sm_path'" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14355 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14356 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14357 | #: git-submodule.sh:656 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14358 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14359 | msgid "Unable to fetch in submodule path '$displaypath'" |
| 14360 | msgstr "无法在子模组路径 '$displaypath' 中获取" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14361 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14362 | #: git-submodule.sh:662 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14363 | #, sh-format |
| 14364 | msgid "" |
| 14365 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " |
| 14366 | "Direct fetching of that commit failed." |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14367 | msgstr "" |
| 14368 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14369 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14370 | #: git-submodule.sh:669 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 14371 | #, sh-format |
| 14372 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" |
| 14373 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" |
| 14374 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14375 | #: git-submodule.sh:670 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14376 | #, sh-format |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 14377 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
| 14378 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" |
| 14379 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14380 | #: git-submodule.sh:674 |
Jiang Xin | 6c94aba | 2014-03-13 12:41:34 +0800 | [diff] [blame] | 14381 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14382 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
| 14383 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14384 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14385 | #: git-submodule.sh:675 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14386 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14387 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
| 14388 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14389 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14390 | #: git-submodule.sh:680 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14391 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14392 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
| 14393 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14394 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14395 | #: git-submodule.sh:681 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14396 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14397 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
| 14398 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14399 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14400 | #: git-submodule.sh:686 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14401 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14402 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
| 14403 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14404 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14405 | #: git-submodule.sh:687 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14406 | #, sh-format |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14407 | msgid "Submodule path '$displaypath': '$command $sha1'" |
Ray Chen | aef18cc | 2016-06-06 00:06:17 +0800 | [diff] [blame] | 14408 | msgstr "子模组 '$displaypath':'$command $sha1'" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14409 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14410 | #: git-submodule.sh:718 |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14411 | #, sh-format |
| 14412 | msgid "Failed to recurse into submodule path '$displaypath'" |
| 14413 | msgstr "无法递归进子模组路径 '$displaypath'" |
| 14414 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14415 | #: git-submodule.sh:826 |
Jiang Xin | 649900b | 2012-08-02 11:50:59 +0800 | [diff] [blame] | 14416 | msgid "The --cached option cannot be used with the --files option" |
| 14417 | msgstr "选项 --cached 不能和选项 --files 同时使用" |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14418 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14419 | #: git-submodule.sh:878 |
Jiang Xin | b694fbb | 2012-06-08 12:07:25 +0800 | [diff] [blame] | 14420 | #, sh-format |
| 14421 | msgid "unexpected mode $mod_dst" |
| 14422 | msgstr "意外的模式 $mod_dst" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14423 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14424 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14425 | #: git-submodule.sh:898 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14426 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14427 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
| 14428 | msgstr " 警告:$display_name 未包含提交 $sha1_src" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14429 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14430 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14431 | #: git-submodule.sh:901 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14432 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14433 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
| 14434 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14435 | |
Jiang Xin | 90e6ef5 | 2012-03-27 14:46:11 +0800 | [diff] [blame] | 14436 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14437 | #: git-submodule.sh:904 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14438 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14439 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
| 14440 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14441 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14442 | #: git-submodule.sh:1051 |
Jiang Xin | 1003b3a | 2013-04-11 17:55:09 +0800 | [diff] [blame] | 14443 | #, sh-format |
| 14444 | msgid "Failed to recurse into submodule path '$sm_path'" |
| 14445 | msgstr "无法递归进子模组路径 '$sm_path'" |
| 14446 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14447 | #: git-submodule.sh:1118 |
Jiang Xin | c04f5ac | 2012-02-13 14:41:59 +0800 | [diff] [blame] | 14448 | #, sh-format |
Jiang Xin | 2e8451e | 2013-07-26 14:00:02 +0800 | [diff] [blame] | 14449 | msgid "Synchronizing submodule url for '$displaypath'" |
| 14450 | msgstr "为 '$displaypath' 同步子模组 url" |
Jiang Xin | 1b7f4a3 | 2015-08-23 15:23:21 +0800 | [diff] [blame] | 14451 | |
Jiang Xin | 5b04ee3 | 2016-05-29 20:40:35 +0800 | [diff] [blame] | 14452 | #: git-parse-remote.sh:89 |
| 14453 | #, sh-format |
| 14454 | msgid "See git-${cmd}(1) for details." |
| 14455 | msgstr "详见 git-${cmd}(1)。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14456 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14457 | #: git-rebase--interactive.sh:140 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14458 | #, sh-format |
| 14459 | msgid "Rebasing ($new_count/$total)" |
| 14460 | msgstr "变基中($new_count/$total)" |
| 14461 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14462 | #: git-rebase--interactive.sh:156 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14463 | msgid "" |
| 14464 | "\n" |
| 14465 | "Commands:\n" |
| 14466 | " p, pick = use commit\n" |
| 14467 | " r, reword = use commit, but edit the commit message\n" |
| 14468 | " e, edit = use commit, but stop for amending\n" |
| 14469 | " s, squash = use commit, but meld into previous commit\n" |
| 14470 | " f, fixup = like \"squash\", but discard this commit's log message\n" |
| 14471 | " x, exec = run command (the rest of the line) using shell\n" |
| 14472 | " d, drop = remove commit\n" |
| 14473 | "\n" |
| 14474 | "These lines can be re-ordered; they are executed from top to bottom.\n" |
| 14475 | msgstr "" |
| 14476 | "\n" |
| 14477 | "命令:\n" |
| 14478 | " p, pick = 使用提交\n" |
| 14479 | " r, reword = 使用提交,但修改提交说明\n" |
| 14480 | " e, edit = 使用提交,但停止以便进行提交修补\n" |
| 14481 | " s, squash = 使用提交,但和前一个版本融合\n" |
| 14482 | " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" |
| 14483 | " x, exec = 使用 shell 运行命令(此行剩余部分)\n" |
| 14484 | " d, drop = 删除提交\n" |
| 14485 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14486 | "这些行可以被重新排序;它们会被从上至下地执行。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14487 | "\n" |
| 14488 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14489 | #: git-rebase--interactive.sh:171 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14490 | msgid "" |
| 14491 | "\n" |
| 14492 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14493 | msgstr "" |
| 14494 | "\n" |
| 14495 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14496 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14497 | #: git-rebase--interactive.sh:175 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14498 | msgid "" |
| 14499 | "\n" |
| 14500 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14501 | msgstr "" |
| 14502 | "\n" |
| 14503 | "如果您在这里删除一行,对应的提交将会丢失。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14504 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14505 | #: git-rebase--interactive.sh:211 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14506 | #, sh-format |
| 14507 | msgid "" |
| 14508 | "You can amend the commit now, with\n" |
| 14509 | "\n" |
| 14510 | "\tgit commit --amend $gpg_sign_opt_quoted\n" |
| 14511 | "\n" |
| 14512 | "Once you are satisfied with your changes, run\n" |
| 14513 | "\n" |
| 14514 | "\tgit rebase --continue" |
| 14515 | msgstr "" |
| 14516 | "您现在可以修补这个提交,使用\n" |
| 14517 | "\n" |
| 14518 | "\tgit commit --amend $gpg_sign_opt_quoted\n" |
| 14519 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14520 | "当您对变更感到满意,执行\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14521 | "\n" |
| 14522 | "\tgit rebase --continue" |
| 14523 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14524 | #: git-rebase--interactive.sh:236 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14525 | #, sh-format |
| 14526 | msgid "$sha1: not a commit that can be picked" |
| 14527 | msgstr "$sha1:不是一个可以被拣选的提交" |
| 14528 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14529 | #: git-rebase--interactive.sh:275 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14530 | #, sh-format |
| 14531 | msgid "Invalid commit name: $sha1" |
| 14532 | msgstr "无效的提交名:$sha1" |
| 14533 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14534 | #: git-rebase--interactive.sh:317 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14535 | msgid "Cannot write current commit's replacement sha1" |
| 14536 | msgstr "不能写入当前提交的替代 sha1" |
| 14537 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14538 | #: git-rebase--interactive.sh:369 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14539 | #, sh-format |
| 14540 | msgid "Fast-forward to $sha1" |
| 14541 | msgstr "快进到 $sha1" |
| 14542 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14543 | #: git-rebase--interactive.sh:371 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14544 | #, sh-format |
| 14545 | msgid "Cannot fast-forward to $sha1" |
| 14546 | msgstr "不能快进到 $sha1" |
| 14547 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14548 | #: git-rebase--interactive.sh:380 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14549 | #, sh-format |
| 14550 | msgid "Cannot move HEAD to $first_parent" |
| 14551 | msgstr "不能移动 HEAD 到 $first_parent" |
| 14552 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14553 | #: git-rebase--interactive.sh:385 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14554 | #, sh-format |
| 14555 | msgid "Refusing to squash a merge: $sha1" |
| 14556 | msgstr "拒绝压缩一个合并:$sha1" |
| 14557 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14558 | #: git-rebase--interactive.sh:399 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14559 | #, sh-format |
| 14560 | msgid "Error redoing merge $sha1" |
| 14561 | msgstr "无法重做合并 $sha1" |
| 14562 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14563 | #: git-rebase--interactive.sh:407 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14564 | #, sh-format |
| 14565 | msgid "Could not pick $sha1" |
| 14566 | msgstr "不能拣选 $sha1" |
| 14567 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14568 | #: git-rebase--interactive.sh:416 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14569 | #, sh-format |
| 14570 | msgid "This is the commit message #${n}:" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14571 | msgstr "这是提交说明 #${n}:" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14572 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14573 | #: git-rebase--interactive.sh:421 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14574 | #, sh-format |
| 14575 | msgid "The commit message #${n} will be skipped:" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14576 | msgstr "提交说明 #${n} 将被跳过:" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14577 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14578 | #: git-rebase--interactive.sh:432 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14579 | #, sh-format |
| 14580 | msgid "This is a combination of $count commit." |
| 14581 | msgid_plural "This is a combination of $count commits." |
| 14582 | msgstr[0] "这是一个 $count 个提交的组合。" |
| 14583 | msgstr[1] "这是一个 $count 个提交的组合。" |
| 14584 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14585 | #: git-rebase--interactive.sh:441 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14586 | #, sh-format |
| 14587 | msgid "Cannot write $fixup_msg" |
| 14588 | msgstr "不能写入 $fixup_msg" |
| 14589 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14590 | #: git-rebase--interactive.sh:444 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14591 | msgid "This is a combination of 2 commits." |
| 14592 | msgstr "这是一个 2 个提交的组合。" |
| 14593 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14594 | #: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 |
| 14595 | #: git-rebase--interactive.sh:531 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14596 | #, sh-format |
| 14597 | msgid "Could not apply $sha1... $rest" |
| 14598 | msgstr "不能应用 $sha1... $rest" |
| 14599 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14600 | #: git-rebase--interactive.sh:559 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14601 | #, sh-format |
| 14602 | msgid "" |
| 14603 | "Could not amend commit after successfully picking $sha1... $rest\n" |
| 14604 | "This is most likely due to an empty commit message, or the pre-commit hook\n" |
| 14605 | "failed. If the pre-commit hook failed, you may need to resolve the issue " |
| 14606 | "before\n" |
| 14607 | "you are able to reword the commit." |
| 14608 | msgstr "" |
| 14609 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" |
| 14610 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" |
| 14611 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" |
| 14612 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14613 | #: git-rebase--interactive.sh:574 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14614 | #, sh-format |
| 14615 | msgid "Stopped at $sha1_abbrev... $rest" |
| 14616 | msgstr "停止在 $sha1_abbrev... $rest" |
| 14617 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14618 | #: git-rebase--interactive.sh:589 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14619 | #, sh-format |
| 14620 | msgid "Cannot '$squash_style' without a previous commit" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14621 | msgstr "没有父提交的情况下不能 '$squash_style'" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14622 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14623 | #: git-rebase--interactive.sh:631 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14624 | #, sh-format |
| 14625 | msgid "Executing: $rest" |
| 14626 | msgstr "执行:$rest" |
| 14627 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14628 | #: git-rebase--interactive.sh:639 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14629 | #, sh-format |
| 14630 | msgid "Execution failed: $rest" |
| 14631 | msgstr "执行失败:$rest" |
| 14632 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14633 | #: git-rebase--interactive.sh:641 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14634 | msgid "and made changes to the index and/or the working tree" |
| 14635 | msgstr "并且修改索引和/或工作区" |
| 14636 | |
| 14637 | # 译者:注意保持前导空格 |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14638 | #: git-rebase--interactive.sh:643 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14639 | msgid "" |
| 14640 | "You can fix the problem, and then run\n" |
| 14641 | "\n" |
| 14642 | "\tgit rebase --continue" |
| 14643 | msgstr "" |
| 14644 | "您可以解决这个问题,然后运行\n" |
| 14645 | "\n" |
| 14646 | "\tgit rebase --continue" |
| 14647 | |
| 14648 | #. TRANSLATORS: after these lines is a command to be issued by the user |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14649 | #: git-rebase--interactive.sh:656 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14650 | #, sh-format |
| 14651 | msgid "" |
| 14652 | "Execution succeeded: $rest\n" |
| 14653 | "but left changes to the index and/or the working tree\n" |
| 14654 | "Commit or stash your changes, and then run\n" |
| 14655 | "\n" |
| 14656 | "\tgit rebase --continue" |
| 14657 | msgstr "" |
| 14658 | "执行成功:$rest\n" |
| 14659 | "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n" |
| 14660 | "\n" |
| 14661 | "\tgit rebase --continue" |
| 14662 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14663 | #: git-rebase--interactive.sh:667 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14664 | #, sh-format |
| 14665 | msgid "Unknown command: $command $sha1 $rest" |
| 14666 | msgstr "未知命令:$command $sha1 $rest" |
| 14667 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14668 | #: git-rebase--interactive.sh:668 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14669 | msgid "Please fix this using 'git rebase --edit-todo'." |
| 14670 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" |
| 14671 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14672 | #: git-rebase--interactive.sh:703 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14673 | #, sh-format |
| 14674 | msgid "Successfully rebased and updated $head_name." |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14675 | msgstr "成功变基并更新 $head_name。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14676 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14677 | #: git-rebase--interactive.sh:750 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14678 | msgid "Could not skip unnecessary pick commands" |
| 14679 | msgstr "不能跳过不必要的拣选命令" |
| 14680 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14681 | #: git-rebase--interactive.sh:908 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14682 | #, sh-format |
| 14683 | msgid "" |
| 14684 | "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" |
| 14685 | " - $line" |
| 14686 | msgstr "" |
| 14687 | "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n" |
| 14688 | " - $line" |
| 14689 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14690 | #: git-rebase--interactive.sh:941 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14691 | #, sh-format |
| 14692 | msgid "" |
| 14693 | "Warning: the command isn't recognized in the following line:\n" |
| 14694 | " - $line" |
| 14695 | msgstr "" |
| 14696 | "警告:下面一行中的命令未能被识别:\n" |
| 14697 | " - $line" |
| 14698 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14699 | #: git-rebase--interactive.sh:980 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14700 | msgid "could not detach HEAD" |
| 14701 | msgstr "不能检出为分离头指针" |
| 14702 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14703 | #: git-rebase--interactive.sh:1018 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14704 | msgid "" |
| 14705 | "Warning: some commits may have been dropped accidentally.\n" |
| 14706 | "Dropped commits (newer to older):" |
| 14707 | msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):" |
| 14708 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14709 | #: git-rebase--interactive.sh:1026 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14710 | msgid "" |
| 14711 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" |
| 14712 | "\n" |
| 14713 | "Use 'git config rebase.missingCommitsCheck' to change the level of " |
| 14714 | "warnings.\n" |
| 14715 | "The possible behaviours are: ignore, warn, error." |
| 14716 | msgstr "" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14717 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14718 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14719 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" |
| 14720 | "可选值有:ignore、warn、error。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14721 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14722 | #: git-rebase--interactive.sh:1037 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14723 | #, sh-format |
| 14724 | msgid "" |
| 14725 | "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " |
| 14726 | "Ignoring." |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14727 | msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14728 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14729 | #: git-rebase--interactive.sh:1054 |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14730 | msgid "" |
| 14731 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" |
| 14732 | "continue'." |
| 14733 | msgstr "" |
Ray Chen | 29004bb | 2016-12-28 17:08:45 +0800 | [diff] [blame] | 14734 | "您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14735 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14736 | #: git-rebase--interactive.sh:1055 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14737 | msgid "Or you can abort the rebase with 'git rebase --abort'." |
| 14738 | msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" |
| 14739 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14740 | #: git-rebase--interactive.sh:1079 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14741 | msgid "Could not remove CHERRY_PICK_HEAD" |
| 14742 | msgstr "不能删除 CHERRY_PICK_HEAD" |
| 14743 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14744 | #: git-rebase--interactive.sh:1084 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14745 | #, sh-format |
| 14746 | msgid "" |
| 14747 | "You have staged changes in your working tree.\n" |
| 14748 | "If these changes are meant to be\n" |
| 14749 | "squashed into the previous commit, run:\n" |
| 14750 | "\n" |
| 14751 | " git commit --amend $gpg_sign_opt_quoted\n" |
| 14752 | "\n" |
| 14753 | "If they are meant to go into a new commit, run:\n" |
| 14754 | "\n" |
| 14755 | " git commit $gpg_sign_opt_quoted\n" |
| 14756 | "\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14757 | "In both cases, once you're done, continue with:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14758 | "\n" |
| 14759 | " git rebase --continue\n" |
| 14760 | msgstr "" |
| 14761 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" |
| 14762 | "\n" |
| 14763 | " git commit --amend $gpg_sign_opt_quoted\n" |
| 14764 | "\n" |
| 14765 | "如果这些变更要形成一个新提交,执行:\n" |
| 14766 | "\n" |
| 14767 | " git commit $gpg_sign_opt_quoted\n" |
| 14768 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14769 | "无论哪种情况,当您完成提交,继续执行:\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14770 | "\n" |
| 14771 | " git rebase --continue\n" |
| 14772 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14773 | #: git-rebase--interactive.sh:1101 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14774 | msgid "Error trying to find the author identity to amend commit" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14775 | msgstr "在修补提交中查找作者信息时遇到错误" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14776 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14777 | #: git-rebase--interactive.sh:1106 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14778 | msgid "" |
| 14779 | "You have uncommitted changes in your working tree. Please commit them\n" |
| 14780 | "first and then run 'git rebase --continue' again." |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14781 | msgstr "" |
| 14782 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14783 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14784 | #: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14785 | msgid "Could not commit staged changes." |
| 14786 | msgstr "不能提交暂存的修改。" |
| 14787 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14788 | #: git-rebase--interactive.sh:1139 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14789 | msgid "" |
| 14790 | "\n" |
| 14791 | "You are editing the todo file of an ongoing interactive rebase.\n" |
| 14792 | "To continue rebase after editing, run:\n" |
| 14793 | " git rebase --continue\n" |
| 14794 | "\n" |
| 14795 | msgstr "" |
| 14796 | "\n" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14797 | "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14798 | "请执行:\n" |
| 14799 | " git rebase --continue\n" |
| 14800 | "\n" |
| 14801 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14802 | #: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14803 | msgid "Could not execute editor" |
| 14804 | msgstr "无法运行编辑器" |
| 14805 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14806 | #: git-rebase--interactive.sh:1160 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14807 | #, sh-format |
| 14808 | msgid "Could not checkout $switch_to" |
| 14809 | msgstr "不能检出 $switch_to" |
| 14810 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14811 | #: git-rebase--interactive.sh:1165 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14812 | msgid "No HEAD?" |
| 14813 | msgstr "没有 HEAD?" |
| 14814 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14815 | #: git-rebase--interactive.sh:1166 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14816 | #, sh-format |
| 14817 | msgid "Could not create temporary $state_dir" |
| 14818 | msgstr "不能创建临时 $state_dir" |
| 14819 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14820 | #: git-rebase--interactive.sh:1168 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14821 | msgid "Could not mark as interactive" |
| 14822 | msgstr "不能标记为交互式" |
| 14823 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14824 | #: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14825 | msgid "Could not init rewritten commits" |
| 14826 | msgstr "不能对重写提交进行初始化" |
| 14827 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14828 | #: git-rebase--interactive.sh:1283 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14829 | #, sh-format |
| 14830 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" |
| 14831 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" |
| 14832 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" |
| 14833 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" |
| 14834 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14835 | #: git-rebase--interactive.sh:1288 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14836 | msgid "" |
| 14837 | "\n" |
| 14838 | "However, if you remove everything, the rebase will be aborted.\n" |
| 14839 | "\n" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14840 | msgstr "" |
| 14841 | "\n" |
| 14842 | "然而,如果您删除全部内容,变基操作将会终止。\n" |
| 14843 | "\n" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14844 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14845 | #: git-rebase--interactive.sh:1295 |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14846 | msgid "Note that empty commits are commented out" |
| 14847 | msgstr "注意空提交已被注释掉" |
| 14848 | |
| 14849 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
| 14850 | #, sh-format |
| 14851 | msgid "usage: $dashless $USAGE" |
| 14852 | msgstr "用法:$dashless $USAGE" |
| 14853 | |
| 14854 | #: git-sh-setup.sh:190 |
| 14855 | #, sh-format |
| 14856 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" |
Ray Chen | 9a4b694 | 2016-09-07 18:03:04 +0800 | [diff] [blame] | 14857 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14858 | |
| 14859 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 |
| 14860 | #, sh-format |
| 14861 | msgid "fatal: $program_name cannot be used without a working tree." |
| 14862 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" |
| 14863 | |
| 14864 | #: git-sh-setup.sh:220 |
| 14865 | msgid "Cannot rebase: You have unstaged changes." |
| 14866 | msgstr "不能变基:您有未暂存的变更。" |
| 14867 | |
| 14868 | #: git-sh-setup.sh:223 |
| 14869 | msgid "Cannot rewrite branches: You have unstaged changes." |
| 14870 | msgstr "不能重写分支:您有未暂存的变更。" |
| 14871 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14872 | #: git-sh-setup.sh:226 |
| 14873 | msgid "Cannot pull with rebase: You have unstaged changes." |
| 14874 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" |
| 14875 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14876 | #: git-sh-setup.sh:229 |
| 14877 | #, sh-format |
| 14878 | msgid "Cannot $action: You have unstaged changes." |
| 14879 | msgstr "不能 $action:您有未暂存的变更。" |
| 14880 | |
| 14881 | #: git-sh-setup.sh:242 |
| 14882 | msgid "Cannot rebase: Your index contains uncommitted changes." |
| 14883 | msgstr "不能变基:您的索引中包含未提交的变更。" |
| 14884 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14885 | #: git-sh-setup.sh:245 |
| 14886 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
| 14887 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" |
| 14888 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14889 | #: git-sh-setup.sh:248 |
| 14890 | #, sh-format |
| 14891 | msgid "Cannot $action: Your index contains uncommitted changes." |
| 14892 | msgstr "不能 $action:您的索引中包含未提交的变更。" |
| 14893 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14894 | #: git-sh-setup.sh:252 |
| 14895 | msgid "Additionally, your index contains uncommitted changes." |
| 14896 | msgstr "而且您的索引中包含未提交的变更。" |
| 14897 | |
Jiang Xin | 5c57d76 | 2016-08-28 10:18:12 +0800 | [diff] [blame] | 14898 | #: git-sh-setup.sh:372 |
| 14899 | msgid "You need to run this command from the toplevel of the working tree." |
| 14900 | msgstr "您需要在工作区的顶级目录中运行这个命令。" |
| 14901 | |
| 14902 | #: git-sh-setup.sh:377 |
| 14903 | msgid "Unable to determine absolute path of git directory" |
| 14904 | msgstr "不能确定 git 目录的绝对路径" |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 14905 | |
Jiang Xin | 1a79b2f | 2017-01-27 22:50:57 +0800 | [diff] [blame] | 14906 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
| 14907 | #: git-add--interactive.perl:238 |
| 14908 | #, perl-format |
| 14909 | msgid "%12s %12s %s" |
| 14910 | msgstr "%12s %12s %s" |
| 14911 | |
| 14912 | #: git-add--interactive.perl:239 |
| 14913 | msgid "staged" |
| 14914 | msgstr "缓存" |
| 14915 | |
| 14916 | #: git-add--interactive.perl:239 |
| 14917 | msgid "unstaged" |
| 14918 | msgstr "未缓存" |
| 14919 | |
| 14920 | #: git-add--interactive.perl:297 git-add--interactive.perl:322 |
| 14921 | msgid "binary" |
| 14922 | msgstr "二进制" |
| 14923 | |
| 14924 | #: git-add--interactive.perl:306 git-add--interactive.perl:360 |
| 14925 | msgid "nothing" |
| 14926 | msgstr "无" |
| 14927 | |
| 14928 | #: git-add--interactive.perl:342 git-add--interactive.perl:357 |
| 14929 | msgid "unchanged" |
| 14930 | msgstr "没有修改" |
| 14931 | |
| 14932 | #: git-add--interactive.perl:653 |
| 14933 | #, perl-format |
| 14934 | msgid "added %d path\n" |
| 14935 | msgid_plural "added %d paths\n" |
| 14936 | msgstr[0] "增加了 %d 个路径\n" |
| 14937 | msgstr[1] "增加了 %d 个路径\n" |
| 14938 | |
| 14939 | #: git-add--interactive.perl:656 |
| 14940 | #, perl-format |
| 14941 | msgid "updated %d path\n" |
| 14942 | msgid_plural "updated %d paths\n" |
| 14943 | msgstr[0] "更新了 %d 个路径\n" |
| 14944 | msgstr[1] "更新了 %d 个路径\n" |
| 14945 | |
| 14946 | #: git-add--interactive.perl:659 |
| 14947 | #, perl-format |
| 14948 | msgid "reverted %d path\n" |
| 14949 | msgid_plural "reverted %d paths\n" |
| 14950 | msgstr[0] "还原了 %d 个路径\n" |
| 14951 | msgstr[1] "还原了 %d 个路径\n" |
| 14952 | |
| 14953 | #: git-add--interactive.perl:662 |
| 14954 | #, perl-format |
| 14955 | msgid "touched %d path\n" |
| 14956 | msgid_plural "touched %d paths\n" |
| 14957 | msgstr[0] "触碰了 %d 个路径\n" |
| 14958 | msgstr[1] "触碰了 %d 个路径\n" |
| 14959 | |
| 14960 | #: git-add--interactive.perl:671 |
| 14961 | msgid "Update" |
| 14962 | msgstr "更新" |
| 14963 | |
| 14964 | #: git-add--interactive.perl:683 |
| 14965 | msgid "Revert" |
| 14966 | msgstr "还原" |
| 14967 | |
| 14968 | #: git-add--interactive.perl:706 |
| 14969 | #, perl-format |
| 14970 | msgid "note: %s is untracked now.\n" |
| 14971 | msgstr "说明:%s 现已成为未跟踪的。\n" |
| 14972 | |
| 14973 | #: git-add--interactive.perl:717 |
| 14974 | msgid "Add untracked" |
| 14975 | msgstr "添加未跟踪的" |
| 14976 | |
| 14977 | #: git-add--interactive.perl:723 |
| 14978 | msgid "No untracked files.\n" |
| 14979 | msgstr "没有未跟踪的文件。\n" |
| 14980 | |
| 14981 | #: git-add--interactive.perl:1039 |
| 14982 | msgid "" |
| 14983 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 14984 | "marked for staging." |
| 14985 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" |
| 14986 | |
| 14987 | #: git-add--interactive.perl:1042 |
| 14988 | msgid "" |
| 14989 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 14990 | "marked for stashing." |
| 14991 | msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。" |
| 14992 | |
| 14993 | #: git-add--interactive.perl:1045 |
| 14994 | msgid "" |
| 14995 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 14996 | "marked for unstaging." |
| 14997 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" |
| 14998 | |
| 14999 | #: git-add--interactive.perl:1048 git-add--interactive.perl:1057 |
| 15000 | msgid "" |
| 15001 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 15002 | "marked for applying." |
| 15003 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" |
| 15004 | |
| 15005 | #: git-add--interactive.perl:1051 |
| 15006 | msgid "" |
| 15007 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 15008 | "marked for discarding" |
| 15009 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃" |
| 15010 | |
| 15011 | #: git-add--interactive.perl:1054 |
| 15012 | msgid "" |
| 15013 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
| 15014 | "marked for discarding." |
| 15015 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" |
| 15016 | |
| 15017 | #: git-add--interactive.perl:1067 |
| 15018 | #, perl-format |
| 15019 | msgid "failed to open hunk edit file for writing: %s" |
| 15020 | msgstr "无法写入块编辑文件:%s" |
| 15021 | |
| 15022 | #: git-add--interactive.perl:1068 |
| 15023 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
| 15024 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" |
| 15025 | |
| 15026 | #: git-add--interactive.perl:1074 |
| 15027 | #, perl-format |
| 15028 | msgid "" |
| 15029 | "---\n" |
| 15030 | "To remove '%s' lines, make them ' ' lines (context).\n" |
| 15031 | "To remove '%s' lines, delete them.\n" |
| 15032 | "Lines starting with %s will be removed.\n" |
| 15033 | msgstr "" |
| 15034 | "---\n" |
| 15035 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" |
| 15036 | "要删除 '%s' 开始的行,删除它们。\n" |
| 15037 | "以 %s 开始的行将被删除。\n" |
| 15038 | |
| 15039 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. |
| 15040 | #: git-add--interactive.perl:1082 |
| 15041 | msgid "" |
| 15042 | "If it does not apply cleanly, you will be given an opportunity to\n" |
| 15043 | "edit again. If all lines of the hunk are removed, then the edit is\n" |
| 15044 | "aborted and the hunk is left unchanged.\n" |
| 15045 | msgstr "" |
| 15046 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" |
| 15047 | "此次编辑被终止,该块不会被修改。\n" |
| 15048 | |
| 15049 | #: git-add--interactive.perl:1096 |
| 15050 | #, perl-format |
| 15051 | msgid "failed to open hunk edit file for reading: %s" |
| 15052 | msgstr "无法读取块编辑文件:%s" |
| 15053 | |
| 15054 | #. TRANSLATORS: do not translate [y/n] |
| 15055 | #. The program will only accept that input |
| 15056 | #. at this point. |
| 15057 | #. Consider translating (saying "no" discards!) as |
| 15058 | #. (saying "n" for "no" discards!) if the translation |
| 15059 | #. of the word "no" does not start with n. |
| 15060 | #: git-add--interactive.perl:1187 |
| 15061 | msgid "" |
| 15062 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " |
| 15063 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " |
| 15064 | |
| 15065 | #: git-add--interactive.perl:1196 |
| 15066 | msgid "" |
| 15067 | "y - stage this hunk\n" |
| 15068 | "n - do not stage this hunk\n" |
| 15069 | "q - quit; do not stage this hunk or any of the remaining ones\n" |
| 15070 | "a - stage this hunk and all later hunks in the file\n" |
| 15071 | "d - do not stage this hunk or any of the later hunks in the file" |
| 15072 | msgstr "" |
| 15073 | "y - 暂存该块\n" |
| 15074 | "n - 不要暂存该块\n" |
| 15075 | "q - 退出。不暂存该块及后面的全部块\n" |
| 15076 | "a - 暂存该块和本文件中后面的全部块\n" |
| 15077 | "d - 不暂存该块和本文件中后面的全部块" |
| 15078 | |
| 15079 | #: git-add--interactive.perl:1202 |
| 15080 | msgid "" |
| 15081 | "y - stash this hunk\n" |
| 15082 | "n - do not stash this hunk\n" |
| 15083 | "q - quit; do not stash this hunk or any of the remaining ones\n" |
| 15084 | "a - stash this hunk and all later hunks in the file\n" |
| 15085 | "d - do not stash this hunk or any of the later hunks in the file" |
| 15086 | msgstr "" |
| 15087 | "y - 贮藏该块\n" |
| 15088 | "n - 不要贮藏该块\n" |
| 15089 | "q - 退出。不贮藏该块及后面的全部块\n" |
| 15090 | "a - 贮藏该块和本文件中后面的全部块\n" |
| 15091 | "d - 不贮藏该块和本文件中后面的全部块" |
| 15092 | |
| 15093 | #: git-add--interactive.perl:1208 |
| 15094 | msgid "" |
| 15095 | "y - unstage this hunk\n" |
| 15096 | "n - do not unstage this hunk\n" |
| 15097 | "q - quit; do not unstage this hunk or any of the remaining ones\n" |
| 15098 | "a - unstage this hunk and all later hunks in the file\n" |
| 15099 | "d - do not unstage this hunk or any of the later hunks in the file" |
| 15100 | msgstr "" |
| 15101 | "y - 不暂存该块\n" |
| 15102 | "n - 不要不暂存该块\n" |
| 15103 | "q - 退出。不要不暂存该块及后面的全部块\n" |
| 15104 | "a - 不暂存该块和本文件中后面的全部块\n" |
| 15105 | "d - 不要不暂存该块和本文件中后面的全部块" |
| 15106 | |
| 15107 | #: git-add--interactive.perl:1214 |
| 15108 | msgid "" |
| 15109 | "y - apply this hunk to index\n" |
| 15110 | "n - do not apply this hunk to index\n" |
| 15111 | "q - quit; do not apply this hunk or any of the remaining ones\n" |
| 15112 | "a - apply this hunk and all later hunks in the file\n" |
| 15113 | "d - do not apply this hunk or any of the later hunks in the file" |
| 15114 | msgstr "" |
| 15115 | "y - 在索引中应用该块\n" |
| 15116 | "n - 不要在索引中应用该块\n" |
| 15117 | "q - 退出。不要应用该块及后面的全部块\n" |
| 15118 | "a - 应用该块和本文件中后面的全部块\n" |
| 15119 | "d - 不要应用该块和本文件中后面的全部块" |
| 15120 | |
| 15121 | #: git-add--interactive.perl:1220 |
| 15122 | msgid "" |
| 15123 | "y - discard this hunk from worktree\n" |
| 15124 | "n - do not discard this hunk from worktree\n" |
| 15125 | "q - quit; do not discard this hunk or any of the remaining ones\n" |
| 15126 | "a - discard this hunk and all later hunks in the file\n" |
| 15127 | "d - do not discard this hunk or any of the later hunks in the file" |
| 15128 | msgstr "" |
| 15129 | "y - 在工作区中丢弃该块\n" |
| 15130 | "n - 不要在工作区中丢弃该块\n" |
| 15131 | "q - 退出。不要丢弃该块及后面的全部块\n" |
| 15132 | "a - 丢弃该块和本文件中后面的全部块\n" |
| 15133 | "d - 不要丢弃该块和本文件中后面的全部块" |
| 15134 | |
| 15135 | #: git-add--interactive.perl:1226 |
| 15136 | msgid "" |
| 15137 | "y - discard this hunk from index and worktree\n" |
| 15138 | "n - do not discard this hunk from index and worktree\n" |
| 15139 | "q - quit; do not discard this hunk or any of the remaining ones\n" |
| 15140 | "a - discard this hunk and all later hunks in the file\n" |
| 15141 | "d - do not discard this hunk or any of the later hunks in the file" |
| 15142 | msgstr "" |
| 15143 | "y - 在索引和工作区中丢弃该块\n" |
| 15144 | "n - 不要在索引和工作区中丢弃该块\n" |
| 15145 | "q - 退出。不要丢弃该块及后面的全部块\n" |
| 15146 | "a - 丢弃该块和本文件中后面的全部块\n" |
| 15147 | "d - 不要丢弃该块和本文件中后面的全部块" |
| 15148 | |
| 15149 | #: git-add--interactive.perl:1232 |
| 15150 | msgid "" |
| 15151 | "y - apply this hunk to index and worktree\n" |
| 15152 | "n - do not apply this hunk to index and worktree\n" |
| 15153 | "q - quit; do not apply this hunk or any of the remaining ones\n" |
| 15154 | "a - apply this hunk and all later hunks in the file\n" |
| 15155 | "d - do not apply this hunk or any of the later hunks in the file" |
| 15156 | msgstr "" |
| 15157 | "y - 在索引和工作区中应用该块\n" |
| 15158 | "n - 不要在索引和工作区中应用该块\n" |
| 15159 | "q - 退出。不要应用该块及后面的全部块\n" |
| 15160 | "a - 应用该块和本文件中后面的全部块\n" |
| 15161 | "d - 不要应用该块和本文件中后面的全部块" |
| 15162 | |
| 15163 | #: git-add--interactive.perl:1241 |
| 15164 | msgid "" |
| 15165 | "g - select a hunk to go to\n" |
| 15166 | "/ - search for a hunk matching the given regex\n" |
| 15167 | "j - leave this hunk undecided, see next undecided hunk\n" |
| 15168 | "J - leave this hunk undecided, see next hunk\n" |
| 15169 | "k - leave this hunk undecided, see previous undecided hunk\n" |
| 15170 | "K - leave this hunk undecided, see previous hunk\n" |
| 15171 | "s - split the current hunk into smaller hunks\n" |
| 15172 | "e - manually edit the current hunk\n" |
| 15173 | "? - print help\n" |
| 15174 | msgstr "" |
| 15175 | "g - 选择跳转到一个块\n" |
| 15176 | "/ - 查找和给定正则表达式匹配的块\n" |
| 15177 | "j - 维持该块未决状态,查看下一个未决块\n" |
| 15178 | "J - 维持该块未决状态,查看下一个块\n" |
| 15179 | "k - 维持该块未决状态,查看上一个未决块\n" |
| 15180 | "K - 维持该块未决状态,查看上一个块\n" |
| 15181 | "s - 拆分当前块为更小的块\n" |
| 15182 | "e - 手动编辑当前块\n" |
| 15183 | "? - 显示帮助\n" |
| 15184 | |
| 15185 | #: git-add--interactive.perl:1272 |
| 15186 | msgid "The selected hunks do not apply to the index!\n" |
| 15187 | msgstr "选中的块不能应用到索引!\n" |
| 15188 | |
| 15189 | #: git-add--interactive.perl:1273 |
| 15190 | msgid "Apply them to the worktree anyway? " |
| 15191 | msgstr "无论如何都要应用到工作区么?" |
| 15192 | |
| 15193 | #: git-add--interactive.perl:1276 |
| 15194 | msgid "Nothing was applied.\n" |
| 15195 | msgstr "未应用。\n" |
| 15196 | |
| 15197 | #: git-add--interactive.perl:1287 |
| 15198 | #, perl-format |
| 15199 | msgid "ignoring unmerged: %s\n" |
| 15200 | msgstr "忽略未合入的:%s\n" |
| 15201 | |
| 15202 | #: git-add--interactive.perl:1296 |
| 15203 | msgid "Only binary files changed.\n" |
| 15204 | msgstr "只有二进制文件被修改。\n" |
| 15205 | |
| 15206 | #: git-add--interactive.perl:1298 |
| 15207 | msgid "No changes.\n" |
| 15208 | msgstr "没有修改。\n" |
| 15209 | |
| 15210 | #: git-add--interactive.perl:1306 |
| 15211 | msgid "Patch update" |
| 15212 | msgstr "补丁更新" |
| 15213 | |
| 15214 | #: git-add--interactive.perl:1358 |
| 15215 | #, perl-format |
| 15216 | msgid "Stage mode change [y,n,q,a,d,/%s,?]? " |
| 15217 | msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? " |
| 15218 | |
| 15219 | #: git-add--interactive.perl:1359 |
| 15220 | #, perl-format |
| 15221 | msgid "Stage deletion [y,n,q,a,d,/%s,?]? " |
| 15222 | msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? " |
| 15223 | |
| 15224 | #: git-add--interactive.perl:1360 |
| 15225 | #, perl-format |
| 15226 | msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " |
| 15227 | msgstr "暂存该块 [y,n,q,a,d,/%s,?]? " |
| 15228 | |
| 15229 | #: git-add--interactive.perl:1363 |
| 15230 | #, perl-format |
| 15231 | msgid "Stash mode change [y,n,q,a,d,/%s,?]? " |
| 15232 | msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? " |
| 15233 | |
| 15234 | #: git-add--interactive.perl:1364 |
| 15235 | #, perl-format |
| 15236 | msgid "Stash deletion [y,n,q,a,d,/%s,?]? " |
| 15237 | msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? " |
| 15238 | |
| 15239 | #: git-add--interactive.perl:1365 |
| 15240 | #, perl-format |
| 15241 | msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " |
| 15242 | msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? " |
| 15243 | |
| 15244 | #: git-add--interactive.perl:1368 |
| 15245 | #, perl-format |
| 15246 | msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " |
| 15247 | msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? " |
| 15248 | |
| 15249 | #: git-add--interactive.perl:1369 |
| 15250 | #, perl-format |
| 15251 | msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " |
| 15252 | msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? " |
| 15253 | |
| 15254 | #: git-add--interactive.perl:1370 |
| 15255 | #, perl-format |
| 15256 | msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " |
| 15257 | msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? " |
| 15258 | |
| 15259 | #: git-add--interactive.perl:1373 |
| 15260 | #, perl-format |
| 15261 | msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " |
| 15262 | msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? " |
| 15263 | |
| 15264 | #: git-add--interactive.perl:1374 |
| 15265 | #, perl-format |
| 15266 | msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " |
| 15267 | msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? " |
| 15268 | |
| 15269 | #: git-add--interactive.perl:1375 |
| 15270 | #, perl-format |
| 15271 | msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " |
| 15272 | msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? " |
| 15273 | |
| 15274 | #: git-add--interactive.perl:1378 |
| 15275 | #, perl-format |
| 15276 | msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " |
| 15277 | msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " |
| 15278 | |
| 15279 | #: git-add--interactive.perl:1379 |
| 15280 | #, perl-format |
| 15281 | msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " |
| 15282 | msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " |
| 15283 | |
| 15284 | #: git-add--interactive.perl:1380 |
| 15285 | #, perl-format |
| 15286 | msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " |
| 15287 | msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " |
| 15288 | |
| 15289 | #: git-add--interactive.perl:1383 |
| 15290 | #, perl-format |
| 15291 | msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " |
| 15292 | msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " |
| 15293 | |
| 15294 | #: git-add--interactive.perl:1384 |
| 15295 | #, perl-format |
| 15296 | msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " |
| 15297 | msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " |
| 15298 | |
| 15299 | #: git-add--interactive.perl:1385 |
| 15300 | #, perl-format |
| 15301 | msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " |
| 15302 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " |
| 15303 | |
| 15304 | #: git-add--interactive.perl:1388 |
| 15305 | #, perl-format |
| 15306 | msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " |
| 15307 | msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? " |
| 15308 | |
| 15309 | #: git-add--interactive.perl:1389 |
| 15310 | #, perl-format |
| 15311 | msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " |
| 15312 | msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? " |
| 15313 | |
| 15314 | #: git-add--interactive.perl:1390 |
| 15315 | #, perl-format |
| 15316 | msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " |
| 15317 | msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? " |
| 15318 | |
| 15319 | #: git-add--interactive.perl:1493 |
| 15320 | msgid "go to which hunk (<ret> to see more)? " |
| 15321 | msgstr "跳转到哪个块(<回车> 查看更多)? " |
| 15322 | |
| 15323 | #: git-add--interactive.perl:1495 |
| 15324 | msgid "go to which hunk? " |
| 15325 | msgstr "跳转到哪个块?" |
| 15326 | |
| 15327 | #: git-add--interactive.perl:1504 |
| 15328 | #, perl-format |
| 15329 | msgid "Invalid number: '%s'\n" |
| 15330 | msgstr "无效数字:'%s'\n" |
| 15331 | |
| 15332 | #: git-add--interactive.perl:1509 |
| 15333 | #, perl-format |
| 15334 | msgid "Sorry, only %d hunk available.\n" |
| 15335 | msgid_plural "Sorry, only %d hunks available.\n" |
| 15336 | msgstr[0] "对不起,只有 %d 个可用块。\n" |
| 15337 | msgstr[1] "对不起,只有 %d 个可用块。\n" |
| 15338 | |
| 15339 | #: git-add--interactive.perl:1535 |
| 15340 | msgid "search for regex? " |
| 15341 | msgstr "使用正则表达式搜索?" |
| 15342 | |
| 15343 | #: git-add--interactive.perl:1548 |
| 15344 | #, perl-format |
| 15345 | msgid "Malformed search regexp %s: %s\n" |
| 15346 | msgstr "错误的正则表达式 %s:%s\n" |
| 15347 | |
| 15348 | #: git-add--interactive.perl:1558 |
| 15349 | msgid "No hunk matches the given pattern\n" |
| 15350 | msgstr "没有和给定模式相匹配的快\n" |
| 15351 | |
| 15352 | #: git-add--interactive.perl:1570 git-add--interactive.perl:1592 |
| 15353 | msgid "No previous hunk\n" |
| 15354 | msgstr "没有前一个块\n" |
| 15355 | |
| 15356 | #: git-add--interactive.perl:1579 git-add--interactive.perl:1598 |
| 15357 | msgid "No next hunk\n" |
| 15358 | msgstr "没有下一个块\n" |
| 15359 | |
| 15360 | #: git-add--interactive.perl:1606 |
| 15361 | #, perl-format |
| 15362 | msgid "Split into %d hunk.\n" |
| 15363 | msgid_plural "Split into %d hunks.\n" |
| 15364 | msgstr[0] "拆分为 %d 块。\n" |
| 15365 | msgstr[1] "拆分为 %d 块。\n" |
| 15366 | |
| 15367 | #: git-add--interactive.perl:1658 |
| 15368 | msgid "Review diff" |
| 15369 | msgstr "检视 diff" |
| 15370 | |
| 15371 | #. TRANSLATORS: please do not translate the command names |
| 15372 | #. 'status', 'update', 'revert', etc. |
| 15373 | #: git-add--interactive.perl:1677 |
| 15374 | msgid "" |
| 15375 | "status - show paths with changes\n" |
| 15376 | "update - add working tree state to the staged set of changes\n" |
| 15377 | "revert - revert staged set of changes back to the HEAD version\n" |
| 15378 | "patch - pick hunks and update selectively\n" |
| 15379 | "diff\t - view diff between HEAD and index\n" |
| 15380 | "add untracked - add contents of untracked files to the staged set of " |
| 15381 | "changes\n" |
| 15382 | msgstr "" |
| 15383 | "status - 显示含变更的路径\n" |
| 15384 | "update - 添加工作区状态至暂存列表\n" |
| 15385 | "revert - 还原修改的暂存集至 HEAD 版本\n" |
| 15386 | "patch - 挑选块并且有选择地更新\n" |
| 15387 | "diff - 显示 HEAD 和索引间差异\n" |
| 15388 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" |
| 15389 | |
| 15390 | #: git-add--interactive.perl:1694 git-add--interactive.perl:1699 |
| 15391 | #: git-add--interactive.perl:1702 git-add--interactive.perl:1709 |
| 15392 | #: git-add--interactive.perl:1713 git-add--interactive.perl:1719 |
| 15393 | msgid "missing --" |
| 15394 | msgstr "缺失 --" |
| 15395 | |
| 15396 | #: git-add--interactive.perl:1715 |
| 15397 | #, perl-format |
| 15398 | msgid "unknown --patch mode: %s" |
| 15399 | msgstr "未知的 --patch 模式:%s" |
| 15400 | |
| 15401 | #: git-add--interactive.perl:1721 git-add--interactive.perl:1727 |
| 15402 | #, perl-format |
| 15403 | msgid "invalid argument %s, expecting --" |
| 15404 | msgstr "无效的参数 %s,期望是 --" |
| 15405 | |
| 15406 | #: git-send-email.perl:121 |
| 15407 | msgid "local zone differs from GMT by a non-minute interval\n" |
| 15408 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" |
| 15409 | |
| 15410 | #: git-send-email.perl:128 git-send-email.perl:134 |
| 15411 | msgid "local time offset greater than or equal to 24 hours\n" |
| 15412 | msgstr "本地时间偏移量大于等于 24 小时\n" |
| 15413 | |
| 15414 | #: git-send-email.perl:202 git-send-email.perl:208 |
| 15415 | msgid "the editor exited uncleanly, aborting everything" |
| 15416 | msgstr "编辑器非正常退出,终止所有操作" |
| 15417 | |
| 15418 | #: git-send-email.perl:282 |
| 15419 | #, perl-format |
| 15420 | msgid "" |
| 15421 | "'%s' contains an intermediate version of the email you were composing.\n" |
| 15422 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" |
| 15423 | |
| 15424 | #: git-send-email.perl:287 |
| 15425 | #, perl-format |
| 15426 | msgid "'%s.final' contains the composed email.\n" |
| 15427 | msgstr "'%s.final' 包含编辑的邮件。\n" |
| 15428 | |
| 15429 | #: git-send-email.perl:305 |
| 15430 | msgid "--dump-aliases incompatible with other options\n" |
| 15431 | msgstr "--dump-aliases 和其它选项不兼容\n" |
| 15432 | |
| 15433 | #: git-send-email.perl:368 git-send-email.perl:623 |
| 15434 | msgid "Cannot run git format-patch from outside a repository\n" |
| 15435 | msgstr "不能在仓库之外运行 git format-patch\n" |
| 15436 | |
| 15437 | #: git-send-email.perl:437 |
| 15438 | #, perl-format |
| 15439 | msgid "Unknown --suppress-cc field: '%s'\n" |
| 15440 | msgstr "未知的 --suppress-cc 字段:'%s'\n" |
| 15441 | |
| 15442 | #: git-send-email.perl:466 |
| 15443 | #, perl-format |
| 15444 | msgid "Unknown --confirm setting: '%s'\n" |
| 15445 | msgstr "未知的 --confirm 设置:'%s'\n" |
| 15446 | |
| 15447 | #: git-send-email.perl:498 |
| 15448 | #, perl-format |
| 15449 | msgid "warning: sendmail alias with quotes is not supported: %s\n" |
| 15450 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" |
| 15451 | |
| 15452 | #: git-send-email.perl:500 |
| 15453 | #, perl-format |
| 15454 | msgid "warning: `:include:` not supported: %s\n" |
| 15455 | msgstr "警告:不支持 `:include:`:%s\n" |
| 15456 | |
| 15457 | #: git-send-email.perl:502 |
| 15458 | #, perl-format |
| 15459 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" |
| 15460 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" |
| 15461 | |
| 15462 | #: git-send-email.perl:507 |
| 15463 | #, perl-format |
| 15464 | msgid "warning: sendmail line is not recognized: %s\n" |
| 15465 | msgstr "警告:不能识别的 sendmail 行:%s\n" |
| 15466 | |
| 15467 | #: git-send-email.perl:589 |
| 15468 | #, perl-format |
| 15469 | msgid "" |
| 15470 | "File '%s' exists but it could also be the range of commits\n" |
| 15471 | "to produce patches for. Please disambiguate by...\n" |
| 15472 | "\n" |
| 15473 | " * Saying \"./%s\" if you mean a file; or\n" |
| 15474 | " * Giving --format-patch option if you mean a range.\n" |
| 15475 | msgstr "" |
| 15476 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除歧义:\n" |
| 15477 | "\n" |
| 15478 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" |
| 15479 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" |
| 15480 | |
| 15481 | #: git-send-email.perl:610 |
| 15482 | #, perl-format |
| 15483 | msgid "Failed to opendir %s: %s" |
| 15484 | msgstr "无法打开目录 %s: %s" |
| 15485 | |
| 15486 | #: git-send-email.perl:634 |
| 15487 | #, perl-format |
| 15488 | msgid "" |
| 15489 | "fatal: %s: %s\n" |
| 15490 | "warning: no patches were sent\n" |
| 15491 | msgstr "" |
| 15492 | "严重:%s:%s\n" |
| 15493 | "警告:补丁未能发送\n" |
| 15494 | |
| 15495 | #: git-send-email.perl:645 |
| 15496 | msgid "" |
| 15497 | "\n" |
| 15498 | "No patch files specified!\n" |
| 15499 | "\n" |
| 15500 | msgstr "\n未指定补丁文件!\n\n" |
| 15501 | |
| 15502 | #: git-send-email.perl:658 |
| 15503 | #, perl-format |
| 15504 | msgid "No subject line in %s?" |
| 15505 | msgstr "在 %s 中没有标题行?" |
| 15506 | |
| 15507 | #: git-send-email.perl:668 |
| 15508 | #, perl-format |
| 15509 | msgid "Failed to open for writing %s: %s" |
| 15510 | msgstr "无法写入 %s: %s" |
| 15511 | |
| 15512 | #: git-send-email.perl:678 |
| 15513 | msgid "" |
| 15514 | "Lines beginning in \"GIT:\" will be removed.\n" |
| 15515 | "Consider including an overall diffstat or table of contents\n" |
| 15516 | "for the patch you are writing.\n" |
| 15517 | "\n" |
| 15518 | "Clear the body content if you don't wish to send a summary.\n" |
| 15519 | msgstr "" |
| 15520 | "以 \"GIT:\" 开头的行将被删除。\n" |
| 15521 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" |
| 15522 | "\n" |
| 15523 | "如果您不想发送摘要,清除内容。\n" |
| 15524 | |
| 15525 | #: git-send-email.perl:701 |
| 15526 | #, perl-format |
| 15527 | msgid "Failed to open %s.final: %s" |
| 15528 | msgstr "无法打开 %s.final: %s" |
| 15529 | |
| 15530 | #: git-send-email.perl:704 |
| 15531 | #, perl-format |
| 15532 | msgid "Failed to open %s: %s" |
| 15533 | msgstr "无法打开 %s: %s" |
| 15534 | |
| 15535 | #: git-send-email.perl:739 |
| 15536 | msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" |
| 15537 | msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" |
| 15538 | |
| 15539 | #: git-send-email.perl:748 |
| 15540 | msgid "Summary email is empty, skipping it\n" |
| 15541 | msgstr "摘要邮件为空,跳过\n" |
| 15542 | |
| 15543 | #. TRANSLATORS: please keep [y/N] as is. |
| 15544 | #: git-send-email.perl:780 |
| 15545 | #, perl-format |
| 15546 | msgid "Are you sure you want to use <%s> [y/N]? " |
| 15547 | msgstr "您确认要使用 <%s> [y/N]?" |
| 15548 | |
| 15549 | #: git-send-email.perl:809 |
| 15550 | msgid "" |
| 15551 | "The following files are 8bit, but do not declare a Content-Transfer-" |
| 15552 | "Encoding.\n" |
| 15553 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" |
| 15554 | |
| 15555 | #: git-send-email.perl:814 |
| 15556 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
| 15557 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" |
| 15558 | |
| 15559 | #: git-send-email.perl:822 |
| 15560 | #, perl-format |
| 15561 | msgid "" |
| 15562 | "Refusing to send because the patch\n" |
| 15563 | "\t%s\n" |
| 15564 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " |
| 15565 | "want to send.\n" |
| 15566 | msgstr "" |
| 15567 | "拒绝发送,因为补丁\n" |
| 15568 | "\t%s\n" |
| 15569 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" |
| 15570 | |
| 15571 | #: git-send-email.perl:841 |
| 15572 | msgid "To whom should the emails be sent (if anyone)?" |
| 15573 | msgstr "邮件将要发送给谁?" |
| 15574 | |
| 15575 | #: git-send-email.perl:859 |
| 15576 | #, perl-format |
| 15577 | msgid "fatal: alias '%s' expands to itself\n" |
| 15578 | msgstr "严重:别名 '%s' 扩展为它自己\n" |
| 15579 | |
| 15580 | #: git-send-email.perl:871 |
| 15581 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
| 15582 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" |
| 15583 | |
| 15584 | #: git-send-email.perl:921 git-send-email.perl:929 |
| 15585 | #, perl-format |
| 15586 | msgid "error: unable to extract a valid address from: %s\n" |
| 15587 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" |
| 15588 | |
| 15589 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your |
| 15590 | #. translation. The program will only accept English input |
| 15591 | #. at this point. |
| 15592 | #: git-send-email.perl:933 |
| 15593 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
| 15594 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" |
| 15595 | |
| 15596 | #: git-send-email.perl:1234 |
| 15597 | #, perl-format |
| 15598 | msgid "CA path \"%s\" does not exist" |
| 15599 | msgstr "CA 路径 \"%s\" 不存在" |
| 15600 | |
| 15601 | #: git-send-email.perl:1309 |
| 15602 | msgid "" |
| 15603 | " The Cc list above has been expanded by additional\n" |
| 15604 | " addresses found in the patch commit message. By default\n" |
| 15605 | " send-email prompts before sending whenever this occurs.\n" |
| 15606 | " This behavior is controlled by the sendemail.confirm\n" |
| 15607 | " configuration setting.\n" |
| 15608 | "\n" |
| 15609 | " For additional information, run 'git send-email --help'.\n" |
| 15610 | " To retain the current behavior, but squelch this message,\n" |
| 15611 | " run 'git config --global sendemail.confirm auto'.\n" |
| 15612 | "\n" |
| 15613 | msgstr "" |
| 15614 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" |
| 15615 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" |
| 15616 | " sendemail.confirm 配置设置。\n" |
| 15617 | "\n" |
| 15618 | " 更多信息,执行 'git send-email --help'。\n" |
| 15619 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" |
| 15620 | " sendemail.confirm auto'。\n" |
| 15621 | "\n" |
| 15622 | |
| 15623 | #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your |
| 15624 | #. translation. The program will only accept English input |
| 15625 | #. at this point. |
| 15626 | #: git-send-email.perl:1324 |
| 15627 | msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " |
| 15628 | msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):" |
| 15629 | |
| 15630 | #: git-send-email.perl:1327 |
| 15631 | msgid "Send this email reply required" |
| 15632 | msgstr "发送要求的邮件回复" |
| 15633 | |
| 15634 | #: git-send-email.perl:1353 |
| 15635 | msgid "The required SMTP server is not properly defined." |
| 15636 | msgstr "要求的 SMTP 服务器未被正确定义。" |
| 15637 | |
| 15638 | #: git-send-email.perl:1397 |
| 15639 | #, perl-format |
| 15640 | msgid "Server does not support STARTTLS! %s" |
| 15641 | msgstr "服务器不支持 STARTTLS!%s" |
| 15642 | |
| 15643 | #: git-send-email.perl:1403 |
| 15644 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
| 15645 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" |
| 15646 | |
| 15647 | #: git-send-email.perl:1421 |
| 15648 | #, perl-format |
| 15649 | msgid "Failed to send %s\n" |
| 15650 | msgstr "无法发送 %s\n" |
| 15651 | |
| 15652 | #: git-send-email.perl:1424 |
| 15653 | #, perl-format |
| 15654 | msgid "Dry-Sent %s\n" |
| 15655 | msgstr "演习发送 %s\n" |
| 15656 | |
| 15657 | #: git-send-email.perl:1424 |
| 15658 | #, perl-format |
| 15659 | msgid "Sent %s\n" |
| 15660 | msgstr "正发送 %s\n" |
| 15661 | |
| 15662 | #: git-send-email.perl:1426 |
| 15663 | msgid "Dry-OK. Log says:\n" |
| 15664 | msgstr "演习成功。日志说:\n" |
| 15665 | |
| 15666 | #: git-send-email.perl:1426 |
| 15667 | msgid "OK. Log says:\n" |
| 15668 | msgstr "OK。日志说:\n" |
| 15669 | |
| 15670 | #: git-send-email.perl:1438 |
| 15671 | msgid "Result: " |
| 15672 | msgstr "结果:" |
| 15673 | |
| 15674 | #: git-send-email.perl:1441 |
| 15675 | msgid "Result: OK\n" |
| 15676 | msgstr "结果:OK\n" |
| 15677 | |
| 15678 | #: git-send-email.perl:1454 |
| 15679 | #, perl-format |
| 15680 | msgid "can't open file %s" |
| 15681 | msgstr "无法打开文件 %s" |
| 15682 | |
| 15683 | #: git-send-email.perl:1501 git-send-email.perl:1521 |
| 15684 | #, perl-format |
| 15685 | msgid "(mbox) Adding cc: %s from line '%s'\n" |
| 15686 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" |
| 15687 | |
| 15688 | #: git-send-email.perl:1507 |
| 15689 | #, perl-format |
| 15690 | msgid "(mbox) Adding to: %s from line '%s'\n" |
| 15691 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" |
| 15692 | |
| 15693 | #: git-send-email.perl:1555 |
| 15694 | #, perl-format |
| 15695 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" |
| 15696 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" |
| 15697 | |
| 15698 | #: git-send-email.perl:1578 |
| 15699 | #, perl-format |
| 15700 | msgid "(body) Adding cc: %s from line '%s'\n" |
| 15701 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" |
| 15702 | |
| 15703 | #: git-send-email.perl:1676 |
| 15704 | #, perl-format |
| 15705 | msgid "(%s) Could not execute '%s'" |
| 15706 | msgstr "(%s) 不能执行 '%s'" |
| 15707 | |
| 15708 | #: git-send-email.perl:1683 |
| 15709 | #, perl-format |
| 15710 | msgid "(%s) Adding %s: %s from: '%s'\n" |
| 15711 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" |
| 15712 | |
| 15713 | #: git-send-email.perl:1687 |
| 15714 | #, perl-format |
| 15715 | msgid "(%s) failed to close pipe to '%s'" |
| 15716 | msgstr "(%s) 无法关闭管道至 '%s'" |
| 15717 | |
| 15718 | #: git-send-email.perl:1714 |
| 15719 | msgid "cannot send message as 7bit" |
| 15720 | msgstr "不能以 7bit 形式发送信息" |
| 15721 | |
| 15722 | #: git-send-email.perl:1722 |
| 15723 | msgid "invalid transfer encoding" |
| 15724 | msgstr "无效的传送编码" |
| 15725 | |
| 15726 | #: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 |
| 15727 | #, perl-format |
| 15728 | msgid "unable to open %s: %s\n" |
| 15729 | msgstr "不能打开 %s:%s\n" |
| 15730 | |
| 15731 | #: git-send-email.perl:1744 |
| 15732 | #, perl-format |
| 15733 | msgid "%s: patch contains a line longer than 998 characters" |
| 15734 | msgstr "%s:补丁包含一个超过 998 字符的行" |
| 15735 | |
| 15736 | #: git-send-email.perl:1760 |
| 15737 | #, perl-format |
| 15738 | msgid "Skipping %s with backup suffix '%s'.\n" |
| 15739 | msgstr "略过 %s 含备份后缀 '%s'。\n" |
| 15740 | |
| 15741 | #. TRANSLATORS: please keep "[y|N]" as is. |
| 15742 | #: git-send-email.perl:1764 |
| 15743 | #, perl-format |
| 15744 | msgid "Do you really want to send %s? [y|N]: " |
| 15745 | msgstr "您真的要发送 %s?[y|N]:" |
| 15746 | |
| 15747 | #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" |
| 15748 | #~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" |
| 15749 | |
| 15750 | #~ msgid "Clever... amending the last one with dirty index." |
| 15751 | #~ msgstr "聪明... 用脏索引修补最后一个提交。" |
| 15752 | |
| 15753 | #~ msgid "" |
| 15754 | #~ "the following submodule (or one of its nested submodules)\n" |
| 15755 | #~ "uses a .git directory:" |
| 15756 | #~ msgid_plural "" |
| 15757 | #~ "the following submodules (or one of their nested submodules)\n" |
| 15758 | #~ "use a .git directory:" |
| 15759 | #~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
| 15760 | #~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
| 15761 | |
| 15762 | #~ msgid "" |
| 15763 | #~ "\n" |
| 15764 | #~ "(use 'rm -rf' if you really want to remove it including all of its " |
| 15765 | #~ "history)" |
| 15766 | #~ msgstr "" |
| 15767 | #~ "\n" |
| 15768 | #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
| 15769 | |
Jiang Xin | a0b6b24 | 2016-10-27 21:53:37 +0800 | [diff] [blame] | 15770 | #~ msgid "Could not write to %s" |
| 15771 | #~ msgstr "不能写入 %s" |
| 15772 | |
| 15773 | #~ msgid "Error wrapping up %s." |
| 15774 | #~ msgstr "错误收尾 %s。" |
| 15775 | |
| 15776 | #~ msgid "Your local changes would be overwritten by cherry-pick." |
| 15777 | #~ msgstr "您的本地修改将被拣选操作覆盖。" |
| 15778 | |
| 15779 | #~ msgid "Cannot revert during another revert." |
| 15780 | #~ msgstr "不能在回退中执行另一回退。" |
| 15781 | |
| 15782 | #~ msgid "Cannot cherry-pick during another cherry-pick." |
| 15783 | #~ msgstr "不能在拣选过程中执行另一拣选。" |
| 15784 | |
| 15785 | #~ msgid "Could not parse line %d." |
| 15786 | #~ msgstr "不能解析第 %d 行。" |
| 15787 | |
| 15788 | #~ msgid "Could not open %s" |
| 15789 | #~ msgstr "不能打开 %s" |
| 15790 | |
| 15791 | #~ msgid "Could not read %s." |
| 15792 | #~ msgstr "不能读取 %s。" |
| 15793 | |
| 15794 | #~ msgid "Could not format %s." |
| 15795 | #~ msgstr "不能格式化 %s。" |
| 15796 | |
| 15797 | #~ msgid "%s: %s" |
| 15798 | #~ msgstr "%s:%s" |
| 15799 | |
| 15800 | #~ msgid "cannot open %s: %s" |
| 15801 | #~ msgstr "不能打开 %s:%s" |
| 15802 | |
| 15803 | #~ msgid "You need to set your committer info first" |
| 15804 | #~ msgstr "您需要先设置您的提交者信息" |