l10n updates for Git 1.7.10-rc1 · freshlybakedca.ke/git@59012e2

+1

po/TEAMS

··· 5 5 Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com> 6 6 7 7 Language: sv (Swedish) 8 + Repository: https://github.com/nafmo/git-l10n-sv/ 8 9 Leader: Peter Krefting <peter@softwolves.pp.se> 9 10 10 11 Language: zh_CN (Simplified Chinese)

+17 -12

po/git.pot

··· 8 8 msgstr "" 9 9 "Project-Id-Version: PACKAGE VERSION\n" 10 10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" 11 - "POT-Creation-Date: 2012-03-08 10:19+0800\n" 11 + "POT-Creation-Date: 2012-03-16 20:18+0800\n" 12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 14 "Language-Team: LANGUAGE <LL@li.org>\n" ··· 3071 3071 msgid "Patch format detection failed." 3072 3072 msgstr "" 3073 3073 3074 - #: git-am.sh:409 3074 + #: git-am.sh:411 3075 3075 msgid "-d option is no longer supported. Do not use." 3076 3076 msgstr "" 3077 3077 3078 - #: git-am.sh:472 3078 + #: git-am.sh:474 3079 3079 #, sh-format 3080 3080 msgid "previous rebase directory $dotest still exists but mbox given." 3081 3081 msgstr "" 3082 3082 3083 - #: git-am.sh:477 3083 + #: git-am.sh:479 3084 3084 msgid "Please make up your mind. --skip or --abort?" 3085 3085 msgstr "" 3086 3086 3087 - #: git-am.sh:504 3087 + #: git-am.sh:506 3088 3088 msgid "Resolve operation not in progress, we are not resuming." 3089 3089 msgstr "" 3090 3090 3091 - #: git-am.sh:570 3091 + #: git-am.sh:572 3092 3092 #, sh-format 3093 3093 msgid "Dirty index: cannot apply patches (dirty: $files)" 3094 3094 msgstr "" 3095 3095 3096 - #: git-am.sh:746 3096 + #: git-am.sh:748 3097 3097 msgid "cannot be interactive without stdin connected to a terminal." 3098 3098 msgstr "" 3099 3099 3100 3100 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] 3101 3101 #. in your translation. The program will only accept English 3102 3102 #. input at this point. 3103 - #: git-am.sh:757 3103 + #: git-am.sh:759 3104 3104 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 3105 3105 msgstr "" 3106 3106 3107 - #: git-am.sh:793 3107 + #: git-am.sh:795 3108 3108 #, sh-format 3109 3109 msgid "Applying: $FIRSTLINE" 3110 3110 msgstr "" 3111 3111 3112 - #: git-am.sh:838 3112 + #: git-am.sh:840 3113 3113 msgid "No changes -- Patch already applied." 3114 3114 msgstr "" 3115 3115 3116 - #: git-am.sh:864 3116 + #: git-am.sh:866 3117 3117 msgid "applying to an empty history" 3118 3118 msgstr "" 3119 3119 ··· 3350 3350 msgid "No submodule mapping found in .gitmodules for path '$path'" 3351 3351 msgstr "" 3352 3352 3353 - #: git-submodule.sh:173 3353 + #: git-submodule.sh:149 3354 3354 #, sh-format 3355 3355 msgid "Clone of '$url' into submodule path '$path' failed" 3356 + msgstr "" 3357 + 3358 + #: git-submodule.sh:159 3359 + #, sh-format 3360 + msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" 3356 3361 msgstr "" 3357 3362 3358 3363 #: git-submodule.sh:247

+23 -18

po/sv.po

··· 5 5 # 6 6 msgid "" 7 7 msgstr "" 8 - "Project-Id-Version: git 1.7.3\n" 8 + "Project-Id-Version: git 1.7.10\n" 9 9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" 10 - "POT-Creation-Date: 2012-03-08 10:19+0800\n" 11 - "PO-Revision-Date: 2012-03-08 10:53+0100\n" 10 + "POT-Creation-Date: 2012-03-16 20:18+0800\n" 11 + "PO-Revision-Date: 2012-03-26 07:00+0100\n" 12 12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" 13 13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 14 14 "Language: sv\n" ··· 463 463 msgstr "" 464 464 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" 465 465 466 - # %s är ett verb ("Untracked"/"Ignored"). 466 + # %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. 467 467 #: wt-status.c:187 468 468 #, c-format 469 469 msgid "%s files:" 470 - msgstr "%s filer:" 470 + msgstr "%se filer:" 471 471 472 472 #: wt-status.c:190 473 473 #, c-format ··· 1886 1886 "some local refs could not be updated; try running\n" 1887 1887 " 'git remote prune %s' to remove any old, conflicting branches" 1888 1888 msgstr "" 1889 - "några lokala referenser kunde inte uppdateras; testa att köra\n" 1889 + "vissa lokala referenser kunde inte uppdateras; testa att köra\n" 1890 1890 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" 1891 1891 1892 1892 #: builtin/fetch.c:540 ··· 2872 2872 #: builtin/push.c:135 2873 2873 #, c-format 2874 2874 msgid "failed to push some refs to '%s'" 2875 - msgstr "misslyckades sända några referenser till \"%s\"" 2875 + msgstr "misslyckades sända vissa referenser till \"%s\"" 2876 2876 2877 2877 #: builtin/push.c:143 2878 2878 #, c-format ··· 3251 3251 msgid "Patch format detection failed." 3252 3252 msgstr "Misslyckades detektera patchformat." 3253 3253 3254 - #: git-am.sh:409 3254 + #: git-am.sh:411 3255 3255 msgid "-d option is no longer supported. Do not use." 3256 3256 msgstr "Flaggan -d stöds inte lägre. Använd inte." 3257 3257 3258 - #: git-am.sh:472 3258 + #: git-am.sh:474 3259 3259 #, sh-format 3260 3260 msgid "previous rebase directory $dotest still exists but mbox given." 3261 3261 msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." 3262 3262 3263 - #: git-am.sh:477 3263 + #: git-am.sh:479 3264 3264 msgid "Please make up your mind. --skip or --abort?" 3265 3265 msgstr "Bestäm dig. --skip eller --abort?" 3266 3266 3267 - #: git-am.sh:504 3267 + #: git-am.sh:506 3268 3268 msgid "Resolve operation not in progress, we are not resuming." 3269 3269 msgstr "Lösningsoperation pågår inte, vi återupptar inte." 3270 3270 3271 - #: git-am.sh:570 3271 + #: git-am.sh:572 3272 3272 #, sh-format 3273 3273 msgid "Dirty index: cannot apply patches (dirty: $files)" 3274 3274 msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" 3275 3275 3276 - #: git-am.sh:746 3276 + #: git-am.sh:748 3277 3277 msgid "cannot be interactive without stdin connected to a terminal." 3278 3278 msgstr "" 3279 3279 "kan inte vara interaktiv om standard in inte är ansluten till en terminal." ··· 3281 3281 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] 3282 3282 #. in your translation. The program will only accept English 3283 3283 #. input at this point. 3284 - #: git-am.sh:757 3284 + #: git-am.sh:759 3285 3285 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 3286 3286 msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " 3287 3287 3288 - #: git-am.sh:793 3288 + #: git-am.sh:795 3289 3289 #, sh-format 3290 3290 msgid "Applying: $FIRSTLINE" 3291 3291 msgstr "Applicerar: $FIRSTLINE" 3292 3292 3293 - #: git-am.sh:838 3293 + #: git-am.sh:840 3294 3294 msgid "No changes -- Patch already applied." 3295 3295 msgstr "Inga ändringar -- Patchen har redan applicerats." 3296 3296 3297 - #: git-am.sh:864 3297 + #: git-am.sh:866 3298 3298 msgid "applying to an empty history" 3299 3299 msgstr "applicerar på en tom historik" 3300 3300 ··· 3539 3539 msgid "No submodule mapping found in .gitmodules for path '$path'" 3540 3540 msgstr "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$path\"" 3541 3541 3542 - #: git-submodule.sh:173 3542 + #: git-submodule.sh:149 3543 3543 #, sh-format 3544 3544 msgid "Clone of '$url' into submodule path '$path' failed" 3545 3545 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\"" 3546 + 3547 + #: git-submodule.sh:159 3548 + #, sh-format 3549 + msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" 3550 + msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt" 3546 3551 3547 3552 #: git-submodule.sh:247 3548 3553 #, sh-format

+269 -262

po/zh_CN.po

