From e4fc58ece8f2256d1805d0561b57d090d8ce6472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=83=E5=A4=B4=E7=81=AF=E7=AC=BC=E9=B1=BC?= <ttdlyu@163.com> Date: Wed, 16 Aug 2023 14:15:56 +0000 Subject: [PATCH] Translated using Weblate (Chinese (Simplified)) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 56.5% (6304 of 11142 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/ Signed-off-by: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com> --- po/documentation.zh_HANS-CN.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 4be32fd..810b6b6 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-08-05 19:25+0200\nPO-Revision-Date: 2023-08-12 07:46+0000\nLast-Translator: 瀛ゅ뜋獒� <8042833@qq.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-08-05 19:25+0200\nPO-Revision-Date: 2023-08-17 10:45+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:772 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 @@ -44215,7 +44215,7 @@ msgstr "瓦쇾릉�뉐퓱熬ヤ폖�믥퍢佯붺뵪烏δ툈�� `git apply` 葉뗥틣竊덂뢿�� link #: en/git-rebase.txt:502 #, priority:100 msgid "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies `--force-rebase`." -msgstr "" +msgstr "訝띴슴�ⓨ퐪�띷뿶�답퐳訝뷸룓雅ㅸ�끾뿥�잞펽�뚧삸鵝욜뵪熬ラ뇥若싧릲�꾣룓雅ㅷ쉪鵝쒑�끾뿥�잋퐳訝뷸룓雅ㅸ�끾뿥�잆�귟��됮」�쀥맜 `--force-rebase` �됮」��" #. type: Labeled list #: en/git-rebase.txt:504 @@ -44227,25 +44227,25 @@ msgstr "--reset-author-date" #: en/git-rebase.txt:508 #, priority:100 msgid "Instead of using the author date of the original commit, use the current time as the\tauthor date of the rebased commit. This option implies `--force-rebase`." -msgstr "" +msgstr "訝띴슴�ⓨ렅冶뗦룓雅ㅷ쉪鵝쒑�끾뿥�잞펽�뚥슴�ⓨ퐪�띷뿶�답퐳訝븅뇥兩뷸룓雅ㅷ쉪鵝쒑�끾뿥�잆�� 閭ㅹ�됮」�쀥맜 `--force-rebase` �됮」��" #. type: Plain text #: en/git-rebase.txt:515 #, priority:100 msgid "Add a `Signed-off-by` trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added." -msgstr "" +msgstr "�ⓩ��됮뇥�숂쉪�먧벡訝�렌�� `Signed-off-by` 弱얏낏�귟�力ⓩ꼷竊뚦쫩�쒐퍢若싦틙 `--interactive`竊뚦닕�ゆ쐣�뉓�訝븃˙�됦릎�곭폋渦묉닑�띶넍�꾣룓雅ㅶ뎺鴉싨렌�졾갼力ⓦ��" #. type: Plain text #: en/git-rebase.txt:523 #, priority:100 msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)." -msgstr "" +msgstr "�쀥눣�녑컛�띶넍�꾣룓雅ㅵ닓烏ⓦ�� 溫⑴뵪�룟쑉�띶넍�띸폋渦묋��쀨〃�� 瓦숂쭕與▼폀阿잌룾�ⓧ틢�녶늽�먧벡竊덅쭅訝뗦뻼�꾣땰�녷룓雅ㅿ펹��" #. type: Plain text #: en/git-rebase.txt:527 #, priority:100 msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format." -msgstr "" +msgstr "�먧벡�쀨〃�쇔폀���싪퓝溫양쉰�띸쉰�됮」 rebase.instructionFormat 瓦쏂죱�닸뵻�� �ゅ츣阿됬쉪�뉏빱�쇔폀鴉싪눎�ⓨ쑉�쇔폀�띶뒥訝딃빣�먧벡�덂툕�쇈��" #. type: Labeled list #: en/git-rebase.txt:531 @@ -44263,19 +44263,19 @@ msgstr "--no-rebase-merges" #: en/git-rebase.txt:542 #, priority:100 msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. `--no-rebase-merges` can be used to countermand both the `rebase.rebaseMerges` config option and a previous `--rebase-merges`." -msgstr "" +msgstr "容섋��끻넻訝뗰펽�섇읃�띴퐳鴉싩��뺝쑑餓롥푷�욂틟窈밧닓烏ⓧ릎�좈솮�덂뭉�먧벡竊뚦뭉弱녻˙�띸쉰�꾣룓雅ㅶ붂�δ�訝ゅ뜒訝��꾤봇�㎩늽��릎�� 鵝욜뵪 `--rebase-merges` �롳펽�섇읃�띴퐳鴉싮�싪퓝�띷뼭�쎾뻠�덂뭉�먧벡竊뚦컼瑥뺜퓷�숃쫨熬ラ뇥營�쉪�먧벡訝�쉪�녷뵱瀯볠엫�귛쑉瓦쇾틳�덂뭉�먧벡訝�펽餓삡퐬藥꿱㎗�녕쉪�덂뭉�꿰챳�뽪뎸�ⓧ엶閭ｉ꺗恙낂』�뗥뒯鰲ｅ넶/�띷뼭佯붺뵪��`--no--rebase-merges` ��빳�ⓩ씎�득텋 `rebase.rebaseMerges` �띸쉰�됮」�뚥퉳�띸쉪 `--rebase-merges �됮」��" #. type: Plain text #: en/git-rebase.txt:551 #, priority:100 msgid "When rebasing merges, there are two modes: `rebase-cousins` and `no-rebase-cousins`. If the mode is not specified, it defaults to `no-rebase-cousins`. In `no-rebase-cousins` mode, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. In `rebase-cousins` mode, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)." -msgstr "" +msgstr "�띶츣�묈릦亮뜻뿶竊뚧쐣訝ㅷ쭕與▼폀竊� `rebase-cousins` �� `no-rebase-cousins`�귛쫩�쒏쑋�뉐츣與▼폀竊뚦닕容섋�訝� `no-rebase-cousins`�귛쑉 `no-rebase-cousins` 與▼폀訝뗰펽亦→쐣 `<訝딀만餓볟틩>` 鵝쒍맏�닸렏曄뽩뀍�꾣룓雅ㅵ컛岳앯븰�뜹렅冶뗥늽��궧竊뚥튋弱길삸瑥댐펽熬� linkgit:git-log[1] �� `--ancestry-path` �됮」�믧솮�ⓨ쨼�꾣룓雅ㅵ컛容섋�岳앯븰�뜹렅冶뗧쪝�덀�귛쑉 `rebase-cousins` 與▼폀訝뗰펽閭ㅷ굳�먧벡鴉싪˙�띶츣�묈댆 `<訝딀만餓볟틩>`竊덃닑��`<onto>`竊뚦쫩�쒏뙁若싦틙竊됥��" #. type: Plain text #: en/git-rebase.txt:555 #, ignore-ellipsis, priority:100 msgid "It is currently only possible to recreate the merge commits using the `ort` merge strategy; different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands." -msgstr "" +msgstr "��뎺�よ꺗鵝욜뵪 `ort` �덂뭉嶺뽫븼�띷뼭�쎾뻠�덂뭉�먧벡竊쎾룵�됮�싪퓝�롧‘�� `exec git merge -s <strategy> [...]` �썰빱�띹꺗鵝욜뵪訝띶릪�꾢릦亮띄춺�γ��" #. type: Plain text #: en/git-rebase.txt:557 -- GitLab