diff --git a/po/documentation.de.po b/po/documentation.de.po
index ccd4251e0d4cc782888c8ec4d550a900cb38687a..8a52c80bcdc67e1820e3493d9bc7a773c748aba6 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -2480,16 +2480,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:256
-#, priority:100
+#, 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:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, fuzzy, no-wrap, priority:280
-#| msgid "--color"
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr "--color"
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -2874,7 +2873,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] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr ""
@@ -2886,7 +2885,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-format.txt:19
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "<filepattern>..."
msgid "git-diff-files [<pattern>...]"
msgstr "<filepattern>..."
@@ -3577,7 +3576,7 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:179
-#, 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 ""
@@ -3847,9 +3846,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -3901,7 +3900,7 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:137
-#, 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 `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr ""
@@ -3949,13 +3948,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:161
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:162
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
@@ -4045,13 +4044,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:209
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:211
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
@@ -4223,9 +4222,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4235,9 +4234,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4247,9 +4246,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4259,9 +4258,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4271,9 +4270,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4283,9 +4282,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4374,9 +4373,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4423,9 +4422,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "--porcelain"
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4435,9 +4434,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr ""
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
@@ -4719,13 +4718,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:527
-#, 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:538
-#, 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 ""
@@ -4785,7 +4784,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-options.txt:573
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
@@ -5718,7 +5717,7 @@ msgstr "횥BERSICHT"
#. type: Plain text
#: en/git-add.txt:15
-#, 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"
@@ -5788,7 +5787,7 @@ msgstr "OPTIONEN"
#. type: Labeled list
#: en/git-add.txt:52 en/git-grep.txt:308 en/git-status.txt:148
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, ignore-ellipsis, no-wrap, priority:300
#| msgid "<paths>..."
msgid "<pathspec>..."
msgstr "<paths>..."
@@ -5936,7 +5935,7 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:145
-#, 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 <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
msgstr ""
@@ -6166,7 +6165,7 @@ msgstr "Es zeigt sich, da횩 foo.png im Vergleich mit dem HEAD ge채ndert wurde, (
#. type: Labeled list
#: en/git-add.txt:267 en/git-update-ref.txt:94
-#, no-wrap, ignore-same, priority:300
+#, ignore-same, no-wrap, priority:300
msgid "update"
msgstr "update"
@@ -6466,7 +6465,7 @@ msgstr "Eine Serie von Patches von einer Mailbox anwenden."
#. 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"
@@ -6486,7 +6485,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "(<mbox>|<Maildir>)..."
msgstr ""
@@ -7034,7 +7033,7 @@ msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
#. 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=<file>] [-R | --reverse]\n"
@@ -7060,7 +7059,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:37
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "<path>..."
msgid "<patch>..."
msgstr "<path>..."
@@ -7479,7 +7478,7 @@ msgstr "git-clone - Klone ein Projektarchiv (repository) in ein neues Verzeichni
#. 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"
" <archive/branch>[:<git-branch>] ...\n"
@@ -7647,7 +7646,7 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n"
"\t [-o <file> | --output=<file>] [--worktree-attributes]\n"
@@ -8037,7 +8036,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-{old,good}=<term> --term-{new,bad}=<term>]\n"
"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
@@ -8232,7 +8231,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:158
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git bisect new [<rev>...]\n"
msgstr ""
@@ -8262,7 +8261,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 ""
@@ -8711,7 +8710,7 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect.txt:463
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
"$ git bisect run sh -c '\n"
@@ -9181,7 +9180,7 @@ msgstr "git-branch - Auflisten, Erzeugen oder L철schen von Entwicklungszweigen (
#. type: Plain text
#: en/git-branch.txt:26
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
#| msgid ""
#| "'git branch' [--color | --no-color] [-r | -a]\n"
#| "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
@@ -9241,7 +9240,7 @@ msgstr "Mittels '--contains' werden nur jene Entwicklungszweige (branches) angez
#. 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 <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, 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 ""
@@ -9448,7 +9447,7 @@ msgstr "Zeige sowohl lokale wie auch remote-tracking Entwicklungszweige an."
#. type: Plain text
#: en/git-branch.txt:176
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
@@ -9714,7 +9713,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=<key> 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 ""
@@ -9758,7 +9757,7 @@ msgstr "Weiterentwicklungs ausgehend von einer bekannten Markierung (tag)"
#. type: delimited block -
#: en/git-branch.txt:317
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, 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"
@@ -9790,7 +9789,7 @@ msgstr "L철schen eines nicht mehr ben철tigten Entwicklungszweiges (branch)"
#. 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"
@@ -9913,7 +9912,7 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git bundle' create <file> <git-rev-list-args>\n"
"'git bundle' verify <file>\n"
@@ -9992,7 +9991,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:71
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -10773,7 +10772,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 | <attr>...] [--] <pathname>...\n"
"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
@@ -11016,7 +11015,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' [<options>] <pathname>...\n"
"'git check-ignore' [<options>] --stdin\n"
@@ -11194,7 +11193,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-mailmap.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgid "'git check-mailmap' [<options>] <contact>...\n"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
@@ -11232,7 +11231,7 @@ msgstr "git-checkout - Abrufen (checkout) eines Entwicklungszweigs (branch) oder
#. 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=<string>]\n"
"\t\t [--stage=<number>|all]\n"
@@ -11510,7 +11509,7 @@ msgstr "git-checkout - Abrufen (checkout) eines Entwicklungszweigs (branch) oder
#. type: Plain text
#: en/git-checkout.txt:18
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git checkout' [-q] [-f] [-m] [<branch>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<branch>]\n"
@@ -11623,7 +11622,7 @@ msgstr "Bezeichnet die Spitze des aktuellen Entwicklungszweigs."
#. type: Labeled list
#: en/git-checkout.txt:82
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -11642,7 +11641,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:98
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -11994,7 +11993,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:326 en/git-switch.txt:58
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, 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 ""
@@ -12025,7 +12024,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:337
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "As a special case, 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 ""
@@ -12637,7 +12636,7 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
"\t\t [-S[<keyid>]] <commit>...\n"
@@ -12694,14 +12693,14 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
#| msgid "-C <commit>"
msgid "<commit>..."
msgstr "-C <commit>"
#. type: Plain text
#: en/git-cherry-pick.txt:52
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
msgstr ""
@@ -12731,7 +12730,7 @@ msgstr "-x"
#. type: Plain text
#: en/git-cherry-pick.txt:78
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
msgstr ""
@@ -13091,7 +13090,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:58
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git checkout -b topic origin/master\n"
"# work and create some commits\n"
@@ -13127,7 +13126,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -13150,7 +13149,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:96
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic\n"
"- cccc000... commit C\n"
@@ -13178,7 +13177,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:126
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
"* 7654321 (origin/master) upstream tip commit\n"
@@ -13204,7 +13203,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cherry.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git cherry origin/master topic base\n"
"- cccc000... commit C\n"
@@ -13259,7 +13258,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-clean.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
msgstr ""
@@ -13277,7 +13276,7 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:25
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If any optional `<path>...` arguments are given, only those paths are affected."
msgstr ""
@@ -13949,7 +13948,7 @@ msgstr "Klonen eines 'fernen' Projektarchivs"
#. type: delimited block -
#: en/git-clone.txt:306
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, ignore-ellipsis, no-wrap, priority:300
#| msgid ""
#| "$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
#| "$ cd my2.6\n"
@@ -13991,7 +13990,7 @@ msgstr "Klone ein 'fernes' Projektarchiv w채hrend Objekte von einem lokalen Proj
#. type: delimited block -
#: en/git-clone.txt:325
-#, fuzzy, no-wrap, priority:300
+#, fuzzy, ignore-ellipsis, no-wrap, priority:300
#| msgid ""
#| "$ git clone --reference my2.6 \\\n"
#| "\tgit://git.kernel.org/pub/scm/.../linux-2.7 \\\n"
@@ -14198,7 +14197,7 @@ msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
#. type: Plain text
#: en/git-commit-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git commit-tree' <tree> [(-p <parent>)...]\n"
"'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
@@ -14403,7 +14402,7 @@ msgstr "git-commit - Trage 횆nderungen im Projektarchiv (repository) ein"
#. type: Plain text
#: en/git-commit.txt:17
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid ""
#| "'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]\n"
#| "\t [(-c | -C) <commit>] [-F <file> | -m <msg>]\n"
@@ -14846,7 +14845,7 @@ msgstr "Der Befehl entspricht in etwa:"
#. type: delimited block -
#: en/git-commit.txt:248
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"\t$ git reset --soft HEAD^\n"
"\t$ ... do something else to come up with the right tree ...\n"
@@ -15019,7 +15018,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:346 en/git-rm.txt:29
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "<file>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -16096,7 +16095,7 @@ msgstr "% git config --replace-all core.gitproxy ssh\n"
#. type: Plain text
#: en/git-config.txt:428
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr "Wenn Sie jedoch wirklich nur eine Zeile f체r den Standardproxy ver채ndern m철chten, beispielsweise diejenige ohne ein Anh채ngsel \"for ...\", k철nnen Sie dies so tun:"
@@ -17462,7 +17461,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:26
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
msgstr ""
@@ -18163,7 +18162,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#. type: Plain text
#: en/git-daemon.txt:25
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git daemon' [--verbose] [--syslog] [--export-all]\n"
"\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
@@ -18734,7 +18733,7 @@ msgstr "Einem Objekt einen f체r Menschen lesbaren Namen basierend auf einer verf
#. type: Plain text
#: en/git-describe.txt:14
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n"
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
@@ -18761,7 +18760,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:37
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid "-C <commit>"
msgid "<commit-ish>..."
msgstr "-C <commit>"
@@ -18858,7 +18857,7 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:95
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)."
msgstr ""
@@ -19037,7 +19036,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-diff-files.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]"
msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
msgstr "'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...]"
@@ -19112,7 +19111,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-diff-index.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
msgstr "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
@@ -19254,7 +19253,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
" :100644 100664 7476bb... 000000... kernel/sched.c\n"
@@ -19293,7 +19292,7 @@ msgstr "git-diff - Zeige Unterschiede zwischen Eintragungen (commits), Eintragun
#. type: Plain text
#: en/git-difftool.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git diff' [--options] <commit> <commit> [--] [<path>...]"
msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
msgstr "'git diff' [--options] <commit> <commit> [--] [<path>...]"
@@ -19610,7 +19609,7 @@ msgstr "Den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen.
#. type: Plain text
#: en/git-diff-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
@@ -19644,7 +19643,7 @@ msgstr "SHA1 eines git-Markierungobjektes."
#. type: Labeled list
#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:422
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr "<path>..."
@@ -19770,7 +19769,7 @@ msgstr "git-diff - Zeige Unterschiede zwischen Eintragungen (commits), Eintragun
#. type: Plain text
#: en/git-diff.txt:17
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
@@ -19787,7 +19786,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:24
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git diff' [<options>] [--] [<path>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -19814,7 +19813,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:41
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
@@ -19828,7 +19827,7 @@ msgstr "Mit --cached zeigt git die 횆nderungen die f체r die n채chste Eintragung
#. type: Labeled list
#: en/git-diff.txt:51
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
@@ -19841,7 +19840,7 @@ msgstr "Zeige die Unterschiede zwischen dem Arbeitsbereich und dem angegebenen <
#. type: Labeled list
#: en/git-diff.txt:59
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] <commit> <commit> [--] [<path>...]"
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit> <commit> [--] [<path>...]"
@@ -19854,7 +19853,7 @@ msgstr "Zeige die 횆nderungen zwischen zwei Eintragungen (commits)."
#. type: Labeled list
#: en/git-diff.txt:64
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] <commit>..<commit> [--] [<path>...]"
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit>..<commit> [--] [<path>...]"
@@ -19867,14 +19866,14 @@ msgstr "Dieser Aufruf bewirkt das Gleiche wie der vorige. Wird <commit> an einer
#. type: Labeled list
#: en/git-diff.txt:70
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] <commit>\\...<commit> [--] [<path>...]"
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr "'git diff' [--options] <commit>\\...<commit> [--] [<path>...]"
#. type: Plain text
#: en/git-diff.txt:77
-#, fuzzy, priority:280
+#, fuzzy, ignore-ellipsis, priority:280
#| msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git-merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr "Zeige die 횆nderungen im Arbeitszweig (branch) der die zweite Eintragung (commit) enth채lt, ausgehend vom gemeinsamen Ursprung beider <commit>. \"git diff A\\...B\" ist somit equivalent zu \"git diff $(git-merge-base A B) B\". Bleibt einer der beiden <commit> unerw채hnt, wird statt dessen HEAD verwendet."
@@ -19888,7 +19887,7 @@ msgstr "F체r alle exotischen Anwendungsf채lle sei erw채hnt, da횩 alle <commit> i
#. type: Plain text
#: en/git-diff.txt:89
-#, fuzzy, priority:280
+#, fuzzy, ignore-ellipsis, priority:280
#| msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:git-rev-parse[1]."
msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr "F체r eine detailliertere Liste der M철glichkeiten <commit> anzugeben, siehe das Kapitel \"SPECIFYING REVISIONS\" in linkgit:git-rev-parse[1]. Allerdings vergleicht \"diff\" immer zwei Versionen miteinander und keine Bereiche. Die Angaben (\"<commit>..<commit>\" und \"<commit>\\...<commit>\") bezeichnen also keine 'Bereiche' wie im \"SPECIFYING RANGES\" Kapitel in linkgit:git-rev-parse[1] beschrieben."
@@ -20004,7 +20003,7 @@ msgstr "Versionszweige (branches) vergleichen"
#. type: delimited block -
#: en/git-diff.txt:160
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n"
@@ -20333,7 +20332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:143
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
@@ -20414,7 +20413,7 @@ msgstr ""
#. type: delimited block -
#: en/git-fast-export.txt:215
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
"$ cd anon-repo\n"
@@ -22739,7 +22738,7 @@ msgstr "git-commit - Trage 횆nderungen im Projektarchiv (repository) ein"
#. type: Plain text
#: en/git-fetch-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n"
"\t[--upload-pack=<git-upload-pack>]\n"
@@ -22897,7 +22896,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:117 en/git-ls-remote.txt:86
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<refs>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -22932,7 +22931,7 @@ msgstr "git-commit - Trage 횆nderungen im Projektarchiv (repository) ein"
#. type: Plain text
#: en/git-fetch.txt:16
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git fetch' [<options>] [<repository> [<refspec>...]]\n"
"'git fetch' [<options>] <group>\n"
@@ -23273,7 +23272,7 @@ msgstr "--summary"
#. type: Plain text
#: en/git-fetch.txt:226
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -23404,7 +23403,7 @@ msgstr "git-branch - Auflisten, Erzeugen oder L철schen von Entwicklungszweigen (
#. type: Plain text
#: en/git-filter-branch.txt:18
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n"
"\t[--env-filter <command>] [--tree-filter <command>]\n"
@@ -23544,7 +23543,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:117
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
@@ -23556,7 +23555,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:125
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
@@ -23580,7 +23579,7 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:138
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "This is the filter for performing the commit. If this filter is specified, it will be called instead of the 'git commit-tree' command, with arguments of the form \"<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]\" and the log message on stdin. The commit id is expected on stdout."
msgstr ""
@@ -23685,7 +23684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:207
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git log' <option>..."
msgid "<rev-list options>..."
msgstr "'git log' <option>..."
@@ -23947,7 +23946,7 @@ msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:388
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git filter-branch ... C..H\n"
msgstr ""
@@ -23959,7 +23958,7 @@ msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:395
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"git filter-branch ... C..H --not D\n"
"git filter-branch ... D..H --not C\n"
@@ -24199,7 +24198,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
@@ -24216,7 +24215,7 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "<filepattern>..."
msgid "<pattern>..."
msgstr "<filepattern>..."
@@ -24517,7 +24516,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:197
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
@@ -24530,7 +24529,7 @@ msgstr "diff"
#. type: Plain text
#: en/git-for-each-ref.txt:210
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
@@ -24751,7 +24750,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:361
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
@@ -24763,7 +24762,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:369
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
@@ -25413,7 +25412,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:372
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
@@ -25421,7 +25420,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:380
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
@@ -25433,7 +25432,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:390
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"...\n"
"> So we should do such-and-such.\n"
@@ -25455,7 +25454,7 @@ msgstr ""
#. type: delimited block -
#: en/git-format-patch.txt:398
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
@@ -25630,7 +25629,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:499
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
@@ -25767,7 +25766,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:573
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
@@ -25873,7 +25872,9 @@ msgstr "die Commits an, die im Zweig \"experimentell\" aber nicht im Zweig \"sta
#: en/git-format-patch.txt:648
#, fuzzy, no-wrap, priority:100
msgid "$ git format-patch origin\n"
-msgstr "bob$ git branch -r\n origin/master\n"
+msgstr ""
+"bob$ git branch -r\n"
+" origin/master\n"
#. type: Plain text
#: en/git-format-patch.txt:651
@@ -25955,7 +25956,7 @@ msgstr "git-fsck-objects - 체berpr체ft die Verbundenheit und Korrektheit der Obj
#. type: Plain text
#: en/git-fsck-objects.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git fsck-objects' ...\n"
msgstr "'git fsck-objects' ...\n"
@@ -26345,7 +26346,7 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
@@ -26522,7 +26523,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:32
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
"\t [-v | --invert-match] [-h|-H] [--full-name]\n"
@@ -27133,7 +27134,7 @@ msgstr "--not"
#. type: Labeled list
#: en/git-grep.txt:284
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "( ... )"
msgstr ""
@@ -27163,7 +27164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:300
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<tree>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -27496,7 +27497,7 @@ msgstr "Von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen.
#. type: Plain text
#: en/git-hash-object.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
@@ -27627,7 +27628,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:38
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
msgstr ""
@@ -28084,7 +28085,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:102
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tAuthType Basic\n"
"\tAuthName \"Git Access\"\n"
@@ -28102,7 +28103,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:115
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<LocationMatch \"^/git/.*/git-receive-pack$\">\n"
"\tAuthType Basic\n"
@@ -28126,7 +28127,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:136
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"<Location /git/private>\n"
"\tAuthType Basic\n"
@@ -28276,7 +28277,7 @@ msgstr ""
#. type: delimited block -
#: en/git-http-backend.txt:231
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"auth.require = (\n"
"\t\"/\" => (\n"
@@ -28483,7 +28484,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
msgstr ""
@@ -28552,7 +28553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-push.txt:54 en/git-send-pack.txt:98
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<ref>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -29436,7 +29437,7 @@ msgstr "Strukturierte Informationen in Commit-Beschreibungen hinzuf체gen oder pa
#. type: Plain text
#: en/git-interpret-trailers.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
"'git interpret-trailers' [<options>] [--parse] [<file>...]\n"
@@ -30109,7 +30110,7 @@ msgstr "git-log - Zeigt die Geschichte des Projekts"
#. type: Plain text
#: en/git-log.txt:13
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
@@ -30209,7 +30210,7 @@ msgstr "--full-diff"
#. type: Plain text
#: en/git-log.txt:63
-#, fuzzy, priority:260
+#, fuzzy, ignore-ellipsis, priority:260
#| msgid "Without this flag, \"git log -p <paths>...\" shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<paths>...\" limits only commits, and doesn't limit diff for those commits."
msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
msgstr "Wir dieses Option nicht angegeben, zeigt \"git log -p <paths>...\" die 횆nderungen, die diese Pfade beeinflussen, an. Mit dieser Optionen werden alle 횆nderungen, die diese Commits eingef체hrt haben dargestellt, auch jene, die nicht diese Pfade beinflussen."
@@ -30264,7 +30265,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:93 en/git-shortlog.txt:72
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid "<path>..."
msgid "[--] <path>..."
msgstr "<path>..."
@@ -30552,7 +30553,7 @@ msgstr "Informationen 체ber Dateien in dem Index und im Arbeitsverzeichnis anzei
#. type: Plain text
#: en/git-ls-files.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-files' [-z] [-t] [-v] [-f]\n"
"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
@@ -31037,7 +31038,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
"\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
@@ -31143,7 +31144,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:91
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <refs>... are specified, only references matching the given patterns are displayed."
msgstr ""
@@ -31189,7 +31190,7 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
"\t [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n"
@@ -31270,7 +31271,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-tree.txt:76
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "<path>..."
msgid "[<path>...]"
msgstr "<path>..."
@@ -31484,7 +31485,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
"\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
@@ -31607,7 +31608,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git merge-base' [-a|--all] <commit> <commit>...\n"
"'git merge-base' [-a|--all] --octopus <commit>...\n"
@@ -31805,7 +31806,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:139
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tA=$(git rev-parse --verify A)\n"
"\tif test \"$A\" = \"$(git merge-base A B)\"\n"
@@ -31822,7 +31823,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:146
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\tif git merge-base --is-ancestor A B\n"
"\tthen\n"
@@ -32322,7 +32323,7 @@ msgstr "Ausf체hren von Tools zur Aufl철sung von Merge-Konflikten zur Behebung di
#. type: Plain text
#: en/git-mergetool.txt:12
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
msgstr ""
@@ -32484,7 +32485,7 @@ msgstr "Zwei oder mehr Entwicklungszweige zusammenf체hren."
#. type: Plain text
#: en/git-merge.txt:17
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
"\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n"
@@ -33081,7 +33082,7 @@ msgstr "git-mv - Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder
#. type: Plain text
#: en/git-mv.txt:13
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git mv' <options>... <args>..."
msgid "'git mv' <options>... <args>...\n"
msgstr "'git mv' <Options>... <Argumente>..."
@@ -33095,7 +33096,7 @@ msgstr "git-mv - Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder
#. type: Plain text
#: en/git-mv.txt:20
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid ""
#| " git mv [-f] [-n] <source> <destination>\n"
#| " git mv [-f] [-n] [-k] <source> ... <destination directory>\n"
@@ -33168,7 +33169,7 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git name-rev' [--tags] [--refs=<pattern>]\n"
"\t ( --all | --stdin | <commit-ish>... )\n"
@@ -33286,7 +33287,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -33637,7 +33638,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
@@ -33703,7 +33704,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -33923,7 +33924,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#. type: Plain text
#: en/git-p4.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n"
"'git p4 sync' [<sync options>] [<p4 depot path>...]\n"
@@ -34769,7 +34770,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:445
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard."
msgstr ""
@@ -34811,7 +34812,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:475
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"//depot/main/...\n"
"//depot/branch1/...\n"
@@ -34825,7 +34826,7 @@ msgstr ""
#. type: delimited block -
#: en/git-p4.txt:480
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "//depot/main/... //depot/branch1/...\n"
msgstr ""
@@ -35944,7 +35945,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
msgstr ""
@@ -36246,7 +36247,7 @@ msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
#. type: Plain text
#: en/git-prune.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
msgstr ""
@@ -36301,7 +36302,7 @@ msgstr ""
#. type: Labeled list
#: en/git-prune.txt:54
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid "<head>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -36359,7 +36360,7 @@ msgstr "Objekte von einem externen Repository anfordern und sie mit einem andere
#. type: Plain text
#: en/git-pull.txt:13
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
msgstr "'git diff' [--options] <commit> [--] [<path>...]"
@@ -36710,7 +36711,7 @@ msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren."
#. type: Plain text
#: en/git-push.txt:18
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
@@ -36740,7 +36741,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:39
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
@@ -36764,7 +36765,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:56
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
msgid "<refspec>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -37129,7 +37130,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:343
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -37262,7 +37263,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:445
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
@@ -37523,7 +37524,7 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:616
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
msgstr ""
@@ -38228,7 +38229,7 @@ msgstr ""
#. type: delimited block -
#: en/git-read-tree.txt:357
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git fetch git://.... linus\n"
"$ LT=`git rev-parse FETCH_HEAD`\n"
@@ -38282,7 +38283,7 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:405
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
msgstr ""
@@ -38664,7 +38665,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:219
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "As a special case, 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 ""
@@ -38929,7 +38930,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:430
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
@@ -38984,7 +38985,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:457
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
@@ -38996,7 +38997,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:461
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
@@ -39032,7 +39033,7 @@ msgstr "--no-autosquash"
#. type: Plain text
#: en/git-rebase.txt:495
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
@@ -39365,7 +39366,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:636
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
"pick fa1afe1 The oneline of the next commit\n"
@@ -39471,7 +39472,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:710
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
"fixup f1a5c00 Fix to feature XXX\n"
@@ -39490,7 +39491,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:720
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
@@ -39634,7 +39635,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rebase.txt:815
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
"\t \\\t\t\t \\\n"
@@ -40435,7 +40436,7 @@ msgstr "'git log' <option>..."
#. type: Plain text
#: en/git-reflog.txt:27
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git reflog' ['show'] [log-options] [<ref>]\n"
"'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -40622,7 +40623,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:12
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
msgstr ""
@@ -40762,7 +40763,7 @@ msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
@@ -40774,7 +40775,7 @@ msgstr "GIT_EXT_SERVICE_NOPREFIX"
#. type: Plain text
#: en/git-remote-ext.txt:74
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
msgstr ""
@@ -40955,7 +40956,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#. type: Plain text
#: en/git-remote.txt:25
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
@@ -41284,7 +41285,7 @@ msgstr "Ein neues entferntes Repository hinzuf체gen, den Inhalt holen und einen
#. type: delimited block -
#: en/git-remote.txt:235
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"$ git remote\n"
"origin\n"
@@ -41534,7 +41535,7 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git replace' [-f] <object> <replacement>\n"
"'git replace' [-f] --edit <object>\n"
@@ -41655,13 +41656,13 @@ msgstr ""
#. type: Labeled list
#: en/git-replace.txt:86
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--graft <commit> [<parent>...]"
msgstr ""
#. type: Plain text
#: en/git-replace.txt:93
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
msgstr ""
@@ -42092,7 +42093,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -42124,7 +42125,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rerere.txt:145
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git switch topic\n"
"\t$ git merge master\n"
@@ -42230,7 +42231,7 @@ msgstr "Aktuellen HEAD zu einem spezifizierten Zustand setzen."
#. type: Plain text
#: en/git-reset.txt:14
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git reset' [-q] [<tree-ish>] [--] <paths>...\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]\n"
@@ -42245,7 +42246,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:22
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..."
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -42258,7 +42259,7 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:30
-#, priority:280
+#, ignore-ellipsis, priority:280
msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <paths>...`."
msgstr ""
@@ -42270,7 +42271,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:38
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -42426,7 +42427,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:138
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --soft HEAD^ <1>\n"
@@ -42507,7 +42508,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:170
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
@@ -42527,7 +42528,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:190
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -42572,7 +42573,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:215
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git pull <1>\n"
"Auto-merging nitfol\n"
@@ -42700,7 +42701,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:289
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git tag start\n"
"$ git switch -c branch1\n"
@@ -42743,7 +42744,7 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:317
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git reset -N HEAD^ <1>\n"
"$ git add -p <2>\n"
@@ -42970,7 +42971,7 @@ msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen."
#. type: Plain text
#: en/git-restore.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...\n"
"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]\n"
@@ -43244,7 +43245,7 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
"'git revert' (--continue | --skip | --abort | --quit)\n"
@@ -43348,7 +43349,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:65
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git rev-list' [ --max-count=<number> ]\n"
"\t [ --skip=<number> ]\n"
@@ -43451,13 +43452,13 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:102
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
msgstr ""
#. type: delimited block -
#: en/git-rev-list.txt:106
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
"\t$ git rev-list A...B\n"
@@ -43483,7 +43484,7 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git mv' <options>... <args>..."
msgid "'git rev-parse' [<options>] <args>...\n"
msgstr "'git mv' <Options>... <Argumente>..."
@@ -43971,7 +43972,7 @@ msgstr "--git-path <Pfad>"
#. type: Plain text
#: en/git-rev-parse.txt:253
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
msgstr ""
@@ -44079,7 +44080,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:290
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "<paths>..."
msgid "<args>..."
msgstr "<paths>..."
@@ -44214,7 +44215,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:364
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"OPTS_SPEC=\"\\\n"
"some-command [<options>] <args>...\n"
@@ -44272,7 +44273,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:389
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git mv' <options>... <args>..."
msgid "usage: some-command [<options>] <args>...\n"
msgstr "'git mv' <Options>... <Argumente>..."
@@ -44285,7 +44286,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:397
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" -h, --help show the help\n"
" --foo some nifty option --foo\n"
@@ -44296,7 +44297,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:400
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"An option group Header\n"
" -C[...] option C with an optional argument\n"
@@ -44402,7 +44403,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-rm.txt:12
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>..."
msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
msgstr "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <Datei>..."
@@ -44642,7 +44643,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:14
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-email' [<options>] <file|directory|rev-list options>...\n"
"'git send-email' --dump-aliases\n"
@@ -44710,7 +44711,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:53
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--bcc=<address>,..."
msgstr ""
@@ -44728,7 +44729,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:59
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--cc=<address>,..."
msgstr ""
@@ -44813,7 +44814,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:110
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" [PATCH 0/2] Here is what I did...\n"
" [PATCH 1/2] Clean up and tests\n"
@@ -44844,7 +44845,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:119
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--to=<address>,..."
msgstr ""
@@ -44976,7 +44977,7 @@ msgstr ""
#. type: delimited block -
#: en/git-send-email.txt:188
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
msgstr ""
@@ -45674,7 +45675,7 @@ msgstr "Objekte 체ber das Git Protokoll zu einem anderen Repository 체bertragen.
#. type: Plain text
#: en/git-send-pack.txt:16
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n"
"\t\t[--verbose] [--thin] [--atomic]\n"
@@ -46049,7 +46050,7 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:13
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid "'git diff' [--options] <commit> [--] [<path>...]"
msgid ""
"'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
@@ -46179,7 +46180,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:17
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -46544,7 +46545,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:15
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference]\n"
"\t [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
@@ -46692,7 +46693,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:111
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --head --dereference\n"
"832e76a9899f560a90ffd62ae2ce83bbeff58f54 HEAD\n"
@@ -46713,7 +46714,7 @@ msgstr ""
#. type: delimited block -
#: en/git-show-ref.txt:121
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git show-ref --heads --hash\n"
"2e3ba0114a1f52b47df29743d6915d056be13278\n"
@@ -46834,7 +46835,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid "'git log' <option>..."
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git log' <option>..."
@@ -46884,7 +46885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid "<object>..."
msgstr ""
"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -47149,7 +47150,7 @@ msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
#. type: Plain text
#: en/git-stage.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git verify-tag' <tag>..."
msgid "'git stage' args...\n"
msgstr "'git verify-tag' <Markierung>..."
@@ -47175,7 +47176,7 @@ msgstr "횆nderungen in einem Arbeitsverzeichnis aufbewahren."
#. type: Plain text
#: en/git-stash.txt:22
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git stash' list [<options>]\n"
"'git stash' show [<options>] [<stash>]\n"
@@ -47198,7 +47199,7 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:38
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
@@ -47210,7 +47211,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:49
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
@@ -47282,7 +47283,7 @@ msgstr ""
#. type: delimited block -
#: en/git-stash.txt:104
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
"stash@{1}: On master: 9cc0589... Add git-stash\n"
@@ -47457,7 +47458,7 @@ msgstr ""
#. type: delimited block -
#: en/git-stash.txt:227
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git pull\n"
" ...\n"
@@ -47475,7 +47476,7 @@ msgstr ""
#. type: delimited block -
#: en/git-stash.txt:246
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git switch -c my_wip\n"
@@ -47496,7 +47497,7 @@ msgstr ""
#. type: delimited block -
#: en/git-stash.txt:257
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git stash\n"
@@ -47520,7 +47521,7 @@ msgstr ""
#. type: delimited block -
#: en/git-stash.txt:275
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"# ... hack hack hack ...\n"
"$ git add --patch foo # add just first part to the index\n"
@@ -47574,7 +47575,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:13
-#, fuzzy, no-wrap, priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -48062,7 +48063,7 @@ msgstr ""
#. type: delimited block .
#: en/git-status.txt:345
-#, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"Field Meaning\n"
"--------------------------------------------------------\n"
@@ -48385,7 +48386,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:23
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n"
@@ -48466,7 +48467,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:74
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
#| msgid "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
msgid "status [--cached] [--recursive] [--] [<path>...]"
msgstr "'git diff' [--options] --cached [<commit>] [--] [<path>...]"
@@ -48491,7 +48492,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:91
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "init [--] [<path>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -48522,7 +48523,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:114
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
msgstr ""
@@ -48552,7 +48553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:132
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
@@ -48677,7 +48678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:182
-#, no-wrap, priority:220
+#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
@@ -48719,7 +48720,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:224
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
#| msgid "'git diff' [--options] [--] [<path>...]"
msgid "sync [--recursive] [--] [<path>...]"
msgstr "'git diff' [--options] [--] [<path>...]"
@@ -49251,7 +49252,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:127
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Fetch unfetched revisions from the Subversion remote we are tracking. The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
msgstr ""
@@ -49706,7 +49707,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:366
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
@@ -50619,7 +50620,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:876
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Clone a repo (like git clone):\n"
"\tgit svn clone http://svn.example.com/project/trunk\n"
@@ -50672,7 +50673,7 @@ msgstr ""
#. type: delimited block -
#: en/git-svn.txt:924
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"# Do the initial import on a server\n"
"\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n"
@@ -51405,7 +51406,7 @@ msgstr "Ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, l철schen oder ver
#. type: Plain text
#: en/git-tag.txt:20
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] [-e]\n"
"\t<tagname> [<commit> | <object>]\n"
@@ -51552,7 +51553,7 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:103
-#, priority:240
+#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
@@ -51853,13 +51854,13 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:319
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
msgstr ""
#. type: delimited block -
#: en/git-tag.txt:321
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "to get the following updates...\n"
msgstr ""
@@ -51871,7 +51872,7 @@ msgstr ""
#. type: delimited block -
#: en/git-tag.txt:327
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
msgstr ""
@@ -51998,7 +51999,7 @@ msgstr "Gibt eine 횥bersicht und eine Liste der gebr채uchlichsten Befehle aus. W
#. type: Plain text
#: en/git.txt:55
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr "Zur Steuerung wie die Handbuchseite dargestellt wird sind andere Optionen verf체gbar. Weitere Informationen finden Sie unter linkgit:git-help[1], weil `git --help ...` intern in `git help ...` konvertiert wird."
@@ -52045,7 +52046,7 @@ msgstr "횥bergibt einen Konfigurationsparameter an den Befehl. Der 체bergebene W
#. type: Plain text
#: en/git.txt:82
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
msgstr "Beachten Sie, dass das Weglassen des `=` in `git -c foo.bar ...` erlaubt ist und `foo.bar` auf `true` setzt (genau wie `[foo]bar` in einer Konfigurationsdatei). Ein Gleichheitszeichen ohne Wert (wie `git -c foo.bar= ...`) setzt `foo.bar` auf einen leeren String, den `git config --type=bool` in `false` konvertiert."
@@ -52249,7 +52250,7 @@ msgstr "F체hrt keine optionalen Operationen durch, die Sperren erfordern. Dies e
#. type: Labeled list
#: en/git.txt:169
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "--list-cmds=group[,group...]"
msgstr "--list-cmds=Gruppe[,Gruppe...]"
@@ -52765,7 +52766,7 @@ msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
# noqa
#: en/git.txt:481
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr "Wenn diese Variable einen Pfad enth채lt, werde nicht-Arbeitsverzeichnis-Dateien, die sich normalerweise in $GIT_DIR befinden stattdessen aus diesem Verzeichnis geladen. Arbeitsverzeichnis-spezifische Dateien wie HEAD oder index werden aus $GIT_DIR geladen. Siehe linkgit:gitrepository-layout[5] und linkgit:git-worktree[1] f체r Details. Andere Pfadvariablen wie GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY, etc. haben Vorrang gegen체ber dieser Variable."
@@ -53730,7 +53731,7 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
#. type: Plain text
#: en/git-update-index.txt:29
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git update-index'\n"
"\t [--add] [--remove | --force-remove] [--replace]\n"
@@ -54290,7 +54291,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:348
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")."
msgstr ""
@@ -55163,7 +55164,7 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
#. type: Plain text
#: en/git-verify-commit.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git verify-tag' <tag>..."
msgid "'git verify-commit' <commit>...\n"
msgstr "'git verify-tag' <Markierung>..."
@@ -55208,7 +55209,7 @@ msgstr ""
#. type: Plain text
#: en/git-verify-pack.txt:13
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
msgstr ""
@@ -55220,7 +55221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:23
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "<pack>.idx ..."
msgstr ""
@@ -55298,7 +55299,7 @@ msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs 체berpr체fen"
#. type: Plain text
#: en/git-verify-tag.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git verify-tag' <tag>..."
msgid "'git verify-tag' [--format=<format>] <tag>...\n"
msgstr "'git verify-tag' <Markierung>..."
@@ -55318,7 +55319,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-tag.txt:27
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "<tag>"
msgid "<tag>..."
msgstr "<Markierung>"
@@ -55345,7 +55346,7 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:12
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git log' <option>..."
msgid "'git web{litdd}browse' [<options>] <url|file>...\n"
msgstr "'git log' <option>..."
@@ -55621,7 +55622,7 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:13
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git log' <option>..."
msgid "'git whatchanged' <option>...\n"
msgstr "'git log' <option>..."
@@ -56162,7 +56163,7 @@ msgstr ""
#. type: delimited block -
#: en/git-worktree.txt:372
-#, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
"$ pushd ../temp\n"
@@ -57370,7 +57371,7 @@ msgstr "--color"
#. type: Labeled list
#: en/pretty-formats.txt:115
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "'%C(...)'"
msgstr ""
@@ -57382,7 +57383,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:129
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
@@ -58441,7 +58442,11 @@ msgstr "The remote configuration is achieved using the `remote.origin.url` and `
#: en/pull-fetch-param.txt:14
#, fuzzy, no-wrap, priority:220
msgid "<refspec>"
-msgstr "#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n<file>...\n#-#-#-#-# git-rm-de.po (PACKAGE VERSION) #-#-#-#-#\n<Datei>..."
+msgstr ""
+"#-#-#-#-# git-commit-de.po (PACKAGE VERSION) #-#-#-#-#\n"
+"<file>...\n"
+"#-#-#-#-# git-rm-de.po (PACKAGE VERSION) #-#-#-#-#\n"
+"<Datei>..."
#. type: Plain text
#: en/pull-fetch-param.txt:18
@@ -58482,7 +58487,7 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:45
-#, priority:220
+#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
@@ -58953,13 +58958,13 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:280
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
#: en/revisions.txt:286
-#, priority:100
+#, ignore-ellipsis, priority:100
msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
msgstr ""
@@ -59049,7 +59054,7 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:331
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
@@ -59103,7 +59108,7 @@ msgstr ""
#. type: delimited block .
#: en/revisions.txt:377
-#, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
" D G H D\n"
@@ -59600,7 +59605,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:256
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
@@ -59612,7 +59617,7 @@ msgstr "--cherry"
#. type: Plain text
#: en/rev-list-options.txt:263
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
@@ -59624,7 +59629,7 @@ msgstr "--walk-reflogs"
#. type: Plain text
#: en/rev-list-options.txt:271
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
@@ -60618,7 +60623,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:875
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
@@ -60654,7 +60659,7 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:892
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
@@ -60666,7 +60671,7 @@ msgstr "--children"
#. type: Plain text
#: en/rev-list-options.txt:896
-#, priority:260
+#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
@@ -60719,13 +60724,13 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:922
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
#: en/rev-list-options.txt:929
-#, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
"\t>bbbbbbb... 2nd on b\n"
@@ -62255,7 +62260,7 @@ msgstr ""
#~ msgid "Limiting Output"
#~ msgstr "Ausgabe von 'diff' einschr채nken"
-#, fuzzy
+#, fuzzy, ignore-ellipsis
#~ msgid "'git diff' --no-index [--options] [--] [<path>...]"
#~ msgstr "'git diff' [--options] [--] [<path>...]"
@@ -62431,6 +62436,7 @@ msgstr ""
#~ msgid "Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com>"
#~ msgstr "Geschrieben von Linus Torvalds <torvalds@osdl.org> und Junio C Hamano <gitster@pobox.com>"
+#, ignore-ellipsis
#~ msgid ""
#~ "'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>]\n"
#~ "'git checkout' [<tree-ish>] [--] <paths>...\n"
@@ -62480,6 +62486,7 @@ msgstr ""
#~ msgid "Create a repository on the kernel.org machine that borrows from Linus"
#~ msgstr "Erzeuge auf dem Rechner kernel.org ein Projektarchiv das Objekte von Linus borgt"
+#, ignore-ellipsis
#~ msgid ""
#~ "$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n"
#~ " /pub/scm/.../me/subsys-2.6.git\n"
@@ -62586,6 +62593,7 @@ msgstr ""
#~ "'git remote prune' [-n | --dry-run] <Name>\n"
#~ "'git remote update' [group]\n"
+#, ignore-ellipsis
#~ msgid ""
#~ "$ git remote\n"
#~ "origin\n"
@@ -62632,6 +62640,7 @@ msgstr ""
#~ msgid "git-repo-config - Get and set repository or global options"
#~ msgstr "git-repo-config - Repositoryeigene/Globale Optionen auslesen und setzen"
+#, ignore-ellipsis
#~ msgid "'git repo-config' ..."
#~ msgstr "'git repo-config' ..."
@@ -62702,6 +62711,7 @@ msgstr ""
#~ msgid "(Without --cached, 'git-diff' will show you any changes that you've made but not yet added to the index.) You can also get a brief summary of the situation with 'git-status':"
#~ msgstr "(Ohne --cached zeigt 'git-diff' alle 횆nderungen, die Sie durchgef체hrt, aber noch nicht zum Index hinzugef체gt haben.) Sie k철nnen auch eine kurze Zusammenfassung der momentanen Situation mit 'git-status' erhalten:"
+#, ignore-ellipsis
#~ msgid ""
#~ "$ git status\n"
#~ "# On branch master\n"
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index a17931ffbd562cdd034fb7c7bc8f8bf8ea43bdbd..636897de4c837049d52bba6fb5d835c80f1bc255 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -2441,9 +2441,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr ""
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -3786,9 +3786,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4159,9 +4159,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4171,7 +4171,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
@@ -4183,9 +4183,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4195,9 +4195,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4207,9 +4207,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4219,9 +4219,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4309,9 +4309,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4357,9 +4357,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "--porcelain"
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4369,9 +4369,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr "listo"
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 42a34655093e67aa5dc8f97a58e4e86c2adf0f62..4ce1a965dd72fd4c97466d0e86c0ec830f48728d 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -2443,7 +2443,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"
@@ -3856,7 +3856,7 @@ msgstr "Choisir un algorithme de diff. Les variantes sont comme suit혻:"
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"
@@ -4236,7 +4236,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
@@ -4248,7 +4248,7 @@ msgstr "Les lignes d챕plac챕es ne sont pas surlign챕es."
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
@@ -4260,7 +4260,7 @@ msgstr "C'est un synonyme de `zebra`. Cela peut changer pour un mode plus raison
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
@@ -4272,7 +4272,7 @@ msgstr "Toute ligne qui est ajout챕e 횪 un endroit et supprim챕e 횪 un autre end
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
@@ -4284,7 +4284,7 @@ msgstr "Les blocs de texte d챕plac챕 d'au moins 20 caract챔res alphanum챕riques
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
@@ -4296,7 +4296,7 @@ msgstr "Les blocs de texte d챕plac챕 sont d챕tect챕s comme dans le mode 'blocks'
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
@@ -4386,7 +4386,7 @@ msgstr "Ignorer les espaces lors de la comparaison de lignes. Ceci ignore les di
#. type: Labeled list
#: en/diff-options.txt:337
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
@@ -4434,7 +4434,7 @@ msgstr "Afficher les mots comme `[-supprim챕-]` et `{+ajout챕+}`. Ne pas tenter
#. type: Labeled list
#: en/diff-options.txt:362
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
@@ -4446,7 +4446,7 @@ msgstr "Utiliser un format sp챕cial ligne par ligne destin챕 횪 la consommation
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 8011f6e3691fb78baba8a654d5b5406a428c8250..fe4e5935f210e2ef936e646fa18ad8965c0f651a 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -2439,9 +2439,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr ""
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -3784,9 +3784,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4157,9 +4157,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4169,9 +4169,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4181,9 +4181,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4193,9 +4193,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4205,9 +4205,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4217,9 +4217,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4307,9 +4307,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4355,9 +4355,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr ""
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4367,9 +4367,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr ""
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.pot b/po/documentation.pot
index c5e411796afba5b87718633789b093e0f1407505..83baecd474624eca6e5f4924db71be3202c126d7 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -2439,7 +2439,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr ""
@@ -3784,9 +3784,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4157,9 +4157,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4169,9 +4169,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4181,9 +4181,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4193,9 +4193,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4205,9 +4205,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4217,9 +4217,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4307,9 +4307,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4355,9 +4355,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr ""
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4367,9 +4367,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr ""
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 17efb8c5148583de8eddf08103bbdde2ca748693..64ed669c4782bdaf235219d635991955f872fea3 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -2480,9 +2480,9 @@ msgstr "O valor de muitas vari찼veis que especificam v찼rios tamanhos podem ter
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr "cor"
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -3889,9 +3889,9 @@ msgstr "Escolha um algoritmo de diff. As variantes s찾o as seguintes:"
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr "`padr찾o`, `myers`"
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4273,9 +4273,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr "n찾o"
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4285,9 +4285,9 @@ msgstr "As linhas movidas n찾o s찾o destacadas."
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr "padr찾o"
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4297,9 +4297,9 @@ msgstr "횋 um sin척nimo para `zebra`. Isso pode mudar para um modo mais sensato
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr "avi찾o"
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4309,9 +4309,9 @@ msgstr "Qualquer linha adicionada em um local e removida em outro local ser찼 co
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr "blocos"
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4321,7 +4321,7 @@ msgstr "Blocos de texto movido de pelo menos 20 caracteres alfanum챕ricos s찾o d
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
@@ -4333,9 +4333,9 @@ msgstr "Blocos de texto movido s찾o detectados como no modo 'blocos'. Os blocos
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr "zebra-escurecida"
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4423,9 +4423,9 @@ msgstr "Ignore os espa챌os em branco ao comparar linhas. Isso ignora as diferen
#. type: Labeled list
#: en/diff-options.txt:337
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
-msgstr "permitir-altera챌찾o-de recuo"
+msgstr "allow-indentation-change"
#. type: Plain text
#: en/diff-options.txt:342
@@ -4471,9 +4471,9 @@ msgstr "Mostrar palavras como `[-removed-]` e `{+ added +}`. N찾o faz nenhuma te
#. type: Labeled list
#: en/diff-options.txt:362
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "porcelana"
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4483,9 +4483,9 @@ msgstr "Use um formato baseado em linha especial destinado ao consumo de scripts
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr "nenhuma"
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index fcb64cea2e4d5030958e670c14cd11c7d5e5be9f..cd51b79e7f7aa574f5508966fdeccaf3554387a5 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -2438,9 +2438,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr ""
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -3783,9 +3783,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4156,9 +4156,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4168,9 +4168,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4180,9 +4180,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4192,9 +4192,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4204,9 +4204,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4216,9 +4216,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4306,9 +4306,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4354,9 +4354,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "--porcelain"
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4366,9 +4366,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr ""
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 72d08b25d1a1cb691e760c482b2cdf27ebdce0f1..8c01469c825aa610e24d301ecf6afb384cc15eea 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -2441,9 +2441,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:257 en/diff-options.txt:356 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr ""
+msgstr "color"
#. type: Plain text
#: en/config.txt:261
@@ -3786,9 +3786,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:107
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:109
@@ -4159,9 +4159,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
@@ -4171,9 +4171,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
@@ -4183,9 +4183,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
@@ -4195,9 +4195,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
@@ -4207,9 +4207,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
@@ -4219,9 +4219,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
@@ -4309,9 +4309,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
-#, 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:342
@@ -4357,9 +4357,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr "--porcelain"
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
@@ -4369,9 +4369,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:167
-#, fuzzy, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr "均棘�棘勻棘"
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 455ace8d24a33eddd6df356d3443d331498c97e0..aa40f5497157327c4765fabeb76bb05128df8710 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -2363,9 +2363,9 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:238 en/diff-options.txt:339 en/git-for-each-ref.txt:177
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr ""
+msgstr "color"
#. type: Plain text
#: en/config.txt:242
@@ -3426,9 +3426,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:97
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
-msgstr ""
+msgstr "`default`, `myers`"
#. type: Plain text
#: en/diff-options.txt:99
@@ -3769,9 +3769,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:267 en/diff-options.txt:309
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "no"
-msgstr ""
+msgstr "no"
#. type: Plain text
#: en/diff-options.txt:269
@@ -3781,9 +3781,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:269 en/git-commit.txt:211
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "default"
-msgstr ""
+msgstr "default"
#. type: Plain text
#: en/diff-options.txt:272
@@ -3793,9 +3793,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:272 en/diff-options.txt:341
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "plain"
-msgstr ""
+msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:279
@@ -3805,9 +3805,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:279
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "blocks"
-msgstr ""
+msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:284
@@ -3817,9 +3817,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "zebra"
-msgstr ""
+msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:289
@@ -3829,9 +3829,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
-msgstr ""
+msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:294
@@ -3919,9 +3919,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320
-#, 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:325
@@ -3967,9 +3967,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:345
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "porcelain"
-msgstr ""
+msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:352
@@ -3979,9 +3979,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:352 en/git-daemon.txt:131 en/git-submodule.txt:162
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
msgid "none"
-msgstr ""
+msgstr "none"
#. type: Plain text
#: en/diff-options.txt:354
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index f8cb4e473eb6e40215db3376d522a3d2b9292a3d..ac347c88e1b45956f5137a4e04df165f895febde 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -8,7 +8,7 @@ def main (f, d=None):
po = polib.pofile(f, wrapwidth=0)
option_re = re.compile(r'-[-a-z0-9[\]]+')
linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+')
- quoted_re = re.compile(r'`[a-zA-Z-_]+`|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames')
+ quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none')
env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
if not d is None:
po_file=polib.pofile(d)