··· 12 12 msgstr "" 13 13 "Project-Id-Version: Git\n" 14 14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" 15 - "POT-Creation-Date: 2012-03-08 10:19+0800\n" 15 + "POT-Creation-Date: 2012-03-16 20:18+0800\n" 16 16 "PO-Revision-Date: 2012-01-30 00:00+0800\n" 17 17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" 18 18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n" ··· 70 70 msgid "failed to close rev-list's stdin: %s" 71 71 msgstr "无法关闭 rev-list 的标准输入：%s" 72 72 73 - # 注意保持前导空格 73 + # 译者：注意保持前导空格 74 74 #: diff.c:105 75 75 #, c-format 76 76 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" 77 77 msgstr " 无法解析 dirstat 阈值 '%.*s'\n" 78 78 79 - # 注意保持前导空格 79 + # 译者：注意保持前导空格 80 80 #: diff.c:110 81 81 #, c-format 82 82 msgid " Unknown dirstat parameter '%.*s'\n" ··· 88 88 "Found errors in 'diff.dirstat' config variable:\n" 89 89 "%s" 90 90 msgstr "" 91 - "配置变量 'diff.dirstat' 出错：\n" 91 + "发现配置变量 'diff.dirstat' 中的错误：\n" 92 92 "%s" 93 93 94 94 #: diff.c:1336 95 95 msgid " 0 files changed\n" 96 - msgstr "0 个文件被修改\n" 96 + msgstr " 0 个文件被修改\n" 97 97 98 98 #: diff.c:1340 99 99 #, c-format ··· 169 169 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" 170 170 msgid_plural "" 171 171 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" 172 - msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进。\n" 172 + msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" 173 173 174 174 #: remote.c:1621 175 175 #, c-format ··· 187 187 #: builtin/merge.c:1095 builtin/merge.c:1105 188 188 #, c-format 189 189 msgid "Could not open '%s' for writing" 190 - msgstr "无法打开 '%s' 以写入" 190 + msgstr "不能为写入打开 '%s'" 191 191 192 192 #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 193 193 #: builtin/merge.c:1097 builtin/merge.c:1110 194 194 #, c-format 195 195 msgid "Could not write to '%s'" 196 - msgstr "无法写入 '%s'" 196 + msgstr "不能写入 '%s'" 197 197 198 198 #: sequencer.c:143 199 199 msgid "" ··· 238 238 #: sequencer.c:232 239 239 #, c-format 240 240 msgid "%s: Unable to write new index file" 241 - msgstr "%s：无法写入新暂存区文件" 241 + msgstr "%s：无法写入新索引文件" 242 242 243 243 #: sequencer.c:298 244 244 msgid "Your index file is unmerged." 245 - msgstr "您的暂存区文件未完成合并。" 245 + msgstr "您的索引文件未完成合并。" 246 246 247 247 #: sequencer.c:301 248 248 msgid "You do not have a valid HEAD" ··· 261 261 #: sequencer.c:328 262 262 #, c-format 263 263 msgid "Mainline was specified but commit %s is not a merge." 264 - msgstr "提供了主线但提交 %s 不是一个合并。" 264 + msgstr "指定了主线但提交 %s 不是一个合并。" 265 265 266 266 #. TRANSLATORS: The first %s will be "revert" or 267 267 #. "cherry-pick", the second %s a SHA1 ··· 298 298 #: sequencer.c:461 299 299 #, c-format 300 300 msgid "git %s: failed to read the index" 301 - msgstr "git %s: 无法读取暂存区" 301 + msgstr "git %s：无法读取索引" 302 302 303 303 #: sequencer.c:466 304 304 #, c-format 305 305 msgid "git %s: failed to refresh the index" 306 - msgstr "git %s: 无法刷新暂存区" 306 + msgstr "git %s：无法刷新索引" 307 307 308 308 #: sequencer.c:551 309 309 #, c-format 310 310 msgid "Cannot %s during a %s" 311 - msgstr "无法 %s 在 %s 过程中" 311 + msgstr "无法 %s 在一个 %s 过程中" 312 312 313 313 #: sequencer.c:573 314 314 #, c-format 315 315 msgid "Could not parse line %d." 316 - msgstr "无法解析第 %d 行。" 316 + msgstr "不能解析第 %d 行。" 317 317 318 318 #: sequencer.c:578 319 319 msgid "No commits parsed." ··· 360 360 #: sequencer.c:671 361 361 #, c-format 362 362 msgid "Could not create sequencer directory %s" 363 - msgstr "无法创建序列目录 %s" 363 + msgstr "不能创建序列目录 %s" 364 364 365 365 #: sequencer.c:687 sequencer.c:772 366 366 #, c-format ··· 377 377 378 378 #: sequencer.c:710 379 379 msgid "cannot abort from a branch yet to be born" 380 - msgstr "不能从未初始分支终止" 380 + msgstr "不能从尚未建立的分支终止" 381 381 382 382 #: sequencer.c:732 383 383 #, c-format ··· 396 396 #: sequencer.c:742 397 397 #, c-format 398 398 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" 399 - msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏" 399 + msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" 400 400 401 401 #: sequencer.c:765 402 402 #, c-format ··· 415 415 msgid "Unmerged paths:" 416 416 msgstr "未合并的路径：" 417 417 418 - # 注意保持前导空格 418 + # 译者：注意保持前导空格 419 419 #: wt-status.c:140 wt-status.c:157 420 420 #, c-format 421 421 msgid " (use \"git reset %s <file>...\" to unstage)" 422 422 msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" 423 423 424 - # 注意保持前导空格 424 + # 译者：注意保持前导空格 425 425 #: wt-status.c:142 wt-status.c:159 426 426 msgid " (use \"git rm --cached <file>...\" to unstage)" 427 427 msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" 428 428 429 - # 注意保持前导空格 429 + # 译者：注意保持前导空格 430 430 #: wt-status.c:143 431 431 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" 432 432 msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" ··· 439 439 msgid "Changes not staged for commit:" 440 440 msgstr "未暂存至提交的变更：" 441 441 442 - # 注意保持前导空格 442 + # 译者：注意保持前导空格 443 443 #: wt-status.c:173 444 444 msgid " (use \"git add <file>...\" to update what will be committed)" 445 445 msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" 446 446 447 - # 注意保持前导空格 447 + # 译者：注意保持前导空格 448 448 #: wt-status.c:175 449 449 msgid " (use \"git add/rm <file>...\" to update what will be committed)" 450 450 msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" 451 451 452 - # 注意保持前导空格 452 + # 译者：注意保持前导空格 453 453 #: wt-status.c:176 454 454 msgid "" 455 455 " (use \"git checkout -- <file>...\" to discard changes in working directory)" 456 456 msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" 457 457 458 - # 注意保持前导空格 458 + # 译者：注意保持前导空格 459 459 #: wt-status.c:178 460 460 msgid " (commit or discard the untracked or modified content in submodules)" 461 461 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" ··· 465 465 msgid "%s files:" 466 466 msgstr "%s文件：" 467 467 468 - # 注意保持前导空格 468 + # 译者：注意保持前导空格 469 469 #: wt-status.c:190 470 470 #, c-format 471 471 msgid " (use \"git %s <file>...\" to include in what will be committed)" 472 - msgstr " （使用 \"git %s <file>...\" 包含到提交列表）" 472 + msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" 473 473 474 474 #: wt-status.c:207 475 475 msgid "bug" ··· 503 503 msgid "both modified:" 504 504 msgstr "双方修改：" 505 505 506 + # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 506 507 #: wt-status.c:248 507 508 msgid "new commits, " 508 509 msgstr "新提交, " 509 510 511 + # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 510 512 #: wt-status.c:250 511 513 msgid "modified content, " 512 514 msgstr "修改的内容, " 513 515 516 + # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 514 517 #: wt-status.c:252 515 518 msgid "untracked content, " 516 519 msgstr "未跟踪的内容, " 517 520 518 - # 为保证在输出中对齐，注意调整句中空格！ 521 + # 译者：为保证在输出中对齐，注意调整句中空格！ 519 522 #: wt-status.c:266 520 523 #, c-format 521 524 msgid "new file: %s" 522 525 msgstr "新文件： %s" 523 526 524 - # 为保证在输出中对齐，注意调整句中空格！ 527 + # 译者：为保证在输出中对齐，注意调整句中空格！ 525 528 #: wt-status.c:269 526 529 #, c-format 527 530 msgid "copied: %s -> %s" 528 531 msgstr "拷贝： %s -> %s" 529 532 530 - # 为保证在输出中对齐，注意调整句中空格！ 533 + # 译者：为保证在输出中对齐，注意调整句中空格！ 531 534 #: wt-status.c:272 532 535 #, c-format 533 536 msgid "deleted: %s" 534 537 msgstr "删除： %s" 535 538 536 - # 为保证在输出中对齐，注意调整句中空格！ 539 + # 译者：为保证在输出中对齐，注意调整句中空格！ 537 540 #: wt-status.c:275 538 541 #, c-format 539 542 msgid "modified: %s" 540 543 msgstr "修改： %s" 541 544 542 - # 为保证在输出中对齐，注意调整句中空格！ 545 + # 译者：为保证在输出中对齐，注意调整句中空格！ 543 546 #: wt-status.c:278 544 547 #, c-format 545 548 msgid "renamed: %s -> %s" 546 549 msgstr "重命名： %s -> %s" 547 550 548 - # 为保证在输出中对齐，注意调整句中空格！ 551 + # 译者：为保证在输出中对齐，注意调整句中空格！ 549 552 #: wt-status.c:281 550 553 #, c-format 551 554 msgid "typechange: %s" 552 555 msgstr "类型变更： %s" 553 556 554 - # 为保证在输出中对齐，注意调整句中空格！ 557 + # 译者：为保证在输出中对齐，注意调整句中空格！ 555 558 #: wt-status.c:284 556 559 #, c-format 557 560 msgid "unknown: %s" 558 561 msgstr "未知： %s" 559 562 560 - # 为保证在输出中对齐，注意调整句中空格！ 563 + # 译者：为保证在输出中对齐，注意调整句中空格！ 561 564 #: wt-status.c:287 562 565 #, c-format 563 566 msgid "unmerged: %s" ··· 566 569 #: wt-status.c:290 567 570 #, c-format 568 571 msgid "bug: unhandled diff status %c" 569 - msgstr "bug: 未处理的差异状态 %c" 572 + msgstr "bug：未处理的差异状态 %c" 570 573 571 574 #: wt-status.c:713 572 575 msgid "On branch " ··· 593 596 msgid "Untracked files not listed%s" 594 597 msgstr "未跟踪的文件没有列出%s" 595 598 596 - # 注意保持前导空格 599 + # 译者：注意保持前导空格 597 600 #: wt-status.c:751 598 601 msgid " (use -u option to show untracked files)" 599 602 msgstr " （使用 -u 参数显示未跟踪的文件）" ··· 607 610 msgid "no changes added to commit%s\n" 608 611 msgstr "修改尚未加入提交%s\n" 609 612 610 - # 注意保持前导空格 613 + # 译者：注意保持前导空格 611 614 #: wt-status.c:763 612 615 msgid " (use \"git add\" and/or \"git commit -a\")" 613 616 msgstr " （使用 \"git add\" 和/或 \"git commit -a\"）" ··· 617 620 msgid "nothing added to commit but untracked files present%s\n" 618 621 msgstr "空提交但存在未跟踪文件%s\n" 619 622 620 - # 注意保持前导空格 623 + # 译者：注意保持前导空格 621 624 #: wt-status.c:767 622 625 msgid " (use \"git add\" to track)" 623 626 msgstr " （使用 \"git add\" 建立跟踪）" ··· 627 630 msgid "nothing to commit%s\n" 628 631 msgstr "无须提交%s\n" 629 632 630 - # 注意保持前导空格 633 + # 译者：注意保持前导空格 631 634 #: wt-status.c:770 632 635 msgid " (create/copy files and use \"git add\" to track)" 633 636 msgstr " （新建/拷贝的文件使用 \"git add\" 建立跟踪）" 634 637 635 - # 注意保持前导空格 638 + # 译者：注意保持前导空格 636 639 #: wt-status.c:773 637 640 msgid " (use -u to show untracked files)" 638 641 msgstr " （使用 -u 显示未跟踪文件）" 639 642 640 - # 注意保持前导空格 643 + # 译者：注意保持前导空格 641 644 #: wt-status.c:776 642 645 msgid " (working directory clean)" 643 646 msgstr " （干净的工作区）" ··· 646 649 msgid "HEAD (no branch)" 647 650 msgstr "HEAD（非分支）" 648 651 649 - # 注意保持句尾空格 652 + # 译者：注意保持句尾空格 650 653 #: wt-status.c:890 651 654 msgid "Initial commit on " 652 655 msgstr "初始提交于 " 653 656 654 - # 注意保持句尾空格 657 + # 译者：注意保持句尾空格 655 658 #: wt-status.c:905 656 659 msgid "behind " 657 660 msgstr "落后 " 658 661 659 - # 注意保持句尾空格 662 + # 译者：注意保持句尾空格 660 663 #: wt-status.c:908 wt-status.c:911 661 664 msgid "ahead " 662 665 msgstr "领先 " 663 666 664 - # 注意保持句尾空格 667 + # 译者：注意保持句尾空格 665 668 #: wt-status.c:913 666 669 msgid ", behind " 667 670 msgstr "，落后 " ··· 687 690 688 691 #: builtin/add.c:192 689 692 msgid "Unstaged changes after refreshing the index:" 690 - msgstr "刷新暂存区后未暂存的变更：" 693 + msgstr "刷新索引之后尚未被暂存的变更：" 691 694 692 695 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 693 696 #, c-format ··· 701 704 702 705 #: builtin/add.c:276 703 706 msgid "Could not read the index" 704 - msgstr "无法读取暂存区" 707 + msgstr "不能读取索引" 705 708 706 709 #: builtin/add.c:286 707 710 #, c-format 708 711 msgid "Could not open '%s' for writing." 709 - msgstr "无法打开 '%s' 以写入。" 712 + msgstr "不能为写入打开 '%s'。" 710 713 711 714 #: builtin/add.c:290 712 715 msgid "Could not write patch" 713 - msgstr "无法写补丁" 716 + msgstr "不能写补丁" 714 717 715 718 #: builtin/add.c:295 716 719 #, c-format 717 720 msgid "Could not stat '%s'" 718 - msgstr "无法查看文件状态 '%s'" 721 + msgstr "不能查看文件状态 '%s'" 719 722 720 723 #: builtin/add.c:297 721 724 msgid "Empty patch. Aborted." ··· 724 727 #: builtin/add.c:303 725 728 #, c-format 726 729 msgid "Could not apply '%s'" 727 - msgstr "无法应用 '%s'" 730 + msgstr "不能应用 '%s'" 728 731 729 732 #: builtin/add.c:312 730 733 msgid "The following paths are ignored by one of your .gitignore files:\n" ··· 733 736 #: builtin/add.c:352 734 737 #, c-format 735 738 msgid "Use -f if you really want to add them.\n" 736 - msgstr "使用 -f 参数如果你确实要添加它们。\n" 739 + msgstr "使用 -f 参数如果您确实要添加它们。\n" 737 740 738 741 #: builtin/add.c:353 739 742 msgid "no files added" ··· 754 757 #: builtin/add.c:413 755 758 #, c-format 756 759 msgid "Nothing specified, nothing added.\n" 757 - msgstr "未提供参数，没有文件被添加。\n" 760 + msgstr "没有指定文件，也没有文件被添加。\n" 758 761 759 762 #: builtin/add.c:414 760 763 #, c-format ··· 764 767 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 765 768 #: builtin/rm.c:162 766 769 msgid "index file corrupt" 767 - msgstr "暂存区文件损坏" 770 + msgstr "索引文件损坏" 768 771 769 772 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 770 773 msgid "Unable to write new index file" 771 - msgstr "无法写入新暂存区文件" 774 + msgstr "无法写入新索引文件" 772 775 773 776 #: builtin/archive.c:17 774 777 #, c-format 775 778 msgid "could not create archive file '%s'" 776 - msgstr "无法创建归档文件 '%s'" 779 + msgstr "不能创建归档文件 '%s'" 777 780 778 781 #: builtin/archive.c:20 779 782 msgid "could not redirect output" 780 - msgstr "无法重定向输出" 783 + msgstr "不能输出重定向" 781 784 782 785 #: builtin/archive.c:37 783 786 msgid "git archive: Remote with no URL" 784 - msgstr "git archive: 未提供远程URL" 787 + msgstr "git archive：未提供远程URL" 785 788 786 789 #: builtin/archive.c:58 787 790 msgid "git archive: expected ACK/NAK, got EOF" 788 - msgstr "git archive: 期待ACK/NACK，却得到EOF" 791 + msgstr "git archive：期待ACK/NACK，却得到EOF" 789 792 790 793 #: builtin/archive.c:63 791 794 #, c-format 792 795 msgid "git archive: NACK %s" 793 - msgstr "git archive: NACK %s" 796 + msgstr "git archive：NACK %s" 794 797 795 798 #: builtin/archive.c:65 796 799 #, c-format ··· 799 802 800 803 #: builtin/archive.c:66 801 804 msgid "git archive: protocol error" 802 - msgstr "git archive: 协议错误" 805 + msgstr "git archive：协议错误" 803 806 804 807 #: builtin/archive.c:71 805 808 msgid "git archive: expected a flush" 806 - msgstr "git archive: 预期一个刷新" 809 + msgstr "git archive：预期一个刷新" 807 810 808 - # 保持原换行格式，在输出时 %s 的替代内容会让字串变长 811 + # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 809 812 #: builtin/branch.c:137 810 813 #, c-format 811 814 msgid "" ··· 815 818 "将要删除的分支 '%s' 已经被合并到\n" 816 819 " '%s'，但未合并到 HEAD。" 817 820 818 - # 保持原换行格式，在输出时 %s 的替代内容会让字串变长 821 + # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 819 822 #: builtin/branch.c:141 820 823 #, c-format 821 824 msgid "" ··· 825 828 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n" 826 829 " 然而却尚未被合并到分支 '%s' 。" 827 830 828 - # 汉字之间无空格，故删除尾部空格 831 + # 译者：汉字之间无空格，故删除尾部空格 829 832 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" 830 833 #: builtin/branch.c:163 831 834 msgid "remote " ··· 866 869 #: builtin/branch.c:214 867 870 #, c-format 868 871 msgid "Error deleting %sbranch '%s'" 869 - msgstr "删除 %s分支 '%s' 时错误" 872 + msgstr "删除 %s分支 '%s' 时出错" 870 873 871 874 #: builtin/branch.c:219 872 875 #, c-format ··· 882 885 msgid "branch '%s' does not point at a commit" 883 886 msgstr "分支 '%s' 未指向一个提交" 884 887 885 - # 注意保持句尾空格 888 + # 译者：注意保持句尾空格 886 889 #: builtin/branch.c:394 887 890 #, c-format 888 891 msgid "behind %d] " 889 892 msgstr "落后 %d] " 890 893 891 - # 注意保持句尾空格 894 + # 译者：注意保持句尾空格 892 895 #: builtin/branch.c:396 893 896 #, c-format 894 897 msgid "ahead %d] " 895 898 msgstr "领先 %d] " 896 899 897 - # 注意保持句尾空格 900 + # 译者：注意保持句尾空格 898 901 #: builtin/branch.c:398 899 902 #, c-format 900 903 msgid "ahead %d, behind %d] " ··· 906 909 907 910 #: builtin/branch.c:566 908 911 msgid "some refs could not be read" 909 - msgstr "一些引用无法读取" 912 + msgstr "一些引用不能读取" 910 913 911 914 #: builtin/branch.c:579 912 915 msgid "cannot rename the current branch while not on any." 913 - msgstr "无法重命名不存在的当前分支。" 916 + msgstr "无法重命名当前分支因为不处于任何分支上。" 914 917 915 918 #: builtin/branch.c:589 916 919 #, c-format ··· 951 954 952 955 #: builtin/branch.c:751 builtin/clone.c:558 953 956 msgid "HEAD not found below refs/heads!" 954 - msgstr "未在 /refs/heads 下发现 HEAD！" 957 + msgstr "HEAD 没有位于 /refs/heads 之下！" 955 958 956 959 #: builtin/branch.c:809 957 960 msgid "-a and -r options to 'git branch' do not make sense with a branch name" ··· 964 967 965 968 #: builtin/bundle.c:56 966 969 msgid "Need a repository to create a bundle." 967 - msgstr "需要一个版本库来创建包" 970 + msgstr "需要一个版本库来创建包。" 968 971 969 972 #: builtin/bundle.c:60 970 973 msgid "Need a repository to unbundle." 971 - msgstr "需要一个版本库来解包" 974 + msgstr "需要一个版本库来解包。" 972 975 973 976 #: builtin/checkout.c:113 builtin/checkout.c:146 974 977 #, c-format ··· 993 996 #: builtin/checkout.c:192 994 997 #, c-format 995 998 msgid "path '%s': cannot merge" 996 - msgstr "path '%s': 无法合并" 999 + msgstr "path '%s'：无法合并" 997 1000 998 1001 #: builtin/checkout.c:209 999 1002 #, c-format ··· 1007 1010 1008 1011 #: builtin/checkout.c:234 builtin/checkout.c:392 1009 1012 msgid "corrupt index file" 1010 - msgstr "冲突的暂存区文件" 1013 + msgstr "损坏的索引文件" 1011 1014 1012 1015 #: builtin/checkout.c:264 builtin/checkout.c:271 1013 1016 #, c-format ··· 1017 1020 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 1018 1021 #: builtin/merge.c:811 1019 1022 msgid "unable to write new index file" 1020 - msgstr "无法写新的暂存区文件" 1023 + msgstr "无法写新的索引文件" 1021 1024 1022 1025 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 1023 1026 msgid "diff_setup_done failed" ··· 1025 1028 1026 1029 #: builtin/checkout.c:414 1027 1030 msgid "you need to resolve your current index first" 1028 - msgstr "您需要先解决当前暂存区的冲突" 1031 + msgstr "您需要先解决当前索引的冲突" 1029 1032 1030 1033 #: builtin/checkout.c:533 1031 1034 #, c-format 1032 1035 msgid "Can not do reflog for '%s'\n" 1033 - msgstr "不能对 '%s' 保存引用日志\n" 1036 + msgstr "不能对 '%s' 执行 reflog 操作\n" 1034 1037 1035 1038 #: builtin/checkout.c:565 1036 1039 msgid "HEAD is now at" ··· 1061 1064 msgid "Switched to branch '%s'\n" 1062 1065 msgstr "切换到分支 '%s'\n" 1063 1066 1064 - # 注意保持前导空格 1067 + # 译者：注意保持前导空格 1065 1068 #: builtin/checkout.c:639 1066 1069 #, c-format 1067 1070 msgid " ... and %d more.\n" 1068 - msgstr " ... 及 %d 更多。\n" 1071 + msgstr " ... 及其它 %d 个。\n" 1069 1072 1070 1073 #. The singular version 1071 1074 #: builtin/checkout.c:645 ··· 1110 1113 1111 1114 #: builtin/checkout.c:722 1112 1115 msgid "You are on a branch yet to be born" 1113 - msgstr "您位于一个未初始化的分支" 1116 + msgstr "您位于一个尚未初始化的分支" 1114 1117 1115 1118 #. case (1) 1116 1119 #: builtin/checkout.c:853 ··· 1158 1161 1159 1162 #: builtin/checkout.c:1017 1160 1163 msgid "git checkout: -f and -m are incompatible" 1161 - msgstr "git checkout: -f 和 -m 不兼容" 1164 + msgstr "git checkout：-f 和 -m 不兼容" 1162 1165 1163 1166 #: builtin/checkout.c:1051 1164 1167 msgid "invalid path specification" 1165 - msgstr "无效的路径" 1168 + msgstr "无效的路径规格" 1166 1169 1167 1170 #: builtin/checkout.c:1059 1168 1171 #, c-format ··· 1170 1173 "git checkout: updating paths is incompatible with switching branches.\n" 1171 1174 "Did you intend to checkout '%s' which can not be resolved as commit?" 1172 1175 msgstr "" 1173 - "git checkout: 更新路径和切换分支不兼容。\n" 1176 + "git checkout：更新路径和切换分支不兼容。\n" 1174 1177 "您是想要检出 '%s' 但未能将其解析为提交么？" 1175 1178 1176 1179 #: builtin/checkout.c:1061 1177 1180 msgid "git checkout: updating paths is incompatible with switching branches." 1178 - msgstr "git checkout: 更新路径和切换分支不兼容。" 1181 + msgstr "git checkout：更新路径和切换分支不兼容。" 1179 1182 1180 1183 #: builtin/checkout.c:1066 1181 1184 msgid "git checkout: --detach does not take a path argument" 1182 - msgstr "git checkout: --detach 不跟路径参数" 1185 + msgstr "git checkout：--detach 不跟路径参数" 1183 1186 1184 1187 #: builtin/checkout.c:1069 1185 1188 msgid "" 1186 1189 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" 1187 1190 "checking out of the index." 1188 1191 msgstr "" 1189 - "git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n" 1190 - "检出暂存区时。" 1192 + "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" 1191 1193 1192 1194 #: builtin/checkout.c:1088 1193 1195 msgid "Cannot switch branch to a non-commit." ··· 1205 1207 msgid "" 1206 1208 "clean.requireForce set to true and neither -n nor -f given; refusing to clean" 1207 1209 msgstr "" 1208 - "clean.requireForce 设置为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作" 1210 + "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" 1209 1211 1210 1212 #: builtin/clean.c:85 1211 1213 msgid "" 1212 1214 "clean.requireForce defaults to true and neither -n nor -f given; refusing to " 1213 1215 "clean" 1214 1216 msgstr "" 1215 - "clean.requireForce 默认为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作" 1217 + "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" 1216 1218 1217 1219 #: builtin/clean.c:155 builtin/clean.c:176 1218 1220 #, c-format ··· 1247 1249 #: builtin/clone.c:302 1248 1250 #, c-format 1249 1251 msgid "failed to open '%s'" 1250 - msgstr "打开 '%s' 失败" 1252 + msgstr "无法打开 '%s'" 1251 1253 1252 1254 #: builtin/clone.c:306 1253 1255 #, c-format 1254 1256 msgid "failed to create directory '%s'" 1255 - msgstr "创建目录 '%s' 失败" 1257 + msgstr "无法创建目录 '%s'" 1256 1258 1257 1259 #: builtin/clone.c:308 builtin/diff.c:75 1258 1260 #, c-format 1259 1261 msgid "failed to stat '%s'" 1260 - msgstr "枚举 '%s' 状态失败" 1262 + msgstr "无法枚举 '%s' 状态" 1261 1263 1262 1264 #: builtin/clone.c:310 1263 1265 #, c-format ··· 1267 1269 #: builtin/clone.c:324 1268 1270 #, c-format 1269 1271 msgid "failed to stat %s\n" 1270 - msgstr "枚举 %s 状态失败\n" 1272 + msgstr "无法枚举 %s 状态\n" 1271 1273 1272 1274 #: builtin/clone.c:341 1273 1275 #, c-format 1274 1276 msgid "failed to unlink '%s'" 1275 - msgstr "删除 '%s' 失败" 1277 + msgstr "无法删除 '%s'" 1276 1278 1277 1279 #: builtin/clone.c:346 1278 1280 #, c-format 1279 1281 msgid "failed to create link '%s'" 1280 - msgstr "创建链接 '%s' 失败" 1282 + msgstr "无法创建链接 '%s'" 1281 1283 1282 1284 #: builtin/clone.c:350 1283 1285 #, c-format 1284 1286 msgid "failed to copy file to '%s'" 1285 - msgstr "拷贝文件至 '%s' 失败" 1287 + msgstr "无法拷贝文件至 '%s'" 1286 1288 1287 1289 #: builtin/clone.c:373 1288 1290 #, c-format ··· 1292 1294 #: builtin/clone.c:440 1293 1295 #, c-format 1294 1296 msgid "Could not find remote branch %s to clone." 1295 - msgstr "无法发现要克隆的远程分支 %s。" 1297 + msgstr "不能发现要克隆的远程分支 %s。" 1296 1298 1297 1299 #: builtin/clone.c:549 1298 1300 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" ··· 1304 1306 1305 1307 #: builtin/clone.c:643 1306 1308 msgid "You must specify a repository to clone." 1307 - msgstr "你必须指定一个版本库来克隆" 1309 + msgstr "您必须指定一个版本库来克隆。" 1308 1310 1309 1311 #: builtin/clone.c:654 1310 1312 #, c-format ··· 1323 1325 #: builtin/clone.c:683 1324 1326 #, c-format 1325 1327 msgid "destination path '%s' already exists and is not an empty directory." 1326 - msgstr "目标路径 '%s' 已经存在且不是一个空目录。" 1328 + msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" 1327 1329 1328 1330 #: builtin/clone.c:693 1329 1331 #, c-format ··· 1333 1335 #: builtin/clone.c:706 builtin/clone.c:720 1334 1336 #, c-format 1335 1337 msgid "could not create leading directories of '%s'" 1336 - msgstr "无法为 '%s' 创建目录" 1338 + msgstr "不能为 '%s' 创建先导目录" 1337 1339 1338 1340 #: builtin/clone.c:709 1339 1341 #, c-format 1340 1342 msgid "could not create work tree dir '%s'." 1341 - msgstr "无法为 '%s' 创建工作区目录。" 1343 + msgstr "不能为 '%s' 创建工作区目录。" 1342 1344 1343 1345 #: builtin/clone.c:728 1344 1346 #, c-format ··· 1377 1379 "\n" 1378 1380 " git commit --amend --reset-author\n" 1379 1381 msgstr "" 1380 - "您的姓名和邮件地址会基于您的用户名和主机地址自动配置。请检查它们\n" 1381 - "正确与否。您可通过下面命令对其显式声明以避免重复出现类似提示：\n" 1382 + "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" 1383 + "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n" 1382 1384 "\n" 1383 1385 " git config --global user.name \"Your Name\"\n" 1384 1386 " git config --global user.email you@example.com\n" 1385 1387 "\n" 1386 - "设置完毕后，您可用下面命令来更改此次提交所使用的用户ID：\n" 1388 + "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n" 1387 1389 "\n" 1388 1390 " git commit --amend --reset-author\n" 1389 1391 ··· 1422 1424 1423 1425 #: builtin/commit.c:325 1424 1426 msgid "failed to unpack HEAD tree object" 1425 - msgstr "解包 HEAD 树对象失败" 1427 + msgstr "无法解包 HEAD 树对象" 1426 1428 1427 1429 #: builtin/commit.c:367 1428 1430 msgid "unable to create temporary index" 1429 - msgstr "不能创建临时暂存区" 1431 + msgstr "不能创建临时索引" 1430 1432 1431 1433 #: builtin/commit.c:373 1432 1434 msgid "interactive add failed" ··· 1434 1436 1435 1437 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 1436 1438 msgid "unable to write new_index file" 1437 - msgstr "无法写入新暂存区文件" 1439 + msgstr "无法写 new_index 文件" 1438 1440 1439 - # %s若翻为中文，前后不需要空格 1441 + # 译者：%s若翻为中文，前后不需要空格 1440 1442 #: builtin/commit.c:457 1441 1443 #, c-format 1442 1444 msgid "cannot do a partial commit during a %s." ··· 1444 1446 1445 1447 #: builtin/commit.c:466 1446 1448 msgid "cannot read the index" 1447 - msgstr "无法读取暂存区" 1449 + msgstr "无法读取索引" 1448 1450 1449 1451 #: builtin/commit.c:486 1450 1452 msgid "unable to write temporary index file" 1451 - msgstr "无法写临时暂存区文件" 1453 + msgstr "无法写临时索引文件" 1452 1454 1453 1455 #: builtin/commit.c:550 builtin/commit.c:556 1454 1456 #, c-format ··· 1462 1464 #: builtin/commit.c:635 1463 1465 #, c-format 1464 1466 msgid "Malformed ident string: '%s'" 1465 - msgstr "非法的识别字串：'%s'" 1467 + msgstr "非法的身份字符串：'%s'" 1466 1468 1467 1469 #: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 1468 1470 #, c-format ··· 1472 1474 #: builtin/commit.c:682 builtin/shortlog.c:296 1473 1475 #, c-format 1474 1476 msgid "(reading log message from standard input)\n" 1475 - msgstr "（正从标准输入中读取说明信息）\n" 1477 + msgstr "（正从标准输入中读取日志信息）\n" 1476 1478 1477 1479 #: builtin/commit.c:684 1478 1480 msgid "could not read log from standard input" 1479 - msgstr "无法从标准输入中读取说明信息" 1481 + msgstr "不能从标准输入中读取日志信息" 1480 1482 1481 1483 #: builtin/commit.c:688 1482 1484 #, c-format 1483 1485 msgid "could not read log file '%s'" 1484 - msgstr "无法读取说明文件 '%s'" 1486 + msgstr "不能读取日志文件 '%s'" 1485 1487 1486 1488 #: builtin/commit.c:694 1487 1489 msgid "commit has empty message" ··· 1489 1491 1490 1492 #: builtin/commit.c:710 1491 1493 msgid "could not read MERGE_MSG" 1492 - msgstr "无法读取 MERGE_MSG" 1494 + msgstr "不能读取 MERGE_MSG" 1493 1495 1494 1496 #: builtin/commit.c:714 1495 1497 msgid "could not read SQUASH_MSG" 1496 - msgstr "无法读取 SQUASH_MSG" 1498 + msgstr "不能读取 SQUASH_MSG" 1497 1499 1498 1500 #: builtin/commit.c:718 1499 1501 #, c-format 1500 1502 msgid "could not read '%s'" 1501 - msgstr "无法读取 '%s'" 1503 + msgstr "不能读取 '%s'" 1502 1504 1503 1505 #: builtin/commit.c:746 1504 1506 #, c-format 1505 1507 msgid "could not open '%s'" 1506 - msgstr "无法打开 '%s'" 1508 + msgstr "不能打开 '%s'" 1507 1509 1508 1510 #: builtin/commit.c:770 1509 1511 msgid "could not write commit template" 1510 - msgstr "无法写提交模版" 1512 + msgstr "不能写提交模版" 1511 1513 1512 - # %s若翻为中文，前后不需要空格 1514 + # 译者：%s若翻为中文，前后不需要空格 1513 1515 #: builtin/commit.c:783 1514 1516 #, c-format 1515 1517 msgid "" ··· 1529 1531 msgid "Please enter the commit message for your changes." 1530 1532 msgstr "请为您的修改输入提交说明。" 1531 1533 1532 - # 前导空格用于拼接英文字串，中文字串拼接无需空格 1534 + # 译者：前导空格用于拼接英文字符串，中文字符串拼接无需空格 1533 1535 #: builtin/commit.c:799 1534 1536 msgid "" 1535 1537 " Lines starting\n" ··· 1538 1540 "以 '#' 开头\n" 1539 1541 "的行将被忽略，并且空的提交说明将会中止提交。\n" 1540 1542 1541 - # 前导空格用于拼接英文字串，中文字串拼接无需空格 1543 + # 译者：前导空格用于拼接英文字符串，中文字符串拼接无需空格 1542 1544 #: builtin/commit.c:804 1543 1545 msgid "" 1544 1546 " Lines starting\n" ··· 1549 1551 "的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n" 1550 1552 "中止提交。\n" 1551 1553 1552 - # 为保证在输出中对齐，注意调整句中空格！ 1554 + # 译者：为保证在输出中对齐，注意调整句中空格！ 1553 1555 #: builtin/commit.c:816 1554 1556 #, c-format 1555 1557 msgid "%sAuthor: %s" 1556 1558 msgstr "%s作者： %s" 1557 1559 1558 - # 为保证在输出中对齐，注意调整句中空格！ 1560 + # 译者：为保证在输出中对齐，注意调整句中空格！ 1559 1561 #: builtin/commit.c:823 1560 1562 #, c-format 1561 1563 msgid "%sCommitter: %s" ··· 1563 1565 1564 1566 #: builtin/commit.c:843 1565 1567 msgid "Cannot read index" 1566 - msgstr "无法读取暂存区" 1568 + msgstr "无法读取索引" 1567 1569 1568 1570 #: builtin/commit.c:880 1569 1571 msgid "Error building trees" ··· 1572 1574 #: builtin/commit.c:895 builtin/tag.c:357 1573 1575 #, c-format 1574 1576 msgid "Please supply the message using either -m or -F option.\n" 1575 - msgstr "请使用 -m 或者 -F 选项提供说明。\n" 1577 + msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" 1576 1578 1577 1579 #: builtin/commit.c:975 1578 1580 #, c-format ··· 1582 1584 #: builtin/commit.c:990 builtin/commit.c:1182 1583 1585 #, c-format 1584 1586 msgid "Invalid untracked files mode '%s'" 1585 - msgstr "无效的非追踪文件参数 '%s'" 1587 + msgstr "无效的未追踪文件参数 '%s'" 1586 1588 1587 1589 #: builtin/commit.c:1030 1588 1590 msgid "Using both --reset-author and --author does not make sense" ··· 1590 1592 1591 1593 #: builtin/commit.c:1041 1592 1594 msgid "You have nothing to amend." 1593 - msgstr "您没有要修补。" 1595 + msgstr "您没有可修补的提交。" 1594 1596 1595 - # %s若翻为中文，前后不需要空格 1597 + # 译者：%s若翻为中文，前后不需要空格 1596 1598 #: builtin/commit.c:1043 1597 1599 #, c-format 1598 1600 msgid "You are in the middle of a %s -- cannot amend." 1599 - msgstr "您正处于一个%s过程中 -- 无法修补提交。" 1601 + msgstr "您正处于一个%s的过程中 -- 无法修补提交。" 1600 1602 1601 1603 #: builtin/commit.c:1045 1602 1604 msgid "Options --squash and --fixup cannot be used together" ··· 1612 1614 1613 1615 #: builtin/commit.c:1063 1614 1616 msgid "--reset-author can be used only with -C, -c or --amend." 1615 - msgstr "--reset-author 只能和 -C, -c 或 --amend 共用。" 1617 + msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" 1616 1618 1617 1619 #: builtin/commit.c:1080 1618 1620 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." ··· 1624 1626 1625 1627 #: builtin/commit.c:1084 1626 1628 msgid "Clever... amending the last one with dirty index." 1627 - msgstr "聪明... 在暂存区不干净下修补最后的提交。" 1629 + msgstr "聪明... 在索引不干净下修补最后的提交。" 1628 1630 1629 1631 #: builtin/commit.c:1086 1630 1632 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." 1631 - msgstr "没有用 -i 或 -o 选项而显式地提供路径，认为是 --only paths..." 1633 + msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." 1632 1634 1633 1635 #: builtin/commit.c:1096 builtin/tag.c:556 1634 1636 #, c-format ··· 1645 1647 1646 1648 #: builtin/commit.c:1282 1647 1649 msgid "could not parse newly created commit" 1648 - msgstr "无法解析新创建的提交" 1650 + msgstr "不能解析新创建的提交" 1649 1651 1650 1652 #: builtin/commit.c:1323 1651 1653 msgid "detached HEAD" 1652 1654 msgstr "分离头指针" 1653 1655 1654 - # 注意保持前导空格 1656 + # 译者：注意保持前导空格 1655 1657 #: builtin/commit.c:1325 1656 1658 msgid " (root-commit)" 1657 1659 msgstr " （根提交）" 1658 1660 1659 1661 #: builtin/commit.c:1415 1660 1662 msgid "could not parse HEAD commit" 1661 - msgstr "无法解析 HEAD 提交" 1663 + msgstr "不能解析 HEAD 提交" 1662 1664 1663 1665 #: builtin/commit.c:1452 builtin/merge.c:509 1664 1666 #, c-format 1665 1667 msgid "could not open '%s' for reading" 1666 - msgstr "无法打开 '%s' 读取" 1668 + msgstr "不能为读入打开 '%s'" 1667 1669 1668 1670 #: builtin/commit.c:1459 1669 1671 #, c-format 1670 1672 msgid "Corrupt MERGE_HEAD file (%s)" 1671 - msgstr "损坏的 MERGE_HEAD 文件 (%s)" 1673 + msgstr "损坏的 MERGE_HEAD 文件（%s）" 1672 1674 1673 1675 #: builtin/commit.c:1466 1674 1676 msgid "could not read MERGE_MODE" 1675 - msgstr "无法读取 MERGE_MODE" 1677 + msgstr "不能读取 MERGE_MODE" 1676 1678 1677 1679 #: builtin/commit.c:1485 1678 1680 #, c-format 1679 1681 msgid "could not read commit message: %s" 1680 - msgstr "无法读取提交说明：%s" 1682 + msgstr "不能读取提交说明：%s" 1681 1683 1682 1684 #: builtin/commit.c:1499 1683 1685 #, c-format ··· 1686 1688 1687 1689 #: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 1688 1690 msgid "failed to write commit object" 1689 - msgstr "写提交对象失败" 1691 + msgstr "无法写提交对象" 1690 1692 1691 1693 #: builtin/commit.c:1535 1692 1694 msgid "cannot lock HEAD ref" ··· 1702 1704 "new_index file. Check that disk is not full or quota is\n" 1703 1705 "not exceeded, and then \"git reset HEAD\" to recover." 1704 1706 msgstr "" 1705 - "版本库已被更新，但无法写入新暂存区文件。检查是否磁盘\n" 1706 - "已满或磁盘配额耗尽，然后执行 \"git reset HEAD\" 恢复。" 1707 + "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n" 1708 + "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。" 1707 1709 1708 1710 #: builtin/describe.c:234 1709 1711 #, c-format ··· 1718 1720 #: builtin/describe.c:240 1719 1721 #, c-format 1720 1722 msgid "tag '%s' is really '%s' here" 1721 - msgstr "tag '%s' 确是在 '%s'" 1723 + msgstr "tag '%s' 的确是在 '%s'" 1722 1724 1723 1725 #: builtin/describe.c:267 1724 1726 #, c-format ··· 1761 1763 "Try --always, or create some tags." 1762 1764 msgstr "" 1763 1765 "没有注释 tag 能描述 '%s'。\n" 1764 - "尝试 --always，或创建一些 tag。" 1766 + "尝试 --always，或者创建一些 tag。" 1765 1767 1766 1768 #: builtin/describe.c:378 1767 1769 #, c-format ··· 1774 1776 "more than %i tags found; listed %i most recent\n" 1775 1777 "gave up search at %s\n" 1776 1778 msgstr "" 1777 - "发现多于 %i 个 tag；列出最近的 %i 个\n" 1778 - "放弃搜索 %s\n" 1779 + "发现多于 %i 个 tag，列出最近的 %i 个\n" 1780 + "在 %s 放弃搜索\n" 1779 1781 1780 1782 #: builtin/describe.c:436 1781 1783 msgid "--long is incompatible with --abbrev=0" ··· 1783 1785 1784 1786 #: builtin/describe.c:462 1785 1787 msgid "No names found, cannot describe anything." 1786 - msgstr "没有发现名称，无法描述任何东西" 1788 + msgstr "没有发现名称，无法描述任何东西。" 1787 1789 1788 1790 #: builtin/describe.c:482 1789 1791 msgid "--dirty is incompatible with committishes" ··· 1849 1851 msgid "[tag update]" 1850 1852 msgstr "[tag更新]" 1851 1853 1852 - # 注意保持前导空格 1854 + # 译者：注意保持前导空格 1853 1855 #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 1854 1856 msgid " (unable to update local ref)" 1855 1857 msgstr " （不能更新本地引用）" ··· 1872 1874 1873 1875 #: builtin/fetch.c:353 1874 1876 msgid "(non-fast-forward)" 1875 - msgstr "（非快进式推送）" 1877 + msgstr "（非快进式）" 1876 1878 1877 1879 #: builtin/fetch.c:384 builtin/fetch.c:676 1878 1880 #, c-format ··· 1898 1900 "一些本地引用不能被更新；尝试运行\n" 1899 1901 " 'git remote prune %s' 来删除旧的、有冲突的分支" 1900 1902 1901 - # 注意保持前导空格 1903 + # 译者：注意保持前导空格 1902 1904 #: builtin/fetch.c:540 1903 1905 #, c-format 1904 1906 msgid " (%s will become dangling)\n" 1905 1907 msgstr " （%s 将成为悬空状态）\n" 1906 1908 1907 - # 注意保持前导空格 1909 + # 译者：注意保持前导空格 1908 1910 #: builtin/fetch.c:541 1909 1911 #, c-format 1910 1912 msgid " (%s has become dangling)\n" ··· 1952 1954 msgid "" 1953 1955 "No remote repository specified. Please, specify either a URL or a\n" 1954 1956 "remote name from which new revisions should be fetched." 1955 - msgstr "未提供远程版本库。请提供一个URL或远程版本库名，用于获取新版本。" 1957 + msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" 1956 1958 1957 1959 #: builtin/fetch.c:918 1958 1960 msgid "You need to specify a tag name." 1959 - msgstr "你需要提供一个 tag 名称" 1961 + msgstr "您需要指定一个 tag 名称。" 1960 1962 1961 1963 #: builtin/fetch.c:970 1962 1964 msgid "fetch --all does not take a repository argument" ··· 1973 1975 1974 1976 #: builtin/fetch.c:991 1975 1977 msgid "Fetching a group and specifying refspecs does not make sense" 1976 - msgstr "获取组并提供引用表达式没有意义" 1978 + msgstr "获取组并指定引用表达式没有意义" 1977 1979 1978 1980 #: builtin/gc.c:63 1979 1981 #, c-format ··· 1982 1984 1983 1985 #: builtin/gc.c:78 1984 1986 msgid "Too many options specified" 1985 - msgstr "提供了太多的选项" 1987 + msgstr "指定了太多的选项" 1986 1988 1987 1989 #: builtin/gc.c:103 1988 1990 #, c-format ··· 2000 2002 "Auto packing the repository for optimum performance. You may also\n" 2001 2003 "run \"git gc\" manually. See \"git help gc\" for more information.\n" 2002 2004 msgstr "" 2003 - "自动打包版本库以求最佳性能。你还可以\n" 2004 - "手动运行 \"git gc\"。参见 \"git help gc\" 获取更多信息。\n" 2005 + "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" 2006 + "参见 \"git help gc\" 以获取更多信息。\n" 2005 2007 2006 2008 #: builtin/gc.c:256 2007 2009 msgid "" 2008 2010 "There are too many unreachable loose objects; run 'git prune' to remove them." 2009 - msgstr "有太多无指向的松散对象，运行 'git prune' 删除它们。" 2011 + msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" 2010 2012 2011 2013 #: builtin/grep.c:216 2012 2014 #, c-format 2013 2015 msgid "grep: failed to create thread: %s" 2014 - msgstr "grep: 无法创建线程：%s" 2016 + msgstr "grep：无法创建线程：%s" 2015 2017 2016 2018 #: builtin/grep.c:402 2017 2019 #, c-format ··· 2021 2023 #: builtin/grep.c:478 builtin/grep.c:512 2022 2024 #, c-format 2023 2025 msgid "unable to read tree (%s)" 2024 - msgstr "无法读取代码树（%s）" 2026 + msgstr "无法读取树（%s）" 2025 2027 2026 2028 #: builtin/grep.c:526 2027 2029 #, c-format ··· 2053 2055 2054 2056 #: builtin/grep.c:966 2055 2057 msgid "--cached or --untracked cannot be used with --no-index." 2056 - msgstr "--cached 或 --untracked 不能与 --no-index 共用" 2058 + msgstr "--cached 或 --untracked 不能与 --no-index 共用。" 2057 2059 2058 2060 #: builtin/grep.c:971 2059 2061 msgid "--no-index or --untracked cannot be used with revs." ··· 2061 2063 2062 2064 #: builtin/grep.c:974 2063 2065 msgid "--[no-]exclude-standard cannot be used for tracked contents." 2064 - msgstr "--[no-]exclude-standard 不能用于跟踪内容。" 2066 + msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" 2065 2067 2066 2068 #: builtin/grep.c:982 2067 2069 msgid "both --cached and trees are given." ··· 2105 2107 #: builtin/init-db.c:102 2106 2108 #, c-format 2107 2109 msgid "cannot symlink '%s' '%s'" 2108 - msgstr "不能创建符号链接 '%s' 到 '%s'" 2110 + msgstr "不能自 '%s' 到 '%s' 创建符号链接" 2109 2111 2110 2112 #: builtin/init-db.c:106 2111 2113 #, c-format ··· 2175 2177 msgid "Initialized empty" 2176 2178 msgstr "初始化空的" 2177 2179 2178 - # 汉字字串合并，之间无空格，故删除前导空格 2180 + # 译者：汉字字符串合并，之间无空格，故删除前导空格 2179 2181 #: builtin/init-db.c:421 2180 2182 msgid " shared" 2181 - msgstr "共享的" 2183 + msgstr "共享" 2182 2184 2183 2185 #: builtin/init-db.c:440 2184 2186 msgid "cannot tell cwd" ··· 2200 2202 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" 2201 2203 "dir=<directory>)" 2202 2204 msgstr "" 2203 - "不允许 %s（或 --work-tree=<directory>）而没有 %s（或 --git-dir=<directory>）" 2205 + "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-dir=<directory>）" 2204 2206 2205 2207 #: builtin/init-db.c:578 2206 2208 msgid "Cannot access current working directory" ··· 2219 2221 #: builtin/log.c:395 builtin/log.c:483 2220 2222 #, c-format 2221 2223 msgid "Could not read object %s" 2222 - msgstr "无法读取对象 %s" 2224 + msgstr "不能读取对象 %s" 2223 2225 2224 2226 #: builtin/log.c:507 2225 2227 #, c-format ··· 2249 2251 2250 2252 #: builtin/log.c:739 2251 2253 msgid "Could not extract email from committer identity." 2252 - msgstr "无法从提交者身份中提取邮件地址。" 2254 + msgstr "不能从提交者身份中提取邮件地址。" 2253 2255 2254 2256 #: builtin/log.c:785 2255 2257 msgid "Cover letter needs email format" ··· 2301 2303 #: builtin/log.c:1257 2302 2304 #, c-format 2303 2305 msgid "Could not create directory '%s'" 2304 - msgstr "无法创建目录 '%s'" 2306 + msgstr "不能创建目录 '%s'" 2305 2307 2306 2308 #: builtin/log.c:1410 2307 2309 msgid "Failed to create output files" ··· 2311 2313 #, c-format 2312 2314 msgid "" 2313 2315 "Could not find a tracked remote branch, please specify <upstream> manually.\n" 2314 - msgstr "无法找到跟踪的远程分支，请手工提供 <upstream>。\n" 2316 + msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" 2315 2317 2316 2318 #: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 2317 2319 #, c-format ··· 2325 2327 #: builtin/merge.c:128 2326 2328 #, c-format 2327 2329 msgid "Could not find merge strategy '%s'.\n" 2328 - msgstr "无法找到合并策略 '%s'。\n" 2330 + msgstr "不能找到合并策略 '%s'。\n" 2329 2331 2330 2332 #: builtin/merge.c:129 2331 2333 #, c-format ··· 2354 2356 msgid "read-tree failed" 2355 2357 msgstr "读取树失败" 2356 2358 2357 - # 注意保持前导空格 2359 + # 译者：注意保持前导空格 2358 2360 #: builtin/merge.c:317 2359 2361 msgid " (nothing to squash)" 2360 2362 msgstr " （无可压缩）" ··· 2385 2387 #: builtin/merge.c:536 2386 2388 #, c-format 2387 2389 msgid "Bad branch.%s.mergeoptions string: %s" 2388 - msgstr "错的 branch.%s.mergeoptions 字串：%s" 2390 + msgstr "坏的 branch.%s.mergeoptions 字符串：%s" 2389 2391 2390 2392 #: builtin/merge.c:629 2391 2393 msgid "git write-tree failed to write a tree" ··· 2397 2399 2398 2400 #: builtin/merge.c:696 2399 2401 msgid "Unable to write index." 2400 - msgstr "不能写暂存区。" 2402 + msgstr "不能写索引。" 2401 2403 2402 2404 #: builtin/merge.c:709 2403 2405 msgid "Not handling anything other than two heads merge." ··· 2457 2459 2458 2460 #: builtin/merge.c:1057 2459 2461 msgid "No current branch." 2460 - msgstr "当前不在分支上。" 2462 + msgstr "没有当前分支。" 2461 2463 2462 2464 #: builtin/merge.c:1059 2463 2465 msgid "No remote for the current branch." 2464 - msgstr "当前分支没有远程版本库。" 2466 + msgstr "当前分支没有对应的远程版本库。" 2465 2467 2466 2468 #: builtin/merge.c:1061 2467 2469 msgid "No default upstream defined for the current branch." 2468 - msgstr "当前分支未定义默认上游分支。" 2470 + msgstr "当前分支没有定义默认的上游分支。" 2469 2471 2470 2472 #: builtin/merge.c:1066 2471 2473 #, c-format ··· 2474 2476 2475 2477 #: builtin/merge.c:1188 2476 2478 msgid "There is no merge to abort (MERGE_HEAD missing)." 2477 - msgstr "没有要终止的合并（MERGE_HEAD 丢失）" 2479 + msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" 2478 2480 2479 2481 #: builtin/merge.c:1204 git-pull.sh:31 2480 2482 msgid "" ··· 2482 2484 "Please, commit your changes before you can merge." 2483 2485 msgstr "" 2484 2486 "您尚未结束您的合并（存在 MERGE_HEAD）。\n" 2485 - "请先提交您的修改，您才能合并。" 2487 + "请在合并前先提交您的修改。" 2486 2488 2487 2489 #: builtin/merge.c:1207 git-pull.sh:34 2488 2490 msgid "You have not concluded your merge (MERGE_HEAD exists)." ··· 2494 2496 "Please, commit your changes before you can merge." 2495 2497 msgstr "" 2496 2498 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" 2497 - "请先提交您的修改，您才能合并。" 2499 + "请在合并前先提交您的修改。" 2498 2500 2499 2501 #: builtin/merge.c:1214 2500 2502 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." ··· 2510 2512 2511 2513 #: builtin/merge.c:1235 2512 2514 msgid "No commit specified and merge.defaultToUpstream not set." 2513 - msgstr "未指出提交并且 merge.defaultToUpstream 未设置。" 2515 + msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" 2514 2516 2515 2517 #: builtin/merge.c:1266 2516 2518 msgid "Can merge only exactly one commit into empty head" 2517 - msgstr "只可将一个提交合并到空分支上" 2519 + msgstr "只能将一个提交合并到空分支上" 2518 2520 2519 2521 #: builtin/merge.c:1269 2520 2522 msgid "Squash commit into empty head not supported yet" ··· 2537 2539 #: builtin/merge.c:1423 2538 2540 #, c-format 2539 2541 msgid "Trying really trivial in-index merge...\n" 2540 - msgstr "尝试非常小的暂存区内合并...\n" 2542 + msgstr "尝试非常小的索引内合并...\n" 2541 2543 2542 2544 #: builtin/merge.c:1430 2543 2545 #, c-format ··· 2598 2600 #: builtin/mv.c:128 2599 2601 #, c-format 2600 2602 msgid "Huh? %.*s is in index?" 2601 - msgstr "嗯？%.*s 在暂存区中？" 2603 + msgstr "嗯？%.*s 在索引中？" 2602 2604 2603 2605 #: builtin/mv.c:140 2604 2606 msgid "source directory is empty" ··· 2698 2700 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 2699 2701 #, c-format 2700 2702 msgid "Failed to resolve '%s' as a valid ref." 2701 - msgstr "无法解析 '%s' 为一个有效引用" 2703 + msgstr "无法解析 '%s' 为一个有效引用。" 2702 2704 2703 2705 #: builtin/notes.c:275 2704 2706 #, c-format ··· 2712 2714 #: builtin/notes.c:340 2713 2715 #, c-format 2714 2716 msgid "Bad notes.rewriteMode value: '%s'" 2715 - msgstr "错误的 notes.rewriteMode 值：'%s'" 2717 + msgstr "坏的 notes.rewriteMode 值：'%s'" 2716 2718 2717 2719 #: builtin/notes.c:350 2718 2720 #, c-format ··· 2724 2726 #: builtin/notes.c:377 2725 2727 #, c-format 2726 2728 msgid "Bad %s value: '%s'" 2727 - msgstr "错误的 %s 值：'%s'" 2729 + msgstr "坏的 %s 值：'%s'" 2728 2730 2729 2731 #: builtin/notes.c:441 2730 2732 #, c-format ··· 2734 2736 #: builtin/notes.c:456 2735 2737 #, c-format 2736 2738 msgid "Failed to copy notes from '%s' to '%s'" 2737 - msgstr "无法从 '%s' 拷贝注解到 '%s'" 2739 + msgstr "无法从 '%s' 到 '%s' 拷贝注解" 2738 2740 2739 2741 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 2740 2742 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 ··· 2781 2783 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" 2782 2784 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" 2783 2785 msgstr "" 2784 - "选项 -m/-F/-c/-C 已为 'edit' 子命令废弃。\n" 2786 + "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" 2785 2787 "请换用 'git notes add -f -m/-F/-c/-C'。\n" 2786 2788 2787 2789 #: builtin/notes.c:971 ··· 2797 2799 #: builtin/pack-objects.c:2310 2798 2800 #, c-format 2799 2801 msgid "unsupported index version %s" 2800 - msgstr "不支持的暂存区版本 %s" 2802 + msgstr "不支持的索引版本 %s" 2801 2803 2802 2804 #: builtin/pack-objects.c:2314 2803 2805 #, c-format 2804 2806 msgid "bad index version '%s'" 2805 - msgstr "错误的暂存区版本 '%s'" 2807 + msgstr "坏的索引版本 '%s'" 2806 2808 2807 2809 #: builtin/pack-objects.c:2322 2808 2810 #, c-format 2809 2811 msgid "option %s does not accept negative form" 2810 - msgstr "选项 '%s' 不接受否定格式" 2812 + msgstr "选项 %s 不接受否定格式" 2811 2813 2812 2814 #: builtin/pack-objects.c:2326 2813 2815 #, c-format ··· 2820 2822 2821 2823 #: builtin/push.c:63 2822 2824 msgid "--delete only accepts plain target ref names" 2823 - msgstr "--delete 只接受简单的引用名称" 2825 + msgstr "--delete 只接受简单的目标引用名" 2824 2826 2825 2827 #: builtin/push.c:73 2826 2828 #, c-format ··· 2832 2834 " git push %s HEAD:<name-of-remote-branch>\n" 2833 2835 msgstr "" 2834 2836 "您当前不在一个分支上。\n" 2835 - "现在为推送当前历史（分离头指针），使用\n" 2837 + "现在为推送当前（分离头指针）的历史，使用\n" 2836 2838 "\n" 2837 2839 " git push %s HEAD:<name-of-remote-branch>\n" 2838 2840 ··· 2857 2859 #: builtin/push.c:111 2858 2860 msgid "" 2859 2861 "You didn't specify any refspecs to push, and push.default is \"nothing\"." 2860 - msgstr "您没有为推送提供任何引用表达式，并且 push.default 为 \"nothing\"。" 2862 + msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" 2861 2863 2862 2864 #: builtin/push.c:131 2863 2865 #, c-format ··· 2876 2878 "Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" 2877 2879 "'Note about fast-forwards' section of 'git push --help' for details.\n" 2878 2880 msgstr "" 2879 - "为防止您丢失提交历史，禁止非快进式推送。\n" 2881 + "为了防止您丢失提交历史，非快进式更新被拒绝。\n" 2880 2882 "再次推送前先与远程变更合并（如 'git pull'）。详见\n" 2881 2883 "'git push --help' 中的 'Note about fast-forwards' 小节。\n" 2882 2884 2883 2885 #: builtin/push.c:160 2884 2886 #, c-format 2885 2887 msgid "bad repository '%s'" 2886 - msgstr "错误的版本库 '%s'" 2888 + msgstr "坏的版本库 '%s'" 2887 2889 2888 2890 #: builtin/push.c:161 2889 2891 msgid "" ··· 2897 2899 "\n" 2898 2900 " git push <name>\n" 2899 2901 msgstr "" 2900 - "未配置推送目标。\n" 2901 - "或者通过命令行提供URL，或者用下面命令配置一个远程版本库\n" 2902 + "没有配置推送目标。\n" 2903 + "或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n" 2902 2904 "\n" 2903 2905 " git remote add <name> <url>\n" 2904 2906 "\n" ··· 2965 2967 2966 2968 #: builtin/reset.c:96 2967 2969 msgid "Could not write new index file." 2968 - msgstr "无法写入新的暂存区文件。" 2970 + msgstr "不能写入新的索引文件。" 2969 2971 2970 2972 #: builtin/reset.c:106 2971 2973 #, c-format ··· 2974 2976 2975 2977 #: builtin/reset.c:130 2976 2978 msgid "Could not read index" 2977 - msgstr "不能读取暂存区" 2979 + msgstr "不能读取索引" 2978 2980 2979 2981 #: builtin/reset.c:133 2980 2982 msgid "Unstaged changes after reset:" 2981 - msgstr "重置后变更撤出暂存区：" 2983 + msgstr "重置后撤出暂存区的变更：" 2982 2984 2983 - # 汉字之间无空格，故删除%s前后空格 2985 + # 译者：汉字之间无空格，故删除%s前后空格 2984 2986 #: builtin/reset.c:223 2985 2987 #, c-format 2986 2988 msgid "Cannot do a %s reset in the middle of a merge." ··· 2999 3001 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." 3000 3002 msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。" 3001 3003 3002 - # 汉字之间无空格，故删除%s前后空格 3004 + # 译者：汉字之间无空格，故删除%s前后空格 3003 3005 #: builtin/reset.c:313 3004 3006 #, c-format 3005 3007 msgid "Cannot do %s reset with paths." 3006 3008 msgstr "不能带路径进行%s重置。" 3007 3009 3008 - # 汉字之间无空格，故删除%s前后空格 3010 + # 译者：汉字之间无空格，故删除%s前后空格 3009 3011 #: builtin/reset.c:325 3010 3012 #, c-format 3011 3013 msgid "%s reset is not allowed in a bare repository" ··· 3014 3016 #: builtin/reset.c:341 3015 3017 #, c-format 3016 3018 msgid "Could not reset index file to revision '%s'." 3017 - msgstr "不能重置暂存区至版本 '%s'。" 3019 + msgstr "不能重置索引文件至版本 '%s'。" 3018 3020 3019 3021 #: builtin/revert.c:70 builtin/revert.c:91 3020 3022 #, c-format 3021 3023 msgid "%s: %s cannot be used with %s" 3022 - msgstr "%s: %s 不能和 %s 共用" 3024 + msgstr "%s：%s 不能和 %s 共用" 3023 3025 3024 3026 #: builtin/revert.c:126 3025 3027 msgid "program error" ··· 3039 3041 "'%s' has staged content different from both the file and the HEAD\n" 3040 3042 "(use -f to force removal)" 3041 3043 msgstr "" 3042 - "'%s' 暂存的内容和工作区文件及 HEAD 中的都不一样\n" 3044 + "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" 3043 3045 "（使用 -f 强制删除）" 3044 3046 3045 3047 #: builtin/rm.c:115 ··· 3048 3050 "'%s' has changes staged in the index\n" 3049 3051 "(use --cached to keep the file, or -f to force removal)" 3050 3052 msgstr "" 3051 - "'%s' 有变更已加入暂存区中\n" 3053 + "'%s' 有变更已暂存至索引中\n" 3052 3054 "（使用 --cached 保存文件，或用 -f 强制删除）" 3053 3055 3054 3056 #: builtin/rm.c:119 ··· 3139 3141 3140 3142 #: builtin/tag.c:321 3141 3143 msgid "bad object type." 3142 - msgstr "无效的对象类型" 3144 + msgstr "坏的对象类型。" 3143 3145 3144 3146 #: builtin/tag.c:334 3145 3147 msgid "tag header too big." 3146 - msgstr "tag 头信息太大" 3148 + msgstr "tag 头信息太大。" 3147 3149 3148 3150 #: builtin/tag.c:366 3149 3151 msgid "no tag message?" ··· 3186 3188 #: builtin/tag.c:540 3187 3189 #, c-format 3188 3190 msgid "'%s' is not a valid tag name." 3189 - msgstr "'%s' 不是一个有效的tag名称" 3191 + msgstr "'%s' 不是一个有效的tag名称。" 3190 3192 3191 3193 #: builtin/tag.c:545 3192 3194 #, c-format ··· 3222 3224 "It does not apply to blobs recorded in its index." 3223 3225 msgstr "" 3224 3226 "您是否曾手动编辑过您的补丁？\n" 3225 - "无法应用补丁到暂存区的数据中。" 3227 + "无法应用补丁到索引中的数据上。" 3226 3228 3227 3229 #: git-am.sh:156 3228 3230 msgid "Falling back to patching base and 3-way merge..." 3229 - msgstr "转而使用补丁应用的基础版本和三路合并..." 3231 + msgstr "回退到补丁基础版本并使用三路合并..." 3230 3232 3231 3233 #: git-am.sh:268 3232 3234 msgid "Only one StGIT patch series can be applied at once" ··· 3241 3243 msgid "Patch format detection failed." 3242 3244 msgstr "补丁格式检测失败。" 3243 3245 3244 - #: git-am.sh:409 3246 + #: git-am.sh:411 3245 3247 msgid "-d option is no longer supported. Do not use." 3246 3248 msgstr "不再支持 -d 选项。不要使用。" 3247 3249 3248 - #: git-am.sh:472 3250 + #: git-am.sh:474 3249 3251 #, sh-format 3250 3252 msgid "previous rebase directory $dotest still exists but mbox given." 3251 3253 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" 3252 3254 3253 - #: git-am.sh:477 3255 + #: git-am.sh:479 3254 3256 msgid "Please make up your mind. --skip or --abort?" 3255 3257 msgstr "请下决心。--skip 或是 --abort ？" 3256 3258 3257 - #: git-am.sh:504 3259 + #: git-am.sh:506 3258 3260 msgid "Resolve operation not in progress, we are not resuming." 3259 3261 msgstr "解决操作未进行，我们不会继续。" 3260 3262 3261 - #: git-am.sh:570 3263 + #: git-am.sh:572 3262 3264 #, sh-format 3263 3265 msgid "Dirty index: cannot apply patches (dirty: $files)" 3264 - msgstr "脏的暂存区：不能应用补丁（脏文件：$files）" 3266 + msgstr "脏的索引：不能应用补丁（脏文件：$files）" 3265 3267 3266 - #: git-am.sh:746 3268 + #: git-am.sh:748 3267 3269 msgid "cannot be interactive without stdin connected to a terminal." 3268 - msgstr "没有和终端关联的标准输入不能进行交互式操作。" 3270 + msgstr "标准输入没有和终端关联，不能进行交互式操作。" 3269 3271 3270 - # 注意保持句尾空格 3272 + # 译者：注意保持句尾空格 3271 3273 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] 3272 3274 #. in your translation. The program will only accept English 3273 3275 #. input at this point. 3274 - #: git-am.sh:757 3276 + #: git-am.sh:759 3275 3277 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 3276 3278 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 3277 3279 3278 - #: git-am.sh:793 3280 + #: git-am.sh:795 3279 3281 #, sh-format 3280 3282 msgid "Applying: $FIRSTLINE" 3281 3283 msgstr "正应用：$FIRSTLINE" 3282 3284 3283 - #: git-am.sh:838 3285 + #: git-am.sh:840 3284 3286 msgid "No changes -- Patch already applied." 3285 3287 msgstr "没有变更 -- 补丁已经应用过。" 3286 3288 3287 - #: git-am.sh:864 3289 + #: git-am.sh:866 3288 3290 msgid "applying to an empty history" 3289 3291 msgstr "正应用到一个空历史上" 3290 3292 3291 - # 注意保持句尾空格 3293 + # 译者：注意保持句尾空格 3292 3294 #. TRANSLATORS: Make sure to include [Y] and [n] in your 3293 3295 #. translation. The program will only accept English input 3294 3296 #. at this point. ··· 3322 3324 3323 3325 #: git-bisect.sh:144 3324 3326 msgid "Bad HEAD - strange symbolic ref" 3325 - msgstr "错误的 HEAD - 奇怪的符号引用" 3327 + msgstr "坏的 HEAD - 奇怪的符号引用" 3326 3328 3327 3329 #: git-bisect.sh:189 3328 3330 #, sh-format 3329 3331 msgid "Bad bisect_write argument: $state" 3330 - msgstr "错误的bisect_write参数：$state" 3332 + msgstr "坏的 bisect_write 参数：$state" 3331 3333 3332 3334 #: git-bisect.sh:218 3333 3335 #, sh-format 3334 3336 msgid "Bad rev input: $arg" 3335 - msgstr "输入错误版本：$arg" 3337 + msgstr "输入坏的版本：$arg" 3336 3338 3337 3339 #: git-bisect.sh:232 3338 3340 msgid "Please call 'bisect_state' with at least one argument." ··· 3347 3349 msgid "'git bisect bad' can take only one argument." 3348 3350 msgstr "'git bisect bad' 只能带一个参数。" 3349 3351 3350 - # 注意保持句尾空格 3352 + # 译者：注意保持句尾空格 3351 3353 #. TRANSLATORS: Make sure to include [Y] and [n] in your 3352 3354 #. translation. The program will only accept English input 3353 3355 #. at this point. ··· 3384 3386 3385 3387 #: git-bisect.sh:474 3386 3388 msgid "We are not bisecting." 3387 - msgstr "我们没有进行二分查找。" 3389 + msgstr "我们没有在二分查找。" 3388 3390 3389 3391 #: git-pull.sh:21 3390 3392 msgid "" ··· 3392 3394 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" 3393 3395 "as appropriate to mark resolution, or use 'git commit -a'." 3394 3396 msgstr "" 3395 - "Pull 不可用，因为你尚有未合并的文件。请先在工作区改正文件，\n" 3397 + "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n" 3396 3398 "然后酌情使用 'git add/rm <file>' 标记解决方案，\n" 3397 - "或使用 'git commit -a'。" 3399 + "或者使用 'git commit -a'。" 3398 3400 3399 3401 #: git-pull.sh:25 3400 3402 msgid "Pull is not possible because you have unmerged files." 3401 - msgstr "Pull 不可用，因为你尚有未合并的文件。" 3403 + msgstr "Pull 不可用，因为您尚有未合并的文件。" 3402 3404 3403 3405 #: git-pull.sh:197 3404 3406 msgid "updating an unborn branch with changes added to the index" 3405 - msgstr "更新尚未诞生的分支，变更添加至暂存区" 3407 + msgstr "更新尚未诞生的分支，变更添加至索引" 3406 3408 3407 3409 #: git-pull.sh:253 3408 3410 msgid "Cannot merge multiple branches into empty head" ··· 3422 3424 3423 3425 #: git-stash.sh:89 3424 3426 msgid "Cannot save the current index state" 3425 - msgstr "无法保存当前暂存区状态" 3427 + msgstr "无法保存当前索引状态" 3426 3428 3427 3429 #: git-stash.sh:123 git-stash.sh:136 3428 3430 msgid "Cannot save the current worktree state" ··· 3430 3432 3431 3433 #: git-stash.sh:140 3432 3434 msgid "No changes selected" 3433 - msgstr "没有修改被选择" 3435 + msgstr "没有选择变更" 3434 3436 3435 3437 #: git-stash.sh:143 3436 3438 msgid "Cannot remove temporary index (can't happen)" 3437 - msgstr "无法删除临时暂存区（不应发生）" 3439 + msgstr "无法删除临时索引（不应发生）" 3438 3440 3439 3441 #: git-stash.sh:156 3440 3442 msgid "Cannot record working tree state" ··· 3446 3448 3447 3449 #: git-stash.sh:227 3448 3450 msgid "Cannot initialize stash" 3449 - msgstr "无法初始化stash" 3451 + msgstr "无法初始化 stash" 3450 3452 3451 3453 #: git-stash.sh:235 3452 3454 msgid "Cannot save the current status" ··· 3458 3460 3459 3461 #: git-stash.sh:352 3460 3462 msgid "No stash found." 3461 - msgstr "未发现stash。" 3463 + msgstr "未发现 stash。" 3462 3464 3463 3465 #: git-stash.sh:359 3464 3466 #, sh-format 3465 3467 msgid "Too many revisions specified: $REV" 3466 - msgstr "提供太多的版本：$REV" 3468 + msgstr "指定了太多的版本：$REV" 3467 3469 3468 3470 #: git-stash.sh:365 3469 3471 #, sh-format ··· 3473 3475 #: git-stash.sh:393 3474 3476 #, sh-format 3475 3477 msgid "'$args' is not a stash-like commit" 3476 - msgstr "'$args' 不是stash样提交" 3478 + msgstr "'$args' 不是 stash 样提交" 3477 3479 3478 3480 #: git-stash.sh:404 3479 3481 #, sh-format 3480 3482 msgid "'$args' is not a stash reference" 3481 - msgstr "'$args' 不是一个stash引用" 3483 + msgstr "'$args' 不是一个 stash 引用" 3482 3484 3483 3485 #: git-stash.sh:412 3484 3486 msgid "unable to refresh index" 3485 - msgstr "无法刷新暂存区" 3487 + msgstr "无法刷新索引" 3486 3488 3487 3489 #: git-stash.sh:416 3488 3490 msgid "Cannot apply a stash in the middle of a merge" ··· 3490 3492 3491 3493 #: git-stash.sh:424 3492 3494 msgid "Conflicts in index. Try without --index." 3493 - msgstr "暂存区冲突。尝试不用 --index。" 3495 + msgstr "索引中有冲突。尝试不使用 --index。" 3494 3496 3495 3497 #: git-stash.sh:426 3496 3498 msgid "Could not save index tree" 3497 - msgstr "无法保存暂存区" 3499 + msgstr "不能保存索引树" 3498 3500 3499 3501 #: git-stash.sh:460 3500 3502 msgid "Cannot unstage modified files" ··· 3508 3510 #: git-stash.sh:492 3509 3511 #, sh-format 3510 3512 msgid "${REV}: Could not drop stash entry" 3511 - msgstr "${REV}: 无法丢弃进度条目" 3513 + msgstr "${REV}：不能丢弃进度条目" 3512 3514 3513 3515 #: git-stash.sh:499 3514 3516 msgid "No branch name specified" ··· 3528 3530 msgid "No submodule mapping found in .gitmodules for path '$path'" 3529 3531 msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射" 3530 3532 3531 - #: git-submodule.sh:173 3533 + #: git-submodule.sh:149 3532 3534 #, sh-format 3533 3535 msgid "Clone of '$url' into submodule path '$path' failed" 3534 - msgstr "克隆 '$url' 到子模组路径 '$path' 失败" 3536 + msgstr "无法克隆 '$url' 到子模组路径 '$path'" 3537 + 3538 + #: git-submodule.sh:159 3539 + #, sh-format 3540 + msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" 3541 + msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" 3535 3542 3536 3543 #: git-submodule.sh:247 3537 3544 #, sh-format ··· 3541 3548 #: git-submodule.sh:264 3542 3549 #, sh-format 3543 3550 msgid "'$path' already exists in the index" 3544 - msgstr "'$path' 已经存在于暂存区中" 3551 + msgstr "'$path' 已经存在于索引中" 3545 3552 3546 3553 #: git-submodule.sh:281 3547 3554 #, sh-format ··· 3576 3583 #: git-submodule.sh:401 3577 3584 #, sh-format 3578 3585 msgid "No url found for submodule path '$path' in .gitmodules" 3579 - msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的url" 3586 + msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url" 3580 3587 3581 3588 #: git-submodule.sh:410 3582 3589 #, sh-format ··· 3600 3607 "Maybe you want to use 'update --init'?" 3601 3608 msgstr "" 3602 3609 "子模组路径 '$path' 没有初始化\n" 3603 - "也许你想用 'update --init'？" 3610 + "也许您想用 'update --init'？" 3604 3611 3605 3612 #: git-submodule.sh:532 3606 3613 #, sh-format ··· 3651 3658 msgid "--" 3652 3659 msgstr "--" 3653 3660 3654 - # 注意保持前导空格 3661 + # 译者：注意保持前导空格 3655 3662 #: git-submodule.sh:766 3656 3663 #, sh-format 3657 3664 msgid " Warn: $name doesn't contain commit $sha1_src" 3658 3665 msgstr " 警告：$name 未包含提交 $sha1_src" 3659 3666 3660 - # 注意保持前导空格 3667 + # 译者：注意保持前导空格 3661 3668 #: git-submodule.sh:769 3662 3669 #, sh-format 3663 3670 msgid " Warn: $name doesn't contain commit $sha1_dst" 3664 3671 msgstr " 警告：$name 未包含提交 $sha1_dst" 3665 3672 3666 - # 注意保持前导空格 3673 + # 译者：注意保持前导空格 3667 3674 #: git-submodule.sh:772 3668 3675 #, sh-format 3669 3676 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" ··· 3680 3687 #: git-submodule.sh:969 3681 3688 #, sh-format 3682 3689 msgid "Synchronizing submodule url for '$name'" 3683 - msgstr "为 '$name' 同步子模组url" 3690 + msgstr "为 '$name' 同步子模组 url"