89f80d72c1 · matheusbsbs/matheus-bagliano

@@ -135,8 +135,8 @@ msgid ""

135 msgstr ""

136 "Project-Id-Version: Git\n"

137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

138 -"POT-Creation-Date: 2015-12-11 23:36+0800\n"

139 -"PO-Revision-Date: 2015-12-14 22:12+0800\n"

138 +"POT-Creation-Date: 2015-12-22 22:50+0800\n"

139 +"PO-Revision-Date: 2015-12-22 23:06+0800\n"

140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

142 "Language: zh_CN\n"

@@ -201,7 +201,7 @@ msgstr "格式"

201 msgid "archive format"

202 msgstr "归档格式"

203

204 -#: archive.c:430 builtin/log.c:1228

204 +#: archive.c:430 builtin/log.c:1229

205 msgid "prefix"

206 msgstr "前缀"

207

@@ -402,7 +402,7 @@ msgstr "仓库中缺少这些必备的提交："

402

403 #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

404 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

405 -#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358

405 +#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

406 #: builtin/shortlog.c:158

407 msgid "revision walk setup failed"

408 msgstr "版本遍历设置失败"

@@ -442,7 +442,7 @@ msgstr "rev-list 终止"

442 msgid "ref '%s' is excluded by the rev-list options"

443 msgstr "引用 '%s' 被 rev-list 选项排除"

444

445 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

445 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

446 #, c-format

447 msgid "unrecognized argument: %s"

448 msgstr "未能识别的参数：%s"

@@ -1382,16 +1382,16 @@ msgstr[1] ""

1382 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1383 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

1384

1385 -#: revision.c:2191

1385 +#: revision.c:2193

1386 msgid "your current branch appears to be broken"

1387 msgstr "您的当前分支好像被损坏"

1388

1389 -#: revision.c:2194

1389 +#: revision.c:2196

1390 #, c-format

1391 msgid "your current branch '%s' does not have any commits yet"

1392 msgstr "您的当前分支 '%s' 尚无任何提交"

1393

1394 -#: revision.c:2388

1394 +#: revision.c:2390

1395 msgid "--first-parent is incompatible with --bisect"

1396 msgstr "--first-parent 与 --bisect 不兼容"

1397

@@ -1799,30 +1799,21 @@ msgstr "不能访问 '%s'：%s"

1799 msgid "unable to access '%s'"

1800 msgstr "不能访问 '%s'"

1801

1802 -#: wrapper.c:611

1803 -#, c-format

1804 -msgid "unable to look up current user in the passwd file: %s"

1805 -msgstr "无法在口令文件中查询到当前用户：%s"

1806 -

1807 -#: wrapper.c:612

1808 -msgid "no such user"

1809 -msgstr "无此用户"

1810 -

1811 -#: wrapper.c:620

1802 +#: wrapper.c:608

1803 msgid "unable to get current working directory"

1804 msgstr "不能获取当前工作目录"

1805

1815 -#: wrapper.c:647

1806 +#: wrapper.c:635

1807 #, c-format

1808 msgid "could not open %s for writing"

1809 msgstr "不能写入 %s"

1810

1820 -#: wrapper.c:658 builtin/am.c:425

1811 +#: wrapper.c:646 builtin/am.c:425

1812 #, c-format

1813 msgid "could not write to %s"

1814 msgstr "不能写入 %s"

1815

1825 -#: wrapper.c:664

1816 +#: wrapper.c:652

1817 #, c-format

1818 msgid "could not close %s"

1819 msgstr "不能关闭 %s"

@@ -2370,14 +2361,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2361 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

2362

2363 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2373 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2364 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2365 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2366 msgid "dry run"

2367 msgstr "演习"

2368

2369 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2370 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2380 -#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2371 +#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

2372 msgid "be verbose"

2373 msgstr "冗长输出"

2374

@@ -2562,7 +2553,7 @@ msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"

2553 msgid "Patch is empty. Was it split wrong?"

2554 msgstr "补丁为空。是不是切分错误？"

2555

2565 -#: builtin/am.c:1417 builtin/log.c:1344

2556 +#: builtin/am.c:1417 builtin/log.c:1347

2557 #, c-format

2558 msgid "invalid ident line: %s"

2559 msgstr "包含无效的身份标识：%s"

@@ -4352,7 +4343,7 @@ msgstr "和新的分支执行三方合并"

