From c1561dadd31156544acc7f1df75c5f1899cfea82 Mon Sep 17 00:00:00 2001
From: Haowei Hsu <hwhsu1231@gmail.com>
Date: Tue, 15 Aug 2023 07:41:57 +0000
Subject: [PATCH] Translated using Weblate (Chinese (Traditional))
Currently translated at 16.6% (1851 of 11142 strings)
Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hant/
Signed-off-by: Haowei Hsu <hwhsu1231@gmail.com>
---
po/documentation.zh_HANT.po | 487 +++++++++++++++++-------------------
1 file changed, 228 insertions(+), 259 deletions(-)
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 4c48e8d..bef14f8 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -2,19 +2,7 @@
# Copyright (C) 2019
# This file is distributed under the same license as the Git package.
msgid ""
-msgstr ""
-"Project-Id-Version: Git Documentation\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2023-08-05 19:25+0200\n"
-"PO-Revision-Date: 2023-07-31 17:04+0000\n"
-"Last-Translator: Haowei Hsu <hwhsu1231@gmail.com>\n"
-"Language-Team: French\n"
-"Language: zh_HANT\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-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: Haowei Hsu <hwhsu1231@gmail.com>\nLanguage-Team: French\nLanguage: zh_HANT\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\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
@@ -466,7 +454,7 @@ msgstr "linkgit:git-show-branch[1]"
#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Show branches and their commits."
-msgstr ""
+msgstr "窈�ㅊ�녷뵱�뚦츆�묊쉪�곦벡��"
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
@@ -538,7 +526,7 @@ msgstr "linkgit:git-config[1]"
#: en/cmds-ancillarymanipulators.txt:3
#, priority:100
msgid "Get and set repository or global options."
-msgstr ""
+msgstr "�꿨룚�뚩Þ若싧꽧耶섇벴�뽩뀲�잓겦�끹��"
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1577
@@ -658,7 +646,7 @@ msgstr "linkgit:git-replace[1]"
#: en/cmds-ancillarymanipulators.txt:33
#, priority:100
msgid "Create, list, delete refs to replace objects."
-msgstr ""
+msgstr "兩븀쳦�곩닓�뷩�곩닼�ㅷ뵪�쇔룚餓ｇ돥餓띄쉪�껆뀱��"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
@@ -670,7 +658,7 @@ msgstr "linkgit:git-archimport[1]"
#: en/cmds-foreignscminterface.txt:3
#, priority:100
msgid "Import a GNU Arch repository into Git."
-msgstr ""
+msgstr "弱뉏��� GNU Arch �꿨춼佯ュ뙬�ε댆 Git��"
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
@@ -996,7 +984,7 @@ msgstr "linkgit:git-branch[1]"
#: en/cmds-mainporcelain.txt:15
#, priority:100
msgid "List, create, or delete branches."
-msgstr ""
+msgstr "�쀥눣�곩뻠塋뗦닑�ら솮�녷뵱��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
@@ -1020,7 +1008,7 @@ msgstr "linkgit:git-checkout[1]"
#: en/cmds-mainporcelain.txt:21
#, priority:100
msgid "Switch branches or restore working tree files."
-msgstr ""
+msgstr "�뉑룢�녷뵱�뽭굜�잌램鵝쒏㉨茹붹죭��"
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:155
@@ -1056,7 +1044,7 @@ msgstr "linkgit:git-clean[1]"
#: en/cmds-mainporcelain.txt:30
#, priority:100
msgid "Remove untracked files from the working tree."
-msgstr ""
+msgstr "孃욃램鵝쒏㉨訝�㎉�ㅶ쑋瓦썼묏�꾣첇旅덀��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
@@ -1068,7 +1056,7 @@ msgstr "linkgit:git-clone[1]"
#: en/cmds-mainporcelain.txt:33
#, priority:100
msgid "Clone a repository into a new directory."
-msgstr ""
+msgstr "�볢＝訝��뗥꽧耶섇벴�경뼭�꾤쎅�꾠��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
@@ -1080,7 +1068,7 @@ msgstr "linkgit:git-commit[1]"
#: en/cmds-mainporcelain.txt:36
#, priority:100
msgid "Record changes to the repository."
-msgstr ""
+msgstr "鼇섌똾�꿨춼佯ョ쉪溫딀쎍��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
@@ -1116,7 +1104,7 @@ msgstr "linkgit:git-fetch[1]"
#: en/cmds-mainporcelain.txt:45
#, priority:100
msgid "Download objects and refs from another repository."
-msgstr ""
+msgstr "孃욃룱訝��뗥꽧耶섇벴訝뗨펹�⒳뻑�뚦룂�㎯��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
@@ -1188,7 +1176,7 @@ msgstr "linkgit:git-log[1]"
#: en/cmds-mainporcelain.txt:63
#, priority:100
msgid "Show commit logs."
-msgstr ""
+msgstr "窈�ㅊ�곦벡�θ챿��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:64
@@ -1392,7 +1380,7 @@ msgstr "linkgit:git-status[1]"
#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Show the working tree status."
-msgstr ""
+msgstr "窈�ㅊ藥δ퐳與밭��뗣��"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
@@ -1741,7 +1729,7 @@ msgstr "linkgit:git-checkout-index[1]"
#: en/cmds-plumbingmanipulators.txt:6
#, priority:100
msgid "Copy files from the index to the working tree."
-msgstr ""
+msgstr "弱뉑첇旅덂풛榮℡폊筽뉓＝�겼램鵝쒏㉨��"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
@@ -1765,7 +1753,7 @@ msgstr "linkgit:git-commit-tree[1]"
#: en/cmds-plumbingmanipulators.txt:12
#, priority:100
msgid "Create a new commit object."
-msgstr ""
+msgstr "兩븀쳦訝��뗦뼭�꾦�곦벡�⒳뻑��"
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
@@ -2299,7 +2287,7 @@ msgstr ""
#: en/config.txt:2 en/git-worktree.txt:308
#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
-msgstr ""
+msgstr "永꾣뀑茹�"
#. type: Plain text
#: en/config.txt:12
@@ -6455,7 +6443,7 @@ msgstr ""
#: en/git-add.txt:49
#, priority:300
msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
-msgstr "linkgit:git-commit[1] �뷴룱訝�葉�컜�㎩��졾뀯�경룓雅ㅴ릎�꾢걳力뺛��"
+msgstr "linkgit:git-commit[1] �뷴룱訝�葉�컜�㎩��졾뀯�곈�곦벡訝�쉪�싨퀡��"
#. type: Title -
#: en/git-add.txt:52 en/git-am.txt:32 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:97 en/git-bugreport.txt:45 en/git-bundle.txt:63 en/git-cat-file.txt:36 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:25 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:66 en/git-config.txt:79 en/git-count-objects.txt:20 en/git-credential-cache.txt:30 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:40 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:124 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:30 en/git-format-patch.txt:106 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:43 en/git-hash-object.txt:25 en/git-help.txt:48 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:27 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:98 en/git-log.txt:28 en/git-ls-files.txt:37 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:28 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge-tree.txt:41 en/git-merge.txt:65 en/git-mktag.txt:41 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:132 en/git-p4.txt:199 en/git-pack-objects.txt:51 en/git-pack-redundant.txt:43 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:78 en/git-quiltimport.txt:32 en/git-range-diff.txt:49 en/git-read-tree.txt:32 en/git-rebase.txt:245 en/git-receive-pack.txt:40 en/git-reflog.txt:58 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:105 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:32 en/git-send-email.txt:45 en/git-send-pack.txt:28 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:158 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:275 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:40 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:43 en/git-update-server-info.txt:23 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:20 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:170 en/git-write-tree.txt:29
@@ -7299,7 +7287,7 @@ msgstr ""
#: en/git-am.txt:91
#, priority:100
msgid "Be quiet. Only print error messages."
-msgstr ""
+msgstr "岳앮똻若됮씄�귛깄�쀥뜲��い鼇딀겘��"
#. type: Labeled list
#: en/git-am.txt:93
@@ -8150,7 +8138,7 @@ msgstr "git-archimport(1)"
#: en/git-archimport.txt:7
#, priority:100
msgid "git-archimport - Import a GNU Arch repository into Git"
-msgstr ""
+msgstr "git-archimport - 弱뉏��� GNU Arch �꿨춼佯ュ뙬�ε댆 Git"
#. type: Plain text
#: en/git-archimport.txt:14
@@ -10481,7 +10469,7 @@ msgstr ""
#: en/git-branch.txt:316
#, priority:260
msgid "The name of an existing branch to rename."
-msgstr ""
+msgstr "誤곲뇥�겼뫝�띸쉪�얏쐣�녷뵱�꾢릫葉긱��"
#. type: Labeled list
#: en/git-branch.txt:317
@@ -10727,7 +10715,7 @@ msgstr ""
#: en/git-bugreport.txt:30
#, priority:100
msgid "'git version --build-options'"
-msgstr ""
+msgstr "'git version --build-options'"
#. type: Plain text
#: en/git-bugreport.txt:31
@@ -11544,7 +11532,7 @@ msgstr ""
#: en/git-cat-file.txt:144
#, priority:80
msgid "`--batch-command` recognizes the following commands:"
-msgstr ""
+msgstr "`--batch-command` �껇춼�δ빳訝뗥뫝餓ㅿ폏"
#. type: Labeled list
#: en/git-cat-file.txt:146
@@ -12522,7 +12510,7 @@ msgstr "git-checkout-index(1)"
#: en/git-checkout-index.txt:7
#, priority:80
msgid "git-checkout-index - Copy files from the index to the working tree"
-msgstr ""
+msgstr "git-checkout-index - 弱뉑첇旅덂풛榮℡폊筽뉓＝�겼램鵝쒏㉨"
#. type: Plain text
#: en/git-checkout-index.txt:18
@@ -13300,7 +13288,7 @@ msgstr "--branch"
#: en/git-checkout.txt:347 en/git-switch.txt:41
#, priority:240
msgid "Name for the new branch."
-msgstr ""
+msgstr "�겼늽��쉪�띸㉠��"
#. type: Plain text
#: en/git-checkout.txt:351
@@ -13461,7 +13449,7 @@ msgstr ""
#: en/git-checkout.txt:465
#, no-wrap, priority:240
msgid "$ git checkout master\n"
-msgstr ""
+msgstr "$ git checkout master\n"
#. type: delimited block -
#: en/git-checkout.txt:473
@@ -13539,7 +13527,7 @@ msgstr ""
#: en/git-checkout.txt:519
#, no-wrap, priority:240
msgid "1. Paths"
-msgstr ""
+msgstr "1. 瓮�풌"
#. type: Plain text
#: en/git-checkout.txt:524
@@ -13555,13 +13543,13 @@ msgid ""
"$ git checkout master~2 Makefile <2>\n"
"$ rm -f hello.c\n"
"$ git checkout hello.c <3>\n"
-msgstr ""
+msgstr "$ git checkout master <1>\n$ git checkout master~2 Makefile <2>\n$ rm -f hello.c\n$ git checkout hello.c <3>\n"
#. type: Plain text
#: en/git-checkout.txt:532
#, priority:240
msgid "switch branch"
-msgstr ""
+msgstr "�뉑룢�녷뵱"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:164
@@ -13585,7 +13573,7 @@ msgstr ""
#: en/git-checkout.txt:540
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
-msgstr ""
+msgstr "$ git checkout -- '*.c'\n"
#. type: Plain text
#: en/git-checkout.txt:546
@@ -13603,14 +13591,13 @@ msgstr ""
#: en/git-checkout.txt:553
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
-msgstr ""
+msgstr "$ git checkout -- hello.c\n"
#. type: Title ===
#: en/git-checkout.txt:555
-#, fuzzy, no-wrap, priority:240
-#| msgid "merge"
+#, no-wrap, priority:240
msgid "2. Merge"
-msgstr "merge"
+msgstr "2. �덁슉"
#. type: Plain text
#: en/git-checkout.txt:559 en/git-switch.txt:203
@@ -13622,7 +13609,7 @@ msgstr ""
#: en/git-checkout.txt:562
#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
-msgstr ""
+msgstr "$ git checkout mytopic\n"
#. type: Plain text
#: en/git-checkout.txt:567
@@ -13660,10 +13647,9 @@ msgstr ""
#. type: Title ===
#: en/git-checkout.txt:585
-#, fuzzy, no-wrap, priority:240
-#| msgid "merge.conflictStyle"
+#, no-wrap, priority:240
msgid "3. Merge conflict"
-msgstr "merge.conflictStyle"
+msgstr "3. �덁슉烏앯챳"
#. type: Plain text
#: en/git-checkout.txt:589
@@ -13693,7 +13679,7 @@ msgstr ""
msgid ""
"$ edit frotz\n"
"$ git add frotz\n"
-msgstr ""
+msgstr "$ edit frotz\n$ git add frotz\n"
#. type: Plain text
#: en/git-checkout.txt:618
@@ -14520,7 +14506,7 @@ msgstr "git-clean(1)"
#: en/git-clean.txt:7
#, priority:100
msgid "git-clean - Remove untracked files from the working tree"
-msgstr ""
+msgstr "git-clean - 孃욃램鵝쒏㉨訝�㎉�ㅶ쑋瓦썼묏�꾣첇旅�"
#. type: Plain text
#: en/git-clean.txt:12
@@ -14568,7 +14554,7 @@ msgstr ""
#: en/git-clean.txt:52
#, priority:100
msgid "Don't actually remove anything, just show what would be done."
-msgstr ""
+msgstr "訝띷쐝野�슋燁삯솮餓삡퐬�김�竊뚦룵�껈’鹽뷴컜誤곲�꿱죱�꾣뱧鵝쒌��"
#. type: Plain text
#: en/git-clean.txt:57
@@ -14656,7 +14642,7 @@ msgstr ""
#: en/git-clean.txt:100
#, priority:100
msgid "Start cleaning files and directories, and then quit."
-msgstr ""
+msgstr "�뗥쭓歷끿릤茹붹죭�뚨쎅�꾬펽�뜹풄���뷩��"
#. type: Labeled list
#: en/git-clean.txt:101
@@ -14734,7 +14720,7 @@ msgstr "git-clone(1)"
#: en/git-clone.txt:7
#, priority:300
msgid "git-clone - Clone a repository into a new directory"
-msgstr ""
+msgstr "git-clone - �볢＝訝��뗥꽧耶섇벴�경뼭�꾤쎅��"
#. type: Plain text
#: en/git-clone.txt:21
@@ -15399,7 +15385,7 @@ msgid ""
"1 4 7 10 13 16 19 22\n"
"2 5 8 11 14 17 20 23\n"
"3 6 9 12 15 18 21 24\n"
-msgstr ""
+msgstr "$ seq 1 24 | git column --mode=column --padding=5\n1 4 7 10 13 16 19 22\n2 5 8 11 14 17 20 23\n3 6 9 12 15 18 21 24\n"
#. type: Plain text
#: en/git-column.txt:61
@@ -15415,7 +15401,7 @@ msgid ""
"1 2 3 4 5 6 7\n"
"8 9 10 11 12 13 14\n"
"15 16 17 18 19 20 21\n"
-msgstr ""
+msgstr "$ seq 1 21 | git column --mode=row --padding=5\n1 2 3 4 5 6 7\n8 9 10 11 12 13 14\n15 16 17 18 19 20 21\n"
#. type: Plain text
#: en/git-column.txt:69
@@ -15432,7 +15418,7 @@ msgid ""
"v2.4.1 v2.4.10 v2.4.11 v2.4.12 v2.4.2\n"
"v2.4.3 v2.4.4 v2.4.5 v2.4.6 v2.4.7\n"
"v2.4.8 v2.4.9\n"
-msgstr ""
+msgstr "$ git tag --list 'v2.4.*' --column=row,dense\nv2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3\nv2.4.1 v2.4.10 v2.4.11 v2.4.12 v2.4.2\nv2.4.3 v2.4.4 v2.4.5 v2.4.6 v2.4.7\nv2.4.8 v2.4.9\n"
#. type: Title =
#: en/git-commit-tree.txt:2
@@ -15444,7 +15430,7 @@ msgstr "git-commit-tree(1)"
#: en/git-commit-tree.txt:7
#, priority:80
msgid "git-commit-tree - Create a new commit object"
-msgstr ""
+msgstr "git-commit-tree - 兩븀쳦訝��뗦뼭�꾦�곦벡�⒳뻑"
#. type: Plain text
#: en/git-commit-tree.txt:15
@@ -15549,7 +15535,7 @@ msgstr ""
#: en/git-commit-tree.txt:71
#, no-wrap, priority:80
msgid "Commit Information"
-msgstr ""
+msgstr "�곦벡蘊뉓쮭"
#. type: Plain text
#: en/git-commit-tree.txt:74
@@ -15597,7 +15583,7 @@ msgstr "茹붹죭"
#: en/git-commit-tree.txt:93
#, priority:80
msgid "/etc/mailname"
-msgstr ""
+msgstr "/etc/mailname"
#. type: Plain text
#: en/git-commit-tree.txt:98
@@ -15615,7 +15601,7 @@ msgstr "git-commit(1)"
#: en/git-commit.txt:7
#, priority:280
msgid "git-commit - Record changes to the repository"
-msgstr ""
+msgstr "git-commit - 鼇섌똾�꿨춼佯ョ쉪溫딀쎍"
#. type: Plain text
#: en/git-commit.txt:19
@@ -15881,7 +15867,7 @@ msgstr ""
#: en/git-commit.txt:181
#, priority:280
msgid "Override the author date used in the commit."
-msgstr ""
+msgstr "誤녻뱥�곦벡訝�슴�①쉪鵝쒑�끾뿥�잆��"
#. type: Labeled list
#: en/git-commit.txt:182 en/git-merge.txt:70 en/git-notes.txt:138 en/git-svn.txt:468 en/git-tag.txt:166
@@ -16242,13 +16228,13 @@ msgstr ""
#. type: delimited block -
#: en/git-commit.txt:428
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
msgid ""
"$ edit hello.c\n"
"$ git rm goodbye.c\n"
"$ git add hello.c\n"
"$ git commit\n"
-msgstr ""
+msgstr "$ edit hello.c\n$ git rm goodbye.c\n$ git add hello.c\n$ git commit\n"
#. type: Plain text
#: en/git-commit.txt:436
@@ -16263,7 +16249,7 @@ msgid ""
"$ edit hello.c\n"
"$ rm goodbye.c\n"
"$ git commit -a\n"
-msgstr ""
+msgstr "$ edit hello.c\n$ rm goodbye.c\n$ git commit -a\n"
#. type: Plain text
#: en/git-commit.txt:446
@@ -16285,7 +16271,7 @@ msgid ""
"$ git add hello.c hello.h\n"
"$ edit Makefile\n"
"$ git commit Makefile\n"
-msgstr ""
+msgstr "$ edit hello.c hello.h\n$ git add hello.c hello.h\n$ edit Makefile\n$ git commit Makefile\n"
#. type: Plain text
#: en/git-commit.txt:464
@@ -16297,7 +16283,7 @@ msgstr ""
#: en/git-commit.txt:467 en/git-commit.txt:493
#, no-wrap, priority:280
msgid "$ git commit\n"
-msgstr ""
+msgstr "$ git commit\n"
#. type: Plain text
#: en/git-commit.txt:471
@@ -16337,7 +16323,7 @@ msgstr ""
#: en/git-commit.txt:503
#, no-wrap, priority:280
msgid "COMMIT INFORMATION"
-msgstr ""
+msgstr "�곦벡蘊뉓쮭"
#. type: Plain text
#: en/git-commit.txt:507
@@ -16355,7 +16341,7 @@ msgid ""
"\tGIT_COMMITTER_NAME\n"
"\tGIT_COMMITTER_EMAIL\n"
"\tGIT_COMMITTER_DATE\n"
-msgstr ""
+msgstr "\tGIT_AUTHOR_NAME\n\tGIT_AUTHOR_EMAIL\n\tGIT_AUTHOR_DATE\n\tGIT_COMMITTER_NAME\n\tGIT_COMMITTER_EMAIL\n\tGIT_COMMITTER_DATE\n"
#. type: Plain text
#: en/git-commit.txt:516
@@ -16415,7 +16401,7 @@ msgstr ""
#: en/git-commit.txt:573
#, no-wrap, priority:280
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
-msgstr ""
+msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#. type: Plain text
#: en/git-commit.txt:579
@@ -16439,7 +16425,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
@@ -16634,13 +16620,13 @@ 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`�귟떏 `$XDG_CONFIG_HOME/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
@@ -17013,13 +16999,13 @@ msgstr "$(prefix)/etc/gitconfig"
#: en/git-config.txt:305
#, priority:100
msgid "System-wide configuration file."
-msgstr ""
+msgstr "楹사뎠影꾢쐨�꾤탡�뗦첇��"
#. type: Plain text
#: en/git-config.txt:306 en/git-config.txt:356
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/config"
-msgstr ""
+msgstr "$XDG_CONFIG_HOME/git/config"
#. type: Plain text
#: en/git-config.txt:307 en/git-config.txt:358
@@ -17230,17 +17216,15 @@ msgstr "GIT_CONFIG_COUNT"
#. type: Labeled list
#: en/git-config.txt:411
-#, fuzzy, no-wrap, priority:100
-#| msgid "GIT_CONFIG"
+#, no-wrap, priority:100
msgid "GIT_CONFIG_KEY_<n>"
-msgstr "GIT_CONFIG"
+msgstr "GIT_CONFIG_KEY_<n>"
#. type: Labeled list
#: en/git-config.txt:412
-#, fuzzy, no-wrap, priority:100
-#| msgid "GIT_CONFIG"
+#, no-wrap, priority:100
msgid "GIT_CONFIG_VALUE_<n>"
-msgstr "GIT_CONFIG"
+msgstr "GIT_CONFIG_VALUE_<n>"
#. type: Plain text
#: en/git-config.txt:421
@@ -17335,7 +17319,7 @@ msgstr ""
#: en/git-config.txt:473
#, no-wrap, priority:100
msgid "% git config core.filemode true\n"
-msgstr ""
+msgstr "% git config core.filemode true\n"
#. type: Plain text
#: en/git-config.txt:478
@@ -17365,7 +17349,7 @@ msgstr ""
#: en/git-config.txt:489
#, no-wrap, priority:100
msgid "% git config --unset diff.renames\n"
-msgstr ""
+msgstr "% git config --unset diff.renames\n"
#. type: Plain text
#: en/git-config.txt:493
@@ -17383,7 +17367,7 @@ msgstr ""
#: en/git-config.txt:498
#, no-wrap, priority:100
msgid "% git config --get core.filemode\n"
-msgstr ""
+msgstr "% git config --get core.filemode\n"
#. type: Plain text
#: en/git-config.txt:501 en/git-merge-index.txt:66
@@ -17395,7 +17379,7 @@ msgstr ""
#: en/git-config.txt:504
#, no-wrap, priority:100
msgid "% git config core.filemode\n"
-msgstr ""
+msgstr "% git config core.filemode\n"
#. type: Plain text
#: en/git-config.txt:507
@@ -17407,7 +17391,7 @@ msgstr ""
#: en/git-config.txt:510
#, no-wrap, priority:100
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
-msgstr ""
+msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
#. type: Plain text
#: en/git-config.txt:513
@@ -17419,7 +17403,7 @@ msgstr ""
#: en/git-config.txt:516
#, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n"
-msgstr ""
+msgstr "% git config --get-all core.gitproxy\n"
#. type: Plain text
#: en/git-config.txt:520
@@ -17431,7 +17415,7 @@ msgstr ""
#: en/git-config.txt:523
#, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n"
-msgstr ""
+msgstr "% git config --replace-all core.gitproxy ssh\n"
#. type: Plain text
#: en/git-config.txt:527
@@ -17443,7 +17427,7 @@ msgstr ""
#: en/git-config.txt:530
#, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n"
-msgstr ""
+msgstr "% git config core.gitproxy ssh '! for '\n"
#. type: Plain text
#: en/git-config.txt:533
@@ -17455,7 +17439,7 @@ msgstr ""
#: en/git-config.txt:536
#, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n"
-msgstr ""
+msgstr "% git config section.key value '[!]'\n"
#. type: Plain text
#: en/git-config.txt:539
@@ -17467,7 +17451,7 @@ msgstr ""
#: en/git-config.txt:542
#, no-wrap, priority:100
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
-msgstr ""
+msgstr "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
#. type: Plain text
#: en/git-config.txt:546
@@ -17621,7 +17605,7 @@ msgstr ""
#: en/git-count-objects.txt:47 en/git-cvsserver.txt:61 en/git-grep.txt:115
#, no-wrap, priority:100
msgid "-H"
-msgstr ""
+msgstr "-H"
#. type: Labeled list
#: en/git-count-objects.txt:48
@@ -17840,7 +17824,7 @@ msgstr ""
#: en/git-credential-store.txt:50
#, no-wrap, priority:100
msgid "~/.git-credentials"
-msgstr ""
+msgstr "~/.git-credentials"
#. type: Plain text
#: en/git-credential-store.txt:52
@@ -17852,7 +17836,7 @@ msgstr ""
#: en/git-credential-store.txt:53
#, no-wrap, priority:100
msgid "$XDG_CONFIG_HOME/git/credentials"
-msgstr ""
+msgstr "$XDG_CONFIG_HOME/git/credentials"
#. type: Plain text
#: en/git-credential-store.txt:59
@@ -17913,7 +17897,7 @@ msgstr ""
#: en/git-credential-store.txt:95
#, no-wrap, priority:100
msgid "https://user:pass@example.com\n"
-msgstr ""
+msgstr "https://user:pass@example.com\n"
#. type: Plain text
#: en/git-credential-store.txt:100
@@ -17943,7 +17927,7 @@ msgstr ""
#: en/git-credential.txt:12
#, no-wrap, priority:100
msgid "'git credential' (fill|approve|reject)\n"
-msgstr ""
+msgstr "'git credential' (fill|approve|reject)\n"
#. type: Plain text
#: en/git-credential.txt:24
@@ -19721,7 +19705,7 @@ msgstr ""
#: en/git-daemon.txt:100
#, no-wrap, priority:100
msgid "--init-timeout=<n>"
-msgstr ""
+msgstr "--init-timeout=<n>"
#. type: Plain text
#: en/git-daemon.txt:104
@@ -19733,7 +19717,7 @@ msgstr ""
#: en/git-daemon.txt:105 en/git-upload-pack.txt:31
#, no-wrap, priority:100
msgid "--timeout=<n>"
-msgstr ""
+msgstr "--timeout=<n>"
#. type: Plain text
#: en/git-daemon.txt:109
@@ -19745,7 +19729,7 @@ msgstr ""
#: en/git-daemon.txt:110
#, no-wrap, priority:100
msgid "--max-connections=<n>"
-msgstr ""
+msgstr "--max-connections=<n>"
#. type: Plain text
#: en/git-daemon.txt:113
@@ -21096,7 +21080,7 @@ msgstr "git-diff(1)"
#: en/git-diff.txt:7
#, priority:280
msgid "git-diff - Show changes between commits, commit and working tree, etc"
-msgstr ""
+msgstr "git-diff - 窈�ㅊ�곦벡阿뗩뼋�꾥츏�담�곲�곦벡�뉐램鵝쒏㉨�앶뼋�꾥츏��...嶺됬춬"
#. type: Plain text
#: en/git-diff.txt:18
@@ -22083,7 +22067,7 @@ msgstr ""
#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85 en/git-pack-objects.txt:129 en/git-repack.txt:108
#, no-wrap, priority:100
msgid "--depth=<n>"
-msgstr ""
+msgstr "--depth=<n>"
#. type: Plain text
#: en/git-fast-import.txt:161
@@ -22107,7 +22091,7 @@ msgstr ""
#: en/git-fast-import.txt:171 en/git-pack-objects.txt:154 en/git-repack.txt:136
#, no-wrap, priority:100
msgid "--max-pack-size=<n>"
-msgstr ""
+msgstr "--max-pack-size=<n>"
#. type: Plain text
#: en/git-fast-import.txt:174
@@ -22203,7 +22187,7 @@ msgstr ""
#: en/git-fast-import.txt:244 en/git-merge-tree.txt:225
#, no-wrap, priority:100
msgid "INPUT FORMAT"
-msgstr ""
+msgstr "雍멨뀯�쇔폀"
#. type: Plain text
#: en/git-fast-import.txt:250
@@ -26067,7 +26051,7 @@ msgstr ""
#: en/git-for-each-ref.txt:112 en/git-ls-files.txt:265 en/git-ls-tree.txt:145
#, no-wrap, priority:80
msgid "FIELD NAMES"
-msgstr ""
+msgstr "轝꾡퐤�띸㉠"
#. type: Plain text
#: en/git-for-each-ref.txt:117
@@ -26907,7 +26891,7 @@ msgstr ""
#: en/git-format-patch.txt:126
#, no-wrap, priority:100
msgid "--start-number <n>"
-msgstr ""
+msgstr "--start-number <n>"
#. type: Plain text
#: en/git-format-patch.txt:128
@@ -27137,7 +27121,7 @@ msgstr ""
#: en/git-format-patch.txt:237
#, no-wrap, priority:100
msgid "--reroll-count=<n>"
-msgstr ""
+msgstr "--reroll-count=<n>"
#. type: Plain text
#: en/git-format-patch.txt:249
@@ -27861,7 +27845,7 @@ msgstr ""
#: en/git-format-patch.txt:679
#, no-wrap, priority:100
msgid "---P---X---Y---Z---A---B---C\n"
-msgstr ""
+msgstr "---P---X---Y---Z---A---B---C\n"
#. type: Plain text
#: en/git-format-patch.txt:686
@@ -27892,7 +27876,7 @@ msgid ""
"---P---X---A---M---C\n"
" \\ /\n"
" Y---Z---B\n"
-msgstr ""
+msgstr "---P---X---A---M---C\n \\ /\n Y---Z---B\n"
#. type: Plain text
#: en/git-format-patch.txt:705
@@ -27916,7 +27900,7 @@ msgstr ""
#: en/git-format-patch.txt:720
#, no-wrap, priority:100
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
-msgstr ""
+msgstr "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
#. type: Plain text
#: en/git-format-patch.txt:724
@@ -27928,7 +27912,7 @@ msgstr ""
#: en/git-format-patch.txt:727
#, no-wrap, priority:100
msgid "$ git format-patch origin\n"
-msgstr ""
+msgstr "$ git format-patch origin\n"
#. type: Plain text
#: en/git-format-patch.txt:730
@@ -27946,7 +27930,7 @@ msgstr ""
#: en/git-format-patch.txt:736
#, no-wrap, priority:100
msgid "$ git format-patch --root origin\n"
-msgstr ""
+msgstr "$ git format-patch --root origin\n"
#. type: Plain text
#: en/git-format-patch.txt:739
@@ -27958,7 +27942,7 @@ msgstr ""
#: en/git-format-patch.txt:742
#, no-wrap, priority:100
msgid "$ git format-patch -M -B origin\n"
-msgstr ""
+msgstr "$ git format-patch -M -B origin\n"
#. type: Plain text
#: en/git-format-patch.txt:749
@@ -27976,7 +27960,7 @@ msgstr ""
#: en/git-format-patch.txt:755
#, no-wrap, priority:100
msgid "$ git format-patch -3\n"
-msgstr ""
+msgstr "$ git format-patch -3\n"
#. type: Plain text
#: en/git-format-patch.txt:764
@@ -28006,7 +27990,7 @@ msgstr ""
#: en/git-fsck-objects.txt:13
#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
-msgstr ""
+msgstr "'git fsck-objects' ...\n"
#. type: Plain text
#: en/git-fsck-objects.txt:19
@@ -28532,7 +28516,7 @@ msgstr ""
#: en/git-get-tar-commit-id.txt:13
#, no-wrap, priority:100
msgid "'git get-tar-commit-id'\n"
-msgstr ""
+msgstr "'git get-tar-commit-id'\n"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:22
@@ -28859,7 +28843,7 @@ msgstr "--files-with-matches"
#: en/git-grep.txt:159
#, no-wrap, priority:100
msgid "-L"
-msgstr ""
+msgstr "-L"
#. type: Labeled list
#: en/git-grep.txt:160
@@ -29207,7 +29191,7 @@ msgstr ""
#: en/git-grep.txt:325
#, no-wrap, priority:100
msgid "`git grep --all-match -e NODE -e Unexpected`"
-msgstr ""
+msgstr "`git grep --all-match -e NODE -e Unexpected`"
#. type: Plain text
#: en/git-grep.txt:328
@@ -29285,7 +29269,7 @@ msgstr ""
#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:44 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:51 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:65
#, no-wrap, priority:240
msgid "COMMANDS"
-msgstr ""
+msgstr "�썰빱"
#. type: Labeled list
#: en/git-gui.txt:32
@@ -29339,13 +29323,13 @@ msgstr ""
#: en/git-gui.txt:52 en/git-whatchanged.txt:29
#, no-wrap, priority:100
msgid "Examples"
-msgstr ""
+msgstr "影꾡풃"
#. type: Labeled list
#: en/git-gui.txt:53
#, no-wrap, priority:100
msgid "`git gui blame Makefile`"
-msgstr ""
+msgstr "`git gui blame Makefile`"
#. type: Plain text
#: en/git-gui.txt:61
@@ -29357,7 +29341,7 @@ msgstr ""
#: en/git-gui.txt:62
#, no-wrap, priority:100
msgid "`git gui blame v0.99.8 Makefile`"
-msgstr ""
+msgstr "`git gui blame v0.99.8 Makefile`"
#. type: Plain text
#: en/git-gui.txt:68
@@ -29369,7 +29353,7 @@ msgstr ""
#: en/git-gui.txt:69
#, no-wrap, priority:100
msgid "`git gui blame --line=100 Makefile`"
-msgstr ""
+msgstr "`git gui blame --line=100 Makefile`"
#. type: Plain text
#: en/git-gui.txt:73
@@ -29381,7 +29365,7 @@ msgstr ""
#: en/git-gui.txt:74
#, no-wrap, priority:100
msgid "`git gui citool`"
-msgstr ""
+msgstr "`git gui citool`"
#. type: Plain text
#: en/git-gui.txt:79
@@ -29393,7 +29377,7 @@ msgstr ""
#: en/git-gui.txt:80
#, no-wrap, priority:100
msgid "`git gui citool --amend`"
-msgstr ""
+msgstr "`git gui citool --amend`"
#. type: Plain text
#: en/git-gui.txt:84
@@ -29405,7 +29389,7 @@ msgstr ""
#: en/git-gui.txt:85
#, no-wrap, priority:100
msgid "`git gui citool --nocommit`"
-msgstr ""
+msgstr "`git gui citool --nocommit`"
#. type: Plain text
#: en/git-gui.txt:91
@@ -29417,7 +29401,7 @@ msgstr ""
#: en/git-gui.txt:92
#, no-wrap, priority:100
msgid "`git citool`"
-msgstr ""
+msgstr "`git citool`"
#. type: Plain text
#: en/git-gui.txt:95
@@ -29429,7 +29413,7 @@ msgstr ""
#: en/git-gui.txt:96
#, no-wrap, priority:100
msgid "`git gui browser maint`"
-msgstr ""
+msgstr "`git gui browser maint`"
#. type: Plain text
#: en/git-gui.txt:101
@@ -29459,13 +29443,13 @@ msgstr ""
#: en/git-gui.txt:116
#, priority:100
msgid "The official repository of the 'git gui' project can be found at:"
-msgstr ""
+msgstr "'git gui' 弱덃죭�꾢츟�밧꽧耶섇벴��빳�ⓧ빳訝뗤퐤營�돻�곤폏"
#. type: Plain text
#: en/git-gui.txt:118
#, no-wrap, priority:100
msgid " https://github.com/prati0100/git-gui.git/\n"
-msgstr ""
+msgstr " https://github.com/prati0100/git-gui.git/\n"
#. type: Title =
#: en/git-hash-object.txt:2
@@ -29981,7 +29965,7 @@ msgstr ""
msgid ""
"$ git config --global help.format web\n"
"$ git config --global web.browser firefox\n"
-msgstr ""
+msgstr "$ git config --global help.format web\n$ git config --global web.browser firefox\n"
#. type: Plain text
#: en/git-help.txt:228 en/git-web--browse.txt:121
@@ -30047,7 +30031,7 @@ msgstr ""
#: en/git-http-backend.txt:47
#, no-wrap, priority:100
msgid "http.uploadpack"
-msgstr ""
+msgstr "http.uploadpack"
#. type: Plain text
#: en/git-http-backend.txt:51
@@ -30059,7 +30043,7 @@ msgstr ""
#: en/git-http-backend.txt:52
#, no-wrap, priority:100
msgid "http.receivepack"
-msgstr ""
+msgstr "http.receivepack"
#. type: Plain text
#: en/git-http-backend.txt:58
@@ -30384,31 +30368,31 @@ msgstr ""
#: en/git-http-backend.txt:263
#, priority:100
msgid "REMOTE_USER"
-msgstr ""
+msgstr "REMOTE_USER"
#. type: Plain text
#: en/git-http-backend.txt:264
#, priority:100
msgid "REMOTE_ADDR"
-msgstr ""
+msgstr "REMOTE_ADDR"
#. type: Plain text
#: en/git-http-backend.txt:265
#, priority:100
msgid "CONTENT_TYPE"
-msgstr ""
+msgstr "CONTENT_TYPE"
#. type: Plain text
#: en/git-http-backend.txt:266
#, priority:100
msgid "QUERY_STRING"
-msgstr ""
+msgstr "QUERY_STRING"
#. type: Plain text
#: en/git-http-backend.txt:267
#, priority:100
msgid "REQUEST_METHOD"
-msgstr ""
+msgstr "REQUEST_METHOD"
#. type: Plain text
#: en/git-http-backend.txt:271
@@ -30462,7 +30446,7 @@ msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [-
#: en/git-http-fetch.txt:17
#, priority:100
msgid "Downloads a remote Git repository via HTTP."
-msgstr ""
+msgstr "�뤻걥 HTTP 訝뗨펹訝��뗩걽塋� Git �꿨춼佯ャ��"
#. type: Plain text
#: en/git-http-fetch.txt:21
@@ -30474,7 +30458,7 @@ msgstr ""
#: en/git-http-fetch.txt:24
#, no-wrap, priority:100
msgid "commit-id"
-msgstr ""
+msgstr "commit-id"
#. type: Plain text
#: en/git-http-fetch.txt:27
@@ -30729,7 +30713,7 @@ msgstr ""
#: en/git-imap-send.txt:13
#, no-wrap, priority:100
msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
-msgstr ""
+msgstr "'git imap-send' [-v] [-q] [--[no-]curl]\n"
#. type: Plain text
#: en/git-imap-send.txt:23
@@ -31146,7 +31130,7 @@ msgstr "git-init-db(1)"
#: en/git-init-db.txt:7
#, priority:100
msgid "git-init-db - Creates an empty Git repository"
-msgstr ""
+msgstr "git-init-db - 兩븀쳦訝��뗧㈉�썹쉪 Git �꿨춼佯�"
#. type: Plain text
#: en/git-init-db.txt:13
@@ -31896,7 +31880,7 @@ msgstr ""
#: en/git-interpret-trailers.txt:162
#, no-wrap, priority:100
msgid "trailer.separators"
-msgstr ""
+msgstr "trailer.separators"
#. type: Plain text
#: en/git-interpret-trailers.txt:167
@@ -32442,7 +32426,7 @@ msgstr "git-log(1)"
#: en/git-log.txt:7
#, priority:260
msgid "git-log - Show commit logs"
-msgstr ""
+msgstr "git-log - 窈�ㅊ�곦벡�θ챿"
#. type: Plain text
#: en/git-log.txt:13
@@ -32454,7 +32438,7 @@ msgstr ""
#: en/git-log.txt:17
#, priority:260
msgid "Shows the commit logs."
-msgstr ""
+msgstr "窈�ㅊ�곦벡�θ챿��"
#. type: Plain text
#: en/git-log.txt:25
@@ -32688,7 +32672,7 @@ msgstr ""
#: en/git-log.txt:164
#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
-msgstr ""
+msgstr "`git log --branches --not --remotes=origin`"
#. type: Plain text
#: en/git-log.txt:169
@@ -33898,7 +33882,7 @@ msgstr ""
#: en/git-mailinfo.txt:39
#, priority:100
msgid "Leading and trailing whitespace."
-msgstr ""
+msgstr "�띶컣�뚦풄�①㈉�썬��"
#. type: Plain text
#: en/git-mailinfo.txt:41
@@ -34841,7 +34825,7 @@ msgstr ""
#: en/git-mergetool--lib.txt:30
#, no-wrap, priority:100
msgid "get_merge_tool"
-msgstr ""
+msgstr "get_merge_tool"
#. type: Plain text
#: en/git-mergetool--lib.txt:34
@@ -34853,7 +34837,7 @@ msgstr ""
#: en/git-mergetool--lib.txt:35
#, no-wrap, priority:100
msgid "get_merge_tool_cmd"
-msgstr ""
+msgstr "get_merge_tool_cmd"
#. type: Plain text
#: en/git-mergetool--lib.txt:37
@@ -34865,7 +34849,7 @@ msgstr ""
#: en/git-mergetool--lib.txt:38
#, no-wrap, priority:100
msgid "get_merge_tool_path"
-msgstr ""
+msgstr "get_merge_tool_path"
#. type: Plain text
#: en/git-mergetool--lib.txt:40
@@ -34875,10 +34859,9 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool--lib.txt:41
-#, fuzzy, no-wrap, priority:100
-#| msgid "linkgit:git-mergetool[1]"
+#, no-wrap, priority:100
msgid "initialize_merge_tool"
-msgstr "linkgit:git-mergetool[1]"
+msgstr "initialize_merge_tool"
#. type: Plain text
#: en/git-mergetool--lib.txt:44
@@ -34890,7 +34873,7 @@ msgstr ""
#: en/git-mergetool--lib.txt:45
#, no-wrap, priority:100
msgid "run_merge_tool"
-msgstr ""
+msgstr "run_merge_tool"
#. type: Plain text
#: en/git-mergetool--lib.txt:50
@@ -35551,7 +35534,7 @@ msgstr "git-merge(1)"
#: en/git-merge.txt:7
#, priority:240
msgid "git-merge - Join two or more development histories together"
-msgstr ""
+msgstr "git-merge - 弱뉐뀳�뗦닑鸚싧�뗩뼀�쇗��꿨릦鵝드쑉訝�壅�"
#. type: Plain text
#: en/git-merge.txt:18
@@ -35584,7 +35567,7 @@ msgid ""
"\t A---B---C topic\n"
"\t /\n"
" D---E---F---G master\n"
-msgstr ""
+msgstr "\t A---B---C topic\n\t /\n D---E---F---G master\n"
#. type: Plain text
#: en/git-merge.txt:42
@@ -35599,7 +35582,7 @@ msgid ""
"\t A---B---C topic\n"
"\t / \\\n"
" D---E---F---G---H master\n"
-msgstr ""
+msgstr "\t A---B---C topic\n\t / \\\n D---E---F---G---H master\n"
#. type: Plain text
#: en/git-merge.txt:56
@@ -35845,7 +35828,7 @@ msgid ""
"git fetch origin\n"
"git merge v1.2.3^0\n"
"git merge --ff-only v1.2.3\n"
-msgstr ""
+msgstr "git fetch origin\ngit merge v1.2.3^0\ngit merge --ff-only v1.2.3\n"
#. type: Title -
#: en/git-merge.txt:236
@@ -36014,7 +35997,7 @@ msgstr ""
#: en/git-merge.txt:364
#, no-wrap, priority:240
msgid "$ git merge fixes enhancements\n"
-msgstr ""
+msgstr "$ git merge fixes enhancements\n"
#. type: Plain text
#: en/git-merge.txt:368
@@ -36026,7 +36009,7 @@ msgstr ""
#: en/git-merge.txt:371
#, no-wrap, priority:240
msgid "$ git merge -s ours obsolete\n"
-msgstr ""
+msgstr "$ git merge -s ours obsolete\n"
#. type: Plain text
#: en/git-merge.txt:375
@@ -36038,7 +36021,7 @@ msgstr ""
#: en/git-merge.txt:378
#, no-wrap, priority:240
msgid "$ git merge --no-commit maint\n"
-msgstr ""
+msgstr "$ git merge --no-commit maint\n"
#. type: Plain text
#: en/git-merge.txt:382
@@ -37047,7 +37030,7 @@ msgstr "git-p4(1)"
#: en/git-p4.txt:7
#, priority:90
msgid "git-p4 - Import from and submit to Perforce repositories"
-msgstr "git-p4 - 孃� Perforce �꿨춼佯ュ뙬�ε뭽�먧벡�� Perforce �꿨춼佯ャ��"
+msgstr "git-p4 - 孃� Perforce �꿨춼佯ュ뙬�ε뭽�먧벡�� Perforce �꿨춼佯�"
#. type: Plain text
#: en/git-p4.txt:16
@@ -39367,7 +39350,7 @@ msgstr ""
#: en/git-patch-id.txt:12
#, no-wrap, priority:100
msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
-msgstr ""
+msgstr "'git patch-id' [--stable | --unstable | --verbatim]\n"
#. type: Plain text
#: en/git-patch-id.txt:16
@@ -39613,7 +39596,7 @@ msgstr ""
#: en/git-prune.txt:68
#, no-wrap, priority:100
msgid "$ git prune $(cd ../another && git rev-parse --all)\n"
-msgstr ""
+msgstr "$ git prune $(cd ../another && git rev-parse --all)\n"
#. type: Plain text
#: en/git-prune.txt:76
@@ -41220,7 +41203,7 @@ msgstr ""
#: en/git-range-diff.txt:142
#, no-wrap, priority:100
msgid "$ git range-diff @{u} @{1} @\n"
-msgstr ""
+msgstr "$ git range-diff @{u} @{1} @\n"
#. type: Plain text
#: en/git-range-diff.txt:146
@@ -41294,7 +41277,7 @@ msgstr ""
#: en/git-range-diff.txt:191
#, no-wrap, priority:100
msgid "Algorithm"
-msgstr ""
+msgstr "轢붺츞力�"
#. type: Plain text
#: en/git-range-diff.txt:195
@@ -41324,19 +41307,19 @@ msgstr ""
#: en/git-range-diff.txt:212
#, no-wrap, priority:100
msgid " 1 A\n"
-msgstr ""
+msgstr " 1 A\n"
#. type: delimited block -
#: en/git-range-diff.txt:214
#, no-wrap, priority:100
msgid " 2 B\n"
-msgstr ""
+msgstr " 2 B\n"
#. type: delimited block -
#: en/git-range-diff.txt:216 en/git-range-diff.txt:228
#, no-wrap, priority:100
msgid "\t\t C\n"
-msgstr ""
+msgstr "\t\t C\n"
#. type: Plain text
#: en/git-range-diff.txt:220
@@ -41351,7 +41334,7 @@ msgid ""
" 1 A\n"
"\t /\n"
" 2 --------' B\n"
-msgstr ""
+msgstr " 1 A\n\t /\n 2 --------' B\n"
#. type: Plain text
#: en/git-range-diff.txt:233
@@ -41369,7 +41352,7 @@ msgid ""
"\t |\n"
"\t `----- C\n"
"\t c>0\n"
-msgstr ""
+msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n"
#. type: Plain text
#: en/git-range-diff.txt:249
@@ -41388,13 +41371,13 @@ msgid ""
" o `----- C\n"
"\t c>0\n"
" o o\n"
-msgstr ""
+msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n"
#. type: delimited block -
#: en/git-range-diff.txt:260
#, no-wrap, priority:100
msgid " o o\n"
-msgstr ""
+msgstr " o o\n"
#. type: Plain text
#: en/git-range-diff.txt:270
@@ -41419,7 +41402,7 @@ msgid ""
" o -' `----- C\n"
"\t c>0\n"
" o ---------- o\n"
-msgstr ""
+msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n"
#. type: delimited block -
#: en/git-range-diff.txt:288
@@ -42115,7 +42098,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
@@ -42129,7 +42112,7 @@ msgstr ""
msgid ""
" git rebase master\n"
" git rebase master topic\n"
-msgstr ""
+msgstr " git rebase master\n git rebase master topic\n"
#. type: Plain text
#: en/git-rebase.txt:76
@@ -42144,7 +42127,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:86
@@ -42168,7 +42151,7 @@ msgid ""
" A---B---C topic\n"
" /\n"
" D---E---A'---F master\n"
-msgstr ""
+msgstr " A---B---C topic\n /\n D---E---A'---F master\n"
#. type: Plain text
#: en/git-rebase.txt:101
@@ -42183,7 +42166,7 @@ msgid ""
" B'---C' topic\n"
" /\n"
" D---E---A'---F master\n"
-msgstr ""
+msgstr " B'---C' topic\n /\n D---E---A'---F master\n"
#. type: Plain text
#: en/git-rebase.txt:111
@@ -42206,7 +42189,7 @@ msgid ""
" o---o---o---o---o next\n"
" \\\n"
" o---o---o topic\n"
-msgstr ""
+msgstr " o---o---o---o---o master\n \\\n o---o---o---o---o next\n \\\n o---o---o topic\n"
#. type: Plain text
#: en/git-rebase.txt:127
@@ -42235,7 +42218,7 @@ msgstr ""
#: en/git-rebase.txt:139
#, no-wrap, priority:100
msgid " git rebase --onto master next topic\n"
-msgstr ""
+msgstr " git rebase --onto master next topic\n"
#. type: Plain text
#: en/git-rebase.txt:143
@@ -42281,7 +42264,7 @@ msgid ""
" | E---F---G topicA\n"
" |/\n"
" A---B---C---D master\n"
-msgstr ""
+msgstr " H'--I'--J' topicB\n /\n | E---F---G topicA\n |/\n A---B---C---D master\n"
#. type: Plain text
#: en/git-rebase.txt:167
@@ -42299,13 +42282,13 @@ msgstr ""
#: en/git-rebase.txt:173
#, no-wrap, priority:100
msgid " E---F---G---H---I---J topicA\n"
-msgstr ""
+msgstr " E---F---G---H---I---J topicA\n"
#. type: Plain text
#: en/git-rebase.txt:178
#, no-wrap, priority:100
msgid " git rebase --onto topicA~5 topicA~3 topicA\n"
-msgstr ""
+msgstr " git rebase --onto topicA~5 topicA~3 topicA\n"
#. type: Plain text
#: en/git-rebase.txt:180
@@ -42317,7 +42300,7 @@ msgstr ""
#: en/git-rebase.txt:183
#, no-wrap, priority:100
msgid " E---H'---I'---J' topicA\n"
-msgstr ""
+msgstr " E---H'---I'---J' topicA\n"
#. type: Plain text
#: en/git-rebase.txt:188
@@ -42347,7 +42330,7 @@ msgstr ""
#: en/git-rebase.txt:204
#, no-wrap, priority:100
msgid " git rebase --continue\n"
-msgstr ""
+msgstr " git rebase --continue\n"
#. type: Plain text
#: en/git-rebase.txt:207
@@ -42359,14 +42342,13 @@ msgstr ""
#: en/git-rebase.txt:210
#, no-wrap, priority:100
msgid " git rebase --abort\n"
-msgstr ""
+msgstr " git rebase --abort\n"
#. type: Title -
#: en/git-rebase.txt:212
-#, fuzzy, no-wrap, priority:100
-#| msgid "OPTIONS"
+#, no-wrap, priority:100
msgid "MODE OPTIONS"
-msgstr "�면쟿"
+msgstr "與▼폀�면쟿"
#. type: Plain text
#: en/git-rebase.txt:216
@@ -42979,7 +42961,7 @@ msgstr ""
#: en/git-rebase.txt:643
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
-msgstr ""
+msgstr "訝띸쎑若밭쉪�면쟿"
#. type: Plain text
#: en/git-rebase.txt:646
@@ -43025,10 +43007,9 @@ msgstr "--exec"
#. type: Plain text
#: en/git-rebase.txt:662
-#, fuzzy, priority:100
-#| msgid "--empty"
+#, priority:100
msgid "--empty="
-msgstr "--empty"
+msgstr "--empty="
#. type: Plain text
#: en/git-rebase.txt:663
@@ -45562,7 +45543,7 @@ msgstr "git-replace(1)"
#: en/git-replace.txt:7
#, priority:100
msgid "git-replace - Create, list, delete refs to replace objects"
-msgstr ""
+msgstr "git-replace - 兩븀쳦�곩닓�뷩�곩닼�ㅷ뵪�쇔룚餓ｇ돥餓띄쉪�껆뀱"
#. type: Plain text
#: en/git-replace.txt:17
@@ -46471,7 +46452,7 @@ msgid ""
"$ git reset --soft HEAD^ <1>\n"
"$ edit <2>\n"
"$ git commit -a -c ORIG_HEAD <3>\n"
-msgstr ""
+msgstr "$ git commit ...\n$ git reset --soft HEAD^ <1>\n$ edit <2>\n$ git commit -a -c ORIG_HEAD <3>\n"
#. type: Plain text
#: en/git-reset.txt:174
@@ -46542,7 +46523,7 @@ msgstr ""
msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
-msgstr ""
+msgstr "$ git commit ...\n$ git reset --hard HEAD~3 <1>\n"
#. type: Plain text
#: en/git-reset.txt:208
@@ -46738,7 +46719,7 @@ msgid ""
"$ edit\n"
"$ git switch -c branch2 <2>\n"
"$ git reset --keep start <3>\n"
-msgstr ""
+msgstr "$ git tag start\n$ git switch -c branch1\n$ edit\n$ git commit ... <1>\n$ edit\n$ git switch -c branch2 <2>\n$ git reset --keep start <3>\n"
#. type: Plain text
#: en/git-reset.txt:323
@@ -46842,7 +46823,7 @@ msgstr ""
#: en/git-reset.txt:387
#, no-wrap, priority:280
msgid "git reset --option target\n"
-msgstr ""
+msgstr "git reset --option target\n"
#. type: Plain text
#: en/git-reset.txt:391
@@ -48614,7 +48595,7 @@ msgstr ""
#: en/git-rm.txt:108
#, no-wrap, priority:280
msgid "Using ``git commit -a''"
-msgstr ""
+msgstr "鵝욜뵪 ``git commit -a''"
#. type: Plain text
#: en/git-rm.txt:115
@@ -50297,7 +50278,7 @@ msgstr "git-show-branch(1)"
#: en/git-show-branch.txt:7
#, priority:100
msgid "git-show-branch - Show branches and their commits"
-msgstr ""
+msgstr "git-show-branch - 窈�ㅊ�녷뵱�뚦츆�묊쉪�곦벡"
#. type: Plain text
#: en/git-show-branch.txt:17
@@ -51831,7 +51812,7 @@ msgstr "git-status(1)"
#: en/git-status.txt:7
#, priority:280
msgid "git-status - Show the working tree status"
-msgstr ""
+msgstr "git-status - 窈�ㅊ藥δ퐳與밭���"
#. type: Plain text
#: en/git-status.txt:13
@@ -53148,7 +53129,7 @@ msgstr ""
#: en/git-submodule.txt:279
#, priority:220
msgid "Only print error messages."
-msgstr ""
+msgstr "�끻닓�곈뙬沃ㅸ쮭����"
#. type: Plain text
#: en/git-submodule.txt:286
@@ -55348,7 +55329,7 @@ msgstr "git-switch(1)"
#: en/git-switch.txt:7
#, priority:100
msgid "git-switch - Switch branches"
-msgstr ""
+msgstr "git-switch - �뉑룢�녷뵱"
#. type: Plain text
#: en/git-switch.txt:15
@@ -55629,7 +55610,7 @@ msgstr ""
#: en/git-switch.txt:266
#, no-wrap, priority:100
msgid "$ git switch -c good-surprises\n"
-msgstr ""
+msgstr "$ git switch -c good-surprises\n"
#. type: Plain text
#: en/git-switch.txt:279
@@ -56254,7 +56235,7 @@ msgstr ""
#: en/git-tag.txt:380
#, no-wrap, priority:240
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
-msgstr ""
+msgstr "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
#. type: Labeled list
#: en/git-tag.txt:387
@@ -56279,7 +56260,7 @@ msgstr ""
#: en/git.txt:2
#, no-wrap, priority:100
msgid "git(1)"
-msgstr ""
+msgstr "git(1)"
#. type: Plain text
#: en/git.txt:7
@@ -56641,7 +56622,7 @@ msgstr ""
#: en/git.txt:221
#, no-wrap, priority:100
msgid "GIT COMMANDS"
-msgstr ""
+msgstr "GIT �썰빱"
#. type: Plain text
#: en/git.txt:225
@@ -57308,7 +57289,7 @@ msgstr ""
#: en/git.txt:611
#, priority:100
msgid "where:"
-msgstr ""
+msgstr "�뜸릎竊�"
#. type: Labeled list
#: en/git.txt:612
@@ -59476,7 +59457,7 @@ msgstr "git-upload-archive(1)"
#: en/git-upload-archive.txt:7
#, priority:100
msgid "git-upload-archive - Send archive back to git-archive"
-msgstr ""
+msgstr "git-upload-archive - 弱뉐컖耶섉첇�녜�곩썮 git-archive"
#. type: Plain text
#: en/git-upload-archive.txt:13
@@ -59555,7 +59536,7 @@ msgstr "git-upload-pack(1)"
#: en/git-upload-pack.txt:7
#, priority:100
msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
-msgstr ""
+msgstr "git-upload-pack - 弱뉑돀�끿쉪�⒳뻑�녜�곩썮 git-fetch-pack"
#. type: Plain text
#: en/git-upload-pack.txt:14
@@ -59635,7 +59616,7 @@ msgstr "git-var(1)"
#: en/git-var.txt:7
#, priority:100
msgid "git-var - Show a Git logical variable"
-msgstr ""
+msgstr "git-var - 窈�ㅊ訝��� Git �뤺섞溫딀빖"
#. type: Plain text
#: en/git-var.txt:13
@@ -59661,13 +59642,13 @@ msgstr ""
msgid ""
"\t$ git var GIT_AUTHOR_IDENT\n"
"\tEric W. Biederman <ebiederm@lnxi.com> 1121223278 -0600\n"
-msgstr ""
+msgstr "\t$ git var GIT_AUTHOR_IDENT\n\tEric W. Biederman <ebiederm@lnxi.com> 1121223278 -0600\n"
#. type: Title -
#: en/git-var.txt:34
#, no-wrap, priority:100
msgid "VARIABLES"
-msgstr ""
+msgstr "溫딀빖"
#. type: Labeled list
#: en/git-var.txt:35
@@ -60123,7 +60104,7 @@ msgstr ""
#: en/git-web--browse.txt:39
#, priority:100
msgid "xdg-open"
-msgstr ""
+msgstr "xdg-open"
#. type: Plain text
#: en/git-web--browse.txt:41
@@ -60165,13 +60146,13 @@ msgstr ""
#: en/git-web--browse.txt:53
#, no-wrap, priority:100
msgid "-c <conf.var>"
-msgstr ""
+msgstr "-c <conf.var>"
#. type: Labeled list
#: en/git-web--browse.txt:54
#, no-wrap, priority:100
msgid "--config=<conf.var>"
-msgstr ""
+msgstr "--config=<conf.var>"
#. type: Plain text
#: en/git-web--browse.txt:57
@@ -60265,7 +60246,7 @@ msgstr ""
#: en/git-web--browse.txt:117
#, no-wrap, priority:100
msgid "$ git config --global web.browser firefox\n"
-msgstr ""
+msgstr "$ git config --global web.browser firefox\n"
#. type: Title =
#: en/git-whatchanged.txt:2
@@ -61004,7 +60985,7 @@ msgid ""
"$ git commit -a -m 'emergency fix for boss'\n"
"$ popd\n"
"$ git worktree remove ../temp\n"
-msgstr ""
+msgstr "$ git worktree add -b emergency-fix ../temp master\n$ pushd ../temp\n# ... hack hack hack ...\n$ git commit -a -m 'emergency fix for boss'\n$ popd\n$ git worktree remove ../temp\n"
#. type: Plain text
#: en/git-worktree.txt:517
@@ -63043,13 +63024,13 @@ msgstr ""
#: en/mergetools-merge.txt:3
#, no-wrap, priority:100
msgid "`bc3`"
-msgstr ""
+msgstr "`bc3`"
#. type: Labeled list
#: en/mergetools-merge.txt:4
#, no-wrap, priority:100
msgid "`bc4`"
-msgstr ""
+msgstr "`bc4`"
#. type: Labeled list
#: en/mergetools-merge.txt:5
@@ -63161,10 +63142,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:14
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff1"
+#, no-wrap, priority:100
msgid "`gvimdiff1`"
-msgstr "gvimdiff1"
+msgstr "`gvimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:15
@@ -63174,10 +63154,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:15
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff2"
+#, no-wrap, priority:100
msgid "`gvimdiff2`"
-msgstr "gvimdiff2"
+msgstr "`gvimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -63187,10 +63166,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:16
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff3"
+#, no-wrap, priority:100
msgid "`gvimdiff3`"
-msgstr "gvimdiff3"
+msgstr "`gvimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:17
@@ -63200,10 +63178,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:17
-#, fuzzy, no-wrap, priority:100
-#| msgid "kdiff3"
+#, no-wrap, priority:100
msgid "`kdiff3`"
-msgstr "kdiff3"
+msgstr "`kdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:18
@@ -63237,10 +63214,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:20
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff1"
+#, no-wrap, priority:100
msgid "`nvimdiff1`"
-msgstr "nvimdiff1"
+msgstr "`nvimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:21
@@ -63250,10 +63226,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:21
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff2"
+#, no-wrap, priority:100
msgid "`nvimdiff2`"
-msgstr "nvimdiff2"
+msgstr "`nvimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:22
@@ -63263,10 +63238,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:22
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff3"
+#, no-wrap, priority:100
msgid "`nvimdiff3`"
-msgstr "nvimdiff3"
+msgstr "`nvimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:23
@@ -63288,10 +63262,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:24
-#, fuzzy, no-wrap, priority:100
-#| msgid "p4merge"
+#, no-wrap, priority:100
msgid "`p4merge`"
-msgstr "p4merge"
+msgstr "`p4merge`"
#. type: Plain text
#: en/mergetools-merge.txt:25
@@ -63349,10 +63322,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:29
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff1"
+#, no-wrap, priority:100
msgid "`vimdiff1`"
-msgstr "vimdiff1"
+msgstr "`vimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:30
@@ -63362,10 +63334,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:30
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff2"
+#, no-wrap, priority:100
msgid "`vimdiff2`"
-msgstr "vimdiff2"
+msgstr "`vimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:31
@@ -63375,10 +63346,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:31
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff3"
+#, no-wrap, priority:100
msgid "`vimdiff3`"
-msgstr "vimdiff3"
+msgstr "`vimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:32
@@ -64365,10 +64335,9 @@ msgstr "'%N'"
#. type: Plain text
#: en/pretty-formats.txt:253
-#, fuzzy, priority:260
-#| msgid "`committer`"
+#, priority:260
msgid "commit notes"
-msgstr "`committer`"
+msgstr "�곦벡�숃㉪"
#. type: Labeled list
#: en/pretty-formats.txt:254
@@ -65292,7 +65261,7 @@ msgid ""
"$ git config push.default current\n"
"$ git config remote.pushdefault myfork\n"
"$ git switch -c mybranch origin/master\n"
-msgstr ""
+msgstr "$ git config push.default current\n$ git config remote.pushdefault myfork\n$ git switch -c mybranch origin/master\n"
#. type: delimited block -
#: en/revisions.txt:140
@@ -65450,7 +65419,7 @@ msgid ""
" \\ /\n"
" \\ /\n"
" A\n"
-msgstr ""
+msgstr "G H I J\n \\ / \\ /\n D E F\n \\ | / \\\n \\ | / |\n \\|/ |\n B C\n \\ /\n \\ /\n A\n"
#. type: Plain text
#: en/revisions.txt:262
@@ -65466,7 +65435,7 @@ msgid ""
" H = D^2 = B^^2 = A^^^2 = A~2^2\n"
" I = F^ = B^3^ = A^^3^\n"
" J = F^2 = B^3^2 = A^^3^2\n"
-msgstr ""
+msgstr " A = = A^0\n B = A^ = A^1 = A~1\n C = = A^2\n D = A^^ = A^1^1 = A~2\n E = B^2 = A^^2\n F = B^3 = A^^3\n G = A^^^ = A^1^1^1 = A~3\n H = D^2 = B^^2 = A^^^2 = A~2^2\n I = F^ = B^3^ = A^^3^\n J = F^2 = B^3^2 = A^^3^2\n"
#. type: Plain text
#: en/revisions.txt:269
--
GitLab