From 21b91090d06ff5cc7e2179e88194e9126b2aafc8 Mon Sep 17 00:00:00 2001 From: Hou Qiyao <ryanhou24@gmail.com> Date: Sat, 29 Apr 2023 16:36:32 +0000 Subject: [PATCH] Translated using Weblate (Chinese (Simplified)) Currently translated at 33.5% (3684 of 10990 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/ Signed-off-by: Hou Qiyao <ryanhou24@gmail.com> --- po/documentation.zh_HANS-CN.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 711bcc5..ab89282 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-05-02 00:50+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 4.18-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-05-02 00:50+0000\nLast-Translator: Hou Qiyao <ryanhou24@gmail.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 4.18-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 @@ -36155,7 +36155,7 @@ msgstr "鵝욜뵪訝�訝챡ergetool�� `git mergetool`��뒯訝�訝ゅ쎗壤℡뙑�꼖ergeto #: en/git-merge.txt:340 #, priority:240 msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions." -msgstr "" +msgstr "�η쐦藥�펰��`git diff`弱녵폏�양ㅊ訝�訝や툒�묈량凉귨펽囹곩눣�양ㅊ餓�`HEAD`��`MERGE_HEAD`�덃쑍�꾢룜�뽧��" #. type: Plain text #: en/git-merge.txt:344 @@ -36173,7 +36173,7 @@ msgstr "�뗤�訝뗥렅餓뜰�� `git show :1:filename`�양ㅊ�긷릪�꾤쪝�덌펽`git s #: en/git-merge.txt:356 #, priority:240 msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:" -msgstr "" +msgstr "�덂뭉�녷뵱 `fixes` �� `enhancements`�겼퐪�띶늽��퉳訝�, 瓦쏂죱鸚싪러�덂뭉��" #. type: delimited block - #: en/git-merge.txt:359 @@ -36185,7 +36185,7 @@ msgstr "$ git merge fixes enhancements\n" #: en/git-merge.txt:363 #, priority:240 msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:" -msgstr "" +msgstr "弱녶늽��`obsolete`�덂뭉�겼퐪�띶늽��펽鵝욜뵪`ours`�꾢릦亮띄춺�ο폏" #. type: delimited block - #: en/git-merge.txt:366 @@ -36197,7 +36197,7 @@ msgstr "$ git merge -s ours obsolete\n" #: en/git-merge.txt:370 #, priority:240 msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:" -msgstr "" +msgstr "�덂뭉�녷뵱`maint`�겼퐪�띶늽��펽鵝녷삸�묇뺄訝띶걳�ゅ뒯�쎾뻠�경룓雅�:" #. type: delimited block - #: en/git-merge.txt:373 @@ -36209,25 +36209,25 @@ msgstr "$ git merge --no-commit maint\n" #: en/git-merge.txt:377 #, priority:240 msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message." -msgstr "" +msgstr "壤볠궓�녑쑉�덂뭉訝�뒥�θ퓵訝�閭η쉪�닸뵻竊뚧닑�끾궓�녔뎸�①폋�쇿릦亮뜻룓雅ㅴ에��뿶竊뚦갚��빳鵝욜뵪閭ㅵ뒣�썬��" #. type: Plain text #: en/git-merge.txt:381 #, priority:240 msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable." -msgstr "" +msgstr "鵝졾틪瑥ι겳�띷빳�②퓳訝ら�됮」竊뚦츆��빳�ⓨ릦亮뜻룓雅ㅴ릎�룟겥�계퓵烏뚨뎵�у틩訝�츩兀ⓩ�㎫쉪岳�뵻�� 弱뤹쉪岳��竊뚥풃倻귚엶�밧룕躍껅뿥恙쀥냵若�/�덃쑍�띸㎞竊뚧삸�②뜍�꾠��" #. type: Labeled list #: en/git-merge.txt:388 #, no-wrap, priority:240 msgid "branch.<name>.mergeOptions" -msgstr "" +msgstr "�녷뵱 .<�띶춻>.�덂뭉�띴퐳�됮」" #. type: Plain text #: en/git-merge.txt:392 #, priority:240 msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported." -msgstr "" +msgstr "溫양쉰�덂뭉�겼늽��<�녷뵱��>�꾦퍡溫ㅹ�됮」�귟�力뺝뭽��똻�꾦�됮」訝�'git merge'�멨릪竊뚥툖瓦뉒쎅�띴툖��똻�끻맜令뷸졏�꾦�됮」�쇈��" #. type: Plain text #: en/git-merge.txt:405 @@ -51350,7 +51350,7 @@ msgstr "'git show' [<options>] [<object>...]\n" #: en/git-show.txt:17 #, priority:240 msgid "Shows one or more objects (blobs, trees, tags and commits)." -msgstr "" +msgstr "�양ㅊ訝�訝ゆ닑鸚싦릉野배괌竊뉰lobs�곫젒�곫젃嶺얍뭽�먧벡竊됥��" #. type: Plain text #: en/git-show.txt:21 -- GitLab