4343 msgid "update ignored files (default)"

4344 msgstr "更新忽略的文件（默认）"

4345

4355 -#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4346 +#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4347 msgid "style"

4348 msgstr "风格"

4349

@@ -4373,7 +4364,7 @@ msgid "do not check if another worktree is holding the given ref"

4364 msgstr "不检查指定的引用是否被其他工作区所占用"

4365

4366 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4376 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4367 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4368 #: builtin/send-pack.c:168

4369 msgid "force progress reporting"

4370 msgstr "强制显示进度报告"

@@ -5244,7 +5235,7 @@ msgstr "以简洁的格式显示状态"

5235 msgid "show branch information"

5236 msgstr "显示分支信息"

5237

5247 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5238 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

5239 #: builtin/worktree.c:423

5240 msgid "machine-readable output"

5241 msgstr "机器可读的输出"

@@ -5368,7 +5359,7 @@ msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

5359 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5360 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

5361

5371 -#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5362 +#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5363 msgid "add Signed-off-by:"

5364 msgstr "添加 Signed-off-by: 签名"

5365

@@ -5937,7 +5928,7 @@ msgstr "深化浅克隆的历史"

5928 msgid "convert to a complete repository"

5929 msgstr "转换为一个完整的仓库"

5930

5940 -#: builtin/fetch.c:118 builtin/log.c:1232

5931 +#: builtin/fetch.c:118 builtin/log.c:1233

5932 msgid "dir"

5933 msgstr "目录"

5934

@@ -7247,187 +7238,191 @@ msgstr "git format-patch [<选项>] [<从> | <版本范围>]"

7238 msgid "Two output directories?"

7239 msgstr "两个输出目录？"

7240

7250 -#: builtin/log.c:1210

7241 +#: builtin/log.c:1211

7242 msgid "use [PATCH n/m] even with a single patch"

7243 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

7244

7254 -#: builtin/log.c:1213

7245 +#: builtin/log.c:1214

7246 msgid "use [PATCH] even with multiple patches"

7247 msgstr "使用 [PATCH]，即使有多个补丁"

7248

7258 -#: builtin/log.c:1217

7249 +#: builtin/log.c:1218

7250 msgid "print patches to standard out"

7251 msgstr "打印补丁到标准输出"

7252

7262 -#: builtin/log.c:1219

7253 +#: builtin/log.c:1220

7254 msgid "generate a cover letter"

7255 msgstr "生成一封附信"

7256

7266 -#: builtin/log.c:1221

7257 +#: builtin/log.c:1222

7258 msgid "use simple number sequence for output file names"

7259 msgstr "使用简单的数字序列作为输出文件名"

7260

7270 -#: builtin/log.c:1222

7261 +#: builtin/log.c:1223

7262 msgid "sfx"

7263 msgstr "后缀"

7264

7274 -#: builtin/log.c:1223

7265 +#: builtin/log.c:1224

7266 msgid "use <sfx> instead of '.patch'"

7267 msgstr "使用 <后缀> 代替 '.patch'"

7268

7278 -#: builtin/log.c:1225

7269 +#: builtin/log.c:1226

7270 msgid "start numbering patches at <n> instead of 1"

7271 msgstr "补丁以 <n> 开始编号，而不是1"

7272

7282 -#: builtin/log.c:1227

7273 +#: builtin/log.c:1228

7274 msgid "mark the series as Nth re-roll"

7275 msgstr "标记补丁系列是第几次重制"

7276

7286 -#: builtin/log.c:1229

7277 +#: builtin/log.c:1230

7278 msgid "Use [<prefix>] instead of [PATCH]"

7279 msgstr "使用 [<前缀>] 代替 [PATCH]"

7280

7290 -#: builtin/log.c:1232

7281 +#: builtin/log.c:1233

7282 msgid "store resulting files in <dir>"

7283 msgstr "把结果文件存储在 <目录>"

7284

7294 -#: builtin/log.c:1235

7285 +#: builtin/log.c:1236

7286 msgid "don't strip/add [PATCH]"

7287 msgstr "不删除/添加 [PATCH]"

7288

7298 -#: builtin/log.c:1238

7289 +#: builtin/log.c:1239

7290 msgid "don't output binary diffs"

7291 msgstr "不输出二进制差异"

7292

7302 -#: builtin/log.c:1240

7293 +#: builtin/log.c:1241

