diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 90cc91d819d4314b397a9d544c670d955007df2e..0bd15ed6b095eaeb1851ec48a073e55b69e1c16a 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Matthias A횩hauer <mha1993@live.de>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-07-19 15:02+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.0-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-07-31 17:04+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.0-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 @@ -36534,7 +36534,7 @@ msgstr "'git mktag'\n" #: en/git-mktag.txt:19 #, priority:100 msgid "Reads a tag contents on standard input and creates a tag object. The output is the new tag's <object> identifier." -msgstr "" +msgstr "瑥삣룚�뉐뇛渦볟뀯訝�쉪�뉒��끻�亮뜹닗兩뷰�訝ゆ젃嶺얍�穩▲�귟풏�뷸삸�경젃嶺양쉪 <object> �뉓칳寧╉��" #. type: Plain text #: en/git-mktag.txt:23 @@ -39400,7 +39400,7 @@ msgstr "--keep-true-parents" #: en/git-pack-objects.txt:299 #, priority:100 msgid "With this option, parents that are hidden by grafts are packed nevertheless." -msgstr "" +msgstr "�싪퓝瓦숂쭕�방퀡竊뚩˙燁삥쨳�⑵쫮�뽫쉪�뜻칾瓦섉삸鴉싪˙�볟똿��" #. type: Plain text #: en/git-pack-objects.txt:304 @@ -39508,7 +39508,7 @@ msgstr "--delta-islands" #: en/git-pack-objects.txt:349 #, priority:100 msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below." -msgstr "" +msgstr "�방뜮 �쒎쿆掠욋�� �먨댍罌욇뇧�백뀓�귟��귡쁾訝뗦뻼�꾢쥭�뤷뙶�띲��" #. type: Title - #: en/git-pack-objects.txt:352 @@ -42527,43 +42527,43 @@ msgstr "倻귝옖�뉐츣雅� `<branch>`竊�`git rebase` 鴉싪눎�ⓩ돢烏� `git switch <b #: en/git-rebase.txt:28 #, priority:100 msgid "If `<upstream>` is not specified, the upstream configured in `branch.<name>.remote` and `branch.<name>.merge` options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort." -msgstr "" +msgstr "倻귝옖�ゆ뙁若� `<upstream>`竊뚦컛鵝욜뵪 `branch.<name>.remote` �� `branch.<name>.merge` �됮」訝�뀓營�쉪訝딀만竊덅�鰲� linkgit:git-config[1]竊됵펽亮뜹걞若싦슴�� `-fork-point`�됮」�� 倻귝옖�ⓨ퐪�띴툖�ⓧ뻣鵝뺝늽��툓竊뚧닑�끻퐪�띶늽��깹�됮뀓營�툓歷몌펽�섇읃�띴퐳鴉싦릎閭㏂��" #. type: Plain text #: en/git-rebase.txt:35 #, priority:100 msgid "All changes made by commits in the current branch but that are not in `<upstream>` are saved to a temporary area. This is the same set of commits that would be shown by `git log <upstream>..HEAD`; or by `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--fork-point` below); or by `git log HEAD`, if the `--root` option is specified." -msgstr "" +msgstr "壤볟뎺�녷뵱訝�쉪���됪룓雅ㅶ��싩쉪�밧뒯竊뚥퐜訝띶쑉 `<upstream>` 訝�쉪竊뚪꺗鴉싪˙岳앭춼�겻�訝や릿�뜹뙷�잆�� 瓦쇾툗 `git log <upstream>..HEAD` �� `git log 'fork_point'..HEAD` ���양ㅊ�꾣룓雅ㅷ쎑�뚳펷倻귝옖��뵪雅� `-fork-point`竊뚩��귡쁾訝뗦뻼�념틢 `-fork-point`�꾣룒瓦곤펹竊쎿닑�낉펽倻귝옖�뉐츣雅� `--root` �됮」竊뚦닕訝� `git log HEAD` ���양ㅊ�꾣룓雅ㅷ쎑�뚣��" #. type: Plain text #: en/git-rebase.txt:40 #, priority:100 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset." -msgstr "" +msgstr "倻귝옖�먧풘雅� `--onto` �됮」竊뚦퐪�띶늽��폏�띸쉰訝� `<upstream>` �� `<newbase>`�� 瓦쇾툗 `git reset --hard <upstream>`竊덃닑 `<newbase>`竊됬쉪�덃옖若뚦뀲�멨릪��`ORIG_HEAD` 溫양쉰訝뷸뙁�묌뇥營�뎺�녷뵱�꾦《塋���" #. type: Plain text #: en/git-rebase.txt:47 #, priority:100 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])." -msgstr "" +msgstr "倻귝옖�③뇥營�퓝葉뗤릎鵝욜뵪雅녶끀餓뽩넍�δ섈凉뺟뵪�꾢뫝餓ㅿ펷堊뗥쫩 `git reset`竊됵펽弱긴툖�썰퓷瑥� `ORIG_HEAD` �③뇥營�퍜�잍뿶餓띸꽫�뉐릲�띴�訝ゅ늽��쉪�녷뵱�먪ㅊ�귚툖瓦뉛펽鵝욜뵪壤볟뎺�녷뵱�� 凉뺟뵪�ε퓱竊덂뜵 `@{1}`竊뚦뢿鰲� linkgit:gitrevisions[7]竊됧룾餓θ���뎺訝�訝ゅ늽��쉪�녷뵱�먪ㅊ��" #. type: Plain text #: en/git-rebase.txt:53 #, priority:100 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)." -msgstr "" +msgstr "�뜹릮竊뚦뀍�띴퓷耶섇쑉訝닸뿶�뷴윜�꾣룓雅ㅵ컛�됮『佯뤻�먧��띷뼭佯붺뵪�겼퐪�띶늽���귟�力ⓩ꼷竊�`HEAD` 訝�뻣鵝뺜툗 `HEAD...<upstream>` 訝�쉪�먧벡�됬쎑�뚧뻼耶쀦뵻�①쉪�먧벡�썰폏熬ョ쐛�ο펷阿잌갚���竊뚥툓歷멨럴瀯뤸렏�쀧쉪烏δ툈竊뚦쫩�쒏룓雅ㅴ에��닑�띌뿴�념툖�뚳펽弱긴폏熬ヨ럼瓦뉛펹��" #. type: Plain text #: en/git-rebase.txt:60 #, priority:100 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead." -msgstr "" +msgstr "�덂뭉鸚김뇰�됧룾�썲��닺�瓦뉒쮮�졿퀡若뚦뀲�ゅ뒯瓦쏂죱�� �ⓨ퓚窈삭㎗�녑릦亮뜹ㅁ兀ι뿮窯섓펽�뜹릮瓦먫죱 `git rebase --continue`�� �╊�燁띷뼶力뺞삸鵝욜뵪 `git rebase --skip` 瀯뺠퓝野쇠눜�덂뭉鸚김뇰�꾣룓雅ㅳ�� 誤곫��ε렅冶뗧쉪 `<branch>` 亮띄㎉�� `.git/rebase-apply` 藥δ퐳�뉏뻑竊뚩�鵝욜뵪 `git rebase --abort` �썰빱��" #. type: Plain text #: en/git-rebase.txt:62 #, priority:100 msgid "Assume the following history exists and the current branch is \"topic\":" -msgstr "" +msgstr "�뉓�耶섇쑉餓δ툔�녶뤁溫겼퐬竊뚦퐪�띶늽��맏 \"topic\"竊�" #. type: delimited block - #: en/git-rebase.txt:67 @@ -42572,7 +42572,7 @@ msgid "" " A---B---C topic\n" " /\n" " D---E---F---G master\n" -msgstr "" +msgstr " A---B---C topic\n /\n D---E---F---G master\n" #. type: Plain text #: en/git-rebase.txt:70