From 730928e5967be7a30b11366a927439147135adde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Mon, 21 Dec 2020 22:46:29 +0100 Subject: [PATCH] Update sources after switching to po4a v0.62 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- ci/install_po4a.sh | 2 +- en/config.txt | 20 +- en/git-fast-import.txt | 8 +- en/git-init.txt | 11 +- en/git-rebase.txt | 2 +- en/git-update-index.txt | 14 +- po/documentation.pot | 6410 +++++++++++++++++++-------------------- sources.txt | 1 - 8 files changed, 3225 insertions(+), 3243 deletions(-) diff --git a/ci/install_po4a.sh b/ci/install_po4a.sh index 17ce3753..78dd3a68 100644 --- a/ci/install_po4a.sh +++ b/ci/install_po4a.sh @@ -1,4 +1,4 @@ #!/bin/sh git clone https://github.com/mquinson/po4a.git -cd po4a && git checkout v0.56 && cd .. +cd po4a && git checkout v0.62 && cd .. diff --git a/en/config.txt b/en/config.txt index bbd5c9b3..6ba50b11 100644 --- a/en/config.txt +++ b/en/config.txt @@ -120,8 +120,8 @@ are: The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location -would be the final location where the .git directory is, not where -the .git file is. +would be the final location where the .git directory is, not where the +.git file is. + The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please @@ -240,15 +240,13 @@ boolean:: When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive. -+ -true;; - Boolean true literals are `yes`, `on`, `true`, - and `1`. Also, a variable defined without `= ` - is taken as true. - -false;; - Boolean false literals are `no`, `off`, `false`, - `0` and the empty string. + + true;; Boolean true literals are `yes`, `on`, `true`, + and `1`. Also, a variable defined without `= ` + is taken as true. + + false;; Boolean false literals are `no`, `off`, `false`, + `0` and the empty string. + When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is "true" or diff --git a/en/git-fast-import.txt b/en/git-fast-import.txt index 39cfa05b..34dd0b4f 100644 --- a/en/git-fast-import.txt +++ b/en/git-fast-import.txt @@ -128,9 +128,9 @@ Submodule Rewriting --rewrite-submodules-from=::: --rewrite-submodules-to=::: Rewrite the object IDs for the submodule specified by from the values - used in the from to those used in the to . The from marks should - have been created by `git fast-export`, and the to marks should have been - created by `git fast-import` when importing that same submodule. + used in the from to those used in the to . The from marks should + have been created by `git fast-export`, and the to marks should have been + created by `git fast-import` when importing that same submodule. + may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks. @@ -1317,7 +1317,7 @@ An example crash: Active Branch LRU ----------------- - active_branches = 1 cur, 5 max + active_branches = 1 cur, 5 max pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/en/git-init.txt b/en/git-init.txt index 59ecda6c..b611d806 100644 --- a/en/git-init.txt +++ b/en/git-init.txt @@ -20,8 +20,9 @@ DESCRIPTION This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, -`refs/tags`, and template files. An initial `HEAD` file that -references the HEAD of the master branch is also created. +`refs/tags`, and template files. An initial branch without any +commits will be created (see the `--initial-branch` option below +for its name). If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository. @@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path. -b :: --initial-branch=:: -Use the specified name for the initial branch in the newly created repository. -If not specified, fall back to the default name: `master`. +Use the specified name for the initial branch in the newly created +repository. If not specified, fall back to the default name (currently +`master`, but this is subject to change in the future; the name can be +customized via the `init.defaultBranch` configuration variable). --shared[=(false|true|umask|group|all|world|everybody|0xxx)]:: diff --git a/en/git-rebase.txt b/en/git-rebase.txt index a0487b5c..e676c5ee 100644 --- a/en/git-rebase.txt +++ b/en/git-rebase.txt @@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible: * --fork-point and --root BEHAVIORAL DIFFERENCES ------------------------ +---------------------- git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to diff --git a/en/git-update-index.txt b/en/git-update-index.txt index 1489cb09..cbe354aa 100644 --- a/en/git-update-index.txt +++ b/en/git-update-index.txt @@ -57,8 +57,8 @@ OPTIONS updates are needed by checking stat() information. -q:: - Quiet. If --refresh finds that the index needs an update, the - default behavior is to error out. This option makes + Quiet. If --refresh finds that the index needs an update, the + default behavior is to error out. This option makes 'git update-index' continue anyway. --ignore-submodules:: @@ -66,9 +66,9 @@ OPTIONS when passed before --refresh. --unmerged:: - If --refresh finds unmerged changes in the index, the default + If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' - continue anyway. + continue anyway. --ignore-missing:: Ignores missing files during a --refresh @@ -81,10 +81,10 @@ OPTIONS encouraged to use a single-parameter form. --index-info:: - Read index information from stdin. + Read index information from stdin. --chmod=(+|-)x:: - Set the execute permissions on the updated files. + Set the execute permissions on the updated files. --[no-]assume-unchanged:: When this flag is specified, the object names recorded @@ -157,7 +157,7 @@ you will need to handle the situation manually. separated by LF (i.e. one path per line) by default. --verbose:: - Report what is being added and removed from index. + Report what is being added and removed from index. --index-version :: Write the resulting index out in the named on-disk format version. diff --git a/po/documentation.pot b/po/documentation.pot index 6743da07..e7ace362 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-12-20 22:54+0100\n" +"POT-Creation-Date: 2020-12-21 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,9 +18,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-b" -msgstr "" +msgstr "-b" #. type: Plain text #: en/blame-options.txt:4 @@ -30,9 +30,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:359 en/git-fsck.txt:38 en/git-rebase.txt:582 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--root" -msgstr "" +msgstr "--root" #. type: Plain text #: en/blame-options.txt:8 @@ -42,9 +42,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:9 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-stats" -msgstr "" +msgstr "--show-stats" #. type: Plain text #: en/blame-options.txt:11 @@ -78,9 +78,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-l" -msgstr "" +msgstr "-l" #. type: Plain text #: en/blame-options.txt:25 @@ -90,9 +90,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:26 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-t" -msgstr "" +msgstr "-t" #. type: Plain text #: en/blame-options.txt:28 @@ -126,9 +126,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--first-parent" -msgstr "" +msgstr "--first-parent" #. type: Plain text #: en/blame-options.txt:45 @@ -138,15 +138,15 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:72 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-p" -msgstr "" +msgstr "-p" #. type: Labeled list #: en/blame-options.txt:47 en/git-commit.txt:115 en/git-push.txt:176 en/git-worktree.txt:217 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--porcelain" -msgstr "" +msgstr "--porcelain" #. type: Plain text #: en/blame-options.txt:49 @@ -156,9 +156,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:50 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--line-porcelain" -msgstr "" +msgstr "--line-porcelain" #. type: Plain text #: en/blame-options.txt:54 @@ -168,9 +168,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:55 en/git-pack-objects.txt:138 en/git-svn.txt:373 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--incremental" -msgstr "" +msgstr "--incremental" #. type: Plain text #: en/blame-options.txt:58 @@ -216,9 +216,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:80 en/git-fsck.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]progress" -msgstr "" +msgstr "--[no-]progress" #. type: Plain text #: en/blame-options.txt:86 @@ -288,9 +288,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:139 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-h" -msgstr "" +msgstr "-h" #. type: Plain text #: en/blame-options.txt:140 @@ -300,9 +300,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:235 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-annotate[1]" -msgstr "" +msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 @@ -312,9 +312,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-blame[1]" -msgstr "" +msgstr "linkgit:git-blame[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:6 @@ -324,9 +324,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bugreport[1]" -msgstr "" +msgstr "linkgit:git-bugreport[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 @@ -336,9 +336,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-count-objects[1]" -msgstr "" +msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 @@ -348,9 +348,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-difftool[1]" -msgstr "" +msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 @@ -360,9 +360,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fsck[1]" -msgstr "" +msgstr "linkgit:git-fsck[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20 @@ -372,9 +372,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-help[1]" -msgstr "" +msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 @@ -384,9 +384,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-instaweb[1]" -msgstr "" +msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 @@ -396,9 +396,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-tree[1]" -msgstr "" +msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 @@ -408,9 +408,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rerere[1]" -msgstr "" +msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 @@ -420,9 +420,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-branch[1]" -msgstr "" +msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 @@ -432,9 +432,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-commit[1]" -msgstr "" +msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 @@ -444,9 +444,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-tag[1]" -msgstr "" +msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 @@ -456,9 +456,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-whatchanged[1]" -msgstr "" +msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 @@ -468,9 +468,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:gitweb[1]" -msgstr "" +msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:45 @@ -480,9 +480,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 @@ -492,9 +492,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fast-export[1]" -msgstr "" +msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 @@ -504,9 +504,9 @@ msgstr "" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fast-import[1]" -msgstr "" +msgstr "linkgit:git-fast-import[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:9 @@ -516,9 +516,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-filter-branch[1]" -msgstr "" +msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 @@ -528,9 +528,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mergetool[1]" -msgstr "" +msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 @@ -540,9 +540,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-refs[1]" -msgstr "" +msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 @@ -552,9 +552,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-prune[1]" -msgstr "" +msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 @@ -564,9 +564,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-reflog[1]" -msgstr "" +msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 @@ -576,9 +576,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-remote[1]" -msgstr "" +msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 @@ -588,9 +588,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-repack[1]" -msgstr "" +msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 @@ -600,9 +600,9 @@ msgstr "" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-replace[1]" -msgstr "" +msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 @@ -612,9 +612,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-archimport[1]" -msgstr "" +msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 @@ -624,9 +624,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsexportcommit[1]" -msgstr "" +msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 @@ -636,9 +636,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsimport[1]" -msgstr "" +msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 @@ -648,9 +648,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cvsserver[1]" -msgstr "" +msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 @@ -660,9 +660,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-imap-send[1]" -msgstr "" +msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 @@ -672,9 +672,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-p4[1]" -msgstr "" +msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 @@ -684,9 +684,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-quiltimport[1]" -msgstr "" +msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 @@ -696,9 +696,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-request-pull[1]" -msgstr "" +msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 @@ -708,9 +708,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-send-email[1]" -msgstr "" +msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 @@ -720,9 +720,9 @@ msgstr "" #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-svn[1]" -msgstr "" +msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 @@ -732,9 +732,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:193 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "linkgit:git-add[1]" -msgstr "" +msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 @@ -744,9 +744,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-am[1]" -msgstr "" +msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 @@ -756,9 +756,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-archive[1]" -msgstr "" +msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 @@ -768,9 +768,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bisect[1]" -msgstr "" +msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 @@ -780,9 +780,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-branch[1]" -msgstr "" +msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 @@ -792,9 +792,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-bundle[1]" -msgstr "" +msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 @@ -804,9 +804,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-checkout[1]" -msgstr "" +msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 @@ -816,9 +816,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cherry-pick[1]" -msgstr "" +msgstr "linkgit:git-cherry-pick[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:24 @@ -828,9 +828,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-citool[1]" -msgstr "" +msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 @@ -840,9 +840,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-clean[1]" -msgstr "" +msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 @@ -852,9 +852,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-clone[1]" -msgstr "" +msgstr "linkgit:git-clone[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:33 @@ -864,9 +864,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit[1]" -msgstr "" +msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 @@ -876,9 +876,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-describe[1]" -msgstr "" +msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 @@ -888,9 +888,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff[1]" -msgstr "" +msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:42 @@ -900,9 +900,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fetch[1]" -msgstr "" +msgstr "linkgit:git-fetch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:45 @@ -912,9 +912,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-format-patch[1]" -msgstr "" +msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 @@ -924,9 +924,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-gc[1]" -msgstr "" +msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 @@ -936,9 +936,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-grep[1]" -msgstr "" +msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 @@ -948,9 +948,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-gui[1]" -msgstr "" +msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 @@ -960,9 +960,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-init[1]" -msgstr "" +msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 @@ -972,9 +972,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:61 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-log[1]" -msgstr "" +msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 @@ -984,9 +984,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-maintenance[1]" -msgstr "" +msgstr "linkgit:git-maintenance[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 @@ -996,9 +996,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:75 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge[1]" -msgstr "" +msgstr "linkgit:git-merge[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 @@ -1008,9 +1008,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mv[1]" -msgstr "" +msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 @@ -1020,9 +1020,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:73 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-notes[1]" -msgstr "" +msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:75 @@ -1032,9 +1032,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:76 en/git-fetch.txt:300 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "linkgit:git-pull[1]" -msgstr "" +msgstr "linkgit:git-pull[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 @@ -1044,9 +1044,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-push[1]" -msgstr "" +msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:81 @@ -1056,9 +1056,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:82 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-range-diff[1]" -msgstr "" +msgstr "linkgit:git-range-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 @@ -1068,9 +1068,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1172 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rebase[1]" -msgstr "" +msgstr "linkgit:git-rebase[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:87 @@ -1080,9 +1080,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-reset[1]" -msgstr "" +msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 @@ -1092,9 +1092,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-restore[1]" -msgstr "" +msgstr "linkgit:git-restore[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 @@ -1104,9 +1104,9 @@ msgstr "" #. type: Plain text #: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:243 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-revert[1]" -msgstr "" +msgstr "linkgit:git-revert[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 @@ -1116,9 +1116,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:97 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rm[1]" -msgstr "" +msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 @@ -1128,9 +1128,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-shortlog[1]" -msgstr "" +msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 @@ -1140,9 +1140,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:103 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show[1]" -msgstr "" +msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 @@ -1152,9 +1152,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:106 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sparse-checkout[1]" -msgstr "" +msgstr "linkgit:git-sparse-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 @@ -1164,9 +1164,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-stash[1]" -msgstr "" +msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 @@ -1176,9 +1176,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:112 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-status[1]" -msgstr "" +msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:114 @@ -1188,9 +1188,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:115 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-submodule[1]" -msgstr "" +msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:117 @@ -1200,9 +1200,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:118 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-switch[1]" -msgstr "" +msgstr "linkgit:git-switch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:120 @@ -1212,9 +1212,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:121 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-tag[1]" -msgstr "" +msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:123 @@ -1224,9 +1224,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:124 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-worktree[1]" -msgstr "" +msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:126 @@ -1236,9 +1236,9 @@ msgstr "" #. type: Labeled list #: en/cmds-mainporcelain.txt:127 en/git-gui.txt:104 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:gitk[1]" -msgstr "" +msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:129 @@ -1248,9 +1248,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cat-file[1]" -msgstr "" +msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 @@ -1260,9 +1260,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-cherry[1]" -msgstr "" +msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 @@ -1272,9 +1272,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-files[1]" -msgstr "" +msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 @@ -1284,9 +1284,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-index[1]" -msgstr "" +msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 @@ -1296,9 +1296,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff-tree[1]" -msgstr "" +msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 @@ -1308,9 +1308,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-for-each-ref[1]" -msgstr "" +msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 @@ -1320,9 +1320,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-get-tar-commit-id[1]" -msgstr "" +msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 @@ -1332,9 +1332,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-files[1]" -msgstr "" +msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 @@ -1344,9 +1344,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-remote[1]" -msgstr "" +msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 @@ -1356,9 +1356,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-ls-tree[1]" -msgstr "" +msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 @@ -1368,9 +1368,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-base[1]" -msgstr "" +msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 @@ -1380,9 +1380,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-name-rev[1]" -msgstr "" +msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 @@ -1392,9 +1392,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-redundant[1]" -msgstr "" +msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 @@ -1404,9 +1404,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rev-list[1]" -msgstr "" +msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:42 @@ -1416,9 +1416,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-rev-parse[1]" -msgstr "" +msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 @@ -1428,9 +1428,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-index[1]" -msgstr "" +msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 @@ -1440,9 +1440,9 @@ msgstr "" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:417 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-ref[1]" -msgstr "" +msgstr "linkgit:git-show-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 @@ -1452,9 +1452,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-unpack-file[1]" -msgstr "" +msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:54 @@ -1464,9 +1464,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-var[1]" -msgstr "" +msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 @@ -1476,9 +1476,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-verify-pack[1]" -msgstr "" +msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:60 @@ -1488,9 +1488,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-apply[1]" -msgstr "" +msgstr "linkgit:git-apply[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 @@ -1500,9 +1500,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-checkout-index[1]" -msgstr "" +msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 @@ -1512,9 +1512,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit-graph[1]" -msgstr "" +msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 @@ -1524,9 +1524,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-commit-tree[1]" -msgstr "" +msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 @@ -1536,9 +1536,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-hash-object[1]" -msgstr "" +msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 @@ -1548,9 +1548,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-index-pack[1]" -msgstr "" +msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 @@ -1560,9 +1560,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-file[1]" -msgstr "" +msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 @@ -1572,9 +1572,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-index[1]" -msgstr "" +msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 @@ -1584,9 +1584,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mktag[1]" -msgstr "" +msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 @@ -1596,9 +1596,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mktree[1]" -msgstr "" +msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 @@ -1608,9 +1608,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-multi-pack-index[1]" -msgstr "" +msgstr "linkgit:git-multi-pack-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 @@ -1620,9 +1620,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-pack-objects[1]" -msgstr "" +msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 @@ -1632,9 +1632,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-prune-packed[1]" -msgstr "" +msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 @@ -1644,9 +1644,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-read-tree[1]" -msgstr "" +msgstr "linkgit:git-read-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 @@ -1656,9 +1656,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-symbolic-ref[1]" -msgstr "" +msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 @@ -1668,9 +1668,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-unpack-objects[1]" -msgstr "" +msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 @@ -1680,9 +1680,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-index[1]" -msgstr "" +msgstr "linkgit:git-update-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:51 @@ -1692,9 +1692,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:52 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-ref[1]" -msgstr "" +msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:54 @@ -1704,9 +1704,9 @@ msgstr "" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:55 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-write-tree[1]" -msgstr "" +msgstr "linkgit:git-write-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:57 @@ -1716,9 +1716,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-attr[1]" -msgstr "" +msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 @@ -1728,9 +1728,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-ignore[1]" -msgstr "" +msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 @@ -1740,9 +1740,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-mailmap[1]" -msgstr "" +msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 @@ -1752,9 +1752,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-check-ref-format[1]" -msgstr "" +msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 @@ -1764,9 +1764,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-column[1]" -msgstr "" +msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 @@ -1776,9 +1776,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential[1]" -msgstr "" +msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 @@ -1788,9 +1788,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential-cache[1]" -msgstr "" +msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 @@ -1800,9 +1800,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:22 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-credential-store[1]" -msgstr "" +msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 @@ -1812,9 +1812,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:25 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fmt-merge-msg[1]" -msgstr "" +msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 @@ -1824,9 +1824,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:28 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-interpret-trailers[1]" -msgstr "" +msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 @@ -1836,9 +1836,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:31 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mailinfo[1]" -msgstr "" +msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 @@ -1848,9 +1848,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:34 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mailsplit[1]" -msgstr "" +msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 @@ -1860,9 +1860,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:37 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-merge-one-file[1]" -msgstr "" +msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 @@ -1872,9 +1872,9 @@ msgstr "" #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-patch-id[1]" -msgstr "" +msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 @@ -1884,9 +1884,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:43 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sh-i18n[1]" -msgstr "" +msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 @@ -1896,9 +1896,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:46 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-sh-setup[1]" -msgstr "" +msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 @@ -1908,9 +1908,9 @@ msgstr "" #. type: Labeled list #: en/cmds-purehelpers.txt:49 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-stripspace[1]" -msgstr "" +msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 @@ -1920,9 +1920,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-fetch[1]" -msgstr "" +msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 @@ -1932,9 +1932,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-push[1]" -msgstr "" +msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 @@ -1944,9 +1944,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-parse-remote[1]" -msgstr "" +msgstr "linkgit:git-parse-remote[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 @@ -1956,9 +1956,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-receive-pack[1]" -msgstr "" +msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 @@ -1968,9 +1968,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-shell[1]" -msgstr "" +msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 @@ -1980,9 +1980,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:16 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-upload-archive[1]" -msgstr "" +msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 @@ -1992,9 +1992,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchelpers.txt:19 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-upload-pack[1]" -msgstr "" +msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:21 @@ -2004,9 +2004,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-daemon[1]" -msgstr "" +msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 @@ -2016,9 +2016,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fetch-pack[1]" -msgstr "" +msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 @@ -2028,9 +2028,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-http-backend[1]" -msgstr "" +msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 @@ -2040,9 +2040,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-send-pack[1]" -msgstr "" +msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 @@ -2052,9 +2052,9 @@ msgstr "" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-server-info[1]" -msgstr "" +msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 @@ -2190,9 +2190,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:114 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`gitdir`" -msgstr "" +msgstr "`gitdir`" #. type: Plain text #: en/config.txt:119 @@ -2201,9 +2201,15 @@ msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If msgstr "" #. type: Plain text -#: en/config.txt:125 +#: en/config.txt:124 #, priority:100 -msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the .git file is." +msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the" +msgstr "" + +#. type: Block title +#: en/config.txt:124 +#, no-wrap, priority:100 +msgid "git file is." msgstr "" #. type: Plain text @@ -2250,9 +2256,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:148 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`onbranch`" -msgstr "" +msgstr "`onbranch`" #. type: Plain text #: en/config.txt:155 @@ -2430,118 +2436,118 @@ msgid "true" msgstr "" #. type: Plain text -#: en/config.txt:248 +#: en/config.txt:247 #, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= ` is taken as true." msgstr "" #. type: Labeled list -#: en/config.txt:249 +#: en/config.txt:248 #, no-wrap, priority:100 msgid "false" msgstr "" #. type: Plain text -#: en/config.txt:252 +#: en/config.txt:250 #, priority:100 msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." msgstr "" #. type: Plain text -#: en/config.txt:256 +#: en/config.txt:254 #, priority:100 msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)." msgstr "" #. type: Labeled list -#: en/config.txt:257 +#: en/config.txt:255 #, no-wrap, priority:100 msgid "integer" msgstr "" #. type: Plain text -#: en/config.txt:261 -#, priority:100 +#: en/config.txt:259 +#, ignore-ellipsis, priority:100 msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc." msgstr "" #. type: Labeled list -#: en/config.txt:262 en/diff-options.txt:361 en/git-for-each-ref.txt:175 -#, no-wrap, priority:280 +#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175 +#, ignore-same, no-wrap, priority:280 msgid "color" -msgstr "" +msgstr "color" #. type: Plain text -#: en/config.txt:266 +#: en/config.txt:264 #, priority:100 msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." msgstr "" #. type: Plain text -#: en/config.txt:272 +#: en/config.txt:270 #, priority:100 msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." msgstr "" #. type: Plain text -#: en/config.txt:277 +#: en/config.txt:275 #, priority:100 msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." msgstr "" #. type: Plain text -#: en/config.txt:284 +#: en/config.txt:282 #, priority:100 msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." msgstr "" #. type: Plain text -#: en/config.txt:287 +#: en/config.txt:285 #, priority:100 msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely." msgstr "" #. type: Plain text -#: en/config.txt:296 +#: en/config.txt:294 #, priority:100 msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." msgstr "" #. type: Labeled list -#: en/config.txt:297 +#: en/config.txt:295 #, no-wrap, priority:100 msgid "pathname" msgstr "" #. type: Plain text -#: en/config.txt:303 +#: en/config.txt:301 #, priority:100 msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory." msgstr "" #. type: Title ~ -#: en/config.txt:306 +#: en/config.txt:304 #, no-wrap, priority:100 msgid "Variables" msgstr "" #. type: Plain text -#: en/config.txt:311 +#: en/config.txt:309 #, priority:100 msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." msgstr "" #. type: Plain text -#: en/config.txt:316 +#: en/config.txt:314 #, priority:100 msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." msgstr "" #. type: Labeled list #: en/config/merge.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.conflictStyle" -msgstr "" +msgstr "merge.conflictStyle" #. type: Plain text #: en/config/merge.txt:8 @@ -2551,9 +2557,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:9 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.defaultToUpstream" -msgstr "" +msgstr "merge.defaultToUpstream" #. type: Plain text #: en/config/merge.txt:18 @@ -2563,9 +2569,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:19 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.ff" -msgstr "" +msgstr "merge.ff" #. type: Plain text #: en/config/merge.txt:28 @@ -2575,9 +2581,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:29 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.verifySignatures" -msgstr "" +msgstr "merge.verifySignatures" #. type: Plain text #: en/config/merge.txt:32 @@ -2587,9 +2593,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:35 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renameLimit" -msgstr "" +msgstr "merge.renameLimit" #. type: Plain text #: en/config/merge.txt:40 @@ -2599,9 +2605,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:41 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renames" -msgstr "" +msgstr "merge.renames" #. type: Plain text #: en/config/merge.txt:45 @@ -2611,9 +2617,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:46 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.directoryRenames" -msgstr "" +msgstr "merge.directoryRenames" #. type: Plain text #: en/config/merge.txt:58 @@ -2623,9 +2629,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:59 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.renormalize" -msgstr "" +msgstr "merge.renormalize" #. type: Plain text #: en/config/merge.txt:68 @@ -2635,9 +2641,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:69 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.stat" -msgstr "" +msgstr "merge.stat" #. type: Plain text #: en/config/merge.txt:72 @@ -2647,9 +2653,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:73 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.autoStash" -msgstr "" +msgstr "merge.autoStash" #. type: Plain text #: en/config/merge.txt:82 @@ -2659,9 +2665,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:83 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.tool" -msgstr "" +msgstr "merge.tool" #. type: Plain text #: en/config/merge.txt:88 @@ -2671,9 +2677,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:89 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.guitool" -msgstr "" +msgstr "merge.guitool" #. type: Plain text #: en/config/merge.txt:94 @@ -2683,9 +2689,9 @@ msgstr "" #. type: Labeled list #: en/config/merge.txt:97 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.verbosity" -msgstr "" +msgstr "merge.verbosity" #. type: Plain text #: en/config/merge.txt:104 @@ -2731,9 +2737,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.branchdesc" -msgstr "" +msgstr "merge.branchdesc" #. type: Plain text #: en/config/fmt-merge-msg.txt:5 @@ -2743,9 +2749,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:6 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.log" -msgstr "" +msgstr "merge.log" #. type: Plain text #: en/config/fmt-merge-msg.txt:11 @@ -2755,9 +2761,9 @@ msgstr "" #. type: Labeled list #: en/config/fmt-merge-msg.txt:12 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "merge.suppressDest" -msgstr "" +msgstr "merge.suppressDest" #. type: Plain text #: en/config/fmt-merge-msg.txt:18 @@ -2881,7 +2887,7 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:16 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-tree [-r] [...]" msgstr "" @@ -2893,7 +2899,7 @@ msgstr "" #. type: Labeled list #: en/diff-format.txt:19 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "git-diff-files [...]" msgstr "" @@ -3573,7 +3579,7 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:184 -#, priority:260 +#, ignore-ellipsis, priority:260 msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it." msgstr "" @@ -3597,9 +3603,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-stat" -msgstr "" +msgstr "--no-stat" #. type: Plain text #: en/diff-options.txt:19 @@ -3609,15 +3615,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-u" -msgstr "" +msgstr "-u" #. type: Labeled list #: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:73 en/git-restore.txt:49 en/git-stash.txt:184 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--patch" -msgstr "" +msgstr "--patch" #. type: Plain text #: en/diff-options.txt:26 @@ -3633,15 +3639,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-diff-tree.txt:77 en/git-format-patch.txt:121 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-s" -msgstr "" +msgstr "-s" #. type: Labeled list #: en/diff-options.txt:31 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-patch" -msgstr "" +msgstr "--no-patch" #. type: Plain text #: en/diff-options.txt:34 @@ -3711,9 +3717,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--raw" -msgstr "" +msgstr "--raw" #. type: Plain text #: en/diff-options.txt:58 @@ -3734,9 +3740,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:72 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patch-with-raw" -msgstr "" +msgstr "--patch-with-raw" #. type: Plain text #: en/diff-options.txt:74 @@ -3752,9 +3758,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:81 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--indent-heuristic" -msgstr "" +msgstr "--indent-heuristic" #. type: Plain text #: en/diff-options.txt:84 @@ -3764,9 +3770,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:85 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-indent-heuristic" -msgstr "" +msgstr "--no-indent-heuristic" #. type: Plain text #: en/diff-options.txt:87 @@ -3776,9 +3782,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:88 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--minimal" -msgstr "" +msgstr "--minimal" #. type: Plain text #: en/diff-options.txt:91 en/diff-options.txt:117 @@ -3788,9 +3794,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:92 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patience" -msgstr "" +msgstr "--patience" #. type: Plain text #: en/diff-options.txt:94 @@ -3800,9 +3806,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:95 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--histogram" -msgstr "" +msgstr "--histogram" #. type: Plain text #: en/diff-options.txt:97 @@ -3848,9 +3854,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:112 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`default`, `myers`" -msgstr "" +msgstr "`default`, `myers`" #. type: Plain text #: en/diff-options.txt:114 @@ -3860,15 +3866,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:114 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`minimal`" -msgstr "" +msgstr "`minimal`" #. type: Labeled list #: en/diff-options.txt:117 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`patience`" -msgstr "" +msgstr "`patience`" #. type: Plain text #: en/diff-options.txt:119 @@ -3878,9 +3884,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:119 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`histogram`" -msgstr "" +msgstr "`histogram`" #. type: Plain text #: en/diff-options.txt:122 @@ -3902,7 +3908,7 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:142 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by giving another width `` after a comma. The width of the graph part can be limited by using `--stat-graph-width=` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=` (does not affect `git format-patch`). By giving a third parameter ``, you can limit the output to the first `` lines, followed by `...` if there are more." msgstr "" @@ -3914,9 +3920,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:146 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--compact-summary" -msgstr "" +msgstr "--compact-summary" #. type: Plain text #: en/diff-options.txt:153 @@ -3926,9 +3932,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:154 en/git-apply.txt:45 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--numstat" -msgstr "" +msgstr "--numstat" #. type: Plain text #: en/diff-options.txt:160 @@ -3938,9 +3944,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:161 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--shortstat" -msgstr "" +msgstr "--shortstat" #. type: Plain text #: en/diff-options.txt:165 @@ -3950,13 +3956,13 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:166 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "-X[]" msgstr "" #. type: Labeled list #: en/diff-options.txt:167 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--dirstat[=]" msgstr "" @@ -3968,9 +3974,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:176 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`changes`" -msgstr "" +msgstr "`changes`" #. type: Plain text #: en/diff-options.txt:182 @@ -3980,9 +3986,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:182 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`lines`" -msgstr "" +msgstr "`lines`" #. type: Plain text #: en/diff-options.txt:190 @@ -3992,9 +3998,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:190 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`files`" -msgstr "" +msgstr "`files`" #. type: Plain text #: en/diff-options.txt:195 @@ -4004,9 +4010,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:195 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "`cumulative`" -msgstr "" +msgstr "`cumulative`" #. type: Plain text #: en/diff-options.txt:200 @@ -4034,9 +4040,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:211 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--cumulative" -msgstr "" +msgstr "--cumulative" #. type: Plain text #: en/diff-options.txt:213 @@ -4046,21 +4052,21 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:214 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--dirstat-by-file[=...]" msgstr "" #. type: Plain text #: en/diff-options.txt:216 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Synonym for --dirstat=files,param1,param2..." msgstr "" #. type: Labeled list #: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:131 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--summary" -msgstr "" +msgstr "--summary" #. type: Plain text #: en/diff-options.txt:220 @@ -4070,9 +4076,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:222 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--patch-with-stat" -msgstr "" +msgstr "--patch-with-stat" #. type: Plain text #: en/diff-options.txt:224 @@ -4082,9 +4088,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:124 en/git-config.txt:215 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-z" -msgstr "" +msgstr "-z" #. type: Plain text #: en/diff-options.txt:231 @@ -4114,9 +4120,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:244 en/git-config.txt:224 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--name-only" -msgstr "" +msgstr "--name-only" #. type: Plain text #: en/diff-options.txt:246 @@ -4126,9 +4132,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:247 en/git-ls-tree.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--name-status" -msgstr "" +msgstr "--name-status" #. type: Plain text #: en/diff-options.txt:250 @@ -4170,9 +4176,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color" -msgstr "" +msgstr "--no-color" #. type: Plain text #: en/diff-options.txt:274 @@ -4221,9 +4227,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:289 en/diff-options.txt:331 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "no" -msgstr "" +msgstr "no" #. type: Plain text #: en/diff-options.txt:291 @@ -4233,9 +4239,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:291 en/git-commit.txt:206 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "default" -msgstr "" +msgstr "default" #. type: Plain text #: en/diff-options.txt:294 @@ -4245,9 +4251,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:294 en/diff-options.txt:363 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "plain" -msgstr "" +msgstr "plain" #. type: Plain text #: en/diff-options.txt:301 @@ -4257,9 +4263,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:301 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "blocks" -msgstr "" +msgstr "blocks" #. type: Plain text #: en/diff-options.txt:306 @@ -4269,9 +4275,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:306 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "zebra" -msgstr "" +msgstr "zebra" #. type: Plain text #: en/diff-options.txt:311 @@ -4281,9 +4287,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:311 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "dimmed-zebra" -msgstr "" +msgstr "dimmed-zebra" #. type: Plain text #: en/diff-options.txt:316 @@ -4293,9 +4299,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:318 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color-moved" -msgstr "" +msgstr "--no-color-moved" #. type: Plain text #: en/diff-options.txt:321 @@ -4335,9 +4341,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:333 en/merge-strategies.txt:61 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-space-at-eol" -msgstr "" +msgstr "ignore-space-at-eol" #. type: Plain text #: en/diff-options.txt:335 en/diff-options.txt:678 @@ -4347,9 +4353,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:335 en/merge-strategies.txt:59 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-space-change" -msgstr "" +msgstr "ignore-space-change" #. type: Plain text #: en/diff-options.txt:339 en/diff-options.txt:684 @@ -4359,9 +4365,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:339 en/merge-strategies.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "ignore-all-space" -msgstr "" +msgstr "ignore-all-space" #. type: Plain text #: en/diff-options.txt:342 @@ -4371,9 +4377,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:342 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "allow-indentation-change" -msgstr "" +msgstr "allow-indentation-change" #. type: Plain text #: en/diff-options.txt:347 @@ -4383,9 +4389,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:349 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-color-moved-ws" -msgstr "" +msgstr "--no-color-moved-ws" #. type: Plain text #: en/diff-options.txt:353 @@ -4419,9 +4425,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:367 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "porcelain" -msgstr "" +msgstr "porcelain" #. type: Plain text #: en/diff-options.txt:374 @@ -4431,9 +4437,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:374 en/git-daemon.txt:131 en/git-submodule.txt:172 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "none" -msgstr "" +msgstr "none" #. type: Plain text #: en/diff-options.txt:376 @@ -4491,9 +4497,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:407 en/git-status.txt:143 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-renames" -msgstr "" +msgstr "--no-renames" #. type: Plain text #: en/diff-options.txt:410 @@ -4503,9 +4509,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:411 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--[no-]rename-empty" -msgstr "" +msgstr "--[no-]rename-empty" #. type: Plain text #: en/diff-options.txt:413 @@ -4515,9 +4521,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:415 en/git-apply.txt:58 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--check" -msgstr "" +msgstr "--check" #. type: Plain text #: en/diff-options.txt:424 @@ -4539,9 +4545,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:437 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--full-index" -msgstr "" +msgstr "--full-index" #. type: Plain text #: en/diff-options.txt:441 @@ -4551,9 +4557,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:442 en/git-apply.txt:160 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--binary" -msgstr "" +msgstr "--binary" #. type: Plain text #: en/diff-options.txt:445 @@ -4665,9 +4671,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:507 en/git-svn.txt:626 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--find-copies-harder" -msgstr "" +msgstr "--find-copies-harder" #. type: Plain text #: en/diff-options.txt:515 @@ -4683,9 +4689,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:517 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--irreversible-delete" -msgstr "" +msgstr "--irreversible-delete" #. type: Plain text #: en/diff-options.txt:525 @@ -4713,13 +4719,13 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:537 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" #. type: Plain text #: en/diff-options.txt:548 -#, priority:280 +#, ignore-ellipsis, priority:280 msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." msgstr "" @@ -4779,7 +4785,7 @@ msgstr "" #. type: delimited block - #: en/diff-options.txt:583 -#, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "+ return frotz(nitfol, two->ptr, 1, 0);\n" "...\n" @@ -4824,9 +4830,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:604 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--pickaxe-all" -msgstr "" +msgstr "--pickaxe-all" #. type: Plain text #: en/diff-options.txt:608 @@ -4836,9 +4842,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:609 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--pickaxe-regex" -msgstr "" +msgstr "--pickaxe-regex" #. type: Plain text #: en/diff-options.txt:612 @@ -4914,9 +4920,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:659 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-relative" -msgstr "" +msgstr "--no-relative" #. type: Plain text #: en/diff-options.txt:668 @@ -4926,15 +4932,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:669 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:66 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-a" -msgstr "" +msgstr "-a" #. type: Labeled list #: en/diff-options.txt:670 en/git-grep.txt:103 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--text" -msgstr "" +msgstr "--text" #. type: Plain text #: en/diff-options.txt:672 @@ -4944,9 +4950,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:673 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-cr-at-eol" -msgstr "" +msgstr "--ignore-cr-at-eol" #. type: Plain text #: en/diff-options.txt:675 @@ -4956,27 +4962,27 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:676 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-space-at-eol" -msgstr "" +msgstr "--ignore-space-at-eol" #. type: Labeled list #: en/diff-options.txt:680 en/git-am.txt:107 en/git-apply.txt:182 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-space-change" -msgstr "" +msgstr "--ignore-space-change" #. type: Labeled list #: en/diff-options.txt:685 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-w" -msgstr "" +msgstr "-w" #. type: Labeled list #: en/diff-options.txt:686 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-all-space" -msgstr "" +msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:690 @@ -4986,9 +4992,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:691 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ignore-blank-lines" -msgstr "" +msgstr "--ignore-blank-lines" #. type: Plain text #: en/diff-options.txt:693 @@ -5034,9 +5040,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:706 en/git-grep.txt:265 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--function-context" -msgstr "" +msgstr "--function-context" #. type: Plain text #: en/diff-options.txt:711 @@ -5046,9 +5052,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:714 en/git-ls-remote.txt:48 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--exit-code" -msgstr "" +msgstr "--exit-code" #. type: Plain text #: en/diff-options.txt:718 @@ -5057,10 +5063,10 @@ msgid "Make the program exit with codes similar to diff(1). That is, it exits w msgstr "" #. type: Labeled list -#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219 -#, no-wrap, priority:300 +#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219 +#, ignore-same, no-wrap, priority:300 msgid "--quiet" -msgstr "" +msgstr "--quiet" #. type: Plain text #: en/diff-options.txt:721 @@ -5070,9 +5076,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:724 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ext-diff" -msgstr "" +msgstr "--ext-diff" #. type: Plain text #: en/diff-options.txt:728 @@ -5082,9 +5088,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:729 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-ext-diff" -msgstr "" +msgstr "--no-ext-diff" #. type: Plain text #: en/diff-options.txt:731 @@ -5094,15 +5100,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:732 en/git-cat-file.txt:60 en/git-grep.txt:106 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--textconv" -msgstr "" +msgstr "--textconv" #. type: Labeled list #: en/diff-options.txt:733 en/git-grep.txt:109 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-textconv" -msgstr "" +msgstr "--no-textconv" #. type: Plain text #: en/diff-options.txt:742 @@ -5148,9 +5154,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:762 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-prefix" -msgstr "" +msgstr "--no-prefix" #. type: Plain text #: en/diff-options.txt:764 @@ -5172,9 +5178,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:768 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--ita-invisible-in-index" -msgstr "" +msgstr "--ita-invisible-in-index" #. type: Plain text #: en/diff-options.txt:775 @@ -5190,9 +5196,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:67 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--all" -msgstr "" +msgstr "--all" #. type: Plain text #: en/fetch-options.txt:3 @@ -5202,9 +5208,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:5 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--append" -msgstr "" +msgstr "--append" #. type: Plain text #: en/fetch-options.txt:9 @@ -5262,9 +5268,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:31 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--unshallow" -msgstr "" +msgstr "--unshallow" #. type: Plain text #: en/fetch-options.txt:35 @@ -5280,9 +5286,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:39 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--update-shallow" -msgstr "" +msgstr "--update-shallow" #. type: Plain text #: en/fetch-options.txt:44 @@ -5322,9 +5328,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:327 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:213 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--dry-run" -msgstr "" +msgstr "--dry-run" #. type: Plain text #: en/fetch-options.txt:66 @@ -5334,9 +5340,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:68 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]write-fetch-head" -msgstr "" +msgstr "--[no-]write-fetch-head" #. type: Plain text #: en/fetch-options.txt:74 @@ -5346,15 +5352,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:154 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-f" -msgstr "" +msgstr "-f" #. type: Labeled list #: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:333 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:111 en/git-tag.txt:80 en/git-worktree.txt:155 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--force" -msgstr "" +msgstr "--force" #. type: Plain text #: en/fetch-options.txt:80 @@ -5384,15 +5390,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:116 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-k" -msgstr "" +msgstr "-k" #. type: Labeled list #: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--keep" -msgstr "" +msgstr "--keep" #. type: Plain text #: en/fetch-options.txt:92 @@ -5402,9 +5408,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:94 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--multiple" -msgstr "" +msgstr "--multiple" #. type: Plain text #: en/fetch-options.txt:97 @@ -5414,15 +5420,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:98 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]auto-maintenance" -msgstr "" +msgstr "--[no-]auto-maintenance" #. type: Labeled list #: en/fetch-options.txt:99 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]auto-gc" -msgstr "" +msgstr "--[no-]auto-gc" #. type: Plain text #: en/fetch-options.txt:103 @@ -5432,9 +5438,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:104 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--[no-]write-commit-graph" -msgstr "" +msgstr "--[no-]write-commit-graph" #. type: Plain text #: en/fetch-options.txt:107 @@ -5444,9 +5450,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:110 en/git-push.txt:153 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--prune" -msgstr "" +msgstr "--prune" #. type: Plain text #: en/fetch-options.txt:120 @@ -5468,9 +5474,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:125 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--prune-tags" -msgstr "" +msgstr "--prune-tags" #. type: Plain text #: en/fetch-options.txt:132 @@ -5480,15 +5486,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:169 en/git-format-patch.txt:101 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:212 en/merge-options.txt:83 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-n" -msgstr "" +msgstr "-n" #. type: Labeled list #: en/fetch-options.txt:140 en/git-clone.txt:251 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-tags" -msgstr "" +msgstr "--no-tags" #. type: Plain text #: en/fetch-options.txt:146 @@ -5510,9 +5516,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:159 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--tags" -msgstr "" +msgstr "--tags" #. type: Plain text #: en/fetch-options.txt:166 @@ -5534,9 +5540,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:181 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-j" -msgstr "" +msgstr "-j" #. type: Labeled list #: en/fetch-options.txt:182 @@ -5564,9 +5570,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:194 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-recurse-submodules" -msgstr "" +msgstr "--no-recurse-submodules" #. type: Plain text #: en/fetch-options.txt:197 @@ -5576,9 +5582,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:199 en/git-branch.txt:227 en/git-push.txt:373 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--set-upstream" -msgstr "" +msgstr "--set-upstream" #. type: Plain text #: en/fetch-options.txt:205 @@ -5612,9 +5618,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:221 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--update-head-ok" -msgstr "" +msgstr "--update-head-ok" #. type: Plain text #: en/fetch-options.txt:228 @@ -5635,10 +5641,10 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac msgstr "" #. type: Labeled list -#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137 -#, no-wrap, priority:300 +#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137 +#, ignore-same, no-wrap, priority:300 msgid "-q" -msgstr "" +msgstr "-q" #. type: Plain text #: en/fetch-options.txt:242 @@ -5648,15 +5654,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:308 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:391 en/git-read-tree.txt:63 en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:226 en/merge-options.txt:141 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-v" -msgstr "" +msgstr "-v" #. type: Labeled list #: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:309 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:392 en/git-rebase.txt:402 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:227 en/merge-options.txt:142 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--verbose" -msgstr "" +msgstr "--verbose" #. type: Plain text #: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144 @@ -5666,9 +5672,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:366 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--progress" -msgstr "" +msgstr "--progress" #. type: Plain text #: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:400 @@ -5696,9 +5702,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:263 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--show-forced-updates" -msgstr "" +msgstr "--show-forced-updates" #. type: Plain text #: en/fetch-options.txt:268 @@ -5708,9 +5714,9 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:269 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--no-show-forced-updates" -msgstr "" +msgstr "--no-show-forced-updates" #. type: Plain text #: en/fetch-options.txt:275 @@ -5720,15 +5726,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:276 en/git-push.txt:422 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-4" -msgstr "" +msgstr "-4" #. type: Labeled list #: en/fetch-options.txt:277 en/git-push.txt:423 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--ipv4" -msgstr "" +msgstr "--ipv4" #. type: Plain text #: en/fetch-options.txt:279 en/git-push.txt:425 @@ -5738,15 +5744,15 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:280 en/git-push.txt:426 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "-6" -msgstr "" +msgstr "-6" #. type: Labeled list #: en/fetch-options.txt:281 en/git-push.txt:427 -#, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:220 msgid "--ipv6" -msgstr "" +msgstr "--ipv6" #. type: Plain text #: en/fetch-options.txt:282 en/git-push.txt:429 @@ -5756,12 +5762,12 @@ msgstr "" #. type: Title = #: en/git-add.txt:2 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "git-add(1)" -msgstr "" +msgstr "git-add(1)" #. type: Title - -#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 +#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5 #, no-wrap, priority:300 msgid "NAME" msgstr "" @@ -5773,14 +5779,14 @@ msgid "git-add - Add file contents to the index" msgstr "" #. type: Title - -#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 +#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9 #, no-wrap, priority:300 msgid "SYNOPSIS" msgstr "" #. type: Plain text #: en/git-add.txt:16 -#, no-wrap, priority:300 +#, 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" @@ -5790,7 +5796,7 @@ msgid "" msgstr "" #. type: Title - -#: en/git-add.txt:18 en/git-am.txt:22 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:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 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:20 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:61 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:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 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:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 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:15 en/git-merge.txt:19 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:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 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-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 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:17 en/git-send-pack.txt:18 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:25 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:22 en/git-write-tree.txt:15 en/gitglossary.txt:13 +#: en/git-add.txt:18 en/git-am.txt:22 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:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 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:20 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:61 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:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 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:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 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:15 en/git-merge.txt:19 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:21 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-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 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:17 en/git-send-pack.txt:18 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:25 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:22 en/git-write-tree.txt:15 en/gitglossary.txt:13 #, no-wrap, priority:300 msgid "DESCRIPTION" msgstr "" @@ -5832,14 +5838,14 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a msgstr "" #. type: Title - -#: en/git-add.txt:52 en/git-am.txt:28 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:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 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:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 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:116 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:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 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.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 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:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 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:103 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:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 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:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 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:152 en/git-write-tree.txt:29 +#: en/git-add.txt:52 en/git-am.txt:28 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:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 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:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 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:116 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:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:41 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 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.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 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:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 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:103 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:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 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:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 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:152 en/git-write-tree.txt:29 #, no-wrap, priority:300 msgid "OPTIONS" msgstr "" #. type: Labeled list #: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:355 en/git-grep.txt:330 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152 -#, no-wrap, priority:300 +#, ignore-ellipsis, no-wrap, priority:300 msgid "..." msgstr "" @@ -5869,15 +5875,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:255 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-i" -msgstr "" +msgstr "-i" #. type: Labeled list #: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--interactive" -msgstr "" +msgstr "--interactive" #. type: Plain text #: en/git-add.txt:88 @@ -5899,15 +5905,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:214 en/git-config.txt:261 en/git-grep.txt:297 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "-e" -msgstr "" +msgstr "-e" #. type: Labeled list #: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:215 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--edit" -msgstr "" +msgstr "--edit" #. type: Plain text #: en/git-add.txt:105 @@ -5923,9 +5929,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:113 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--update" -msgstr "" +msgstr "--update" #. type: Plain text #: en/git-add.txt:117 @@ -5947,9 +5953,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:125 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-ignore-removal" -msgstr "" +msgstr "--no-ignore-removal" #. type: Plain text #: en/git-add.txt:130 @@ -5965,15 +5971,15 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:136 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-all" -msgstr "" +msgstr "--no-all" #. type: Labeled list #: en/git-add.txt:137 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-removal" -msgstr "" +msgstr "--ignore-removal" #. type: Plain text #: en/git-add.txt:142 @@ -5983,7 +5989,7 @@ msgstr "" #. type: Plain text #: en/git-add.txt:146 -#, priority:300 +#, ignore-ellipsis, priority:300 msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add ...\" was a synonym for \"git add --no-all ...\", i.e. ignored removed files." msgstr "" @@ -5995,9 +6001,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:148 en/git-apply.txt:77 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--intent-to-add" -msgstr "" +msgstr "--intent-to-add" #. type: Plain text #: en/git-add.txt:154 @@ -6007,9 +6013,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:155 en/git-update-index.txt:55 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--refresh" -msgstr "" +msgstr "--refresh" #. type: Plain text #: en/git-add.txt:158 @@ -6019,9 +6025,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:159 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-errors" -msgstr "" +msgstr "--ignore-errors" #. type: Plain text #: en/git-add.txt:165 @@ -6031,9 +6037,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--ignore-missing" -msgstr "" +msgstr "--ignore-missing" #. type: Plain text #: en/git-add.txt:171 @@ -6043,9 +6049,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:172 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-warn-embedded-repo" -msgstr "" +msgstr "--no-warn-embedded-repo" #. type: Plain text #: en/git-add.txt:178 @@ -6055,9 +6061,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:179 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/git-add.txt:185 @@ -6091,9 +6097,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:284 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:86 en/git-stash.txt:208 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--pathspec-file-nul" -msgstr "" +msgstr "--pathspec-file-nul" #. type: Plain text #: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:288 en/git-reset.txt:124 en/git-restore.txt:141 en/git-rm.txt:90 en/git-stash.txt:214 @@ -6114,7 +6120,7 @@ msgid "This option can be used to separate command-line options from the list of msgstr "" #. type: Title - -#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394 +#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:154 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394 #, no-wrap, priority:300 msgid "EXAMPLES" msgstr "" @@ -6224,9 +6230,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:281 en/git-update-ref.txt:102 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "update" -msgstr "" +msgstr "update" #. type: Plain text #: en/git-add.txt:290 @@ -6337,9 +6343,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:350 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "diff" -msgstr "" +msgstr "diff" #. type: Plain text #: en/git-add.txt:354 @@ -6475,27 +6481,27 @@ msgstr "" #. type: Plain text #: en/git-add.txt:435 -#, priority:300 +#, ignore-same, priority:300 msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" -msgstr "" +msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" #. type: Title - -#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:420 en/git-write-tree.txt:41 en/gitglossary.txt:26 +#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:170 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:420 en/git-write-tree.txt:41 en/gitglossary.txt:26 #, no-wrap, priority:300 msgid "GIT" msgstr "" #. type: Plain text -#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:421 en/git-write-tree.txt:42 en/gitglossary.txt:27 +#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:171 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:421 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" msgstr "" #. type: Title = #: en/git-am.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-am(1)" -msgstr "" +msgstr "git-am(1)" #. type: Plain text #: en/git-am.txt:7 @@ -6505,7 +6511,7 @@ msgstr "" #. type: Plain text #: en/git-am.txt:20 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" @@ -6525,7 +6531,7 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:29 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "(|)..." msgstr "" @@ -6537,9 +6543,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--signoff" -msgstr "" +msgstr "--signoff" #. type: Plain text #: en/git-am.txt:39 en/git-format-patch.txt:126 @@ -6555,9 +6561,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:44 en/git-quiltimport.txt:59 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--keep-non-patch" -msgstr "" +msgstr "--keep-non-patch" #. type: Plain text #: en/git-am.txt:46 en/git-quiltimport.txt:61 @@ -6567,9 +6573,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:47 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--[no-]keep-cr" -msgstr "" +msgstr "--[no-]keep-cr" #. type: Plain text #: en/git-am.txt:52 @@ -6579,15 +6585,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:117 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "-c" -msgstr "" +msgstr "-c" #. type: Labeled list #: en/git-am.txt:54 en/git-mailinfo.txt:74 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--scissors" -msgstr "" +msgstr "--scissors" #. type: Plain text #: en/git-am.txt:58 @@ -6597,9 +6603,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:59 en/git-mailinfo.txt:89 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-scissors" -msgstr "" +msgstr "--no-scissors" #. type: Plain text #: en/git-am.txt:61 @@ -6609,15 +6615,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:137 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "-m" -msgstr "" +msgstr "-m" #. type: Labeled list #: en/git-am.txt:63 en/git-mailinfo.txt:70 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--message-id" -msgstr "" +msgstr "--message-id" #. type: Plain text #: en/git-am.txt:68 @@ -6627,9 +6633,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:69 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-message-id" -msgstr "" +msgstr "--no-message-id" #. type: Plain text #: en/git-am.txt:72 @@ -6645,9 +6651,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:78 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--utf8" -msgstr "" +msgstr "--utf8" #. type: Plain text #: en/git-am.txt:84 @@ -6665,9 +6671,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:88 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-utf8" -msgstr "" +msgstr "--no-utf8" #. type: Plain text #: en/git-am.txt:91 @@ -6677,21 +6683,21 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:92 en/git-apply.txt:85 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-3" -msgstr "" +msgstr "-3" #. type: Labeled list #: en/git-am.txt:93 en/git-apply.txt:86 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--3way" -msgstr "" +msgstr "--3way" #. type: Labeled list #: en/git-am.txt:94 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-3way" -msgstr "" +msgstr "--no-3way" #. type: Plain text #: en/git-am.txt:101 @@ -6701,15 +6707,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--rerere-autoupdate" -msgstr "" +msgstr "--rerere-autoupdate" #. type: Labeled list #: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-rerere-autoupdate" -msgstr "" +msgstr "--no-rerere-autoupdate" #. type: Plain text #: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119 @@ -6719,9 +6725,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:462 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-whitespace" -msgstr "" +msgstr "--ignore-whitespace" #. type: Labeled list #: en/git-am.txt:109 en/git-rebase.txt:478 @@ -6761,9 +6767,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:115 en/git-apply.txt:108 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--reject" -msgstr "" +msgstr "--reject" #. type: Plain text #: en/git-am.txt:119 @@ -6773,9 +6779,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--patch-format" -msgstr "" +msgstr "--patch-format" #. type: Plain text #: en/git-am.txt:126 @@ -6791,9 +6797,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:131 en/git-rebase.txt:485 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--committer-date-is-author-date" -msgstr "" +msgstr "--committer-date-is-author-date" #. type: Plain text #: en/git-am.txt:137 @@ -6803,9 +6809,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:138 en/git-rebase.txt:490 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--ignore-date" -msgstr "" +msgstr "--ignore-date" #. type: Plain text #: en/git-am.txt:144 @@ -6815,9 +6821,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:145 en/git-rebase.txt:336 en/sequencer.txt:6 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--skip" -msgstr "" +msgstr "--skip" #. type: Plain text #: en/git-am.txt:148 @@ -6839,9 +6845,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:345 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-gpg-sign" -msgstr "" +msgstr "--no-gpg-sign" #. type: Plain text #: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:351 en/git-rebase.txt:396 en/git-revert.txt:99 @@ -6851,21 +6857,21 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--continue" -msgstr "" +msgstr "--continue" #. type: Labeled list #: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-r" -msgstr "" +msgstr "-r" #. type: Labeled list #: en/git-am.txt:160 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--resolved" -msgstr "" +msgstr "--resolved" #. type: Plain text #: en/git-am.txt:167 @@ -6887,9 +6893,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--abort" -msgstr "" +msgstr "--abort" #. type: Plain text #: en/git-am.txt:177 @@ -6899,9 +6905,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--quit" -msgstr "" +msgstr "--quit" #. type: Plain text #: en/git-am.txt:181 @@ -7019,15 +7025,15 @@ msgstr "" #. type: Plain text #: en/git-am.txt:247 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-apply[1]." -msgstr "" +msgstr "linkgit:git-apply[1]." #. type: Title = #: en/git-annotate.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-annotate(1)" -msgstr "" +msgstr "git-annotate(1)" #. type: Plain text #: en/git-annotate.txt:7 @@ -7055,9 +7061,9 @@ msgstr "" #. type: Title = #: en/git-apply.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-apply(1)" -msgstr "" +msgstr "git-apply(1)" #. type: Plain text #: en/git-apply.txt:7 @@ -7067,7 +7073,7 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:20 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" "\t [--apply] [--no-add] [--build-fake-ancestor=] [-R | --reverse]\n" @@ -7093,7 +7099,7 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:37 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "..." msgstr "" @@ -7105,9 +7111,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:82 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--stat" -msgstr "" +msgstr "--stat" #. type: Plain text #: en/git-apply.txt:44 @@ -7135,9 +7141,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--index" -msgstr "" +msgstr "--index" #. type: Plain text #: en/git-apply.txt:71 @@ -7147,9 +7153,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--cached" -msgstr "" +msgstr "--cached" #. type: Plain text #: en/git-apply.txt:76 @@ -7189,9 +7195,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:105 en/rev-list-options.txt:814 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--reverse" -msgstr "" +msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:107 @@ -7225,9 +7231,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:135 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unidiff-zero" -msgstr "" +msgstr "--unidiff-zero" #. type: Plain text #: en/git-apply.txt:141 @@ -7243,9 +7249,9 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:145 en/git-rebase.txt:263 en/git-rebase.txt:632 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--apply" -msgstr "" +msgstr "--apply" #. type: Plain text #: en/git-apply.txt:151 @@ -7255,9 +7261,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:152 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-add" -msgstr "" +msgstr "--no-add" #. type: Plain text #: en/git-apply.txt:158 @@ -7267,9 +7273,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:159 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--allow-binary-replacement" -msgstr "" +msgstr "--allow-binary-replacement" #. type: Plain text #: en/git-apply.txt:165 @@ -7369,9 +7375,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:217 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--inaccurate-eof" -msgstr "" +msgstr "--inaccurate-eof" #. type: Plain text #: en/git-apply.txt:223 @@ -7387,9 +7393,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:230 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--recount" -msgstr "" +msgstr "--recount" #. type: Plain text #: en/git-apply.txt:234 @@ -7417,9 +7423,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:243 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unsafe-paths" -msgstr "" +msgstr "--unsafe-paths" #. type: Plain text #: en/git-apply.txt:248 @@ -7441,9 +7447,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:256 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "apply.ignoreWhitespace" -msgstr "" +msgstr "apply.ignoreWhitespace" #. type: Plain text #: en/git-apply.txt:260 @@ -7453,9 +7459,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:260 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "apply.whitespace" -msgstr "" +msgstr "apply.whitespace" #. type: Plain text #: en/git-apply.txt:263 @@ -7489,15 +7495,15 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:282 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:git-am[1]." -msgstr "" +msgstr "linkgit:git-am[1]." #. type: Title = #: en/git-archimport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-archimport(1)" -msgstr "" +msgstr "git-archimport(1)" #. type: Plain text #: en/git-archimport.txt:7 @@ -7507,7 +7513,7 @@ msgstr "" #. type: Plain text #: en/git-archimport.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n" " [:] ...\n" @@ -7605,9 +7611,9 @@ msgstr "" #. type: Labeled list #: en/git-archimport.txt:86 en/git-commit.txt:262 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-o" -msgstr "" +msgstr "-o" #. type: Plain text #: en/git-archimport.txt:93 @@ -7659,9 +7665,9 @@ msgstr "" #. type: Title = #: en/git-archive.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-archive(1)" -msgstr "" +msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 @@ -7671,7 +7677,7 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:16 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archive' [--format=] [--list] [--prefix=/] []\n" "\t [-o | --output=] [--worktree-attributes]\n" @@ -7705,9 +7711,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--list" -msgstr "" +msgstr "--list" #. type: Plain text #: en/git-archive.txt:46 @@ -7759,9 +7765,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:64 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--worktree-attributes" -msgstr "" +msgstr "--worktree-attributes" #. type: Plain text #: en/git-archive.txt:67 @@ -7795,9 +7801,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--exec=" -msgstr "" +msgstr "--exec=" #. type: Plain text #: en/git-archive.txt:82 @@ -7843,9 +7849,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "-0" -msgstr "" +msgstr "-0" #. type: Plain text #: en/git-archive.txt:98 @@ -7855,9 +7861,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:98 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "-9" -msgstr "" +msgstr "-9" #. type: Plain text #: en/git-archive.txt:101 @@ -8041,15 +8047,15 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:200 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitattributes[5]" -msgstr "" +msgstr "linkgit:gitattributes[5]" #. type: Title = #: en/git-bisect.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bisect(1)" -msgstr "" +msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 @@ -8071,7 +8077,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:31 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" " git bisect start [--term-{new,bad}= --term-{old,good}=]\n" "\t\t [--no-checkout] [--first-parent] [ [...]] [--] [...]\n" @@ -8266,7 +8272,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:158 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "git bisect new [...]\n" msgstr "" @@ -8296,7 +8302,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:175 -#, priority:100 +#, ignore-ellipsis, priority:100 msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using" msgstr "" @@ -8576,9 +8582,9 @@ msgstr "" #. type: Labeled list #: en/git-bisect.txt:357 en/git-clone.txt:145 -#, no-wrap, priority:300 +#, ignore-same, no-wrap, priority:300 msgid "--no-checkout" -msgstr "" +msgstr "--no-checkout" #. type: Plain text #: en/git-bisect.txt:362 @@ -8754,7 +8760,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:474 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git bisect start HEAD [ ... ] --no-checkout\n" "$ git bisect run sh -c '\n" @@ -8828,9 +8834,9 @@ msgstr "" #. type: Title = #: en/git-blame.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-blame(1)" -msgstr "" +msgstr "git-blame(1)" #. type: Plain text #: en/git-blame.txt:7 @@ -8896,9 +8902,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:56 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--score-debug" -msgstr "" +msgstr "--score-debug" #. type: Plain text #: en/git-blame.txt:64 @@ -8908,9 +8914,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-name" -msgstr "" +msgstr "--show-name" #. type: Plain text #: en/git-blame.txt:70 @@ -8920,9 +8926,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:72 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-number" -msgstr "" +msgstr "--show-number" #. type: Plain text #: en/git-blame.txt:74 @@ -8938,9 +8944,9 @@ msgstr "" #. type: Labeled list #: en/git-blame.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--show-email" -msgstr "" +msgstr "--show-email" #. type: Plain text #: en/git-blame.txt:83 @@ -9210,9 +9216,9 @@ msgstr "" #. type: Title = #: en/git-branch.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-branch(1)" -msgstr "" +msgstr "git-branch(1)" #. type: Plain text #: en/git-branch.txt:7 @@ -9222,7 +9228,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:26 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git branch' [--color[=] | --no-color] [--show-current]\n" "\t[-v [--abbrev= | --no-abbrev]]\n" @@ -9267,7 +9273,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:61 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "The command's second form creates a new branch head named which points to the current `HEAD`, or if given. As a special case, for , you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -9309,15 +9315,15 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:97 en/git-checkout.txt:204 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:180 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "-d" -msgstr "" +msgstr "-d" #. type: Labeled list #: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--delete" -msgstr "" +msgstr "--delete" #. type: Plain text #: en/git-branch.txt:102 @@ -9333,9 +9339,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:106 en/git-tag.txt:190 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--create-reflog" -msgstr "" +msgstr "--create-reflog" #. type: Plain text #: en/git-branch.txt:115 @@ -9351,9 +9357,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:126 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--move" -msgstr "" +msgstr "--move" #. type: Plain text #: en/git-branch.txt:128 @@ -9375,9 +9381,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:133 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--copy" -msgstr "" +msgstr "--copy" #. type: Plain text #: en/git-branch.txt:135 @@ -9411,9 +9417,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--ignore-case" -msgstr "" +msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:152 @@ -9429,9 +9435,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135 -#, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:280 msgid "--no-column" -msgstr "" +msgstr "--no-column" #. type: Plain text #: en/git-branch.txt:158 @@ -9447,9 +9453,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:162 en/git-show-branch.txt:44 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--remotes" -msgstr "" +msgstr "--remotes" #. type: Plain text #: en/git-branch.txt:165 @@ -9465,15 +9471,15 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:176 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "List branches. With optional `...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)." msgstr "" #. type: Labeled list #: en/git-branch.txt:177 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--show-current" -msgstr "" +msgstr "--show-current" #. type: Plain text #: en/git-branch.txt:180 @@ -9483,9 +9489,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:182 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "-vv" -msgstr "" +msgstr "-vv" #. type: Plain text #: en/git-branch.txt:191 @@ -9507,9 +9513,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:204 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-abbrev" -msgstr "" +msgstr "--no-abbrev" #. type: Plain text #: en/git-branch.txt:206 @@ -9519,9 +9525,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--track" -msgstr "" +msgstr "--track" #. type: Plain text #: en/git-branch.txt:216 @@ -9537,9 +9543,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--no-track" -msgstr "" +msgstr "--no-track" #. type: Plain text #: en/git-branch.txt:226 @@ -9573,9 +9579,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:237 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--unset-upstream" -msgstr "" +msgstr "--unset-upstream" #. type: Plain text #: en/git-branch.txt:240 @@ -9585,9 +9591,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:241 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "--edit-description" -msgstr "" +msgstr "--edit-description" #. type: Plain text #: en/git-branch.txt:246 @@ -9699,7 +9705,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:291 -#, priority:240 +#, ignore-ellipsis, priority:240 msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort= option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]." msgstr "" @@ -9741,7 +9747,7 @@ msgstr "" #. type: delimited block - #: en/git-branch.txt:317 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n" "$ cd my2.6\n" @@ -9763,7 +9769,7 @@ msgstr "" #. type: delimited block - #: en/git-branch.txt:329 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git clone git://git.kernel.org/.../git.git my.git\n" "$ cd my.git\n" @@ -9865,9 +9871,9 @@ msgstr "" #. type: Title = #: en/git-bugreport.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bugreport(1)" -msgstr "" +msgstr "git-bugreport(1)" #. type: Plain text #: en/git-bugreport.txt:7 @@ -9991,9 +9997,9 @@ msgstr "" #. type: Title = #: en/git-bundle.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-bundle(1)" -msgstr "" +msgstr "git-bundle(1)" #. type: Plain text #: en/git-bundle.txt:7 @@ -10003,7 +10009,7 @@ msgstr "" #. type: Plain text #: en/git-bundle.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]\n" "\t\t [--version=] \n" @@ -10092,7 +10098,7 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:77 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "[...]" msgstr "" @@ -10104,9 +10110,9 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:90 en/git-pack-objects.txt:157 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--all-progress" -msgstr "" +msgstr "--all-progress" #. type: Plain text #: en/git-bundle.txt:100 en/git-pack-objects.txt:167 @@ -10116,9 +10122,9 @@ msgstr "" #. type: Labeled list #: en/git-bundle.txt:101 en/git-pack-objects.txt:168 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--all-progress-implied" -msgstr "" +msgstr "--all-progress-implied" #. type: Plain text #: en/git-bundle.txt:105 en/git-pack-objects.txt:172 @@ -10337,9 +10343,9 @@ msgstr "" #. type: Title = #: en/git-cat-file.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-cat-file(1)" -msgstr "" +msgstr "git-cat-file(1)" #. type: Plain text #: en/git-cat-file.txt:7 @@ -10423,9 +10429,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:66 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--filters" -msgstr "" +msgstr "--filters" #. type: Plain text #: en/git-cat-file.txt:71 @@ -10447,9 +10453,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:77 en/git-mktree.txt:32 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch" -msgstr "" +msgstr "--batch" #. type: Labeled list #: en/git-cat-file.txt:78 @@ -10465,9 +10471,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:85 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch-check" -msgstr "" +msgstr "--batch-check" #. type: Labeled list #: en/git-cat-file.txt:86 @@ -10483,9 +10489,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:93 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--batch-all-objects" -msgstr "" +msgstr "--batch-all-objects" #. type: Plain text #: en/git-cat-file.txt:99 @@ -10495,9 +10501,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:100 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--buffer" -msgstr "" +msgstr "--buffer" #. type: Plain text #: en/git-cat-file.txt:106 @@ -10507,9 +10513,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:107 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--unordered" -msgstr "" +msgstr "--unordered" #. type: Plain text #: en/git-cat-file.txt:116 @@ -10519,9 +10525,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:117 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--allow-unknown-type" -msgstr "" +msgstr "--allow-unknown-type" #. type: Plain text #: en/git-cat-file.txt:119 @@ -10531,9 +10537,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:120 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--follow-symlinks" -msgstr "" +msgstr "--follow-symlinks" #. type: Plain text #: en/git-cat-file.txt:129 @@ -10678,9 +10684,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:202 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objectname`" -msgstr "" +msgstr "`objectname`" #. type: Plain text #: en/git-cat-file.txt:204 @@ -10690,9 +10696,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:205 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objecttype`" -msgstr "" +msgstr "`objecttype`" #. type: Plain text #: en/git-cat-file.txt:207 @@ -10702,9 +10708,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:208 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`objectsize`" -msgstr "" +msgstr "`objectsize`" #. type: Plain text #: en/git-cat-file.txt:211 @@ -10726,9 +10732,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:216 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`deltabase`" -msgstr "" +msgstr "`deltabase`" #. type: Plain text #: en/git-cat-file.txt:220 @@ -10738,9 +10744,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:221 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "`rest`" -msgstr "" +msgstr "`rest`" #. type: Plain text #: en/git-cat-file.txt:227 @@ -10904,9 +10910,9 @@ msgstr "" #. type: Title = #: en/git-check-attr.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-attr(1)" -msgstr "" +msgstr "git-check-attr(1)" #. type: Plain text #: en/git-check-attr.txt:7 @@ -10916,7 +10922,7 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git check-attr' [-a | --all | ...] [--] ...\n" "'git check-attr' --stdin [-z] [-a | --all | ...]\n" @@ -10948,9 +10954,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:51 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212 -#, no-wrap, priority:260 +#, ignore-same, no-wrap, priority:260 msgid "--stdin" -msgstr "" +msgstr "--stdin" #. type: Plain text #: en/git-check-attr.txt:33 en/git-check-ignore.txt:46 @@ -10996,9 +11002,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:60 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'unspecified'" -msgstr "" +msgstr "'unspecified'" #. type: Plain text #: en/git-check-attr.txt:61 @@ -11008,9 +11014,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:61 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'unset'" -msgstr "" +msgstr "'unset'" #. type: Plain text #: en/git-check-attr.txt:62 @@ -11020,9 +11026,9 @@ msgstr "" #. type: Labeled list #: en/git-check-attr.txt:62 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "'set'" -msgstr "" +msgstr "'set'" #. type: Plain text #: en/git-check-attr.txt:63 @@ -11139,15 +11145,15 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:117 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitattributes[5]." -msgstr "" +msgstr "linkgit:gitattributes[5]." #. type: Title = #: en/git-check-ignore.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-ignore(1)" -msgstr "" +msgstr "git-check-ignore(1)" #. type: Plain text #: en/git-check-ignore.txt:7 @@ -11157,7 +11163,7 @@ msgstr "" #. type: Plain text #: en/git-check-ignore.txt:14 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git check-ignore' [] ...\n" "'git check-ignore' [] --stdin\n" @@ -11225,9 +11231,9 @@ msgstr "" #. type: Labeled list #: en/git-check-ignore.txt:58 en/git-grep.txt:79 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-index" -msgstr "" +msgstr "--no-index" #. type: Plain text #: en/git-check-ignore.txt:64 @@ -11321,15 +11327,15 @@ msgstr "" #. type: Plain text #: en/git-check-ignore.txt:123 -#, priority:100 +#, ignore-same, priority:100 msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" -msgstr "" +msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]" #. type: Title = #: en/git-check-mailmap.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-check-mailmap(1)" -msgstr "" +msgstr "git-check-mailmap(1)" #. type: Plain text #: en/git-check-mailmap.txt:7 @@ -11339,7 +11345,7 @@ msgstr "" #. type: Plain text #: en/git-check-mailmap.txt:13 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git check-mailmap' [] ...\n" msgstr "" @@ -11363,9 +11369,9 @@ msgstr "" #. type: Title = #: en/git-checkout-index.txt:2 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "git-checkout-index(1)" -msgstr "" +msgstr "git-checkout-index(1)" #. type: Plain text #: en/git-checkout-index.txt:7 @@ -11375,7 +11381,7 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:17 -#, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=]\n" "\t\t [--stage=|all]\n" @@ -11416,9 +11422,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout-index.txt:44 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--no-create" -msgstr "" +msgstr "--no-create" #. type: Plain text #: en/git-checkout-index.txt:47 @@ -11452,9 +11458,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout-index.txt:57 -#, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:100 msgid "--temp" -msgstr "" +msgstr "--temp" #. type: Plain text #: en/git-checkout-index.txt:61 @@ -11638,9 +11644,9 @@ msgstr "" #. type: Title = #: en/git-checkout.txt:2 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "git-checkout(1)" -msgstr "" +msgstr "git-checkout(1)" #. type: Plain text #: en/git-checkout.txt:7 @@ -11650,7 +11656,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:18 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git checkout' [-q] [-f] [-m] []\n" "'git checkout' [-q] [-f] [-m] --detach []\n" @@ -11761,7 +11767,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:82 -#, no-wrap, priority:240 +#, ignore-ellipsis, no-wrap, priority:240 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=