7294 +msgid "output all-zero hash in From header"

7295 +msgstr "在 From 头信息中输出全为零的哈希值"

7296 +

7297 +#: builtin/log.c:1243

7298 msgid "don't include a patch matching a commit upstream"

7299 msgstr "不包含已在上游提交中的补丁"

7300

7306 -#: builtin/log.c:1242

7301 +#: builtin/log.c:1245

7302 msgid "show patch format instead of default (patch + stat)"

7303 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

7304

7310 -#: builtin/log.c:1244

7305 +#: builtin/log.c:1247

7306 msgid "Messaging"

7307 msgstr "邮件发送"

7308

7314 -#: builtin/log.c:1245

7309 +#: builtin/log.c:1248

7310 msgid "header"

7311 msgstr "header"

7312

7318 -#: builtin/log.c:1246

7313 +#: builtin/log.c:1249

7314 msgid "add email header"

7315 msgstr "添加邮件头"

7316

7322 -#: builtin/log.c:1247 builtin/log.c:1249

7317 +#: builtin/log.c:1250 builtin/log.c:1252

7318 msgid "email"

7319 msgstr "邮件地址"

7320

7326 -#: builtin/log.c:1247

7321 +#: builtin/log.c:1250

7322 msgid "add To: header"

7323 msgstr "添加收件人"

7324

7330 -#: builtin/log.c:1249

7325 +#: builtin/log.c:1252

7326 msgid "add Cc: header"

7327 msgstr "添加抄送"

7328

7334 -#: builtin/log.c:1251

7329 +#: builtin/log.c:1254

7330 msgid "ident"

7331 msgstr "标识"

7332

7338 -#: builtin/log.c:1252

7333 +#: builtin/log.c:1255

7334 msgid "set From address to <ident> (or committer ident if absent)"

7335 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"

7336

7342 -#: builtin/log.c:1254

7337 +#: builtin/log.c:1257

7338 msgid "message-id"

7339 msgstr "邮件标识"

7340

7346 -#: builtin/log.c:1255

7341 +#: builtin/log.c:1258

7342 msgid "make first mail a reply to <message-id>"

7343 msgstr "使第一封邮件作为对 <邮件标识> 的回复"

7344

7350 -#: builtin/log.c:1256 builtin/log.c:1259

7345 +#: builtin/log.c:1259 builtin/log.c:1262

7346 msgid "boundary"

7347 msgstr "边界"

7348

7354 -#: builtin/log.c:1257

7349 +#: builtin/log.c:1260

7350 msgid "attach the patch"

7351 msgstr "附件方式添加补丁"

7352

7358 -#: builtin/log.c:1260

7353 +#: builtin/log.c:1263

7354 msgid "inline the patch"

7355 msgstr "内联显示补丁"

7356

7362 -#: builtin/log.c:1264

7357 +#: builtin/log.c:1267

7358 msgid "enable message threading, styles: shallow, deep"

7359 msgstr "启用邮件线索，风格：浅，深"

7360

7366 -#: builtin/log.c:1266

7361 +#: builtin/log.c:1269

7362 msgid "signature"

7363 msgstr "签名"

7364

7370 -#: builtin/log.c:1267

7365 +#: builtin/log.c:1270

7366 msgid "add a signature"

7367 msgstr "添加一个签名"

7368

7374 -#: builtin/log.c:1269

7369 +#: builtin/log.c:1272

7370 msgid "add a signature from a file"

7371 msgstr "从文件添加一个签名"

7372

7378 -#: builtin/log.c:1270

7373 +#: builtin/log.c:1273

7374 msgid "don't print the patch filenames"

7375 msgstr "不要打印补丁文件名"

7376

7382 -#: builtin/log.c:1359

7377 +#: builtin/log.c:1362

7378 msgid "-n and -k are mutually exclusive."

7379 msgstr "-n 和 -k 互斥。"

7380

7386 -#: builtin/log.c:1361

7381 +#: builtin/log.c:1364

7382 msgid "--subject-prefix and -k are mutually exclusive."

7383 msgstr "--subject-prefix 和 -k 互斥。"

7384

7390 -#: builtin/log.c:1369

7385 +#: builtin/log.c:1372

7386 msgid "--name-only does not make sense"

7387 msgstr "--name-only 无意义"

7388

7394 -#: builtin/log.c:1371

7389 +#: builtin/log.c:1374

