From: Jiang Xin <worldhello.net@gmail.com> Date: Thu, 27 Sep 2012 22:53:54 +0000 (+0800) Subject: Merge branch 'maint' X-Git-Tag: v1.8.0-rc0~8^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a;p=git.git Merge branch 'maint' * maint: l10n: de.po: correct translation of a 'rebase' message l10n: Improve many translation for zh_CN l10n: Unify the translation for '(un)expected' --- 4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a diff --cc po/zh_CN.po index c9331e955,354bf4dac..8fc595948 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -653,13 -661,13 +653,13 @@@ msgid_plural " "and have %d and %d different commits each, respectively.\n" msgstr[0] "" "æ¨çåæ¯å '%s' åºç°äºå离ï¼\n" - "并ä¸åèªåå«æ %d å %d å¤ä¸åçæ交ã\n" + "并ä¸åå«æ %d å %d å¤ä¸åçæ交ã\n" msgstr[1] "" "æ¨çåæ¯å '%s' åºç°äºå离ï¼\n" - "并ä¸åèªåå«æ %d å %d å¤ä¸åçæ交ã\n" + "并ä¸åå«æ %d å %d å¤ä¸åçæ交ã\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "ä¸è½ä¸ºåå ¥æå¼ '%s'" @@@ -1439,12 -1442,12 +1439,12 @@@ msgstr "regexec è¿å %dï¼è¾å ¥ä¸ºï¼ msgid "unable to find filename in patch at line %d" msgstr "ä¸è½å¨è¡¥ä¸ç第 %d è¡æ¾å°æ件å" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" - msgstr "git applyï¼é误ç git-diff - ææ /dev/nullï¼ä½å¨ç¬¬ %2$d è¡å¾å° %1$s" + msgstr "git applyï¼é误ç git-diff - åºä¸º /dev/nullï¼ä½å¨ç¬¬ %2$d è¡å¾å° %1$s" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git applyï¼é误ç git-diff - 第 %d è¡ä¸æ°æ件åä¸ä¸è´" @@@ -1454,12 -1457,12 +1454,12 @@@ msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git applyï¼é误ç git-diff - 第 %d è¡ä¸æ§æ件åä¸ä¸è´" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" - msgstr "git applyï¼é误ç git-diff - ææ /dev/null äºç¬¬ %d è¡" + msgstr "git applyï¼é误ç git-diff - 第 %d è¡å¤åºä¸º /dev/null" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recountï¼æå¤çè¡ï¼%.*s" @@@ -1488,12 -1491,12 +1488,12 @@@ msgstr "æ°æ件ä¾èµæ§å 容 msgid "deleted file still has contents" msgstr "å é¤çæ件ä»æå 容" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" - msgstr "è¡¥ä¸æåä½äºç¬¬ %d è¡" + msgstr "è¡¥ä¸å¨ç¬¬ %d è¡æå" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "æ°æ件 %s ä¾èµæ§å 容" @@@ -1574,12 -1577,12 +1574,12 @@@ msgstr "缺失 '%s' çäºè¿å¶è¡¥ä¸æ msgid "binary patch does not apply to '%s'" msgstr "äºè¿å¶è¡¥ä¸æªåºç¨å° '%s'" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" - msgstr "å° '%s' çäºè¿å¶è¡¥ä¸äº§çäºä¸æ£ç¡®çç»æï¼é¢æ %sï¼å¾å° %sï¼" + msgstr "å° '%s' çäºè¿å¶è¡¥ä¸äº§çäºä¸æ£ç¡®çç»æï¼åºä¸º %sï¼å´ä¸º %sï¼" -#: builtin/apply.c:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "æè¡¥ä¸å¤±è´¥ï¼%s:%ld" @@@ -1623,12 -1626,12 +1623,12 @@@ msgstr "移é¤è¡¥ä¸ä»çä¸äºæ件å msgid "%s: wrong type" msgstr "%sï¼é误类å" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" - msgstr "%s çç±»åæ¯ %oï¼é¢ææ¯ %o" + msgstr "%s çç±»åæ¯ %oï¼åºä¸º %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "%sï¼å·²ç»åå¨äºç´¢å¼ä¸" @@@ -1712,10 -1715,10 +1712,10 @@@ msgstr "å é¨é误 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." - msgstr[0] "åºç¨è¡¥ä¸ %%s æ¶ %d 个被æç»..." - msgstr[1] "åºç¨è¡¥ä¸ %%s æ¶ %d 个被æç»..." + msgstr[0] "åºç¨ %%s 个补ä¸ï¼å ¶ä¸ %d 个被æç»..." + msgstr[1] "åºç¨ %%s 个补ä¸ï¼å ¶ä¸ %d 个被æç»..." -#: builtin/apply.c:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æªç .rej æ件å为 %.*s.rej" @@@ -1786,11 -1789,11 +1786,11 @@@ msgstr "确认补ä¸å¯ä»¥åºç¨å°å½å msgid "apply a patch without touching the working tree" msgstr "åºç¨è¡¥ä¸èä¸ä¿®æ¹å·¥ä½åº" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" - msgstr "è¿åºç¨æ¤è¡¥ä¸ï¼ä½¿ç¨ --stat/--summary/--check åæ°ï¼" + msgstr "è¿åºç¨æ¤è¡¥ä¸ï¼ä¸ --stat/--summary/--check é项åæ¶ä½¿ç¨ï¼" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 msgid "attempt three-way merge if a patch does not apply" msgstr "å¦æä¸ä¸ªè¡¥ä¸ä¸è½åºç¨åå°è¯ä¸è·¯å并" @@@ -1838,11 -1841,11 +1838,11 @@@ msgstr "å 许éå çè¡¥ä¸ç段 msgid "be verbose" msgstr "åé¿è¾åº" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" - msgstr "宽容ä¸æ£ç¡®çæ件æ«å°¾æ¢è¡ç¬¦" + msgstr "å 许ä¸æ£ç¡®çæ件æ«å°¾æ¢è¡ç¬¦" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç段ç头信æ¯ä¸çè¡å·"