From d2a2978dd369517f4079fc64ceada3ebdac91a66 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: Thu, 16 Feb 2023 05:00:22 +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 28.5% (3129 of 10953 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 | 328 +++++++++++++++------------------
1 file changed, 153 insertions(+), 175 deletions(-)
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 60608f0..0f96a9e 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: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-16 02:48+0000\nLast-Translator: taotieren <admin@taotieren.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.16-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-18 23:49+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.16-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:763 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
@@ -4518,9 +4518,9 @@ msgstr "堊뗥쫩竊뚦쫩�쒍퐷弱� `diff.algorithm` �섌뇧�띸쉰訝븅씆容섋��쇽펽鵝�
#. type: Labeled list
#: en/diff-options.txt:198
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
-msgstr "--stat[=<width>[,<name-width>[,<count>]]]"
+msgstr "--stat[=<若썲벧>[,<�띸㎞若썲벧>[,<�겼��>]]]"
#. type: Plain text
#: en/diff-options.txt:212
@@ -4820,9 +4820,9 @@ msgstr "\t瓦쇿뭽 `--color=never` �멨릪��\n"
#. type: Labeled list
#: en/diff-options.txt:352
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
-msgstr "--color-moved[=<mode>]"
+msgstr "--color-moved[=<與▼폀>]"
#. type: Plain text
#: en/diff-options.txt:354
@@ -4934,9 +4934,9 @@ msgstr "�녜뿭燁삣뒯汝�役뗣�귟퓳��빳�ⓩ씎誤녺썣�띸쉰溫양쉰�귛츆訝� `--color
#. type: Labeled list
#: en/diff-options.txt:395
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
-msgstr "--color-moved-ws=<modes>"
+msgstr "--color-moved-ws=<與▼폀>"
#. type: Plain text
#: en/diff-options.txt:398
@@ -5108,9 +5108,9 @@ msgstr "閭ｅ닕烏②씨凉뤶튋��빳�싪퓝藥�펰葉뗥틣�뽭뀓營��됮」�θ�營�펽��
#. type: Labeled list
#: en/diff-options.txt:475
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
-msgstr "--color-words[=<regex>]"
+msgstr "--color-words[=<閭ｅ닕烏②씨凉�>]"
#. type: Plain text
#: en/diff-options.txt:478
@@ -5315,7 +5315,7 @@ msgstr "�뷰틢�㎬꺗�껇솑竊뚪퍡溫ㅶ깄�듕툔竊�`-C` �됮」�ゅ쑉鸚띶댍�꾢렅冶�
#. type: Labeled list
#: en/diff-options.txt:589 en/git-branch.txt:104 en/git-http-push.txt:45
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "-D"
msgstr "-D"
@@ -5376,7 +5376,7 @@ msgstr "瑥룡낏�륅펽亮뜸툖����됬쉪藥�펰�썼꺗�끻맜���됬굳�뗣�귚풃倻귨펽
#. type: Labeled list
#: en/diff-options.txt:634
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "-S<string>"
msgstr "-S<string>"
@@ -5400,9 +5400,9 @@ msgstr "雅뚩퓵�뜻뻼餓뜸튋鴉싪˙�쒐뇨�겹��"
#. type: Labeled list
#: en/diff-options.txt:647
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "-G<regex>"
-msgstr "-G<regex>"
+msgstr "-G<閭ｅ닕烏②씨凉�>"
#. type: Plain text
#: en/diff-options.txt:650
@@ -5448,9 +5448,9 @@ msgstr "�닷쩀岳→겘瑥룟뢿鰲� linkgit:gitdiffcore[7] 訝�쉪 'pickaxe' �←쎅��"
#. type: Labeled list
#: en/diff-options.txt:671
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--find-object=<object-id>"
-msgstr "--find-object=<object-id>"
+msgstr "--find-object=<野배괌ID>"
#. type: Plain text
#: en/diff-options.txt:676
@@ -6506,25 +6506,14 @@ msgstr "礖귟염"
#. type: Plain text
#: en/git-add.txt:16
-#, fuzzy, ignore-ellipsis, no-wrap, priority:300
-#| msgid ""
-#| "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
-#| "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-#| "\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-#| "\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
-#| "\t [--] [<pathspec>...]\n"
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]\n"
"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
-msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
-"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
-"\t [--] [<pathspec>...]\n"
+msgstr "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]\n\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t [--] [<pathspec>...]\n"
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:24 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:29 en/git-bugreport.txt:15 en/git-bundle.txt:19 en/git-cat-file.txt:22 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:20 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:21 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:28 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:35 en/git-gui.txt:14 en/git-hash-object.txt:17 en/git-help.txt:19 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:16 en/git-log.txt:15 en/git-ls-files.txt:26 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:18 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:17 en/git-merge.txt:20 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:22 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-range-diff.txt:18 en/git-read-tree.txt:18 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:21 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:18 en/git-send-pack.txt:19 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:28 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:23 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -6594,13 +6583,13 @@ msgstr "�됧뀽 <�뉐츣瓮�푶> �쇔폀�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:gitgloss
#. type: Plain text
#: en/git-add.txt:73
-#, fuzzy, priority:300
+#, priority:300
msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
msgstr "若욇솀訝듾툖曆삣뒥�뉏뻑竊뚥퍎掠뺟ㅊ�뉏뻑��맔耶섇쑉�뽪삸��옙�γ��"
#. type: Plain text
#: en/git-add.txt:81
-#, fuzzy, priority:300
+#, priority:300
msgid "Allow adding otherwise ignored files."
msgstr "�곮�曆삣뒥藥꿱˙恙썹븼�꾣뻼餓뜰��"
@@ -15144,7 +15133,7 @@ msgstr "--also-filter-submodules"
#: en/git-clone.txt:189
#, priority:300
msgid "Also apply the partial clone filter to any submodules in the repository. Requires `--filter` and `--recurse-submodules`. This can be turned on by default by setting the `clone.filterSubmodules` config option."
-msgstr ""
+msgstr "�뚧뿶野밭뎵�у틩訝�쉪餓삡퐬耶먩Æ�쀥틪�③깿�녶뀑�녻퓝譯ㅵ솳�� ��誤�`--fliter`��`--recurse-submodules`�귟퓳��빳�싪퓝溫양쉰 `clone.filterSubmodules` �띸쉰窈방씎容섋�凉�����"
#. type: Labeled list
#: en/git-clone.txt:190 en/git-push.txt:161
@@ -15154,9 +15143,9 @@ msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:197
-#, fuzzy, priority:300
+#, priority:300
msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
-msgstr "兩븀쳦繹먨춼�ⓨ틩�꾦븳�뤵�귟퓳�쀥맜 `--bare` �됮」�귚툗 `--bare` �멩캈竊�`--mirror` 訝띴퍎弱녷틦�꾣쑍�겼늽��삝弱꾢댆��젃�꾣쑍�겼늽��펽瓦섉삝弱꾣��됧폊�⑨펷�끾떖瓦쒐쮮瓮잒릉�녷뵱竊뚧낏�딁춬竊됧뭉溫양쉰雅� refspec �띸쉰竊뚦썱�뚦쑉��젃耶섇궓佯볞릎�㎬죱 `git remote update` �띰펽���됭퓳雅쎾폊�③꺗鴉싪˙�띶넍��"
+msgstr "兩븀쳦繹먨춼�ⓨ틩�꾦븳�뤵�귟퓳容섋��끻맜 `--bare` �됮」�귚툗 `--bare` �멩캈竊�`--mirror` 訝띴퍎弱녷틦�꾣쑍�겼늽��삝弱꾢댆��젃�꾣쑍�겼늽��펽瓦섉삝弱꾣��됧폊�⑨펷�끾떖瓦쒐쮮瓮잒릉�녷뵱竊뚧낏�딁춬竊됧뭉溫양쉰雅녶폊�②쭊�껓펽�좄�뚦쑉��젃耶섇궓佯볞릎�㎬죱 `git remote update` �띰펽���됭퓳雅쎾폊�③꺗鴉싪˙誤녺썣��"
#. type: Labeled list
#: en/git-clone.txt:198
@@ -15172,9 +15161,9 @@ msgstr "--origin <�띸㎞>"
#. type: Plain text
#: en/git-clone.txt:203
-#, fuzzy, priority:300
+#, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`. Overrides `clone.defaultRemoteName` from the config."
-msgstr "訝띴슴�②퓶葉뗥릫燁� `origin` �θ퇎甕や툓歷멨춼�ⓨ틩竊뚩�뚥슴��`<�띸㎞>`��"
+msgstr "訝띴슴�②퓶葉뗥릫燁�`origin`�θ퇎甕よ퓶葉뗤퍜佯볩펽�뚥슴��`<name>`�쇈�� 瓦쇾폏誤녺썣�띸쉰訝�`clone.defaultRemoteName`�꾥�營���"
#. type: Labeled list
#: en/git-clone.txt:204
@@ -15391,13 +15380,13 @@ msgstr "誤곩뀑�녶댆�꾣뼭��퐬�꾢릫燁겹�귛쫩�쒏쑋�롧‘�뉐츣��퐬竊뚦닕鵝�
#: en/git-clone.txt:326
#, no-wrap, priority:300
msgid "--bundle-uri=<uri>"
-msgstr ""
+msgstr "--bundle-uri=<uri>"
#. type: Plain text
#: en/git-clone.txt:332
#, priority:300
msgid "Before fetching from the remote, fetch a bundle from the given `<uri>` and unbundle the data into the local repository. The refs in the bundle will be stored under the hidden `refs/bundle/*` namespace. This option is incompatible with `--depth`, `--shallow-since`, and `--shallow-exclude`."
-msgstr ""
+msgstr "�ⓧ퍗瓦쒐쮮�룟룚阿뗥뎺竊뚥퍗瀯쇿츣��`<uri>`訝�렩�뽨�訝ゆ뜂瀯묈똿竊뚦뭉弱녷빊��㎗瀯묈댆�у쑑壅꾣틦佯볞릎�귝뜂瀯묈똿訝�쉪凉뺟뵪弱녻˙耶섇궓�③쉺�뤹쉪 `refs/bundle/*` �썲릫令븅뿴訝뗣�귟��됮」訝띴툗`--depth`��`--shallow--scince`��`--shallow--exclude`�쇔���"
#. type: Plain text
#: en/git-clone.txt:340
@@ -15477,7 +15466,7 @@ msgstr "git-column(1)"
#: en/git-column.txt:7
#, priority:100
msgid "git-column - Display data in columns"
-msgstr ""
+msgstr "git-column - 餓ε닓掠뺟ㅊ�경뜮"
#. type: Plain text
#: en/git-column.txt:13
@@ -15485,37 +15474,37 @@ msgstr ""
msgid ""
"'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]\n"
"\t [--indent=<string>] [--nl=<string>] [--padding=<n>]\n"
-msgstr ""
+msgstr "'git column' [--command=<�띸㎞>] [--[raw-]mode=<與▼폀>] [--width=<若썲벧>]\n\t [--indent=<耶쀧Е訝�>] [--nl=<耶쀧Е訝�>] [--padding=<n>]\n"
#. type: Plain text
#: en/git-column.txt:20
#, priority:100
msgid "This command formats the lines of its standard input into a table with multiple columns. Each input line occupies one cell of the table. It is used internally by other git commands to format output into columns."
-msgstr ""
+msgstr "瑥ε뫝餓ㅵ컛�뜻젃�녻풏�η쉪烏뚧졏凉뤷뙑訝뷰�訝ゅ쩀�쀨〃�쇈�귝캀訝よ풏�θ죱�졿뜮烏ⓩ졏�꾡�訝ゅ뜒�껁�귛츆熬ュ끀餓뺾it�썰빱�낂깿鵝욜뵪竊뚥빳弱녻풏�뷰에��졏凉뤷뙑訝뷴닓��"
#. type: Labeled list
#: en/git-column.txt:23
#, no-wrap, priority:100
msgid "--command=<name>"
-msgstr ""
+msgstr "--command=<�띸㎞>"
#. type: Plain text
#: en/git-column.txt:26
#, priority:100
msgid "Look up layout mode using configuration variable column.<name> and column.ui."
-msgstr ""
+msgstr "鵝욜뵪�띸쉰�섌뇧column.<�띸㎞>�똠olumn.ui�θ�躍껃�與▼폀��"
#. type: Labeled list
#: en/git-column.txt:27
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--mode=<mode>"
-msgstr "--mode=<mode>"
+msgstr "--mode=<與▼폀>"
#. type: Plain text
#: en/git-column.txt:30
#, priority:100
msgid "Specify layout mode. See configuration variable column.ui for option syntax in linkgit:git-config[1]."
-msgstr ""
+msgstr "�뉐츣躍껃�與▼폀�귡�됮」�꾥�力뺠쭅 linkgit:git-config[1] 訝춃olumn.ui�섌뇧�꾦뀓營���"
#. type: Labeled list
#: en/git-column.txt:31
@@ -15527,43 +15516,43 @@ msgstr "--raw-mode=<n>"
#: en/git-column.txt:34
#, priority:100
msgid "Same as --mode but take mode encoded as a number. This is mainly used by other commands that have already parsed layout mode."
-msgstr ""
+msgstr "訝�--與▼폀�됮」�멨릪竊뚥퐜瑥ι�됮」弱녷Æ凉뤹폋�곦맏訝�訝ゆ빊耶쀣�귟퓳訝삭쫨��˙�뜸퍟藥꿰퍘鰲ｆ옄雅녶툋掠�與▼폀�꾢뫝餓ㅴ슴�ⓦ��"
#. type: Labeled list
#: en/git-column.txt:35
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--width=<width>"
-msgstr "--width=<width>"
+msgstr "--width=<若썲벧>"
#. type: Plain text
#: en/git-column.txt:38
#, priority:100
msgid "Specify the terminal width. By default 'git column' will detect the terminal width, or fall back to 80 if it is unable to do so."
-msgstr ""
+msgstr "�뉐츣瀯덄ク�꾢�佯╉�귡퍡溫ㅶ깄�듕툔竊�'git column'鴉싨�役뗧퍑塋��佯�펽倻귝옖�졿퀡汝�役뗰펽�쇾폏弱녶끀若썲벧溫양쉰訝�80��"
#. type: Labeled list
#: en/git-column.txt:39
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--indent=<string>"
-msgstr "--indent=<string>"
+msgstr "--indent=<耶쀧Е訝�>"
#. type: Plain text
#: en/git-column.txt:41
#, priority:100
msgid "String to be printed at the beginning of each line."
-msgstr ""
+msgstr "溫양쉰誤곩쑉驪뤶�烏뚨쉪凉�鸚닸돀�곁쉪耶쀧Е訝꿔��"
#. type: Labeled list
#: en/git-column.txt:42
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--nl=<string>"
-msgstr "--indent=<string>"
+msgstr "--indent=<耶쀧Е訝�>"
#. type: Plain text
#: en/git-column.txt:45
#, priority:100
msgid "String to be printed at the end of each line, including newline character."
-msgstr ""
+msgstr "�ⓩ캀訝�烏뚨쉪�ュ갼誤곫돀�곁쉪耶쀧Е訝뀐펽�끾떖��죱寧╉��"
#. type: Labeled list
#: en/git-column.txt:46
@@ -15575,13 +15564,13 @@ msgstr "--padding=<N>"
#: en/git-column.txt:48
#, priority:100
msgid "The number of spaces between columns. One space by default."
-msgstr ""
+msgstr "�쀤퉳�당쉪令뷸졏�곤펽容섋�訝뷰�訝ょ㈉�쇈��"
#. type: Plain text
#: en/git-column.txt:53
#, priority:100
msgid "Format data by columns:"
-msgstr ""
+msgstr "�됧닓�쇔폀�뽪빊��폏"
#. type: delimited block -
#: en/git-column.txt:58
@@ -15601,7 +15590,7 @@ msgstr ""
#: en/git-column.txt:61
#, priority:100
msgid "Format data by rows:"
-msgstr ""
+msgstr "�됭죱�쇔폀�뽪빊��폏"
#. type: delimited block -
#: en/git-column.txt:66
@@ -15621,7 +15610,7 @@ msgstr ""
#: en/git-column.txt:69
#, priority:100
msgid "List some tags in a table with unequal column widths:"
-msgstr ""
+msgstr "�ⓧ�訝ゅ닓若썰툖嶺됬쉪烏ⓩ졏訝�닓�뷰�雅쎿젃嶺억폏"
#. type: delimited block -
#: en/git-column.txt:75
@@ -15722,9 +15711,9 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:53 en/git-fmt-merge-msg.txt:42
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-m <message>"
-msgstr "-m <message>"
+msgstr "-m <岳→겘>"
#. type: Plain text
#: en/git-commit-tree.txt:56
@@ -16676,7 +16665,7 @@ msgstr "git-config(1)"
#: en/git-config.txt:7
#, priority:100
msgid "git-config - Get and set repository or global options"
-msgstr ""
+msgstr "git-config - �룟룚�뚩�營�퍜佯볠닑�ⓨ��됮」"
#. type: Plain text
#: en/git-config.txt:27
@@ -16697,97 +16686,97 @@ msgid ""
"'git config' [<file-option>] --get-color <name> [<default>]\n"
"'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n"
"'git config' [<file-option>] -e | --edit\n"
-msgstr ""
+msgstr "'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n'git config' [<file-option>] [--type=<type>] --add <name> <value>\n'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n'git config' [<file-option>] --rename-section <old-name> <new-name>\n'git config' [<file-option>] --remove-section <name>\n'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n'git config' [<file-option>] --get-color <name> [<default>]\n'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n'git config' [<file-option>] -e | --edit\n# file-opon:�띸쉰�뉏뻑竊�\n"
#. type: Plain text
#: en/git-config.txt:33
#, priority:100
msgid "You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped."
-msgstr ""
+msgstr "鵝졾룾餓η뵪瓦쇾릉�썰빱�θ�/溫양쉰/�욘뜟/�뽪텋�됮」�귛릫燁�(name)若욇솀訝딀삸�①궧�붷��꾥뒄�뚪뵰竊뚦��(value)鴉싪˙饔т퉱��"
#. type: Plain text
#: en/git-config.txt:43
#, priority:100
msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a `value-pattern` (which is an extended regular expression, unless the `--fixed-value` option is given) needs to be given. Only the existing values that match the pattern are updated or unset. If you want to handle the lines that do *not* match the pattern, just prepend a single exclamation mark in front (see also <<EXAMPLES>>), but note that this only works when the `--fixed-value` option is not in use."
-msgstr ""
+msgstr "�싪퓝鵝욜뵪`--add`�됮」竊뚦룾餓δ맏訝�訝ら�됮」曆삣뒥鸚싪죱�� 倻귝옖鵝졿꺍�닸뼭�뽩룚易덁�訝ゅ룾餓ε눣�겼쑉鸚싪죱�꾦�됮」竊뚪�誤곭퍢�뷰�訝�`value-pattern`竊덅퓳���訝ゆ돥掠뺟쉪閭ｅ닕烏②씨凉륅펽�ㅹ씆瀯쇿눣`--fixed-value`�됮」竊됥�� �ゆ쐣寧�릦瑥ζÆ凉뤹쉪�경쐣�쇠˙�닸뼭�뽩룚易덅�營��� 倻귝옖鵝졿꺍鸚꾤릤訝띸Е�덃Æ凉뤹쉪烏뚳펽�ら��ⓨ뎺�℡뒥訝듾�訝ゆ꽏�밧뤇竊덂뢿鰲�<<堊뗥춴>>竊됵펽鵝녷낏�뤺퓳�ゅ쑉亦→쐣鵝욜뵪`--fixed-value`�됮」�뜻쐣�덀��"
#. type: Plain text
#: en/git-config.txt:48
#, priority:100
msgid "The `--type=<type>` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given <type>. If no `--type=<type>` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`."
-msgstr ""
+msgstr "`--type=<映삣엹>`�됮」�뉒ㅊ'git config'簾�퓷鴉졾뀯�뚥폖�븀쉪�쇔쑉瀯쇿츣��<映삣엹>訝뗦삸��빳熬ヨ쭊�껃뙑�꾠�� 倻귝옖亦→쐣瀯쇿츣`--type=<映삣엹>`竊뚦컛訝띷돢烏뚩쭊�껃뙑�귟컘�②�끻룾餓η뵪`--no-type`�뽪텋�경쐣��`--type`�뉐츣�ⓦ��"
#. type: Plain text
#: en/git-config.txt:54
#, priority:100
msgid "When reading, the values are read from the system, global and repository local configuration files by default, and options `--system`, `--global`, `--local`, `--worktree` and `--file <filename>` can be used to tell the command to read from only that location (see <<FILES>>)."
-msgstr ""
+msgstr "瑥삣룚�띸쉰�띰펽容섋�餓롧내瀯잆�곩뀲掠��뚩탡繹먨틩�꾣쑍�곈뀓營�뻼餓뜸릎瑥삣룚�겼�쇽펽�됮」`--楹사퍨(system)`��`--�ⓨ�(global)`��`--(local)`��`--藥δ퐳��(worktree)`��`--�뉏뻑(file)<�뉏뻑��>`��빳�ⓩ씎�딂칹�썰빱�や퍗�됧츣�꾡퐤營���뽳펷鰲�<<�뉏뻑>>竊됥��"
#. type: Plain text
#: en/git-config.txt:60
#, priority:100
msgid "When writing, the new value is written to the repository local configuration file by default, and options `--system`, `--global`, `--worktree`, `--file <filename>` can be used to tell the command to write to that location (you can say `--local` but that is the default)."
-msgstr ""
+msgstr "�쇿뀯�띰펽�겼�쇤퍡溫ㅵ넍�η뎵�у틩�꾣쑍�곈뀓營�뻼餓띰펽�됮」`--system(楹사퍨)`��`--global(�ⓨ�)`��`--worktree(藥δ퐳��)`��`--file(�뉏뻑) <filename>`��빳�ⓩ씎�딂칹�썰빱�쇿댆�ｄ릉鵝띸쉰竊덁퐷��빳瀯쇿눣`--local(�у쑑)`�됮」竊뚥퐜��퍡溫ㅹ�됮」弱길삸�у쑑(local)竊됥��"
#. type: Plain text
#: en/git-config.txt:63
#, priority:100
msgid "This command will fail with non-zero status upon error. Some exit codes are:"
-msgstr ""
+msgstr "瑥ε뫝餓ㅵ눣�숁뿶弱녵빳�욇쎏�뜻�곩ㅁ兀γ�� 餓δ툔���雅쏃���뷰빰�곻폏"
#. type: Plain text
#: en/git-config.txt:65
#, priority:100
msgid "The section or key is invalid (ret=1),"
-msgstr ""
+msgstr "瑥θ뒄�뽭뵰�졿븞竊덆���뷰빰�곦맏1竊됵펽"
#. type: Plain text
#: en/git-config.txt:66
#, priority:100
msgid "no section or name was provided (ret=2),"
-msgstr ""
+msgstr "亦→쐣�먧풘�귝닑��펷���뷴�쇌맏2竊됵펽"
#. type: Plain text
#: en/git-config.txt:67
#, priority:100
msgid "the config file is invalid (ret=3),"
-msgstr ""
+msgstr "�띸쉰�뉏뻑�졿븞竊덆���뷰빰�곦맏3竊됵펽"
#. type: Plain text
#: en/git-config.txt:68
#, priority:100
msgid "the config file cannot be written (ret=4),"
-msgstr ""
+msgstr "�띸쉰�뉏뻑�졿퀡�쇿뀯竊덆���뷰빰�곦맏4竊됵펽"
#. type: Plain text
#: en/git-config.txt:69
#, priority:100
msgid "you try to unset an option which does not exist (ret=5),"
-msgstr ""
+msgstr "鵝좄캊�얍룚易덁�訝や툖耶섇쑉�꾦�됮」竊덆���뷰빰�곦맏5竊됵펽"
#. type: Plain text
#: en/git-config.txt:70
#, priority:100
msgid "you try to unset/set an option for which multiple lines match (ret=5), or"
-msgstr ""
+msgstr "鵝좄캊�얍룚易�/溫양쉰訝�訝ゅ쩀烏뚦뙶�띸쉪�됮」竊덆���뷰빰�곦맏5竊됵펽��"
#. type: Plain text
#: en/git-config.txt:71
#, priority:100
msgid "you try to use an invalid regexp (ret=6)."
-msgstr ""
+msgstr "瑥뺝쎗鵝욜뵪訝�訝ゆ뿞�덄쉪閭ｅ닕烏②씨凉륅펷���뷰빰�곦맏6竊됥��"
#. type: Plain text
#: en/git-config.txt:73
#, priority:100
msgid "On success, the command returns the exit code 0."
-msgstr ""
+msgstr "�㎬죱�먨뒣�띰펽瑥ε뫝餓ㅸ퓭�욇���뷰빰��0��"
#. type: Plain text
#: en/git-config.txt:76
#, priority:100
msgid "A list of all available configuration variables can be obtained using the `git help --config` command."
-msgstr ""
+msgstr "���됧룾�③뀓營�룜�뤹쉪�쀨〃��빳�싪퓝`git help --config`�썰빱�룟룚��"
#. type: Labeled list
#: en/git-config.txt:81
@@ -16799,7 +16788,7 @@ msgstr "--replace-all"
#: en/git-config.txt:84
#, priority:100
msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the `value-pattern`)."
-msgstr ""
+msgstr "容섋�烏뚥맏���鸚싨쎘�㏘�烏뚣�귟퓳弱녵폏�욘뜟���됦툗��펷餓ε룋���됬쉪`value-pattern`竊됧뙶�띸쉪烏뚣��"
#. type: Labeled list
#: en/git-config.txt:85 en/git-update-index.txt:44
@@ -16811,7 +16800,7 @@ msgstr "--add"
#: en/git-config.txt:89
#, priority:100
msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the `value-pattern` in `--replace-all`."
-msgstr ""
+msgstr "訝띷뵻�섆뻣鵝뺟렟�됬쉪�쇘쉪�끻넻訝뗰펽�③�됮」訝�쥭�졽�訝ゆ뼭�꾥죱�� 瓦쇾툗��`--replace-all`訝�룓堊�'^$'鵝쒍맏`value-pattern` ����루쉪��"
#. type: Labeled list
#: en/git-config.txt:90
@@ -16823,7 +16812,7 @@ msgstr "--get"
#: en/git-config.txt:94
#, priority:100
msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
-msgstr ""
+msgstr "�룟룚訝�訝ょ퍢若싩쉪��쉪�쇽펷���됪떓�싪퓝訝롨��쇘쎑�백뀓�꾣��숃〃渦얍폀瓦쏂죱瓦뉑빱竊됥�귛쫩�쒏깹�됪돻�곈뵰�쇽펽瓦붷썮�숃�餓ｇ쟻1竊쎾쫩�쒏돻�겼쩀訝ら뵰�쇽펽�숃퓭�욄��롣�訝ゅ�쇈��"
#. type: Labeled list
#: en/git-config.txt:95
@@ -16835,7 +16824,7 @@ msgstr "--get-all"
#: en/git-config.txt:97
#, priority:100
msgid "Like get, but returns all values for a multi-valued key."
-msgstr ""
+msgstr "��--get訝��뤄펽鵝녷삸瓦붷썮訝�訝ゅ쩀�쇤뵰�꾣��됧�쇈��"
#. type: Labeled list
#: en/git-config.txt:98
@@ -16847,19 +16836,19 @@ msgstr "--get-regexp"
#: en/git-config.txt:104
#, priority:100
msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
-msgstr ""
+msgstr "�� --get-all 訝��뤄펽鵝녷삸�ⓩ��숃〃渦얍폀鵝쒍맏竊뚦뭉�쇿눣��릫�� 閭ｅ닕烏②씨凉뤷뙶�띸쎅�띷삸�뷴늽鸚㎩컦�숂쉪竊뚦뭉訝붹삸�덂�訝�訝よ쭊�껃뙑�꾦뵰�꾤뎵�ц퓵烏뚨쉪竊뚦끀訝�뒄(section)�뚦룜�뤷릫燁경삸弱뤷넍�꾬펽鵝녶춴�귛릫燁겻툖��컦�숂쉪��"
#. type: Labeled list
#: en/git-config.txt:105
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--get-urlmatch <name> <URL>"
-msgstr "--get-urlmatch name URL"
+msgstr "--get-urlmatch <�띸㎞> <URL>"
#. type: Plain text
#: en/git-config.txt:112
#, priority:100
msgid "When given a two-part name section.key, the value for section.<URL>.key whose <URL> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found."
-msgstr ""
+msgstr "壤볡퍢若싦�訝ょ뵳訝ㅹ깿�녺퍍�먪쉪�띸㎞section.key�띰펽瓦붷썮section.<URL>.key�꾢�쇽펽��<URL>�ⓨ늽��퍢若싩쉪���멨뙶�띸쉪URL竊덂쫩�쒏깹�됭퓳�루쉪��춼�⑨펽section.key�꾢�쇔컛鵝쒍맏鸚뉒뵪�쇽펹�� 壤볟룵瀯쇿눣section�꾢릫燁경뿶竊뚦�section訝�쉪���뎚ey瓦쏂죱鸚꾤릤竊뚦뭉弱녶끀�쀥눣�� 倻귝옖亦→쐣�얍댆�쇽펽瓦붷썮�숃�餓ｇ쟻1竊늮ection: �귨펽key:��폑�③뀓營�뻼餓뜸릎��퓳�루쉪[section] key=value竊됥��"
#. type: Labeled list
#: en/git-config.txt:113
@@ -16871,19 +16860,19 @@ msgstr "--global"
#: en/git-config.txt:118
#, priority:100
msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
-msgstr ""
+msgstr "野밥틢�쇿뀯�됮」竊싧넍�ε뀲掠���`~/.gitconfig`�뉏뻑�뚥툖��퍜佯볡쉪`.git/config`�뉏뻑竊뚦쫩�쒑��뉏뻑耶섇쑉��`~/.gitconfig`�뉏뻑訝띶춼�⑨펽�쇿넍��`$XDG_CONFIG_HOME/git/config`�뉏뻑��"
#. type: Plain text
#: en/git-config.txt:121
#, priority:100
msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
-msgstr ""
+msgstr "野밥틢瑥삣룚�됮」竊싧룵餓롥뀲掠���`~/.gitconfig`��`$XDG_CONFIG_HOME/git/config`訝���뽳펽�뚥툖��퍗���됧룾�ⓩ뻼餓뜸릎瑥삣룚��"
#. type: Plain text
#: en/git-config.txt:123 en/git-config.txt:133 en/git-config.txt:142 en/git-config.txt:161 en/git-config.txt:409
#, priority:100
msgid "See also <<FILES>>."
-msgstr ""
+msgstr "����귟쭅<<�뉏뻑>>��"
#. type: Labeled list
#: en/git-config.txt:124
@@ -16895,25 +16884,25 @@ msgstr "--system"
#: en/git-config.txt:128
#, priority:100
msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
-msgstr ""
+msgstr "野밥틢�숅�됮」竊싧넍�곁내瀯잒똽�닷냵��`$(prefix)/etc/gitconfig`�뉏뻑訝�펽�뚥툖��퍜佯볞릎��`.git/config`�뉏뻑��"
#. type: Plain text
#: en/git-config.txt:131
#, priority:100
msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
-msgstr ""
+msgstr "野밥틢瑥삣룚�됮」竊싧룵餓롧내瀯잒똽�닷냵��`$(prefix)/etc/gitconfig`瑥삣룚竊뚩�뚥툖��퍗���됧룾�ⓩ뻼餓뜸릎瑥삣룚��"
#. type: Plain text
#: en/git-config.txt:137
#, priority:100
msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
-msgstr ""
+msgstr "野밥틢�숅�됮」竊싧넍�곁뎵�у틩��`.git/config`�뉏뻑訝��� 瓦숁삸容섋�烏뚥맏��"
#. type: Plain text
#: en/git-config.txt:140
#, priority:100
msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
-msgstr ""
+msgstr "野밥틢瑥삣룚�됮」竊싧룵餓롥춼�ⓨ틩`.git/config`訝���뽳펽�뚥툖��퍗���됧룾�ⓩ뻼餓뜸릎瑥삣룚��"
#. type: Labeled list
#: en/git-config.txt:143 en/git-restore.txt:59
@@ -16925,43 +16914,43 @@ msgstr "--worktree"
#: en/git-config.txt:151
#, priority:100
msgid "Similar to `--local` except that `$GIT_DIR/config.worktree` is read from or written to if `extensions.worktreeConfig` is enabled. If not it's the same as `--local`. Note that `$GIT_DIR` is equal to `$GIT_COMMON_DIR` for the main working tree, but is of the form `$GIT_DIR/worktrees/<id>/` for other working trees. See linkgit:git-worktree[1] to learn how to enable `extensions.worktreeConfig`."
-msgstr ""
+msgstr "訝�`--local`映삡세竊뚦룵��쫩�쒎맦�ⓧ틙`extensions.worktreeConfig`竊뚦닕餓�`$GIT_DIR/config.worktree`瑥삣룚�뽩넍�γ�귛쫩�쒏깹�됵펽�쇾툗`--local`�멨릪�귝낏�륅펽野밥틢訝삣램鵝쒎뙷竊�`$GIT_DIR`嶺됦틢`$GIT_COMMON_DIR`竊뚥퐜野밥틢�뜸퍟藥δ퐳�븝펽若껆쉪壤℡폀��`$GIT_DIR/worktrees/<id>/`�귚틙鰲ｅ쫩鵝뺝맦�� `extensions.worktreeConfig`竊뚦뢿鰲� linkgit:git-worktree[1] ��"
#. type: Labeled list
#: en/git-config.txt:152
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "-f <config-file>"
-msgstr "--file config-file"
+msgstr "-f <�띸쉰�뉏뻑>"
#. type: Labeled list
#: en/git-config.txt:153
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--file <config-file>"
-msgstr "--file config-file"
+msgstr "--file <�띸쉰�뉏뻑>"
#. type: Plain text
#: en/git-config.txt:156
#, priority:100
msgid "For writing options: write to the specified file rather than the repository `.git/config`."
-msgstr ""
+msgstr "野밥틢�쇿뀯�됮」竊싧넍�경뙁若싩쉪�뉏뻑竊뚩�뚥툖��퍜佯�`.git/config`��"
#. type: Plain text
#: en/git-config.txt:159
#, priority:100
msgid "For reading options: read only from the specified file rather than from all available files."
-msgstr ""
+msgstr "野밥틢瑥삣룚�됮」竊싧룵餓롦뙁若싩쉪�뉏뻑�뚥툖��퍗���됧룾�①쉪�뉏뻑訝���뽧��"
#. type: Labeled list
#: en/git-config.txt:162
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--blob <blob>"
-msgstr "--blob blob"
+msgstr "--blob <雅뚩퓵�뜹�穩�>"
#. type: Plain text
#: en/git-config.txt:168
#, priority:100
msgid "Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
-msgstr ""
+msgstr "映삡세雅�`--file`竊뚥퐜鵝욜뵪�뉐츣�꾡틠瓦쎾댍野배괌�뚥툖��뻼餓뜰�귚풃倻귨펽鵝졾룾餓δ슴��'master:.gitmodules'�θ��뽨말�녷뵱訝�'.gitmodules'�뉏뻑訝�쉪�쇈�귛뢿鰲� linkgit:gitrevisions[7] 訝�쉪 \"�뉐츣�꾡엶閭�\"�ⓨ늽竊뚥빳�룟풓�닷츑�당쉪雅뚩퓵�뜹�穩▼릫燁경떬�숁뼶凉뤵��"
#. type: Labeled list
#: en/git-config.txt:169
@@ -16973,7 +16962,7 @@ msgstr "--remove-section"
#: en/git-config.txt:171
#, priority:100
msgid "Remove the given section from the configuration file."
-msgstr ""
+msgstr "餓롩뀓營�뻼餓뜸릎�좈솮雅녻��귙��"
#. type: Labeled list
#: en/git-config.txt:172
@@ -16985,7 +16974,7 @@ msgstr "--rename-section"
#: en/git-config.txt:174
#, priority:100
msgid "Rename the given section to a new name."
-msgstr ""
+msgstr "弱녺퍢若싩쉪�귡뇥�썲릫訝뷰�訝ゆ뼭�꾢릫燁겹��"
#. type: Labeled list
#: en/git-config.txt:175
@@ -17009,13 +16998,13 @@ msgstr "--unset-all"
#: en/git-config.txt:180
#, priority:100
msgid "Remove all lines matching the key from config file."
-msgstr ""
+msgstr "餓롩뀓營�뻼餓뜸릎�좈솮���됧뙶�띹���쉪烏뚣��"
#. type: Plain text
#: en/git-config.txt:184
#, priority:100
msgid "List all variables set in config file, along with their values."
-msgstr ""
+msgstr "�쀥눣�띸쉰�뉏뻑訝��營�쉪���됧룜�륅펽餓ε룋若껂뺄�꾢�쇈��"
#. type: Labeled list
#: en/git-config.txt:185
@@ -17027,13 +17016,13 @@ msgstr "--fixed-value"
#: en/git-config.txt:190
#, priority:100
msgid "When used with the `value-pattern` argument, treat `value-pattern` as an exact string instead of a regular expression. This will restrict the name/value pairs that are matched to only those where the value is exactly equal to the `value-pattern`."
-msgstr ""
+msgstr "壤볞툗`value-pattern`�귝빊訝�壅룝슴�ⓩ뿶竊뚦컛`value-pattern`鰲녵맏暎양‘�꾢춻寧╊림竊뚩�뚥툖����숃〃渦얍폀�귟퓳弱녵슴孃쀨˙�백뀓�꾢릫燁�/�쇔�竊뚦룵�됮궍雅쎾�쇌툗`value-pattern'若뚦뀲�며춬�꾢릫燁�/�쇔���"
#. type: Labeled list
#: en/git-config.txt:191
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
msgid "--type <type>"
-msgstr "--type <type>"
+msgstr "--type <映삣엹>"
#. type: Plain text
#: en/git-config.txt:195
@@ -57677,19 +57666,19 @@ msgstr "path old-file old-hex old-mode new-file new-hex new-mode"
#: en/git.txt:612
#, priority:100
msgid "where:"
-msgstr "鵝띸쉰竊�"
+msgstr "鵝욜뵪竊�"
#. type: Labeled list
#: en/git.txt:613
#, no-wrap, priority:100
msgid "<old|new>-file"
-msgstr ""
+msgstr "<old|new>-file"
#. type: Plain text
#: en/git.txt:615
#, priority:100
msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
-msgstr ""
+msgstr "�츶IT_EXTERNAL_DIFF�ⓩ씎瑥삣룚<old|new>�끻��꾣뻼餓띰펽"
#. type: Labeled list
#: en/git.txt:615
@@ -57701,7 +57690,7 @@ msgstr "<old|new>-hex"
#: en/git.txt:616
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
-msgstr ""
+msgstr "��40訝ゅ뛻��퓵�띄쉪SHA-1�덂툕�쇽펽"
#. type: Labeled list
#: en/git.txt:616
@@ -57713,19 +57702,19 @@ msgstr "<old|new>-mode"
#: en/git.txt:617
#, priority:100
msgid "are the octal representation of the file modes."
-msgstr ""
+msgstr "��뻼餓뜻Æ凉뤹쉪�ヨ퓵�띈〃鹽뷸퀡��"
#. type: Plain text
#: en/git.txt:623
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
-msgstr ""
+msgstr "�뉏뻑�귝빊��빳�뉐릲�ⓩ댎�꾢램鵝쒏뻼餓띰펷堊뗥쫩 \"git-diff-files \"訝�쉪`new-file`竊됵펽`/dev/null`竊덁풃倻귛쑉曆삣뒥�경뻼餓뜻뿶��`old-file`竊됵펽�뽨�訝や릿�뜻뻼餓띰펷堊뗥쫩榮℡폊訝�쉪`old-file`竊됥�� �좈��끻퓘`GIT_EXTERNAL_DIFF`野밥릿�뜻뻼餓띄쉪�얏렏��맔鰲ｉ솮�붴�붷퐪`GIT_EXTERNAL_DIFF`���뷸뿶竊뚦츆鴉싪˙�좈솮��"
#. type: Plain text
#: en/git.txt:626
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
-msgstr ""
+msgstr "`GIT_EXTERNAL_DIFF`熬ヨ컘�ⓩ뿶竊뚦�雅롦쑋�덂뭉�꾥러孃꾢룾�싪퓝<path>瓦쏂죱溫양쉰��"
#. type: Plain text
#: en/git.txt:629
@@ -62746,13 +62735,13 @@ msgstr "瑥룡낏�륅펽�묇뺄�방꼷�됪떓�ⓩ룓雅ㅵ�穩▼콆�㏘툓竊뚥툖野방룓雅ㅶ뿥
#: en/includes/cmd-config-section-all.txt:3
#, priority:300
msgid "Everything below this line in this section is selectively included from the linkgit:git-config[1] documentation. The content is the same as what's found there:"
-msgstr ""
+msgstr "�ц뒄訝�퓳訝�烏뚥빳訝뗧쉪�끻��썸삸餓� linkgit:git-config[1] �뉑。訝�몮壤뺟쉪�귛끀�끻�訝롩궍�뚨쉪�끻��멨릪竊�"
#. type: Plain text
#: en/includes/cmd-config-section-rest.txt:3
#, priority:280
msgid "Everything above this line in this section isn't included from the linkgit:git-config[1] documentation. The content that follows is the same as what's found there:"
-msgstr ""
+msgstr "�ц뒄訝�퓳訝�烏뚥빳訝딁쉪�끻�亮뜸툖�끾떖�� linkgit:git-config[1] �뉑。訝��귚툔�®쉪�끻�訝롩궍�뚨쉪�끻��멨릪竊�"
#. type: Plain text
#: en/line-range-format.txt:2
@@ -65932,7 +65921,7 @@ msgstr "--since=<date>"
#: en/rev-list-options.txt:32
#, priority:260
msgid "Show all commits more recent than a specific date. This visits all commits in the range, rather than stopping at the first commit which is older than a specific date."
-msgstr ""
+msgstr "�양ㅊ���됪캈�뉐츣�ζ쐿�닺퓩�꾣룓雅ㅳ�귟퓳弱녻�����껃쎍�끿쉪���됪룓雅ㅿ펽�뚥툖��걶�①К訝�訝ゆ캈�뉐츣�ζ쐿�닸뿩�꾣룓雅ㅳ��"
#. type: Labeled list
#: en/rev-list-options.txt:33
@@ -66167,7 +66156,7 @@ msgstr "--exclude-first-parent-only"
#: en/rev-list-options.txt:150
#, priority:260
msgid "When finding commits to exclude (with a '{caret}'), follow only the first parent commit upon seeing a merge commit. This can be used to find the set of changes in a topic branch from the point where it diverged from the remote branch, given that arbitrary merges can be valid topic branch changes."
-msgstr ""
+msgstr "�ⓨ��얕쫨�믧솮�꾣룓雅ㅿ펷��'{caret}'竊됪뿶竊뚦쑉�뗥댆�덂뭉�먧벡�뜹룵瓮잓쉹寧т�訝ょ댍�먧벡�� �껇솑�겻뻣�뤹쉪�덂뭉�썲룾餓ζ닇訝뷸쐣�덄쉪訝삯쥦�녷뵱�섇뙑竊뚩퓳��빳�ⓩ씎�ζ돻訝삯쥦�녷뵱訝�퍗若껂툗瓦쒐쮮�녷뵱�꾢늽閭㎫궧凉�冶뗧쉪�섇뙑�녶릦��"
#. type: Plain text
#: en/rev-list-options.txt:154
@@ -66897,13 +66886,13 @@ msgstr "瓦섉쐣訝�燁띸��뽪Æ凉뤷룾�ⓦ��"
#: en/rev-list-options.txt:587
#, priority:260
msgid "Limit the displayed commits to those which are an ancestor of <commit>, or which are a descendant of <commit>, or are <commit> itself."
-msgstr ""
+msgstr "弱녷샑鹽븀쉪�먧벡�먨댍��<�먧벡>�꾤쪝�덌펽��<�먧벡>�꾢릮餓ｏ펽��<�먧벡>�ц벴��"
#. type: Plain text
#: en/rev-list-options.txt:589
#, priority:260
msgid "As an example use case, consider the following commit history:"
-msgstr "鵝쒍맏訝�訝ょ뵪堊뗰펽瑥룩�껇솑餓δ툔�먧벡�녶뤁��"
+msgstr "鵝쒍맏訝�訝ょ뵪堊뗰펽瑥룩�껇솑餓δ툔�먧벡�녶뤁竊�"
#. type: delimited block -
#: en/rev-list-options.txt:596
@@ -66953,59 +66942,48 @@ msgstr ""
#: en/rev-list-options.txt:622
#, priority:260
msgid "We can also use `--ancestry-path=D` instead of `--ancestry-path` which means the same thing when applied to the 'D..M' range but is just more explicit."
-msgstr ""
+msgstr "�묇뺄阿잌룾餓η뵪`--ancestry-path=D`�δ빰��`--ancestry-path`竊뚩퓳�ⓨ틪�ⓧ틢'D...M'�껃쎍�뜻꼷�앯쎑�뚳펽�ゆ삸�닷뒥�롧‘��"
#. type: Plain text
#: en/rev-list-options.txt:627
#, priority:260
msgid "If we instead are interested in a given topic within this range, and all commits affected by that topic, we may only want to view the subset of `D..M` which contain that topic in their ancestry path. So, using `--ancestry-path=H D..M` for example would result in:"
-msgstr ""
+msgstr "倻귝옖�묇뺄�잌뀾擁ｇ쉪��퓳訝よ똽�닷냵�꾣윇訝や말窯섓펽餓ε룋�쀨�訝삯쥦壤긷뱧�꾣��됪룓雅ㅿ펽�묇뺄��꺗�ゆ꺍�η쐦曄뽩뀍瓮�푶訝�똿�ヨ�訝삯쥦��`D...M`耶먬썓�� �졿�竊뚥빳`--ancestry-path=H D...M`訝뷰풃竊뚥폏壤€닇餓δ툔瀯볠옖竊�"
#. type: delimited block -
#: en/rev-list-options.txt:634
-#, fuzzy, no-wrap, priority:260
-#| msgid ""
-#| "\t\tE-------F\n"
-#| "\t\t \\ \\\n"
-#| "\t\t G---H---I---J\n"
-#| "\t\t\t \\\n"
-#| "\t\t\t\tL--M\n"
+#, no-wrap, priority:260
msgid ""
"\t\tE\n"
"\t\t \\\n"
"\t\t G---H---I---J\n"
"\t\t\t \\\n"
"\t\t\t\tL--M\n"
-msgstr ""
-"\t\tE-------F\n"
-"\t\t \\ \\\n"
-"\t\t G--H--I--J\n"
-"\t\t\t \\\n"
-"\t\t\t\tL--M\n"
+msgstr "\t\tE\n\t\t \\\n\t\t G---H---I---J\n\t\t\t \\\n\t\t\t\tL--M\n"
#. type: Plain text
#: en/rev-list-options.txt:637
#, priority:260
msgid "Whereas `--ancestry-path=K D..M` would result in"
-msgstr ""
+msgstr "��`--ancestry-path=K D...M`鴉싧숱�먧빳訝뗧퍜��"
#. type: delimited block -
#: en/rev-list-options.txt:640
#, no-wrap, priority:260
msgid "\t\tK---------------L--M\n"
-msgstr ""
+msgstr "\t\tK---------------L--M\n"
#. type: Plain text
#: en/rev-list-options.txt:644
#, priority:260
msgid "Before discussing another option, `--show-pulls`, we need to create a new example history."
-msgstr "�②�溫뷴룱訝�訝ら�됮」竊�`--�양ㅊ--�ⓨ뒟'阿뗥뎺竊뚧닊餓ч�誤곩닗兩뷰�訝ゆ뼭�꾢럣�꿨츩堊뗣��"
+msgstr "�②�溫뷴룱訝�訝ら�됮」竊�`--show-pulls`阿뗥뎺竊뚧닊餓ч�誤곩닗兩뷰�訝ゆ뼭�꾢럣�꿨츩堊뗣��"
#. type: Plain text
#: en/rev-list-options.txt:649
#, priority:260
msgid "A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case:"
-msgstr "�ⓩ댎�ⓩ윥�뗧��뽩럣�꿩뿶瀯뤷만�뉐댆�꾡�訝ら뿮窯섉삸竊뚥퍟餓х윥�볡쉪野방윇訝ゆ뻼餓띄쉪岳�뵻�먧벡亮뜻깹�됧눣�겼쑉瑥ζ뻼餓띄쉪嶸��뽩럣�꿜릎�귟��묇뺄轢붺ㅊ訝�訝ゆ뼭�꾡풃耶먲펽亮띈���`--full-history`��`--simplify-merges`嶺됮�됮」�②퓳燁띷깄�듕툔��쫩鵝뺝램鵝쒐쉪��"
+msgstr "�ⓩ댎�ⓩ윥�뗧��뽫쉪�먧벡�녶뤁�띄퍘躍면걞�곁쉪訝�訝ら뿮窯섉삸竊뚥퍟餓х윥�볡쉪野방윇訝ゆ뻼餓띄쉪岳�뵻�먧벡亮뜻깹�됧눣�겼쑉瑥ζ뻼餓띄쉪嶸��꿜릎�귟��묇뺄轢붺ㅊ訝�訝ゆ뼭�꾡풃耶먲펽亮띈���`--full-history`��`--simplify-merges`嶺됮�됮」�②퓳燁띷깄�듕툔��쫩鵝뺝램鵝쒐쉪竊�"
#. type: delimited block -
#: en/rev-list-options.txt:657
@@ -67029,13 +67007,13 @@ msgstr ""
#: en/rev-list-options.txt:670
#, priority:260
msgid "For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by resolving the merge conflict to include both changes from `A` and `B` and hence is not TREESAME to either. The merge commit `R`, however, was created by ignoring the contents of `file.txt` at `M` and taking only the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not `M`. Finally, the natural merge resolution to create `N` is to take the contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively."
-msgstr "�②퓳訝や풃耶먧릎竊뚦걞溫�`I`�쎾뻠雅�`file.txt`竊뚦뭉熬�`A`��`B`��`X`餓δ툖�뚧뼶凉뤶엶�밤�귛뜒雅꿩룓雅ㅷ쉪`C`��`Z`��`Y`亦→쐣岳�뵻`file.txt`�귛릦亮뜻룓雅� \"M \"���싪퓝鰲ｅ넶�덂뭉�꿰챳�뚥벨�잏쉪竊뚦똿�т틙 \"A \"�� \"B \"�꾡엶�뱄펽�졿�訝롥끀訝�뻣鵝뺜�訝ら꺗訝띷삸�뚧틦�꾠�귞꽫�뚳펽�덂뭉�먧벡`R`���싪퓝恙썹븼`M`鸚꾤쉪`file.txt`�꾢냵若뱄펽�뚦룵�뉒뵪`X`鸚꾤쉪`file.txt`�꾢냵若배�뚥벨�잏쉪�귛썱閭ㅿ펽`R`訝�`X`��릪繹먪쉪竊뚥퐜訝띷삸`M`�귝��롳펽�쎾뻠`N'�꾥눎�뜹릦亮뜹넶溫�삸��`file.txt`��`R'�꾢냵若뱄펽��餓�`N'訝�`R'��릪繹먪쉪竊뚥퐜訝띷삸`C'�� �덂뭉�먧벡�� \"O \"�� \"P \"訝롥츆餓х쉪寧т�餓ｇ댍驪띷삸�뚧틦�꾬펽鵝녵툗若껂뺄�꾤К雅뚥빰�뜻칾 \"Z \"�� \"Y \"�쇾툖��릪繹먪쉪��"
+msgstr "�②퓳訝や풃耶먧릎竊뚦걞溫�`I`�쎾뻠雅�`file.txt`竊뚦뭉熬�`A`��`B`��`X`餓δ툖�뚧뼶凉뤶엶�밤�귛뜒雅꿩룓雅ㅷ쉪`C`��`Z`��`Y`亦→쐣岳�뵻`file.txt`�귛릦亮뜻룓雅� `M`���싪퓝鰲ｅ넶�덂뭉�꿰챳�뚥벨�잏쉪竊뚦똿�т틙 `A `�� `B `�꾡엶�뱄펽�졿�訝롥끀訝�뻣鵝뺜�訝ら꺗訝띷삸�뚧틦�꾠�귞꽫�뚳펽�덂뭉�먧벡`R`���싪퓝恙썹븼`M`鸚꾤쉪`file.txt`�꾢냵若뱄펽�뚦룵�뉒뵪`X`鸚꾤쉪`file.txt`�꾢냵若배�뚥벨�잏쉪�귛썱閭ㅿ펽`R`訝�`X`��릪繹먪쉪竊뚥퐜訝띷삸`M`�귝��롳펽�쎾뻠`N'�꾥눎�뜹릦亮뜹넶溫�삸��`file.txt`��`R'�꾢냵若뱄펽��餓�`N'訝�`R`��릪繹먪쉪竊뚥퐜訝띷삸`C`�� �덂뭉�먧벡�� `O` �� `P` 訝롥츆餓х쉪寧т�餓ｇ댍驪띷삸�뚧틦�꾬펽鵝녵툗若껂뺄�꾤К雅뚥빰�뜻칾 `Z` �� `Y `�쇾툖��릪繹먪쉪��"
#. type: Plain text
#: en/rev-list-options.txt:674
#, priority:260
msgid "When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:"
-msgstr "壤볞슴�③퍡溫ㅶÆ凉뤸뿶竊�`N'��`R'�썸쐣訝�訝챆REESAME�띄벨竊뚧�餓θ퓳雅쏂씁熬ヨ뎔竊뚦끀餓뽫쉪熬ュ옙�γ�귞뵳閭ㅴ벨�잏쉪�녶뤁�얏삸��"
+msgstr "壤볞슴�③퍡溫ㅶÆ凉뤸뿶竊�`N'��`R`�썸쐣訝�訝챆REESAME�띄벨竊뚧�餓θ퓳雅쏂씁熬ュ콝鹽뷴눣�ο펽�뜸퍟渦배˙恙썹븼�귞뵳閭ㅴ벨�잏쉪�녶뤁�얏삸竊�"
#. type: delimited block -
#: en/rev-list-options.txt:677
@@ -67875,25 +67853,25 @@ msgstr "�볟뜲訝�訝ゆ빊耶쀯펽瑥닸삇�됧쩀弱묉룓雅ㅴ폏熬ュ닓�븝펽亮뜻뒔�뜻���
#: en/sequencer.txt:5
#, priority:100
msgid "Continue the operation in progress using the information in `.git/sequencer`. Can be used to continue after resolving conflicts in a failed cherry-pick or revert."
-msgstr ""
+msgstr "鵝욜뵪`.git/sequencer`訝�쉪岳→겘瀯㎫뺌瓦쏂죱訝�쉪�띴퐳�� ��빳�ⓩ씎�②㎗�녔떍�됪닑瓦섇렅鸚김뇰�꾢넳囹곩릮瀯㎫뺌�㎬죱��"
#. type: Plain text
#: en/sequencer.txt:9
#, priority:100
msgid "Skip the current commit and continue with the rest of the sequence."
-msgstr ""
+msgstr "瓮녘퓝壤볟뎺�꾣룓雅ㅿ펽瀯㎫뺌瓦쏂죱�잌닓訝�끀鵝숂쉪�썰빱��"
#. type: Plain text
#: en/sequencer.txt:14
#, priority:100
msgid "Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert."
-msgstr ""
+msgstr "恙썹븼壤볟뎺閭ｅ쑉瓦쏂죱�꾣뱧鵝쒌�� ��빳�ⓩ씎�ⓩ떍�됪닑瓦섇렅鸚김뇰阿뗥릮歷낂솮佯뤷닓�①쉪�뜻�곥��"
#. type: Plain text
#: en/sequencer.txt:16
#, priority:100
msgid "Cancel the operation and return to the pre-sequence state."
-msgstr ""
+msgstr "�뽪텋�띴퐳亮띈퓭�욃댆窯꾣럲佯뤹듁�곥��"
#. type: Labeled list
#: en/signoff-option.txt:5
@@ -68314,7 +68292,7 @@ msgstr "映삡세雅� \"git://example.org/path/to/repo.git\" �� URL 鴉싪˙�띶넍訝�
#: en/git-bisect-lk2009.txt:2
#, no-wrap, priority:100
msgid "Fighting regressions with git bisect"
-msgstr ""
+msgstr "�쭳it雅뚦늽�ζ돻鰲ｅ넶�욃퐩��쥦"
#. type: Title -
#: en/git-bisect-lk2009.txt:8
@@ -68326,7 +68304,7 @@ msgstr "�섋쫨"
#: en/git-bisect-lk2009.txt:17
#, priority:100
msgid "\"git bisect\" enables software users and developers to easily find the commit that introduced a regression. We show why it is important to have good tools to fight regressions. We describe how \"git bisect\" works from the outside and the algorithms it uses inside. Then we explain how to take advantage of \"git bisect\" to improve current practices. And we discuss how \"git bisect\" could improve in the future."
-msgstr ""
+msgstr "\"Git雅뚦늽�ζ돻\"鵝욤쉴餓띄뵪�룟뭽凉��묋�낁꺗鸚잒슥�얏돻�겼폊�ε썮壤믥쉪�먧벡�귝닊餓у콝鹽뷰틙訝뷰�阿덃떏�됧��꾢램�룡씎野방뒚�욃퐩��푽�띹쫨�꾠�귝닊餓ф룒瓦겻틙 \"Git雅뚦늽�ζ돻 \"餓롥쨼�ⓨ쫩鵝뺝램鵝쒙펽餓ε룋若껃쑉�낂깿鵝욜뵪�꾤츞力뺛�귞꽫�롦닊餓ц㎗�듿쫩鵝뺝닶�� \"Git雅뚦늽�ζ돻\"�ζ뵻瓦쎾퐪�띸쉪若욆럿�귝닊餓ц퓲溫②�雅� \"Git雅뚦늽�ζ돻\"�ⓩ쑋�ε룾餓ε쫩鵝뺞뵻瓦쎼��"
#. type: Title -
#: en/git-bisect-lk2009.txt:20
@@ -68338,151 +68316,151 @@ msgstr "Introduction to \"git bisect\""
#: en/git-bisect-lk2009.txt:24
#, priority:100
msgid "Git is a Distributed Version Control system (DVCS) created by Linus Torvalds and maintained by Junio Hamano."
-msgstr ""
+msgstr "Git���訝ゅ늽躍껃폀�덃쑍�㎩댍楹사퍨竊뉲VCS竊됵펽�켏inus Torvalds竊덁��ф뙁 �쀧볐��룡쑍瀛녕К�뗧돶쨌�섊벀�뱄폑Linux阿뗧댍竊됧닗兩븝펽�켍unio Hamano竊� Junio C Hamano竊쎿빻�� 瀛�펹瀯닸뒪��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:30
#, priority:100
msgid "In Git like in many other Version Control Systems (VCS), the different states of the data that is managed by the system are called commits. And, as VCS are mostly used to manage software source code, sometimes \"interesting\" changes of behavior in the software are introduced in some commits."
-msgstr ""
+msgstr "�쭳it訝�펽�뤺�鸚싧끀餓뽫뎵�ф렒�띄내瀯잞펷VCS竊됦��뤄펽�긺내瀯잏��녺쉪�경뜮�꾡툖�뚨듁�곮˙燁겻맏�먧벡�귟�뚥툝竊뚨뵳雅롧뎵�ф렒�띄내瀯잋말誤곭뵪雅롧��녻쉴餓뜻틦餓ｇ쟻竊뚧쐣�뜸폏�ⓧ�雅쎿룓雅ㅴ릎凉뺝뀯饔�뻑訝� \"�됭땃 \"�꾥죱訝뷴룜�뽧��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:37
#, priority:100
msgid "In fact people are specially interested in commits that introduce a \"bad\" behavior, called a bug or a regression. They are interested in these commits because a commit (hopefully) contains a very small set of source code changes. And it's much easier to understand and properly fix a problem when you only need to check a very small set of changes, than when you don't know where look in the first place."
-msgstr ""
+msgstr "雅뗥츩訝딉펽雅뷰뺄野백궍雅쎾폊�� \"�� \"烏뚥맏�꾣룓雅ㅷ돶�ユ꽏�닺땃竊뚩퓳雅쏂죱訝븃˙燁겻맏�숃��뽩썮壤믡�귚퍟餓т퉳��餓ε�瓦쇾틳�먧벡�잌뀾擁ｏ펽��썱訝뷰�訝ゆ룓雅ㅿ펷躍뚧쐹竊됧룵�끻맜訝�瀯꾦씆躍멨컦�꾣틦餓ｇ쟻�밧뒯�귛퐪鵝졾룵��誤곫��ε푽弱뤹쉪�밧뒯�띰펽�녻㎗�뚧�簾�엶鸚띴�訝ら뿮窯섋쫨驪붶퐷訝띸윥�볞퍗�ら뇤�얗뿮窯섇��볟풓鸚싥��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:45
#, priority:100
msgid "So to help people find commits that introduce a \"bad\" behavior, the \"git bisect\" set of commands was invented. And it follows of course that in \"git bisect\" parlance, commits where the \"interesting behavior\" is present are called \"bad\" commits, while other commits are called \"good\" commits. And a commit that introduce the behavior we are interested in is called a \"first bad commit\". Note that there could be more than one \"first bad commit\" in the commit space we are searching."
-msgstr ""
+msgstr "��餓δ맏雅녶리�⒳볶餓ф돻�겼폊�� \"�� \"烏뚥맏�꾣룓雅ㅿ펽�묉삇雅� \"Git雅뚦늽�ζ돻\"�썰빱�녴�귛퐪�띰펽�� \"Git雅뚦늽�ζ돻\"�꾥�力뺜릎竊뚦춼�� \"�됭땃烏뚥맏 \"�꾣룓雅ㅸ˙燁겻맏 \"�� \"�먧벡竊뚩�뚦끀餓뽪룓雅ㅸ˙燁겻맏 \"也� \"�먧벡�귟�뚦폊�ζ닊餓ф꽏�닺땃�꾥죱訝븀쉪�먧벡熬ョ㎞訝� \"寧т�訝ゅ쓯�먧벡\"�귟�力ⓩ꼷竊뚦쑉�묇뺄�쒐뇨�꾣룓雅ㅷ㈉�답릎竊뚦룾�썲춼�ⓧ툖閭㏘�訝� \"寧т�訝ゅ쓯�먧벡\"��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:48
#, priority:100
msgid "So \"git bisect\" is designed to help find a \"first bad commit\". And to be as efficient as possible, it tries to perform a binary search."
-msgstr ""
+msgstr "�졿�竊�\"Git雅뚦늽�ζ돻\"熬ヨ�溫←뵪�ε리�⒵돻�� \"寧т�訝ゅ쓯�먧벡\"�귚맏雅녶갹��꺗�꾦쳵�덌펽若껇캊�얕퓵烏뚥틠�녷윥�얇��"
#. type: Title -
#: en/git-bisect-lk2009.txt:51
#, no-wrap, priority:100
msgid "Fighting regressions overview"
-msgstr ""
+msgstr "鰲ｅ넶�욃퐩礖귟염"
#. type: Title ~
#: en/git-bisect-lk2009.txt:54
#, no-wrap, priority:100
msgid "Regressions: a big problem"
-msgstr ""
+msgstr "�욃퐩竊싦�訝ゅㄷ��쥦"
#. type: Plain text
#: en/git-bisect-lk2009.txt:58
#, priority:100
msgid "Regressions are a big problem in the software industry. But it's difficult to put some real numbers behind that claim."
-msgstr ""
+msgstr "�욃퐩��쉴餓띈죱訝싩쉪訝�訝ゅㄷ��쥦�귚퐜��푽�양뵪�겼춻�θ��롨퓳訝ら뿮窯섅��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:61
#, priority:100
msgid "There are some numbers about bugs in general, like a NIST study in 2002 <<1>> that said:"
-msgstr ""
+msgstr "�됦�雅쎾뀽雅롣��촢ug�꾣빊耶쀯펽驪붷쫩2002亮퀿IST�꾡�窈밭젘令�<<1>>�숅걪竊�"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:78
#, priority:100
msgid "Software bugs, or errors, are so prevalent and so detrimental that they cost the U.S. economy an estimated $59.5 billion annually, or about 0.6 percent of the gross domestic product, according to a newly released study commissioned by the Department of Commerce's National Institute of Standards and Technology (NIST). At the national level, over half of the costs are borne by software users and the remainder by software developers/vendors. The study also found that, although all errors cannot be removed, more than a third of these costs, or an estimated $22.2 billion, could be eliminated by an improved testing infrastructure that enables earlier and more effective identification and removal of software defects. These are the savings associated with finding an increased percentage (but not 100 percent) of errors closer to the development stages in which they are introduced. Currently, over half of all errors are not found until \"downstream\" in the development process or during post-sale software use."
-msgstr ""
+msgstr "�방뜮獰롥쎖�녶뒦�ⓨ쎖若뜻젃�녵툗����젘令뜻�竊뉿IST竊됪뼭瓦묈룕躍껆쉪訝�窈밭젘令띰펽饔�뻑煐븅쇃�뽭뵗瑥�삸�욃만��걤訝붹삸�얗슻�㎫쉪竊뚥빳�념틢若껂뺄驪뤷뭅瀯숂풆�썹퍘役롩�졿닇瀛�595雅욜풆�껆쉪�잌ㅁ竊뚧닑瀛�뜝�썲냵�잋벨�삣�쇘쉪0.6%�귛쑉�ⓨ쎖�껃쎍�낉펽擁낁퓝訝��딁쉪�먩쑍�김쉴餓띄뵪�룡돽�낉펽�뜸퐰�꾤뵳饔�뻑凉��묈븚/堊쎾틪�녷돽�끹�� 瑥η젘令띈퓲�묊렟竊뚦갹嶸→��됬쉪�숃��썸뿞力뺞텋�ㅿ펽鵝녽�싪퓝�배퓵役뗨캊�븀��뜻엫竊뚩꺗鸚잍쎍�⒲�곫쎍�됪븞�계칳�ュ뭽易덆솮饔�뻑煐븅쇃竊뚦룾餓ζ텋�ㅸ퓳雅쎿닇�х쉪訝됧늽阿뗤�餓δ툓竊뚦뜵鴉계�訝�222雅욜풆�껁�귟퓳雅쏃꺗��쑉�닸렏瓦묌뵗瑥�룕�잏쉪凉��묌샄餘드룕�경쎍遙섉캈堊뗰펷鵝녵툖��100%竊됬쉪�숃���躍�씎�꾥뒄瀛╉�귞쎅�랃펽擁낁퓝訝��딁쉪�숃���쑉凉��묋퓝葉뗧쉪 \"訝뗦만 \"�뽩뵰�롨쉴餓뜸슴�ⓩ쐿�닸뎺熬ュ룕�곁쉪��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:81
#, priority:100
msgid "And then:"
-msgstr ""
+msgstr "�뜹릮竊�"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:87
#, priority:100
msgid "Software developers already spend approximately 80 percent of development costs on identifying and correcting defects, and yet few products of any type other than software are shipped with such high levels of errors."
-msgstr ""
+msgstr "饔�뻑凉��묇볶�섇럴瀯뤷컛鸚㎫벧80%�꾢��묉닇�х뵪雅롨칳�ュ뭽瀛졿�煐븅쇃竊뚨꽫�뚳펽�ㅴ틙饔�뻑阿뗥쨼竊뚦푽弱묉쐣�뜸퍟映삣엹�꾡벨�곩쑉�뷴럟�뜹눣�겼쫩閭ㅹ쳵�꾦뵗瑥���"
#. type: Plain text
#: en/git-bisect-lk2009.txt:90
#, priority:100
msgid "Eventually the conclusion started with:"
-msgstr ""
+msgstr "��瀯덄퍜溫뷸삸竊�"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:94
#, priority:100
msgid "The path to higher software quality is significantly improved software testing."
-msgstr ""
+msgstr "�밧뻹饔�뻑役뗨캊���싧��닻쳵�꾥쉴餓띈뇽�뤹쉪�볢러��訝뷸쐣�덄쉪�밧폀��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:98
#, priority:100
msgid "There are other estimates saying that 80% of the cost related to software is about maintenance <<2>>."
-msgstr ""
+msgstr "瓦섉쐣雅뷰섟溫↑�竊뚥툗饔�뻑�됧뀽�꾣닇�т릎��80%��뀽雅롧뺨�ㅷ쉪<<2>>��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:100
#, priority:100
msgid "Though, according to Wikipedia <<3>>:"
-msgstr ""
+msgstr "弱썹�竊뚧졊��뺨�븀쇍燁�<<3>>�꾥�力뺧폏"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:108
#, priority:100
msgid "A common perception of maintenance is that it is merely fixing bugs. However, studies and surveys over the years have indicated that the majority, over 80%, of the maintenance effort is used for non-corrective actions (Pigosky 1997). This perception is perpetuated by users submitting problem reports that in reality are functionality enhancements to the system."
-msgstr ""
+msgstr "雅뷰뺄野밭뺨�ㅵ램鵝쒐쉪��걤�뗦퀡��펽若껂퍎餓끾삸�ⓧ엶鸚띺뵗瑥��귞꽫�뚳펽鸚싧뭅�η쉪�붺㈅�뚩컘�θ〃�롳펽鸚㏝깿�놅펷擁낁퓝80%竊됬쉪瀯닸뒪藥δ퐳�썸삸�ⓧ틢�욅틺閭ｆ�㎫쉪烏뚦뒯竊늁igosky 1997竊됥�귞뵪�룡룓雅ㅷ쉪��쥦�ε몜若욇솀訝딀삸野밭내瀯잌뒣�썹쉪�먨뜃竊뚩퓳鵝욕풓瓦숂쭕�뗦퀡孃쀤빳兩띄뺌��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:113
#, priority:100
msgid "But we can guess that improving on existing software is very costly because you have to watch out for regressions. At least this would make the above studies consistent among themselves."
-msgstr ""
+msgstr "鵝녷닊餓у룾餓η뙗役뗰펽�①렟�됭쉴餓뜸툓瓦쏂죱�배퓵�꾡빰餓룡삸�욃만�귟뉘�꾬펽�졽맏鵝졾퓚窈삥낏�뤷뒣�썽��閭η쉪��쥦�귟눛弱묋퓳��빳鵝요툓瓦곁젘令뜸퉳�답퓷�곦��담��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:121
#, priority:100
msgid "Of course some kind of software is developed, then used during some time without being improved on much, and then finally thrown away. In this case, of course, regressions may not be a big problem. But on the other hand, there is a lot of big software that is continually developed and maintained during years or even tens of years by a lot of people. And as there are often many people who depend (sometimes critically) on such software, regressions are a really big problem."
-msgstr ""
+msgstr "壤볡꽫竊뚧쐣雅쏂쉴餓띈˙凉��묈눣�ο펽�뜹릮�ⓧ�餘득뿶�닷냵鵝욜뵪訝�펽亦→쐣孃쀥댆孃덂ㄷ�꾣뵻瓦쏉펽���롨˙佯잌펱�귛퐪�띰펽�②퓳燁띷깄�듕툔竊뚪��閭ε룾�썰툖���訝ゅㄷ��쥦�귚퐜�╊��백씊竊뚧쐣孃덂쩀鸚㎩엹饔�뻑��뵳孃덂쩀雅뷴쑉�졾뭅�싪눛�졾뛻�졾뭅�꾣뿶�닻뇤訝띷뼪凉��묈뭽瀯닸뒪�꾠�귞뵳雅롧퍘躍멩쐣溫멨쩀雅뷰풚壅뽬퓳燁띹쉴餓띰펷�됪뿶��뀽���㎫쉪竊됵펽��餓ε썮壤믤삸訝�訝ょ쐿閭ｇ쉪鸚㏝뿮窯섅��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:128
#, priority:100
msgid "One such software is the Linux kernel. And if we look at the Linux kernel, we can see that a lot of time and effort is spent to fight regressions. The release cycle start with a 2 weeks long merge window. Then the first release candidate (rc) version is tagged. And after that about 7 or 8 more rc versions will appear with around one week between each of them, before the final release."
-msgstr ""
+msgstr "Linux�끾졇弱길삸瓦숁졆訝�訝よ쉴餓뜰�귛쫩�쒏닊餓х쐦訝�訝딯inux�끾졇竊뚧닊餓у룾餓η쐦�계뒻雅녶ㄷ�뤹쉪�띌뿴�뚨꼐�쎿씎野방뒚��閭γ�귛룕躍껃뫅�잋퍗2�①쉪�덂뭉囹쀥룭凉�冶뗣�귞꽫�롳펽寧т�訝ゅ�숅�됬뎵�э펷rc竊됭˙�뉓��귛쑉�ｄ퉳�롳펽�ⓩ�瀯덂룕躍껂퉳�랃펽鸚㎫벧瓦섉쐣7��8訝챩c�덃쑍鴉싧눣�곤펽驪뤶릉�덃쑍阿뗩뿴�면슂訝��ⓨ랩�녈��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:134
#, priority:100
msgid "The time between the first rc release and the final release is supposed to be used to test rc versions and fight bugs and especially regressions. And this time is more than 80% of the release cycle time. But this is not the end of the fight yet, as of course it continues after the release."
-msgstr ""
+msgstr "餓롧К訝�訝챩c�덃쑍�경�瀯덄뎵�т퉳�당쉪�띌뿴佯붻���뵪�ζ탩瑥븈c�덃쑍�뚩㎗�쿫ug竊뚨돶�ユ삸�욃퐩bug�귟�뚩퓳餘득뿶�닷뜝�겻틙�묈툋�ⓩ쐿��80%餓δ툓�귛룕躍껃뭉訝띷꼷�녕��섉뼏瀯볠씇竊뚦썱訝튯ug�ⓨ룕躍껃릮瓦섆폏瀯㎫뺌�븀렟��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:137
#, priority:100
msgid "And then this is what Ingo Molnar (a well known Linux kernel developer) says about his use of git bisect:"
-msgstr ""
+msgstr "�뜹릮瓦숁삸Ingo Molnar竊덁�鵝띸윥�띸쉪Linux�끾졇凉��묋�낉펹野밥퍟閭ｅ쑉鵝욜뵪�껯it雅뚦늽�ζ돻�꾥칱餓뤄폏"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:143
#, priority:100
msgid "I most actively use it during the merge window (when a lot of trees get merged upstream and when the influx of bugs is the highest) - and yes, there have been cases that i used it multiple times a day. My average is roughly once a day."
-msgstr ""
+msgstr "�묈쑉�덂뭉囹쀥룭�잍�燁�엨�겻슴�ⓨ츆竊덂퐪鸚㏝뇧�꾣젒熬ュ릦亮뜹댆訝딀만�띰펽阿잍삸bug易뚦뀯��鸚싩쉪�뜹�숋펹竊뚧쐣訝�雅쎿깄�듕툔竊뚧닊訝�鸚⑵쫨鸚싨А鵝욜뵪�귝닊�꾢뭄�뉏슴�③쥜�뉐ㄷ瀛�삸驪뤷ㄹ訝�轝▲��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:149
#, priority:100
msgid "So regressions are fought all the time by developers, and indeed it is well known that bugs should be fixed as soon as possible, so as soon as they are found. That's why it is interesting to have good tools for this purpose."
-msgstr ""
+msgstr "�졿�竊뚦��묇볶�섆��닷쑉訝롥썮壤믢퐳�쀤틝竊뚥틟若욂툓竊뚥폌���①윥竊뚪뵗瑥�틪瑥θ˙弱썲엮岳�쨳竊뚧�餓δ���룕�겼갚佯붻�弱썲엮岳�쨳�귟퓳弱길삸訝뷰�阿덃쐣也썹쉪藥ε끁�θ씨�계퓳訝ょ쎅�꾣삸孃덃쐣擁ｇ쉪��"
#. type: Title ~
#: en/git-bisect-lk2009.txt:151
#, no-wrap, priority:100
msgid "Other tools to fight regressions"
-msgstr ""
+msgstr "野방뒚�욃퐩�꾢끀餓뽩램��"
#. type: Plain text
#: en/git-bisect-lk2009.txt:156
--
GitLab