7390 msgid "--name-status does not make sense"

7391 msgstr "--name-status 无意义"

7392

7398 -#: builtin/log.c:1373

7393 +#: builtin/log.c:1376

7394 msgid "--check does not make sense"

7395 msgstr "--check 无意义"

7396

7402 -#: builtin/log.c:1396

7397 +#: builtin/log.c:1401

7398 msgid "standard output, or directory, which one?"

7399 msgstr "标准输出或目录，哪一个？"

7400

7406 -#: builtin/log.c:1398

7401 +#: builtin/log.c:1403

7402 #, c-format

7403 msgid "Could not create directory '%s'"

7404 msgstr "不能创建目录 '%s'"

7405

7411 -#: builtin/log.c:1495

7406 +#: builtin/log.c:1500

7407 #, c-format

7408 msgid "unable to read signature file '%s'"

7409 msgstr "无法读取签名文件 '%s'"

7410

7416 -#: builtin/log.c:1558

7411 +#: builtin/log.c:1563

7412 msgid "Failed to create output files"

7413 msgstr "无法创建输出文件"

7414

7420 -#: builtin/log.c:1606

7415 +#: builtin/log.c:1611

7416 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7417 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

7418

7424 -#: builtin/log.c:1660

7419 +#: builtin/log.c:1665

7420 #, c-format

7421 msgid ""

7422 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

7423 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"

7424

7430 -#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685

7425 +#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7426 #, c-format

7427 msgid "Unknown commit %s"

7428 msgstr "未知提交 %s"

@@ -8816,19 +8811,19 @@ msgstr "无法将多个分支合并到空分支。"

8811 msgid "Cannot rebase onto multiple branches."

8812 msgstr "无法变基到多个分支。"

8813

8819 -#: builtin/push.c:15

8814 +#: builtin/push.c:16

8815 msgid "git push [<options>] [<repository> [<refspec>...]]"

8816 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"

8817

8823 -#: builtin/push.c:86

8818 +#: builtin/push.c:88

8819 msgid "tag shorthand without <tag>"

8820 msgstr "标签后面未提供 <标签> 参数"

8821

8827 -#: builtin/push.c:96

8822 +#: builtin/push.c:98

8823 msgid "--delete only accepts plain target ref names"

8824 msgstr "--delete 只接受简单的目标引用名"

8825

8831 -#: builtin/push.c:140

8826 +#: builtin/push.c:142

8827 msgid ""

8828 "\n"

8829 "To choose either option permanently, see push.default in 'git help config'."

@@ -8836,7 +8831,7 @@ msgstr ""

8831 "\n"

8832 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"

8833

8839 -#: builtin/push.c:143

8834 +#: builtin/push.c:145

8835 #, c-format

8836 msgid ""

8837 "The upstream branch of your current branch does not match\n"

@@ -8860,7 +8855,7 @@ msgstr ""

8855 " git push %s %s\n"

8856 "%s"

8857

8863 -#: builtin/push.c:158

8858 +#: builtin/push.c:160

8859 #, c-format

8860 msgid ""

8861 "You are not currently on a branch.\n"

@@ -8874,7 +8869,7 @@ msgstr ""

8869 "\n"

8870 " git push %s HEAD:<远程分支名字>\n"

8871

8877 -#: builtin/push.c:172

8872 +#: builtin/push.c:174

8873 #, c-format

8874 msgid ""

8875 "The current branch %s has no upstream branch.\n"

@@ -8887,12 +8882,12 @@ msgstr ""

8882 "\n"

8883 " git push --set-upstream %s %s\n"

8884

8890 -#: builtin/push.c:180

8885 +#: builtin/push.c:182

8886 #, c-format

8887 msgid "The current branch %s has multiple upstream branches, refusing to push."

8888 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

8889

8895 -#: builtin/push.c:183

8890 +#: builtin/push.c:185

8891 #, c-format

8892 msgid ""

8893 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -8903,7 +8898,7 @@ msgstr ""

8898 "而没有告诉我要推送什么、更新哪个远程分支。"

8899

8900 # 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短

8906 -#: builtin/push.c:206

8901 +#: builtin/push.c:208

8902 msgid ""

8903 "push.default is unset; its implicit value has changed in\n"

8904 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

@@ -8946,12 +8941,12 @@ msgstr ""

8941 "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"

8942 "为保持兼容，请用 'current' 代替 'simple'）"

8943

8949 -#: builtin/push.c:273

8944 +#: builtin/push.c:275

8945 msgid ""

8946 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

8947 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"

8948

8954 -#: builtin/push.c:280

8949 +#: builtin/push.c:282

8950 msgid ""

8951 "Updates were rejected because the tip of your current branch is behind\n"

8952 "its remote counterpart. Integrate the remote changes (e.g.\n"

@@ -8962,7 +8957,7 @@ msgstr ""

8957 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"

8958 "'git push --help' 中的 'Note about fast-forwards' 小节。"

8959

8965 -#: builtin/push.c:286

8960 +#: builtin/push.c:288

8961 msgid ""

8962 "Updates were rejected because a pushed branch tip is behind its remote\n"

8963 "counterpart. Check out this branch and integrate the remote changes\n"

@@ -8973,7 +8968,7 @@ msgstr ""

8968 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"

8969 "'git push --help' 中的 'Note about fast-forwards' 小节。"

8970

8976 -#: builtin/push.c:292

8971 +#: builtin/push.c:294

8972 msgid ""

8973 "Updates were rejected because the remote contains work that you do\n"

8974 "not have locally. This is usually caused by another repository pushing\n"

@@ -8986,11 +8981,11 @@ msgstr ""

8981 "（如 'git pull ...'）。\n"

8982 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

8983

8989 -#: builtin/push.c:299

8984 +#: builtin/push.c:301

8985 msgid "Updates were rejected because the tag already exists in the remote."

8986 msgstr "更新被拒绝，因为该标签在远程已经存在。"

8987

8993 -#: builtin/push.c:302

8988 +#: builtin/push.c:304

8989 msgid ""

8990 "You cannot update a remote ref that points at a non-commit object,\n"

8991 "or update a remote ref to make it point at a non-commit object,\n"

@@ -8999,22 +8994,22 @@ msgstr ""

8994 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"

8995 "也不能更新远程引用让其指向一个非提交对象。\n"

8996

9002 -#: builtin/push.c:361

8997 +#: builtin/push.c:363

8998 #, c-format

8999 msgid "Pushing to %s\n"

9000 msgstr "推送到 %s\n"

9001

9007 -#: builtin/push.c:365

9002 +#: builtin/push.c:367

9003 #, c-format

9004 msgid "failed to push some refs to '%s'"

9005 msgstr "无法推送一些引用到 '%s'"

9006

9012 -#: builtin/push.c:395

9007 +#: builtin/push.c:397

9008 #, c-format

9009 msgid "bad repository '%s'"

9010 msgstr "坏的仓库 '%s'"

9011

9017 -#: builtin/push.c:396

9012 +#: builtin/push.c:398

9013 msgid ""

9014 "No configured push destination.\n"

9015 "Either specify the URL from the command-line or configure a remote "

@@ -9035,100 +9030,105 @@ msgstr ""

9030 "\n"

9031 " git push <名称>\n"

9032

9038 -#: builtin/push.c:411

9033 +#: builtin/push.c:413

9034 msgid "--all and --tags are incompatible"

9035 msgstr "--all 和 --tags 不兼容"

9036

9042 -#: builtin/push.c:412

9037 +#: builtin/push.c:414

9038 msgid "--all can't be combined with refspecs"

9039 msgstr "--all 不能和引用规格同时使用"

9040

9046 -#: builtin/push.c:417

9041 +#: builtin/push.c:419

9042 msgid "--mirror and --tags are incompatible"

9043 msgstr "--mirror 和 --tags 不兼容"

9044

9050 -#: builtin/push.c:418

9045 +#: builtin/push.c:420

9046 msgid "--mirror can't be combined with refspecs"

9047 msgstr "--mirror 不能和引用规格同时使用"

9048

9054 -#: builtin/push.c:423

9049 +#: builtin/push.c:425

9050 msgid "--all and --mirror are incompatible"

9051 msgstr "--all 和 --mirror 不兼容"

9052

9058 -#: builtin/push.c:539

9053 +#: builtin/push.c:537

9054 msgid "repository"

9055 msgstr "仓库"

9056

9062 -#: builtin/push.c:540 builtin/send-pack.c:161

9057 +#: builtin/push.c:538 builtin/send-pack.c:161

9058 msgid "push all refs"

9059 msgstr "推送所有引用"

9060

9066 -#: builtin/push.c:541 builtin/send-pack.c:163

9061 +#: builtin/push.c:539 builtin/send-pack.c:163

9062 msgid "mirror all refs"

9063 msgstr "镜像所有引用"

9064

9070 -#: builtin/push.c:543

9065 +#: builtin/push.c:541

9066 msgid "delete refs"

9067 msgstr "删除引用"

9068

9074 -#: builtin/push.c:544

9069 +#: builtin/push.c:542

9070 msgid "push tags (can't be used with --all or --mirror)"

9071 msgstr "推送标签（不能使用 --all or --mirror）"

9072

9078 -#: builtin/push.c:547 builtin/send-pack.c:164

9073 +#: builtin/push.c:545 builtin/send-pack.c:164

9074 msgid "force updates"

9075 msgstr "强制更新"

9076

9082 -#: builtin/push.c:549 builtin/send-pack.c:175

9077 +#: builtin/push.c:547 builtin/send-pack.c:175

9078 msgid "refname>:<expect"

9079 msgstr "引用名>:<期望值"

9080

9086 -#: builtin/push.c:550 builtin/send-pack.c:176

9081 +#: builtin/push.c:548 builtin/send-pack.c:176

9082 msgid "require old value of ref to be at this value"

9083 msgstr "要求引用旧的取值为设定值"

9084

9090 -#: builtin/push.c:553

9085 +# 译者：可选值，不能翻译

9086 +#: builtin/push.c:550

9087 +msgid "check|on-demand|no"

9088 +msgstr "check|on-demand|no"

9089 +

9090 +#: builtin/push.c:551

9091 msgid "control recursive pushing of submodules"

9092 msgstr "控制子模组的递归推送"

9093

9094 -#: builtin/push.c:555 builtin/send-pack.c:169

9094 +#: builtin/push.c:553 builtin/send-pack.c:169

9095 msgid "use thin pack"

9096 msgstr "使用精简打包"

9097

9098 -#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158

9098 +#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158

9099 #: builtin/send-pack.c:159

9100 msgid "receive pack program"

9101 msgstr "接收包程序"

9102

9103 -#: builtin/push.c:558

9103 +#: builtin/push.c:556

9104 msgid "set upstream for git pull/status"

9105 msgstr "设置 git pull/status 的上游"

9106

9107 -#: builtin/push.c:561

9107 +#: builtin/push.c:559

9108 msgid "prune locally removed refs"

9109 msgstr "清除本地删除的引用"

9110

9111 -#: builtin/push.c:563

9111 +#: builtin/push.c:561

9112 msgid "bypass pre-push hook"

9113 msgstr "绕过 pre-push 钩子"

9114

9115 -#: builtin/push.c:564

9115 +#: builtin/push.c:562

9116 msgid "push missing but relevant tags"

9117 msgstr "推送缺失但有关的标签"

9118

9119 -#: builtin/push.c:567 builtin/send-pack.c:166

9119 +#: builtin/push.c:565 builtin/send-pack.c:166

9120 msgid "GPG sign the push"

9121 msgstr "用 GPG 为推送签名"

9122

9123 -#: builtin/push.c:569 builtin/send-pack.c:170

9123 +#: builtin/push.c:567 builtin/send-pack.c:170

9124 msgid "request atomic transaction on remote side"

9125 msgstr "需要远端支持原子事务"

9126

9127 -#: builtin/push.c:579

9127 +#: builtin/push.c:577

9128 msgid "--delete is incompatible with --all, --mirror and --tags"

9129 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

9130

9131 -#: builtin/push.c:581

9131 +#: builtin/push.c:579

9132 msgid "--delete doesn't make sense without any refs"

9133 msgstr "--delete 未接任何引用没有意义"

9134

@@ -11971,6 +11971,12 @@ msgstr "无法递归进子模组路径 '$sm_path'"

11971 msgid "Synchronizing submodule url for '$displaypath'"

11972 msgstr "为 '$displaypath' 同步子模组 url"

11973

11974 +#~ msgid "unable to look up current user in the passwd file: %s"

11975 +#~ msgstr "无法在口令文件中查询到当前用户：%s"

11976 +

11977 +#~ msgid "no such user"

11978 +#~ msgstr "无此用户"

11979 +

11980 #~ msgid "show usage"

11981 #~ msgstr "显示用法"

11982

l10n: zh_CN: for git v2.7.0 l10n round 2