From dd732e2bd150ec13509e99a13f6d4dd6f3ab1cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Wed, 25 Dec 2024 20:12:52 +0100
Subject: [PATCH] update po files to v2.48.0 with fixup in synopsis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

synopsis paragraph are verbatim.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 po/documentation.de.po         |  611 ++++++++-------
 po/documentation.es.po         |  611 ++++++++-------
 po/documentation.es_MX.po      |  611 ++++++++-------
 po/documentation.fr.po         | 1315 +++++++++++---------------------
 po/documentation.hu.po         |  611 ++++++++-------
 po/documentation.id.po         |  611 ++++++++-------
 po/documentation.is.po         |  611 ++++++++-------
 po/documentation.it.po         |  611 ++++++++-------
 po/documentation.ja.po         |  611 ++++++++-------
 po/documentation.ko.po         |  611 ++++++++-------
 po/documentation.mr.po         |  611 ++++++++-------
 po/documentation.nb_NO.po      |  611 ++++++++-------
 po/documentation.nl.po         |  611 ++++++++-------
 po/documentation.pl.po         |  611 ++++++++-------
 po/documentation.pot           |  587 +++++++-------
 po/documentation.pt_BR.po      |  611 ++++++++-------
 po/documentation.pt_PT.po      |  611 ++++++++-------
 po/documentation.ro.po         |  611 ++++++++-------
 po/documentation.ru.po         |  704 +++++++++--------
 po/documentation.sk.po         |  611 ++++++++-------
 po/documentation.tr.po         |  611 ++++++++-------
 po/documentation.uk.po         |  611 ++++++++-------
 po/documentation.vi.po         |  611 ++++++++-------
 po/documentation.zh_HANS-CN.po |  623 ++++++++-------
 po/documentation.zh_HANT.po    |  611 ++++++++-------
 25 files changed, 8082 insertions(+), 7978 deletions(-)

diff --git a/po/documentation.de.po b/po/documentation.de.po
index 5a6b13b3..869f39c5 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-10-01 11:16+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: Matthias Aßhauer <mha1993@live.de>\n"
@@ -4877,49 +4877,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, fuzzy, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in Anführungszeichen gesetzt, wie es für die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4931,7 +4942,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -5028,91 +5039,95 @@ msgstr "       diff --cc Datei\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7942,7 +7957,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Fügt Datei-Inhalte zum Index hinzu"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8782,7 +8797,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "git-am - Eine Serie von Patches von einer Mailbox anwenden"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9412,7 +9427,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -9443,7 +9458,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - Einen Patch auf Dateien und/oder den Index anwenden"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9928,7 +9943,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr "git-archimport - Ein GNU-Arch-Repository in Git importieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10092,7 +10107,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10541,7 +10556,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "git-bisect - Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht hat"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11328,7 +11343,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "git-blame - Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen einer Datei zuletzt geändert wurden"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, fuzzy, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11740,7 +11755,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11770,7 +11785,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr "git-branch - Auflisten, Erzeugen oder Löschen von Entwicklungszweigen (branches)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12526,7 +12541,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, fuzzy, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12691,7 +12706,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13234,7 +13249,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "git-cat-file - Inhalt oder Informationen zu Typ und Größe für Repository-Objekte bereitstellen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13972,7 +13987,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14233,7 +14248,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14421,7 +14436,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14487,7 +14502,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr "git-checkout-index - Dateien von dem Index ins Arbeitsverzeichnis kopieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14776,7 +14791,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - Branches wechseln oder Dateien im Arbeitsbereich wiederherstellen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15757,7 +15772,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15955,7 +15970,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16364,7 +16379,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16577,7 +16592,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr "git-citool - Graphische Alternative zu git-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16609,7 +16624,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - Unversionierte Dateien vom Arbeitsverzeichnis entfernen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16822,7 +16837,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone – Klont ein Repository in ein neues Verzeichnis"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17544,7 +17559,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17703,7 +17718,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr "git-commit-tree - Erstelle ein Commit-Objekt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17874,7 +17889,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - Trage Änderungen im Projektarchiv (repository) ein"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18750,7 +18765,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config – Repository eigene oder globale Optionen auslesen und setzen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -20095,7 +20110,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -20191,7 +20206,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20929,7 +20944,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr "git-cvsexportcommit - Einzelnen Commit zu einem ausgecheckten CVS-Repository exportieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -21112,7 +21127,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport – Retten Sie Ihre Daten aus einem anderen SCM, das die Leute liebend gerne hassen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21539,7 +21554,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21547,25 +21562,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22276,7 +22291,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22848,7 +22863,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - Einem Objekt einen für Menschen lesbaren Namen basierend auf einer verfügbaren Referenz geben."
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -23143,7 +23158,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -23215,7 +23230,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23404,7 +23419,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr "git-diff - Zeige Unterschiede zwischen Eintragungen (commits), Eintragung und Arbeitsbereich, etc"
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23650,7 +23665,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "git-diff-tree – Vergleicht Inhalt und Modus von Blobs, die über zwei Baumobjekte gefunden wurden"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23810,10 +23825,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff – Zeigt die Unterschiede zwischen Commits, Commit und Arbeitsbereich usw."
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, fuzzy, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 "'git diff' [<Optionen>] [<Commit>] [--] [<Pfad>...]\n"
 "'git diff' [<Optionen>] --cached [<Commit>] [--] [<Pfad>...]\n"
@@ -24273,7 +24294,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24674,7 +24695,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -27036,7 +27057,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr "git-commit - Trage Änderungen im Projektarchiv (repository) ein"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -27232,7 +27253,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch – Objekte und Referenzen von einem anderen Repository abrufen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27719,7 +27740,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr "git-branch - Auflisten, Erzeugen oder Löschen von Entwicklungszweigen (branches)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28578,7 +28599,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28708,7 +28729,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29639,7 +29660,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30951,7 +30972,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - überprüft die Verbundenheit und Korrektheit der Objekte in der Datenbank"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30976,7 +30997,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - überprüft die Verbundenheit und Korrektheit der Objekte in der Datenbank"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -31274,7 +31295,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "git-gc – Unnötige Dateien entfernen und das lokale Repository optimieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31503,7 +31524,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31533,7 +31554,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -32264,7 +32285,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "git-gui – Eine portable grafische Schnittstelle zu Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32481,7 +32502,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "git-hash-object – Berechnet Objekt-ID und erzeugt optional einen Blob aus einer Datei"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32574,7 +32595,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Hilfsinformationen über Git anzeigen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32999,7 +33020,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33450,7 +33471,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33570,7 +33591,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33720,7 +33741,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "git-imap-send – Sendet eine Sammlung von Patches von der Standard-Eingabe an einen IMAP-Ordner"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33831,13 +33852,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33854,31 +33875,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33923,7 +33944,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -34154,7 +34175,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - Erstellt ein leeres git-Repository"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, fuzzy, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -34179,7 +34200,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init-db – Erstellt ein leeres Git-Repository oder initialisiert ein vorhandenes erneut"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -34524,7 +34545,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "git-instaweb – Durchsucht das aktuelle Repository in gitweb sofort"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34683,7 +34704,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen."
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35526,7 +35547,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr "git-log - Zeigt die Geschichte des Projekts"
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35871,7 +35892,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "git-ls-files – Informationen über Dateien in dem Index und im Arbeitsbereich anzeigen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36550,7 +36571,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36765,7 +36786,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36990,7 +37011,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "git-mailinfo – Patch und Urheberschaft aus einer einzelnen E-Mail-Nachricht extrahieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -37185,7 +37206,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -37308,7 +37329,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "möglichst besten gemeinsamen Vorgänger-Commit für einen Merge finden"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37660,7 +37681,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37848,7 +37869,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37902,7 +37923,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37955,7 +37976,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr "git-merge-one-file - Das Standardhilfsprogramm welches in Kombination mit git-merge-index verwendet wird"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37979,7 +38000,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -38081,7 +38102,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "git-mergetool – Ausführen von Tools zur Lösung von Merge-Konflikten"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -38232,7 +38253,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern."
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38741,7 +38762,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge – Verbindet zwei oder mehr Entwicklungsverläufe miteinander"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -39272,7 +39293,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Ein Tag-Objekt erstellen."
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -39368,7 +39389,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39416,7 +39437,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder umbenennen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -39506,7 +39527,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39675,7 +39696,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -40219,7 +40240,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41763,7 +41784,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42371,7 +42392,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42449,7 +42470,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42558,7 +42579,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42673,7 +42694,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42733,7 +42754,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42841,7 +42862,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull – Abrufen von und Integrieren in ein anderes Repository oder einen lokalen Branch"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42999,7 +43020,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -43011,7 +43032,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -43171,7 +43192,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push – Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -44128,7 +44149,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -44220,7 +44241,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Vergleiche zwei Commit-Bereiche (z.B. zwei Versionen eines Branches)."
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44640,7 +44661,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -45250,7 +45271,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -45285,25 +45306,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -47192,7 +47213,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr "git-commit - Trage Änderungen im Projektarchiv (repository) ein"
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47627,7 +47648,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47821,7 +47842,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -48145,7 +48166,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48553,7 +48574,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48844,7 +48865,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -49115,7 +49136,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -49247,7 +49268,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "git-rerere – Wiederverwenden der aufgezeichneten Auflösung von widersprüchlichen Merges"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -49265,7 +49286,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49538,7 +49559,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset – Den aktuellen HEAD auf den definierten Zustand zurücksetzen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -50294,7 +50315,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "git-restore - Dateien im Arbeitsbereich wiederherstellen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50565,7 +50586,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50699,7 +50720,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Commit-Objekte chronologisch absteigend sortiert auflisten."
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 #| msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
@@ -50861,7 +50882,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 #| msgid "'git rev-parse' [<options>] <args>...\n"
@@ -51883,7 +51904,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -52128,7 +52149,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -53129,7 +53150,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "git-send-pack - Objekte über das Git Protokoll zu einem anderen Repository übertragen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -53278,7 +53299,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "git-shell - Login-Shell beschränkt für Nur-Git SSH-Zugriff"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53432,7 +53453,7 @@ msgstr "git-sh-i18n{litdd}envsubst(1)"
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53474,7 +53495,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53522,7 +53543,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53718,7 +53739,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr "git-show-branch - Zeige Branches und ihre Commits an"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -54021,7 +54042,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -54081,7 +54102,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54406,7 +54427,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54546,7 +54567,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54722,7 +54743,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - Füge Dateiinhalte zum Staging-Bereich hinzu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54747,7 +54768,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - Änderungen in einem Arbeitsverzeichnis aufbewahren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -55284,7 +55305,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
@@ -56109,7 +56130,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -56263,7 +56284,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56932,7 +56953,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "git-svn - Bidirektionale Operationen zwischen einem Subversion-Repository und Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -57163,7 +57184,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -57205,31 +57226,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, fuzzy, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr "% git config --get-all core.gitproxy\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, fuzzy, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr "% git config --get-all core.gitproxy\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -57265,7 +57286,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, fuzzy, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -57277,7 +57298,7 @@ msgstr "% git config --get-all core.gitproxy\n"
 msgid "--log-window-size=<n>"
 msgstr "--log-window-size=<Anz>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -57289,7 +57310,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -57301,7 +57322,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -57313,7 +57334,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr "--placeholder-filename=<Datei>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -57325,31 +57346,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -57361,25 +57382,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -57391,13 +57412,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57405,13 +57426,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57423,31 +57444,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57459,7 +57480,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, fuzzy, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57471,7 +57492,7 @@ msgstr "Verschiebe/Umbenenne einen Entwicklungszweig und den zugehörigen reflog
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, fuzzy, priority:100
 msgid "Allows to specify the commit message."
@@ -57483,7 +57504,7 @@ msgstr "Verwende die angegebene <msg> als Eintragungsbemerkung (commit message).
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57501,19 +57522,19 @@ msgstr "-d<Pfad>"
 msgid "--destination=<path>"
 msgstr "--destination=<Pfad>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57525,7 +57546,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57537,13 +57558,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57555,7 +57576,7 @@ msgstr "git config --get-all svn-remote.<Name>.commiturl"
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57567,7 +57588,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57579,13 +57600,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57603,13 +57624,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57621,19 +57642,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr "--limit=<Anz>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57645,7 +57666,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, fuzzy, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57657,19 +57678,19 @@ msgstr "Zeigt die Geschichte des Projekts"
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57681,7 +57702,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57693,7 +57714,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57705,7 +57726,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57723,7 +57744,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57735,7 +57756,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57747,7 +57768,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57759,7 +57780,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57771,7 +57792,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57783,7 +57804,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57795,19 +57816,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57826,7 +57847,7 @@ msgid "--file=<filename>"
 msgstr "--file=<Datei>"
 
 # ERROR: --edit not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, fuzzy, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57838,7 +57859,7 @@ msgstr "Lies die Commit-Beschreibung aus der spezifizierten Datei. Mit '-' wird
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57850,7 +57871,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57862,7 +57883,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57874,7 +57895,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57973,7 +57994,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57996,7 +58017,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -58083,7 +58104,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -58095,19 +58116,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -58125,13 +58146,13 @@ msgstr "-l<Anz>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -58151,7 +58172,7 @@ msgstr "-o <name>"
 msgid "--authors-file=<filename>"
 msgstr "--authors-file=<Datei>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -58169,7 +58190,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -58181,25 +58202,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr "--authors-prog=<Datei>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -58211,37 +58232,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "-s<Strategie>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -58253,13 +58274,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -58271,13 +58292,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -58337,7 +58358,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58892,7 +58913,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr "git-switch - Branches wechseln"
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -59201,7 +59222,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -59300,7 +59321,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag - Ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder verifizieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59860,7 +59881,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - der stupide Content-Tracker"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61939,7 +61960,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61972,7 +61993,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -62032,7 +62053,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr "git-update-index - Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62950,7 +62971,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -63270,7 +63291,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "'git update-server-info'\n"
@@ -63319,7 +63340,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -63392,7 +63413,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63502,7 +63523,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63696,7 +63717,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr "git-verify-commit - Die GPG-Signatur eines Commits überprüfen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 #| msgid "'git verify-commit' <commit>...\n"
@@ -63739,7 +63760,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63829,7 +63850,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr "git-verify-tag - Die GPG-Signaturen von Markierungs überprüfen"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 #| msgid "'git verify-tag' [--format=<format>] <tag>...\n"
@@ -63872,7 +63893,7 @@ msgstr "git-web{litdd}browse(1)"
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -64147,7 +64168,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen."
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -64208,7 +64229,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64911,7 +64932,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr "git-write-tree - Erstelle ein Baumobjekt des aktuellen Index'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -69034,13 +69055,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -72236,7 +72257,7 @@ msgstr "wobei <Adresse> ein Pfad, ein Server und Pfad oder eine beliebige URL-ä
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Wenn es eine große Anzahl ähnlich benannter Remote-Repositorys gibt und Sie für diese ein anderes Format verwenden möchten (sodass die von Ihnen verwendeten URLs in funktionierende URLs umgeschrieben werden), kann ein Konfigurations-Abschnitt in dieser Form erstellt werden:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -72249,7 +72270,7 @@ msgstr ""
 "\t[url \"<aktuelle URL-Basis>\"]\n"
 "\t\tinsteadOf = <andere URL-Basis>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -72279,7 +72300,7 @@ msgstr "eine URL wie \"work:Repo.git\" oder wie \"host.xz:/fad/zu/Repo.git\" wir
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Wenn Sie URLs nur zum Pushen neu schreiben möchten, können Sie einen Konfiguration-Abschnitt in der folgenden Form erstellen:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 14d18a55..5b1219ff 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-09-02 08:45+0000\n"
 "Last-Translator: Salvador Peña <salvadorp74@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4814,9 +4814,9 @@ msgstr "Cuando se involucra un renombre/copia, `fichero1` y `fichero2` muestra e
 msgid "It is followed by one or more extended header lines:"
 msgstr "Es seguido por una o mas líneas de encabezado extendido:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4829,7 +4829,18 @@ msgstr "Es seguido por una o mas líneas de encabezado extendido:"
 #| "similarity index <number>\n"
 #| "dissimilarity index <number>\n"
 #| "index <hash>..<hash> <mode>\n"
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 "old mode <modo>\n"
 "new mode <modo>\n"
@@ -4843,45 +4854,45 @@ msgstr ""
 "dissimilarity index <número>\n"
 "index <hash>..<hash> <modo>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, fuzzy, priority:280
 #| msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "Modos de fichero se imprimen como números octales de 6 dígitos incluyendo el tipo de fichero y los bits de permiso de fichero."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "Nombres de ruta en encabezados extendidos no incluyen los prefijos `a/` y `b/`."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "El índice de similaridad es el porcentaje de líneas sin cambios, y el índice de disimilaridad es el porcentaje de líneas modificadas. Es un entero redondeado hacia abajo, seguido por un signo de porcentaje. El índice de similaridad valor 100% es por lo tanto reservado para dos ficheros iguales, mientras que un 100% de disimilaridad significa que ninguna línea del fichero antiguo llegó al nuevo."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, fuzzy, priority:280
 #| msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "La línea de índice incluye los nombres de objeto blob antes y después del cambio. El <modo> se incluye si el modo del fichero no cambia; de lo contrario, líneas separadas indican los modos anterior y nuevo."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Nombres de ruta con caracteres \"inusuales\" se entrecomillan como se explica para la variable de configuración `core.quotePath` (ver linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "Todos los ficheros `fichero1` en la salida refieren a ficheros antes del commit, y todos los ficheros `fichero2`refieren a ficheros después del commit. Es incorrecto aplicar cada cambio a cada fichero secuencialmente. Por ejemplo, este parche intercambiará a y b:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4899,7 +4910,7 @@ msgstr ""
 "rename from b\n"
 "rename to a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -5021,101 +5032,105 @@ msgstr "       diff --cc fichero\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "Es seguido por uno o mas líneas de encabezado extendido (este ejemplo muestra una fusión con dos padres):"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "index <hash>,<hash>..<hash>\n"
 #| "mode <mode>,<mode>..<mode>\n"
 #| "new file mode <mode>\n"
 #| "deleted file mode <mode>,<mode>\n"
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 "index <hash>,<hash>..<hash>\n"
 "mode <modo>,<modo>..<modo>\n"
 "new file mode <modo>\n"
 "deleted file mode <modo>,<modo>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, fuzzy, priority:280
 #| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format."
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "La línea `mode <modo>,<modo>..<modo>` sólo aparece si por lo menos uno de los <modo> es diferente del resto. Los encabezados extendidos con información sobre movimientos de contenido detectados (detección de renombrados y copia) están diseñados para trabajar con el diff de dos <arbol-ismos> y no se usan en el formato diff combinado."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "Es seguido por un encabezado de dos líneas del-fichero/al-fichero:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/fichero"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/fichero"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "Similar al encabezado de dos líneas del formato diff tradicional 'unificado', se usa `/dev/null` para indicar ficheros creados o borrados."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "Sin embargo, si se da la opción --combined-all-paths, en lugar de dos líneas con de-fichero/a-fichero obtendrá un encabezado de-fichero/a-fichero de N+1 líneas, donde N es el número de padres en la confirmación de fusión:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "Este formato extendido puede ser útil si la detección de renombre o copia esta activa, para permitirte ver el nombre original del fichero en padres diferentes."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "El formato de encabezado de fragmento se modifica para prevenir a la gente de mandarlo accidentalmente a `patch -p1`. El formato diff combinado fue creado para revisión de cambios de commit de fusión, sin la intención de ser aplicado. El cambio es similar al cambio en el encabezado de 'índice' extendido:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <rango-desde-fichero> <rango-desde-fichero> <rango-hacia-fichero> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "Hay (número de padres +1) caracteres `@` en el encabezado de fragmento para formato diff combinado."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 "A diferencia del formato diff 'unificado' tradicional, el cual muestra dos ficheros A Y B con una sola columna con los prefijos `-`(menos -- aparece en A pero eliminado en B), `+`(mas -- faltante en A pero agregado a B), o `\" \"` (espacio -- sin cambio), este formato compara dos o mas ficheros fichero1, fichero2,... con un fichero X, y muestra como X difiere de cada ficheroN. Una columna para cada uno de los ficheroN es antepuesta a la línea de salida para notar como la línea de X es diferente de ella."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "Un caracter `-` en la columna N significa que la línea aparece en ficheroN pero no aparece en el resultado. Un caracter `+` en la columna N significa que la línea aparece en el resultado, y ficheroN no tiene esa línea (en otras palabras, la línea fue añadida, desde el punto de vista del antecesor)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "En el ejemplo de salida de arriba, la firma de la función cambió en ambos ficheros (por eso los dos `-` eliminaciones de ambos ficheros fichero1 y fichero2, además `++` que significa que una línea agregada no aparece en ningún fichero de fichero1 o fichero2). Además, otras ocho líneas iguales del fichero1 que no aparecen en fichero2 (por eso prefijadas con `+`)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7996,7 +8011,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Añadir contenido de un fichero al índice"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8797,7 +8812,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "git-am - Aplica una serie de parches de un buzón"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9425,7 +9440,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9455,7 +9470,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - Aplicar un parche a los ficheros y/o al índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9938,7 +9953,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10102,7 +10117,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "git-archive - Crear un archivo de ficheros de un árbol nombrado"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10550,7 +10565,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "git-bisect - Usa búsqueda binaria para encontrar el commit que introdujo el bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11337,7 +11352,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "git-blame - Mostrar qué revisión y autor modificaron al último cada línea de un fichero"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11743,7 +11758,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11773,7 +11788,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12502,7 +12517,7 @@ msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "git-bugreport - Recolectar información para el usuario para generar un reporte de bug"
 
 # ERROR: --output-directory) not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12670,7 +12685,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13212,7 +13227,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "git-cat-file - Proveer contenido o detalles de objetos de repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13949,7 +13964,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14208,7 +14223,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14396,7 +14411,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14463,7 +14478,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14751,7 +14766,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - Cambia de rama o restaura los ficheros del árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15675,7 +15690,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15873,7 +15888,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16282,7 +16297,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "git-cherry - Encuentra commits que faltan aplicar en upstream"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16495,7 +16510,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16525,7 +16540,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - Remueve ficheros sin seguimiento del árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16733,7 +16748,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone: clonar un repositorio en un directorio nuevo"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 #| msgid ""
@@ -17412,7 +17427,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17571,7 +17586,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17742,7 +17757,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - Registra cambios en el repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 #| msgid ""
@@ -18604,7 +18619,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config - Obtiene y asigna opciones globales o de repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19879,7 +19894,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19975,7 +19990,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20698,7 +20713,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20881,7 +20896,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport - Salva tus datos de otro SCM que la gente adora odiar"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21308,7 +21323,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21316,25 +21331,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22045,7 +22060,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "git-daemon - Un servidor realmente simple para repositorios Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22617,7 +22632,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - Dar a un objeto un nombre legible por humanos basado en una referencia disponible"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22912,7 +22927,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22984,7 +22999,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23173,7 +23188,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23419,7 +23434,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "git-diff-tree - Compara el contenido y el modo de blobs encontrados a través de dos objetos de árbol"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23578,10 +23593,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Muestra los cambios entre confirmaciones, confirmación y árbol de trabajo, etc"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -24012,7 +24033,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24413,7 +24434,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26773,7 +26794,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26969,7 +26990,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - Descarga objetos y referencias desde otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27450,7 +27471,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28309,7 +28330,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28439,7 +28460,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29359,7 +29380,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30670,7 +30691,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - Verifica la conectividad y validez de los objetos en la base de datos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30694,7 +30715,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck - Verifica la conectividad y validez de los objetos en la base de datos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30992,7 +31013,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "git-gc - Limpia ficheros innecesarios y optimiza el repositorio local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31220,7 +31241,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31250,7 +31271,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31979,7 +32000,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "git-gui - Una interfaz gráfica portátil para Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32195,7 +32216,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "git-hash-object - Computa ID de objeto y opcionalmente crea un objeto de un fichero"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32288,7 +32309,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "git-help - Mostrar información de ayuda sobre Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32711,7 +32732,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33162,7 +33183,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33282,7 +33303,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "git-http-push - Empuja objetos por HTTP/DAV a otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33432,7 +33453,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "git-imap-send - Enviar una colección de parches desde stdin a una carpeta IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33543,13 +33564,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33566,31 +33587,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33635,7 +33656,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "git-index-pack - Construye un fichero de índice empaquetado para un archivo empaquetado existente"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33867,7 +33888,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33891,7 +33912,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Crear un repositorio de Git vacío o reinicializar uno ya existente"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -34228,7 +34249,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "git-instaweb - Buscar instantáneamente tu repositorio de trabajo en gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34387,7 +34408,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35227,7 +35248,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35569,7 +35590,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "git-ls-files - Muestra información sobre ficheros en el índice y el árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36244,7 +36265,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36457,7 +36478,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36682,7 +36703,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "git-mailinfo - Extraer parche y autoría de un único mensaje de correo electrónico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36877,7 +36898,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36999,7 +37020,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "git-merge-base - Encuentra los mejores ancestros comunes posibles para una fusión"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37351,7 +37372,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37539,7 +37560,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37593,7 +37614,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37646,7 +37667,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37670,7 +37691,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37772,7 +37793,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "git-mergetool - Ejecuta las herramientas de resolución de conflictos de fusión para resolver conflictos de fusión"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37922,7 +37943,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "git-merge-tree - Hacer fusión sin tocar el índice o árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38429,7 +38450,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge - Une dos o más historiales de desarrollo juntos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38955,7 +38976,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "git-mktag - Crea un objeto etiqueta con validación extra"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -39051,7 +39072,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-mktree - Construir un objeto árbol de un texto en formato ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39099,7 +39120,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - Mueve o renombra un fichero, un directorio o un enlace simbólico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -39179,7 +39200,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39348,7 +39369,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39891,7 +39912,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-p4 - Importar desde y enviar a repositorios Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41434,7 +41455,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42042,7 +42063,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42120,7 +42141,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "git-pack-refs - Empaqueta heads y etiquetas para un acceso eficiente al repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42228,7 +42249,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42342,7 +42363,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42402,7 +42423,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-prune - Limpia todos los objetos no alcanzables de la base de datos de objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42510,7 +42531,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull - Obtener desde e integrarse con otro repositorio o rama local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42668,7 +42689,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42680,7 +42701,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42840,7 +42861,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push - Actualiza referencias remotas junto con sus objetos asociados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43797,7 +43818,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43889,7 +43910,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "git-range-diff - Compara dos rangos de commit (ej. dos versiones de una rama)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44309,7 +44330,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44922,7 +44943,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase - Vuelve a aplicar commits por encima de otra punta base"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44957,25 +44978,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46862,7 +46883,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -47295,7 +47316,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47489,7 +47510,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47813,7 +47834,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48214,7 +48235,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48502,7 +48523,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "git-replace - Crea, lista, borra referencias para reemplazar objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48772,7 +48793,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48904,7 +48925,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "git-rerere - Reutilizar la resolución registrada de fusiones conflictivas"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48922,7 +48943,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49193,7 +49214,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset - Restablece el HEAD actual a un estado especifico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49945,7 +49966,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50204,7 +50225,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50338,7 +50359,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "git-rev-list - Lista objetos commit en orden cronológico inverso"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50499,7 +50520,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51513,7 +51534,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - Borra ficheros del árbol de trabajo y del índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51753,7 +51774,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52754,7 +52775,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "git-send-pack - Empujar objetos por protocolo Git a otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52903,7 +52924,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "git-shell - Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53056,7 +53077,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53098,7 +53119,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53146,7 +53167,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53342,7 +53363,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53649,7 +53670,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53709,7 +53730,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54033,7 +54054,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54171,7 +54192,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54345,7 +54366,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - Agrega contenidos de fichero al área de presentación"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54369,7 +54390,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - Reserva aparte los cambios de un directorio de trabajo con cambios"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54903,7 +54924,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55719,7 +55740,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55873,7 +55894,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56539,7 +56560,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "git-svn - Operación bidireccional entre un repositorio Subversion y Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56767,7 +56788,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56809,31 +56830,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56869,7 +56890,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56881,7 +56902,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56893,7 +56914,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56905,7 +56926,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56917,7 +56938,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56929,31 +56950,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56965,25 +56986,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56995,13 +57016,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57009,13 +57030,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57027,31 +57048,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57063,7 +57084,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57075,7 +57096,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -57087,7 +57108,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57105,19 +57126,19 @@ msgstr "-d<ruta>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57129,7 +57150,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57141,13 +57162,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57159,7 +57180,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57171,7 +57192,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57183,13 +57204,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57207,13 +57228,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57225,19 +57246,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57249,7 +57270,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57261,19 +57282,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57285,7 +57306,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57297,7 +57318,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57309,7 +57330,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57327,7 +57348,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57339,7 +57360,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57351,7 +57372,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57363,7 +57384,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57375,7 +57396,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57387,7 +57408,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57399,19 +57420,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57429,7 +57450,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57441,7 +57462,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57453,7 +57474,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57465,7 +57486,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57477,7 +57498,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57576,7 +57597,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57599,7 +57620,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57686,7 +57707,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57698,19 +57719,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57728,13 +57749,13 @@ msgstr "-l<número>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57754,7 +57775,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57772,7 +57793,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57784,25 +57805,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57814,37 +57835,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "-s<estrategia>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57856,13 +57877,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57874,13 +57895,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57940,7 +57961,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58495,7 +58516,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58796,7 +58817,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58895,7 +58916,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag - Crea, lista, elimina o verifica una etiqueta de objeto firmada con GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59440,7 +59461,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - el estúpido rastreador de contenido"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61444,7 +61465,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61477,7 +61498,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61537,7 +61558,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62454,7 +62475,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62771,7 +62792,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62819,7 +62840,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -62891,7 +62912,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63001,7 +63022,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63195,7 +63216,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63237,7 +63258,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63327,7 +63348,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63369,7 +63390,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63643,7 +63664,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "git-whatchanged - Mostrar logs con las diferencias que introduce cada confirmación"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63703,7 +63724,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64406,7 +64427,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68506,13 +68527,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71697,7 +71718,7 @@ msgstr "donde _<dirección>_ puede ser una ruta de acceso, un servidor y una rut
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Si hay un número grande de repositorios con nombres similares y quieres usar un formato diferente para ellos (de manera que las URLs que uses se reescriban a las URLs que funcionan), puedes crear una sección de configuración de la forma:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71707,7 +71728,7 @@ msgstr ""
 "\t[url \"__<url-base-actual>__\"]\n"
 "\t\tinsteadOf = _<otra-url-base>_\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71737,7 +71758,7 @@ msgstr "una URL como \"trabajo:repo.git\" o como \"host.xz:/ruta/a/repo.git\" se
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Si quieres reescribir URLs sólo para push, puedes crear una sección de configuración de la forma:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 5bcd3159..58c30410 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2019-10-05 21:56+0000\n"
 "Last-Translator: Farándula <farandula@versoblanco.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4765,49 +4765,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4819,7 +4830,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4916,91 +4927,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7766,7 +7781,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Agrega el contenido de los archivos al índice"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8532,7 +8547,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Aplicar una serie de parches de un mailbox"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9160,7 +9175,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9190,7 +9205,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Aplicar un parche a archivos y/o el índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9673,7 +9688,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9837,7 +9852,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Crear un archivo o archivos de un árbol nombrado"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10288,7 +10303,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11075,7 +11090,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Mostrar qué revisión y autor modificaron al último cada línea de un archivo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11482,7 +11497,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11512,7 +11527,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12240,7 +12255,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12408,7 +12423,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12951,7 +12966,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Proveer contenido o tipo y tamaño de información para objetos de repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13689,7 +13704,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13949,7 +13964,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14137,7 +14152,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14204,7 +14219,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14492,7 +14507,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15420,7 +15435,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15618,7 +15633,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16027,7 +16042,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Encuentra commits que faltan aplicar en upstream"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16240,7 +16255,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16270,7 +16285,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Remueve archivos del árbol de trabajo no rastreados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16478,7 +16493,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "Clona un repositorio dentro de un nuevo directorio"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17113,7 +17128,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17272,7 +17287,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17443,7 +17458,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18273,7 +18288,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Configurar repositorio u opciones globales"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19561,7 +19576,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19658,7 +19673,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20383,7 +20398,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20566,7 +20581,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Salva tus datos de otro SCM que la gente adora odiar"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20993,7 +21008,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21001,25 +21016,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21730,7 +21745,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Un servidor realmente simple para repositorios Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22302,7 +22317,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "Dar a un objeto un nombre legible por humanos basado en una referencia disponible"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22597,7 +22612,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22669,7 +22684,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22858,7 +22873,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23106,7 +23121,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "Compara el contenido y el modo de blobs encontrados a través de dos objetos de árbol"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23265,10 +23280,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23690,7 +23711,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24091,7 +24112,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26451,7 +26472,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26647,7 +26668,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "Descarga objetos y referencias de otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27128,7 +27149,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27987,7 +28008,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28118,7 +28139,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29044,7 +29065,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30359,7 +30380,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30383,7 +30404,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30681,7 +30702,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30909,7 +30930,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30939,7 +30960,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31668,7 +31689,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Una interfaz gráfica portátil para Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31884,7 +31905,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31977,7 +31998,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Mostrar información sobre Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32400,7 +32421,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32851,7 +32872,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32971,7 +32992,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33121,7 +33142,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33232,13 +33253,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33255,31 +33276,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33324,7 +33345,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Constuye un archivo de índice para un archivo empaquetado existente"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33555,7 +33576,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33579,7 +33600,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33897,7 +33918,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34056,7 +34077,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "Agregar o analizar información estructurada en mensajes de commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34897,7 +34918,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35239,7 +35260,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35919,7 +35940,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36131,7 +36152,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36356,7 +36377,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Extraer parche y autoría de un único mensaje de e-mail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36551,7 +36572,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36673,7 +36694,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Encuentra un ancestro común bueno para una posible fusión"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37025,7 +37046,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37213,7 +37234,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37267,7 +37288,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37320,7 +37341,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37344,7 +37365,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37447,7 +37468,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Ejecuta las herramientas de fusión de resolución de conflictos para resolver conflictos de fusión"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37597,7 +37618,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "Mostrar fusión de tres vías sin tocar el índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38108,7 +38129,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "Junta dos o mas historiales de desarrollo juntos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38634,7 +38655,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38730,7 +38751,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "Construir un objeto árbol de un texto en formato ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38778,7 +38799,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38858,7 +38879,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39027,7 +39048,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39570,7 +39591,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Importar desde y enviar a repositorios Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41115,7 +41136,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41723,7 +41744,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41801,7 +41822,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41909,7 +41930,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42023,7 +42044,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42083,7 +42104,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42191,7 +42212,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Realiza un fetch e integra con otro repositorio o rama local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42349,7 +42370,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42361,7 +42382,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42521,7 +42542,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "Actualiza referencias remotas junto con sus objetos asociados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43478,7 +43499,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43570,7 +43591,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43991,7 +44012,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44601,7 +44622,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44636,25 +44657,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46546,7 +46567,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46982,7 +47003,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47176,7 +47197,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47500,7 +47521,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47901,7 +47922,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48191,7 +48212,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Crea, lista, borra referencias para reemplazar objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48463,7 +48484,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48595,7 +48616,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48613,7 +48634,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48884,7 +48905,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Reinicia el HEAD actual a un estado especifico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49636,7 +49657,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49896,7 +49917,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50030,7 +50051,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Lista objetos commit en orden cronológico inverso"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50192,7 +50213,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51212,7 +51233,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Borra archivos del árbol de trabajo y del índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51450,7 +51471,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52451,7 +52472,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Empujar objetos por protocolo Git a otro repositorio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52600,7 +52621,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52754,7 +52775,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52796,7 +52817,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52844,7 +52865,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53039,7 +53060,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53344,7 +53365,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53404,7 +53425,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53728,7 +53749,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53866,7 +53887,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54040,7 +54061,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "Agrega contenidos de un archivo al área de staging"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54064,7 +54085,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54598,7 +54619,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55416,7 +55437,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55570,7 +55591,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56237,7 +56258,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Operación bidireccional entre un repositorio Subversion y Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56467,7 +56488,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56509,31 +56530,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56569,7 +56590,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56581,7 +56602,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56593,7 +56614,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56605,7 +56626,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56617,7 +56638,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56629,31 +56650,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56665,25 +56686,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56695,13 +56716,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56709,13 +56730,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56727,31 +56748,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56763,7 +56784,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56775,7 +56796,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56787,7 +56808,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56805,19 +56826,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56829,7 +56850,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56841,13 +56862,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56859,7 +56880,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56871,7 +56892,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56883,13 +56904,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56907,13 +56928,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56925,19 +56946,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56949,7 +56970,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56961,19 +56982,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56985,7 +57006,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56997,7 +57018,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57009,7 +57030,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57027,7 +57048,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57039,7 +57060,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57051,7 +57072,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57063,7 +57084,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57075,7 +57096,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57087,7 +57108,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57099,19 +57120,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57129,7 +57150,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57141,7 +57162,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57153,7 +57174,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57165,7 +57186,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57177,7 +57198,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57276,7 +57297,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57299,7 +57320,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57387,7 +57408,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57399,19 +57420,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57429,13 +57450,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57455,7 +57476,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57473,7 +57494,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57485,25 +57506,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57515,37 +57536,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57557,13 +57578,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57575,13 +57596,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57642,7 +57663,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58197,7 +58218,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58499,7 +58520,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58598,7 +58619,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59145,7 +59166,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61141,7 +61162,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61174,7 +61195,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61234,7 +61255,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62151,7 +62172,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62472,7 +62493,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "'git update-server-info' [--force]\n"
@@ -62522,7 +62543,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62595,7 +62616,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62705,7 +62726,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62899,7 +62920,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62941,7 +62962,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63031,7 +63052,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63073,7 +63094,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63347,7 +63368,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Muestra logs con las diferencias que cada commit introduce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63407,7 +63428,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64110,7 +64131,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68252,13 +68273,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71435,7 +71456,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71443,7 +71464,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71470,7 +71491,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 8d112087..3b1548c2 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -1,6 +1,18 @@
 #
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-12-17 15:04+0100\nPO-Revision-Date: 2024-12-24 14:18+0000\nLast-Translator: Jean-Noël Avila <jn.avila@free.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.10-dev\n"
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
+"PO-Revision-Date: 2024-12-24 14:18+0000\n"
+"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/git-instaweb.txt:45 en/git-ls-remote.txt:24 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31
@@ -3317,7 +3329,11 @@ msgid ""
 "\t(using `--dirstat=<param>,...`). The fallback defaults\n"
 "\t(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.\n"
 "\tThe following parameters are available:\n"
-msgstr "\tLes valeurs par défaut peuvent être surchargées sur la ligne de commande\n\t(en utilisant `--dirstat=<param>,...`). Les valeurs par défaut\n\t(lorsqu'elles ne sont pas modifiée par `diff.dirstat`) sont `changes,noncumulative,3`.\n\tLes paramètres suivants sont disponibles :\n"
+msgstr ""
+"\tLes valeurs par défaut peuvent être surchargées sur la ligne de commande\n"
+"\t(en utilisant `--dirstat=<param>,...`). Les valeurs par défaut\n"
+"\t(lorsqu'elles ne sont pas modifiée par `diff.dirstat`) sont `changes,noncumulative,3`.\n"
+"\tLes paramètres suivants sont disponibles :\n"
 
 #. type: Labeled list
 #: en/config/diff.txt:27 en/diff-options.txt:264
@@ -3619,7 +3635,9 @@ msgstr "\tVoir l'option `-O` de linkgit:git-diff[1] pour plus de détails.\n"
 msgid ""
 "\tIf `diff.orderFile` is a relative pathname, it is treated as\n"
 "\trelative to the top of the working tree.\n"
-msgstr "\tSi `diff.orderFile` est un nom de chemin relatif, il est traité comme\n\trelatif au sommet de l'arbre de travail.\n"
+msgstr ""
+"\tSi `diff.orderFile` est un nom de chemin relatif, il est traité comme\n"
+"\trelatif au sommet de l'arbre de travail.\n"
 
 #. type: Labeled list
 #: en/config/diff.txt:151
@@ -4765,49 +4783,72 @@ msgstr "Quand un renommage ou un copie est décrit, `fichier1` et `fichier2` ind
 msgid "It is followed by one or more extended header lines:"
 msgstr "Suivent un ligne ou plus d'entête étendu :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
-msgstr "old mode <mode>\nnew mode <mode>\ndeleted file mode <mode>\nnew file mode <mode>\ncopy from <chemin>\ncopy to <chemin>\nrename from <chemin>\nrename to <chemin>\nsimilarity index <nombre>\ndissimilarity index <nombre>\nindex <empreinte>..<empreinte> <mode>"
-
-#. type: Plain text
+#, fuzzy, no-wrap, priority:280
+#| msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
+msgstr ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <chemin>\n"
+"copy to <chemin>\n"
+"rename from <chemin>\n"
+"rename to <chemin>\n"
+"similarity index <nombre>\n"
+"dissimilarity index <nombre>\n"
+"index <empreinte>..<empreinte> <mode>"
+
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "Les modes de fichier _<mode>_ sont affichés comme des nombres à 6 chiffres en octal incluant le type de fichier et les bits de permission."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "Les noms de chemin dans les entêtes étendus n'incluent pas les préfixes `a/` et `b/`."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "L'index de similarité et le pourcentage de lignes inchangées et l'index de dissimilarité est le pourcentage de lignes changées. Il est arrondi à l'entier inférieur, suivi du signe pourcent. Une valeur d'index de similarité à 100 % correspond donc à deux fichiers identiques, tandis qu'un index de dissimilarité de 100 % signifie qu'aucune ligne de l'ancien fichier ne se retrouve dans le nouveau fichier."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "La ligne d'index inclut les noms des objets blob avant et après la modification. Le _<mode>_ est inclus si le mode du fichier n'est pas modifié ; sinon, des lignes séparées indiquent l'ancien et le nouveau mode."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Les noms de chemin avec des caractères « inhabituels » sont cités comme expliqué pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "Tous les fichiers `fichier1` de la sortie font référence à des fichiers avant la validation, et tous les fichiers `fichier2` font référence aux fichiers après la validation. Il est incorrect d'appliquer chaque modification à chaque fichier séquentiellement. Par exemple, cette rustine échange a et b :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4825,7 +4866,7 @@ msgstr ""
 "rename from b\n"
 "rename to a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4947,91 +4988,100 @@ msgstr "       diff --cc file\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "Il est suivi par une ligne d'entête étendu ou plus (cet exemple montre une fusion avec deux parents) :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
-msgstr "index <empreinte>,<empreinte>..<empreinte>\nmode <mode>,<mode>..<mode>\nnew file mode <mode>\ndeleted file mode <mode>,<mode>"
+#, fuzzy, no-wrap, priority:280
+#| msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
+msgstr ""
+"index <empreinte>,<empreinte>..<empreinte>\n"
+"mode <mode>,<mode>..<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "La ligne `mode <mode>,<mode>..<mode>` n'apparaît que si au moins un des modes est différent du reste. Les entêtes étendus avec l'information à propos des déplacements détectés de contenu (détection de renommages et de copies) sont conçus pour fonctionner avec le diff de deux _<arbre-esques>_ et ne sont pas utilisés dans le format de diff combiné."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "Il est suivi par un entête de deux lignes fichier-source/fichier-cible :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/fichier"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/fichier"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "Similaire à l'entête à deux lignes pour le format diff unifié traditionnel, `/dev/null` est utilisé pour indiquer un fichier créé ou supprimé."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "Cependant, si l'option --combined-all-paths est fournie, au lieu des deux lignes de fichier-source/fichier-cible, vous obtenez un en-tête de N+1 lignes de fichier-source/fichier-cible, où N est le nombre de parents dans le commit de fusion :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "Ce format étendu peut être utile si la détection de renommage ou de copie est active, pour vous permettre de voir le nom original du fichier dans différents parents."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "Le format d'entête de section est modifié pour empêcher l'utilisation accidentelle avec `patch -p1`. Le format de diff combiné a été créé pour les revues des modifications de commits de fusions, et n'était pas destiné à être appliqué. La modification est similaire à la modification dans l'entête étendu d'index :"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <intervalle-de-fichier-source> <intervalle-de-fichier-source> <intervalle-de-fichier-cible> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "Il y a (nombre de parents + 1) caractères `@` dans l'entête de section pour le format de diff combiné."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 "À la différence du format diff 'unifié' traditionnel qui montre deux fichiers A et B avec une seule colonne qui a un préfixe `-` (moins -- apparaît dans A mais supprimé dans B), `+` (plus -- manquant dans A mais ajouté dans B), ou `\" \"` (espace -- non modifié), ce format compare un fichier ou plus fichier1, fichier2,… avec un fichier X, et affiche comment X diffère de chaque fichierN. Une colonne pour chaque fichierN est insérée dans la sortie pour montrer comment la ligne de X est différente de la ligne correspondante de celui-ci."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "Un caractère `-` dans la colonne N signifie que la ligne apparaît dans fichierN mais pas dans le résultat. Un caractère `+` dans la colonne N signifie que la ligne apparaît dans le résultat, et fichierN ne l'a pas (en d'autres termes, la ligne a été ajoutée du point de vue de ce parent)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "Dans l'exemple de sortie ci-dessus, la signature de la fonction a été changée depuis les deux fichiers (d'où les deux suppressions `-` depuis fichier1 et fichier2, plus `++` pour signifier qu'une ligne qui a été ajoutée n'apparaît ni dans fichier1 ni dans fichier2). De plus, huit autres lignes sont identiques depuis fichier1 mais n'apparaissent pas dans fichier2 (et sont donc préfixées par `+`)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -6235,7 +6285,16 @@ msgid ""
 "\t0.5, and is thus the same as `-M50%`.  Similarly, `-M05` is\n"
 "\tthe same as `-M5%`.  To limit detection to exact renames, use\n"
 "\t`-M100%`.  The default similarity index is 50%.\n"
-msgstr "\tSi _<n>_ est spécifié, c'est un seuil d'index de similarité\n\t(c-à-d la quantité d'addition/suppression comparé à la taille\n\tdu fichier). Par exemple, `-M90%` signifie que Git considérera \n\tun couple suppression/ajout comme renommage si plus de 90 %\n\tdu fichier n'a pas changé. Sans le signe `%`, le nombre doit être\n\tlu comme une fraction précédée du point décimal. `-M5` devient\n\t0,5, tout comme `-M50%`. De même, `-M05` est identique à\n\t`-M5%`.  Pour limiter la détection à des renommages exacts,\n\tutilisez `-M100%`. L'index de similarité par défaut est `50%`.\n"
+msgstr ""
+"\tSi _<n>_ est spécifié, c'est un seuil d'index de similarité\n"
+"\t(c-à-d la quantité d'addition/suppression comparé à la taille\n"
+"\tdu fichier). Par exemple, `-M90%` signifie que Git considérera \n"
+"\tun couple suppression/ajout comme renommage si plus de 90 %\n"
+"\tdu fichier n'a pas changé. Sans le signe `%`, le nombre doit être\n"
+"\tlu comme une fraction précédée du point décimal. `-M5` devient\n"
+"\t0,5, tout comme `-M50%`. De même, `-M05` est identique à\n"
+"\t`-M5%`.  Pour limiter la détection à des renommages exacts,\n"
+"\tutilisez `-M100%`. L'index de similarité par défaut est `50%`.\n"
 
 #. type: Labeled list
 #: en/diff-options.txt:593
@@ -7901,7 +7960,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Ajoute le contenu de fichiers à l'index"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -7910,7 +7969,12 @@ msgid ""
 "\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
 "\t[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "\t[--] [<pathspec>...]\n"
-msgstr "git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n\t[--chmod=(+|-)x] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n\t[--] [<spécificateur-de-chemin>...]\n"
+msgstr ""
+"git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
+"\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n"
+"\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
+"\t[--chmod=(+|-)x] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
+"\t[--] [<spécificateur-de-chemin>...]\n"
 
 #. type: Plain text
 #: en/git-add.txt:25
@@ -8676,7 +8740,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "git-am - Appliquer une série de rustines depuis des fichiers mailbox"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9314,7 +9378,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr "git-annotate - Annote les lignes d'un fichier avec les informations de commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9344,7 +9408,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - Applique une rustine à des fichiers et/ou à l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9836,7 +9900,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr "git-archimport - Importer un dépôt GNU Arch dans Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10002,7 +10066,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "git-archive - Crée une archive de fichiers depuis un arbre nommé"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10454,7 +10518,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "git-bisect - Trouver par recherche binaire la modification qui a introduit un bogue"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11315,7 +11379,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "git-blame - Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un fichier"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11737,7 +11801,7 @@ msgstr "\"nom de fichier\" <nom-de-fichier-avec-espaces-échappés-ici>\n"
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr "et donc il est vraiment très facile à analyser pour un analyseur orienté lignes et mots (ce qui devrait être assez naturel pour la plupart des langages de script)."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11767,7 +11831,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr "git-branch - Liste, crée, ou supprime des branches"
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12524,7 +12588,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "git-bugreport - Collecte les informations permettant à l'utilisateur de déposer un rapport de bogue"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12692,7 +12756,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr "git-bundle - Déplace les objets et les références par archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13266,7 +13330,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "git-cat-file - Fournit le contenu ou les détails pour les objets du dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -14022,7 +14086,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr "git-check-attr - Affiche les informations gitattributes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14300,7 +14364,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr "git-check-ignore - Débogue les fichiers gitignore / exclude"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14490,16 +14554,17 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr "git-check-mailmap - Affiche les noms canoniques et les adresses de courriel des contacts"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
 msgstr "'git check-mailmap' [<options>] <contact>...\n"
 
+# ERROR: $user not found in translation
 # ERROR: $user not found in translation
 #. type: Plain text
 #: en/git-check-mailmap.txt:22
-#, placeholders:'$user':'`--stdin`', priority:100
+#, fuzzy, placeholders:'$user':'`--stdin`', priority:100
 msgid "For each ``Name $$<user@host>$$'', ``$$<user@host>$$'', or ``$$user@host$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
 msgstr "Pour chaque \"Nom $$<utilisateur@hote>$$\", \"$$<utilisateur@hote>$$\" ou \"$$utilisateur@hote$$\" de la ligne de commande ou de l'entrée standard (si vous utilisez `--stdin`), rechercher le nom canonique et l'adresse électronique de la personne (voir \"Convertir les auteurs\" ci-dessous). S'ils sont trouvés, les afficher, sinon afficher l'entrée telle quelle."
 
@@ -14557,7 +14622,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr "git-checkout-index - Copie les fichiers depuis l'index dans l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14851,7 +14916,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - Bascule sur une autre branche ou restaure des fichiers de l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15855,7 +15920,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr "git-check-ref-format - S'assure qu'un nom de référence est bien formé"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -16059,7 +16124,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr "git-cherry-pick - Applique les modifications introduites par certains commits existants"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16475,7 +16540,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "git-cherry - Trouver les commits à appliquer en amont"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16727,7 +16792,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr "git-citool - Alternative graphique à git-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16757,7 +16822,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - Supprime les fichiers non suivis de l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16969,7 +17034,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Clone un dépôt dans un nouveau répertoire"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -16982,7 +17047,16 @@ msgid ""
 "\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
 "\t  [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>\n"
 "\t  [<directory>]\n"
-msgstr "git clone [--template=<répertoire-de-modèles>]\n\t[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t[-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <dépôt>]\n\t[--dissociate] [--separate-git-dir <répertoire-git>]\n\t[--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n\t[--recurse-submodules[=<spéc-de-chemin>]] [--[no-]shallow-submodules]\n\t[--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t[--filter=<filtre>] [--also-filter-submodules]] [--] <dépôt>\n\t[<répertoire>]\n"
+msgstr ""
+"git clone [--template=<répertoire-de-modèles>]\n"
+"\t[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t[-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <dépôt>]\n"
+"\t[--dissociate] [--separate-git-dir <répertoire-git>]\n"
+"\t[--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n"
+"\t[--recurse-submodules[=<spéc-de-chemin>]] [--[no-]shallow-submodules]\n"
+"\t[--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n"
+"\t[--filter=<filtre>] [--also-filter-submodules]] [--] <dépôt>\n"
+"\t[<répertoire>]\n"
 
 #. type: Plain text
 #: en/git-clone.txt:30
@@ -17153,9 +17227,10 @@ msgid "`--server-option=<option>`"
 msgstr "`--server-option=<option>`"
 
 # ERROR: `--server-option= not found in translation
+# ERROR: ++--server-option=++ not found in translation
 #. type: Plain text
 #: en/git-clone.txt:158
-#, placeholders:'`--server-option=':'++--server-option=++', priority:300
+#, fuzzy, placeholders:'`--server-option=':'++--server-option=++', priority:300
 msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line. When no ++--server-option=++__<option>__ is given from the command line, the values of configuration variable `remote.<name>.serverOption` are used instead."
 msgstr "Transmettre la chaîne donnée au serveur lors d'une communication utilisant la version 2 du protocole. La chaîne donnée ne doit pas contenir de caractère NUL ou LF. La gestion par le serveur des options du serveur, y compris les options inconnues, est spécifique au serveur. Lorsque plusieurs `--server-option=<option>` sont donnés, ils sont tous envoyés à l'autre côté dans l'ordre indiqué sur la ligne de commande. Quand `--server-option=<option>` est fourni sur la ligne de commande, les valeurs de la variable de configuration `remote.<nom>.serverOption` sont utilisées à la place."
 
@@ -17303,15 +17378,17 @@ msgstr "`--template=<répertoire-de-modèles>`"
 msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
 msgstr "Spécifier le répertoire depuis lequel les modèles vont être tirés ; (voir la section « RÉPERTOIRE DE MODÈLES » de linkgit:git-init[1].)"
 
+# ERROR: `-c` not found in translation
 #. type: Labeled list
 #: en/git-clone.txt:234
-#, no-wrap, placeholders:'`-c`', priority:300
+#, fuzzy, no-wrap, placeholders:'`-c`', priority:300
 msgid "`-c` `<key>=<value>`"
 msgstr "`-c <nom>=<valeur>`"
 
+# ERROR: `--config` not found in translation
 #. type: Labeled list
 #: en/git-clone.txt:235
-#, no-wrap, placeholders:'`--config`', priority:300
+#, fuzzy, no-wrap, placeholders:'`--config`', priority:300
 msgid "`--config` `<key>=<value>`"
 msgstr "`--config <clé>=<valeur>`"
 
@@ -17605,7 +17682,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr "git-column - Affiche les données en colonnes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17779,7 +17856,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr "git-commit-tree - Crée un nouvel objet commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17953,7 +18030,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - Enregistrer les modifications dans le dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18817,7 +18894,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config - Lire et écrire les options du dépôt et les options globales"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, fuzzy, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 #| msgid ""
@@ -20155,7 +20232,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr "git-count-objects - Compte le nombre d'objets non emballés et leur consommation disque"
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -20251,7 +20328,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr "git-credential-cache--daemon - Stocke temporairement les informations d'identification de l'utilisateur en mémoire"
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20998,7 +21075,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr "git-cvsexportcommit - Exporter un seul commit vers une extraction CVS"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -21190,7 +21267,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport - Sauve vos données depuis un autre SCM qu'on aime haïr"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21630,7 +21707,7 @@ msgstr "git-cvsserver - Un émulateur de serveur CVS pour Git"
 msgid "SSH:"
 msgstr "SSH :"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21640,25 +21717,25 @@ msgstr ""
 "export CVS_SERVER=\"git cvsserver\"\n"
 "'cvs' -d :ext:user@serveur/chemin/depot.git co <nom-HEAD>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr "pserver (/etc/inetd.conf) :"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22384,7 +22461,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "git-daemon - un serveur vraiment très simple pour les dépôts Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22988,7 +23065,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - Baptiser un objet avec un nom lisible à partir d'une référence disponible"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -23302,7 +23379,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr "git-diff-files - Compare les fichiers dans l'arbre de travail et dans l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -23374,7 +23451,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr "git-diff-index - Compare un arbre avec l'arbre de travail ou l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23563,7 +23640,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr "git-difftool - Affiche les changements à l'aide d'outils diff courants"
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23809,7 +23886,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "git-diff-tree - Compare le contenu et la mode des blobs trouvés via deux objets arbre"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23971,11 +24048,24 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Affiche les modifications entre les commits, un commit et l'arbre de travail, etc"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
-msgstr "git diff [<options>] [<commit>] [--] [<chemin>...]\ngit diff [<options>] --cached [--merge-base] [<commit>] [--] [<chemin>...]\ngit diff [<options>] [--merge-base] <commit> [<commit>...]<commit> [--] [<chemin>...]\ngit diff [<options>] <commit>...<commit> [--] [<chemin>...]\ngit diff [<options>] <blob> <blob>\ngit diff [<options>] --no-index [--] <chemin> <chemin>"
+#, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+#| msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
+msgstr ""
+"git diff [<options>] [<commit>] [--] [<chemin>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<chemin>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...]<commit> [--] [<chemin>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<chemin>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <chemin> <chemin>"
 
 #. type: Plain text
 #: en/git-diff.txt:25
@@ -24432,7 +24522,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr "git-fast-export - exportateur de données Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24844,7 +24934,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr "git-fast-import - moteur pour les importateurs de données Git rapides"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -27296,7 +27386,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr "git-fetch-pack - Recevoir les objets manquants depuis un autre dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -27492,7 +27582,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - Télécharger les objets et références depuis un autre dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27993,7 +28083,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28852,7 +28942,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr "git-fmt-merge-msg - Produit un message de commit de fusion"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28987,7 +29077,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr "git-for-each-ref - Affiche des informations sur chaque référence"
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29908,7 +29998,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr "git-format-patch - Prépare les rustines pour la soumission par courriel"
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -31289,7 +31379,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - Vérifier la connectivité et la validité des objets en base de données"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -31313,7 +31403,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck - Vérifier la connectivité et la validité des objets dans la base de données"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -31616,7 +31706,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "git-gc - Efface les fichiers non-nécessaires et optimiser le dépôt local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31844,7 +31934,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr "git-get-tar-commit-id - Extrait l'ID de commit d'une archive créée avec git-archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31874,7 +31964,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr "git-grep - Imprime les lignes correspondant à un motif"
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -32625,7 +32715,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "git-gui - Une interface graphique portable pour Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32841,7 +32931,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "git-hash-object- Calculer l'ID d'objet et créer optionnellement un objet depuis un fichier"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32934,7 +33024,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "git-help - Afficher l'information d'aide à propos de Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -33372,7 +33462,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr "git-http-backend - Implémentation côté serveur de Git sur HTTP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33908,7 +33998,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr "git-http-fetch - Télécharger depuis un dépôt Git distant via HTTP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -34028,7 +34118,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "git-http-push - Pousse des objets via HTTP/DAV sur un autre dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -34178,7 +34268,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "git-imap-send - Envoye un ensemble de rustines depuis stdin vers un répertoire IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -34304,13 +34394,13 @@ msgstr ""
 "    port = 123\n"
 "    ; sslVerify = false\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr "Vous pouvez utiliser `sslVerify=false` pendant le dépannage, si vous pensez que la raison pour laquelle vous avez des difficultés à vous connecter est que le certificat que vous utilisez sur le serveur privé `exemple.com` que vous essayez de mettre en place (ou que vous avez mis en place) peut ne pas être vérifié correctement."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -34332,31 +34422,31 @@ msgstr ""
 "\tuser = user@gmail.com\n"
 "\tport = 993\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr "Il se peut que vous deviez utiliser à la place : `folder = \"[Google Mail]/Drafts\"` si vous obtenez une erreur indiquant que le \"Dossier n'existe pas\"."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr "Si votre compte Gmail est configuré dans une autre langue que l'anglais, le nom du dossier \"Brouillons\" sera localisé."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr "Une fois que les commandes sont prêtes à être envoyées, exécutez la commande suivante :"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -34404,7 +34494,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "git-index-pack - Construit un fichier d'index pack depuis une archive compactée existante"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -34638,7 +34728,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - Crée un dépôt Git vide"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -34662,7 +34752,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Crée un dépôt Git vide ou réinitialise un dépôt existant"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -34671,7 +34761,12 @@ msgid ""
 "\t [--ref-format=<format>]\n"
 "\t [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t [--shared[=<permissions>]] [<directory>]\n"
-msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-de-modèles>]\n\t [--separate-git-dir <répertoire-git>] [--object-format=<format>]\n\t [--ref-format=<format>]\n\t [-b <nom-de-branche> | --initial-branch=<nom-de-branche>]\n\t [--shared[=<permissions>]] [<répertoire>]\n"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<répertoire-de-modèles>]\n"
+"\t [--separate-git-dir <répertoire-git>] [--object-format=<format>]\n"
+"\t [--ref-format=<format>]\n"
+"\t [-b <nom-de-branche> | --initial-branch=<nom-de-branche>]\n"
+"\t [--shared[=<permissions>]] [<répertoire>]\n"
 
 #. type: Plain text
 #: en/git-init.txt:27
@@ -34981,7 +35076,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "git-instaweb - Navigue instantanément votre dépôt de travail dans gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -35149,7 +35244,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "git-interpret-trailers - Ajoute ou analyse de l'information structurée dans les messages de validation"
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -36082,7 +36177,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr "git-log - Afficher les journaux de validation"
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -36426,7 +36521,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "git-ls-files - Affiche des informations sur les fichiers de l'index et de l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -37101,7 +37196,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr "git-ls-remote - Liste les références dans un dépôt distant"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -37328,7 +37423,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -37553,7 +37648,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "git-mailinfo - Extrait la rustine et l'information de d'auteur depuis un simple message de courriel"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -37751,7 +37846,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr "git-mailsplit - Programme simple de découpage de fichier UNIX mbox"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -37875,7 +37970,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "git-merge-base - Trouve un ancêtre aussi bon que possible pour une fusion"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -38242,7 +38337,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -38430,7 +38525,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -38484,7 +38579,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -38537,7 +38632,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr "git-merge-one-file - Ce programme auxiliaire standard à utiliser avec git-merge-index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -38561,7 +38656,7 @@ msgstr "git-mergetool{litdd}lib(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr "git-mergetool--lib - Scripts communs d'outils de fusion Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -38663,7 +38758,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "git-mergetool - Lancer les outils de résolution de conflit de fusion pour résoudre les conflits de fusion"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -38813,7 +38908,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "git-merge-tree - Effectue une fusion sans toucher à l'index ou à l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -39208,7 +39303,17 @@ msgid ""
 "       NEWCOMMIT=$(git commit-tree $NEWTREE -F message.txt \\\n"
 "           -p $BRANCH1 -p $BRANCH2)\n"
 "       git update-ref $BRANCH1 $NEWCOMMIT\n"
-msgstr "       vi message.txt\n       BRANCH1=refs/heads/test\n       BRANCH2=main\n       NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || {\n           echo \"There were conflicts...\" 1>&2\n           exit 1\n       }\n       NEWCOMMIT=$(git commit-tree $NEWTREE -F message.txt \\\n           -p $BRANCH1 -p $BRANCH2)\n       git update-ref $BRANCH1 $NEWCOMMIT\n"
+msgstr ""
+"       vi message.txt\n"
+"       BRANCH1=refs/heads/test\n"
+"       BRANCH2=main\n"
+"       NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || {\n"
+"           echo \"There were conflicts...\" 1>&2\n"
+"           exit 1\n"
+"       }\n"
+"       NEWCOMMIT=$(git commit-tree $NEWTREE -F message.txt \\\n"
+"           -p $BRANCH1 -p $BRANCH2)\n"
+"       git update-ref $BRANCH1 $NEWCOMMIT\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:227
@@ -39344,7 +39449,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge - Fusionne deux ou plusieurs historiques de développement ensemble"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -39922,7 +40027,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "git-mktag - Crée un objet étiquette avec une validation supplémentaire"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -40025,7 +40130,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-mktree - Construit un objet arbre depuis du texte au format ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -40073,7 +40178,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - Déplace ou renomme un fichier, un répertoire, ou un lien symbolique"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -40155,7 +40260,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr "git-name-rev - Trouver des noms symboliques pour des révs données"
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -40339,7 +40444,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr "git-notes - Ajouter ou inspecter les notes des objets"
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -40355,7 +40460,19 @@ msgid ""
 "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
 "'git notes' prune [-n] [-v]\n"
 "'git notes' get-ref\n"
-msgstr "'git notes' [list [<objet>]]\n'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<coupure-paragraphe>] [--[no-]stripspace] [-F <fichier> | -m <msg> | (-c | -C) <objet>] [-e] [<objet>]\n'git notes' copy [-f] ( --stdin | <objet-source> [<objet-cible>] )\n'git notes' append [--allow-empty] [--[no-]separator | --separator=<coupure-paragraphe>] [--[no-]stripspace] [-F <fichier> | -m <msg> | (-c | -C) <objet>] [-e] [<objet>]\n'git notes' edit [--allow-empty] [<objet>]\n'git notes' show [<objet>]\n'git notes' merge [-v | -q] [-s <strategie> ] <ref-de-notes>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<objet>...]\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
+msgstr ""
+"'git notes' [list [<objet>]]\n"
+"'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<coupure-paragraphe>] [--[no-]stripspace] [-F <fichier> | -m <msg> | (-c | -C) <objet>] [-e] [<objet>]\n"
+"'git notes' copy [-f] ( --stdin | <objet-source> [<objet-cible>] )\n"
+"'git notes' append [--allow-empty] [--[no-]separator | --separator=<coupure-paragraphe>] [--[no-]stripspace] [-F <fichier> | -m <msg> | (-c | -C) <objet>] [-e] [<objet>]\n"
+"'git notes' edit [--allow-empty] [<objet>]\n"
+"'git notes' show [<objet>]\n"
+"'git notes' merge [-v | -q] [-s <strategie> ] <ref-de-notes>\n"
+"'git notes' merge --commit [-v | -q]\n"
+"'git notes' merge --abort [-v | -q]\n"
+"'git notes' remove [--ignore-missing] [--stdin] [<objet>...]\n"
+"'git notes' prune [-n] [-v]\n"
+"'git notes' get-ref\n"
 
 #. type: Plain text
 #: en/git-notes.txt:29
@@ -40893,7 +41010,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-p4 - Importe depuis et soumet à des dépôts Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -42436,7 +42553,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr "git-pack-objects - Crée une archive empaquetée d'objets"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -43057,7 +43174,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr "git-pack-redundant - Trouve des fichiers de paquet redondants"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -43136,7 +43253,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "git-pack-refs - Empaquette les têtes et les étiquettes pour un accès efficace au dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -43244,7 +43361,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr "git-patch-id - Calcule un ID unique pour une rustine"
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -43358,7 +43475,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr "git-prune-packed - Retire les objets surnuméraires qui sont déjà dans des fichiers paquet"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -43418,7 +43535,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-prune - Élague tous les objets non joignables de la base de données d'objets"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -43526,7 +43643,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull - Rapatrier et intégrer un autre dépôt ou une branche locale"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -43692,7 +43809,7 @@ msgstr "Lorsque vous êtes en mode `interactive`, activer le mode interactif de
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr "Voir `pull.rebase`, `branch. <nom> .rebase` et `branch.autoSetupRebase` dans linkgit:git-config[1] si vous voulez que `git pull` utilise toujours `--rebase` au lieu de fusionner ."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -43704,7 +43821,7 @@ msgstr "C'est un mode de fonctionnement potentiellement _dangereux_. Il réécri
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -43868,7 +43985,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push - Met à jour les références distantes ainsi que les objets associés"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -44858,7 +44975,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr "git-quiltimport - Applique un ensemble de rustines quilt sur la branche actuelle"
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -44952,7 +45069,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "git-range-diff - Comparer deux plages de commits (par exemple deux versions d'une branche)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -45415,7 +45532,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr "git-read-tree - Lit l'information d'arbre dans l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -46028,7 +46145,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase - Réapplique des commits sur le sommet de l'autre base"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -46069,25 +46186,25 @@ msgstr "Tous les changements apportés par des commits dans la branche actuelle,
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr "La branche actuelle est réinitialisée à `<amont>` ou `<nouvellebase>` si l'option `--onto` a été fournie. Cela a le même effet que `git reset --hard <amont>` (ou `<nouvellebase>`). `ORIG_HEAD` est fixé pour pointer au sommet de la branche avant la réinitialisation."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr "`ORIG_HEAD` n'est pas garanti de toujours pointer vers le sommet de la branche précédente à la fin du rebasage si d'autres commandes qui écrivent cette pseudo-réf (par exemple `git reset`) sont utilisées pendant le rebasage. La pointe de la branche précédente, cependant, est accessible en utilisant le reflog de la branche actuelle (i.e. `@{1}`, voir linkgit:gitrevisions[7])."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr "Les commits qui ont été précédemment sauvés dans la zone temporaire sont ensuite réappliqués à la branche actuelle, un par un, dans l'ordre. Notez que tout commit dans `HEAD` qui introduit les mêmes changements textuels que ceux d'un commit dans `HEAD..<amont>` sont omis (c.-à-d. une rustine déjà acceptée en amont avec un autre message de validation ou un autre horodatage sera ignorée)."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr "Il est possible qu'un échec de fusion empêche ce processus d'être complètement automatique. Vous devrez résoudre un tel échec de fusion et exécuter `git rebase --continue`. Une autre option est de contourner le commit qui a causé l'échec de fusion avec `git rebase --skip`. Pour extraire la `<branche>`originale et supprimer les fichiers de travail de `.git/rebase-apply`, utilisez la commande `git rebase --abort` à la place."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -48094,7 +48211,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr "git-receive-pack - Reçoit ce qui a été poussé dans un dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -48529,7 +48646,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr "git-reflog - Gérer l'information de réflog"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -48732,7 +48849,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -49056,7 +49173,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr "git-remote - Gère un ensemble de dépôts suivis"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -49498,7 +49615,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr "git-repack - Empaquète les objets non empaquetés dans le dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -49786,7 +49903,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "git-replace - Crée, liste, supprime des référence pour remplacer des objets"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -50062,7 +50179,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr "git-request-pull - Génère un résumé des modifications en suspens"
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -50194,7 +50311,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "git-rerere - Réutilise une résolution enregistrée de fusions conflictuelles"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -50212,7 +50329,7 @@ msgstr "Dans un workflow employant des branches de sujet relativement longues, l
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr "Cette commande aide le développeur dans ce processus en enregistrant des résultats d'autofusion en conflit et les résultats correspondants de la fusion manuelle initiale, et en appliquant des résolutions à la main précédemment enregistrées à leurs résultats d'autofusion correspondants."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -50514,7 +50631,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset - Réinitialise la HEAD actuelle à l'état spécifié"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -51382,7 +51499,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "git-restore - Restaure les fichier d'un arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -51648,7 +51765,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr "git-revert - Inverse des commits existants"
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -51784,7 +51901,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "git-rev-list - Affiche les objets commit dans l'ordre chronologique inverse"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -51945,7 +52062,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -52961,7 +53078,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - Supprime des fichiers de l'arbre de travail et de l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -53201,7 +53318,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -54202,7 +54319,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "git-send-pack - Pousse des objets par le protocole Git vers un autre dépôt"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -54351,7 +54468,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "git-shell - Shell de login restreint pour un accès SSH vers Git seulement"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -54504,7 +54621,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -54546,7 +54663,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -54594,7 +54711,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr "git-shortlog - Résume 'git log' sortie"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -54791,7 +54908,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -55098,7 +55215,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -55158,7 +55275,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -55482,7 +55599,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr "git-show - Afficher différents types d'objets"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -55620,7 +55737,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -55794,7 +55911,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - Ajoute le contenu de fichiers à l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -55818,7 +55935,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - Remiser les modifications d'un répertoire de travail sale"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -56413,7 +56530,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr "git-status - Montrer le statut de l'arbre de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -57313,7 +57430,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -57467,7 +57584,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr "git-submodule - Initialisation, mise à jour ou inspection des sous-modules"
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -58145,7 +58262,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "git-svn - Opération Bidirectionnelles entre un dépôt Subversion et Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -58373,7 +58490,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -58415,31 +58532,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -58475,7 +58592,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -58487,7 +58604,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -58499,7 +58616,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -58511,7 +58628,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -58523,7 +58640,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr "--placeholder-filename=<fichier>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -58535,31 +58652,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -58571,25 +58688,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -58601,13 +58718,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -58615,13 +58732,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -58633,31 +58750,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -58669,7 +58786,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -58681,7 +58798,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -58693,7 +58810,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -58711,19 +58828,19 @@ msgstr "-d<chemin>"
 msgid "--destination=<path>"
 msgstr "--destination=<chemin>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -58735,7 +58852,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -58747,13 +58864,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -58765,7 +58882,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -58777,7 +58894,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -58789,13 +58906,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -58813,13 +58930,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -58831,19 +58948,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -58855,7 +58972,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -58867,19 +58984,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -58891,7 +59008,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -58903,7 +59020,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -58915,7 +59032,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -58933,7 +59050,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -58945,7 +59062,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -58957,7 +59074,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -58969,7 +59086,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -58981,7 +59098,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -58993,7 +59110,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -59005,20 +59122,20 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
 # ERROR: `--edit` not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -59037,7 +59154,7 @@ msgid "--file=<filename>"
 msgstr "--file=<fichier>"
 
 # ERROR: `--edit` not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -59049,7 +59166,7 @@ msgstr "Prendre le message de validation depuis le fichier indiqué. Cette optio
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -59061,7 +59178,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -59073,7 +59190,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -59085,7 +59202,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -59184,7 +59301,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -59207,7 +59324,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -59294,7 +59411,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -59306,19 +59423,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -59336,13 +59453,13 @@ msgstr "-l<num>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -59362,7 +59479,7 @@ msgstr "-A<fichier>"
 msgid "--authors-file=<filename>"
 msgstr "--authors-file=<fichier>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -59380,7 +59497,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -59392,25 +59509,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr "--authors-prog=<fichier>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -59422,37 +59539,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "-s<strategie>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -59464,13 +59581,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -59482,13 +59599,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -59548,7 +59665,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -60103,7 +60220,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr "git-switch - bascule de branche"
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -60416,7 +60533,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -60515,7 +60632,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag - Créer, lister, supprimer ou vérifier un objet étiquette signé avec GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -61077,7 +61194,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - le traqueur de contenu stupide"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -63084,7 +63201,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -63117,7 +63234,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -63177,7 +63294,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr "git-update-index - Enregistre le contenu de fichiers de l'arbre de travail à l'index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -64094,7 +64211,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -64411,7 +64528,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -64459,7 +64576,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -64531,7 +64648,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -64643,7 +64760,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -64837,7 +64954,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -64879,7 +64996,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -64969,7 +65086,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -65011,7 +65128,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -65285,7 +65402,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "git-whatchanged - Affiche les journaux avec la différence que chaque commit introduit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -65345,7 +65462,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr "git-worktree - Gérer plusieurs arbres de travail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -65829,9 +65946,11 @@ msgstr "DÉTAILS"
 # ERROR: `$GIT_DIR/worktrees/test-next1` not found in translation
 # ERROR: `$GIT_DIR/worktrees/test-next` not found in translation
 # ERROR: `$GIT_DIR/worktrees/test-next1` not found in translation
+# ERROR: `$GIT_DIR/worktrees/test-next` not found in translation
+# ERROR: `$GIT_DIR/worktrees/test-next1` not found in translation
 #. type: Plain text
 #: en/git-worktree.txt:361
-#, placeholders:'`$GIT_DIR/worktrees`':'`$GIT_DIR':'`$GIT_DIR/worktrees/test-next`':'`$GIT_DIR/worktrees/test-next1`', priority:240
+#, fuzzy, placeholders:'`$GIT_DIR/worktrees`':'`$GIT_DIR':'`$GIT_DIR/worktrees/test-next`':'`$GIT_DIR/worktrees/test-next1`', priority:240
 msgid "Each linked worktree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked worktree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked worktree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr "Chaque arbre-de-travail lié possède un sous-répertoire privé dans le répertoire `$GIT_DIR/worktrees` du dépôt. Le nom du sous-répertoire privé est généralement le nom de base du chemin de l'arbre-de-travail lié, éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /chemin/autre/test-prochain prochain` crée l'arbre-de-travail lié dans `/chemin/autre/test-prochain` et crée aussi un répertoire `$GIT_DIR/worktrees/test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est déjà pris)."
 
@@ -66113,7 +66232,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr "git-write-tree - Crée un objet arbre depuis l'index actuel"
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -70250,13 +70369,13 @@ msgstr "Contrairement à une poussée avec linkgit:git-push[1], il n'y a pas de
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr "Comme pour la poussée avec linkgit:git-push[1], toutes les règles décrites ci-dessus concernant ce qui n'est pas autorisé comme une mise à jour, peuvent être annulées en ajoutant un \"+\" optionnel à un spécificateur de référence (ou en utilisant l'option de ligne de commande `--force`). La seule exception à cette règle est qu'aucun forçage ne fera accepter à l'espace de noms `refs/heads/*` un objet non commit."
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr "Lorsque la branche distante que vous voulez récupérer est connue pour être régulièrement rembobinée et rebasée, on s'attend à ce que son nouveau sommet ne soit pas un descendant de son sommet précédent (telle qu'il était stocké dans votre branche de suivi à distance la dernière fois que vous l'avez récupéré). Vous pouvez utiliser le signe \"+\" pour indiquer que des mises à jour non en avance rapide seront nécessaires pour ces branches. Il n'y a aucun moyen de déterminer ou de déclarer qu'une branche sera rendue disponible dans un dépôt avec ce comportement ; l'utilisateur qui tire doit simplement savoir que c'est le modèle d'utilisation attendu pour une branche."
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -73540,7 +73659,7 @@ msgstr "où _<adresse>_ peut être un chemin, un serveur et chemin, ou une chaî
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "S'il y a un grand nombre de dépôts aux noms similaires et que vous souhaitez utiliser un format différent pour eux (de telle sorte que les URL que vous utiliserez seront réécrites en URL fonctionnelles), vous pouvez créer une section de configuration de la forme :"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -73550,7 +73669,7 @@ msgstr ""
 "\t[url \"__<veritable-base-d-url>__\"]\n"
 "\t\tinsteadOf = _<autre-base-d'URL>_\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -73580,7 +73699,7 @@ msgstr "une URL comme « travail:depot.git » ou « host.xz:/chemin/vers/depo
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Si vous souhaitez réécrire les URL seulement pour pousser, vous pouvez créer une section de configuration de la forme :"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
@@ -75674,575 +75793,3 @@ msgstr ""
 #, placeholders:'[[[9]]]':'https://github.com/Ealdwulf/bbchop[', priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
-
-#, placeholders:'`--ignore-errors`':'linkgit:git-add[1]':'add.ignore'
-#~ msgid "Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables."
-#~ msgstr "Dire à 'git add' de continuer d'ajouter des fichiers lorsque certains fichiers ne peuvent pas être ajoutés en raison d'erreurs d'indexation. Équivalent à l ' option `--ignore-errors` de linkgit:git-add[1]. `add.ignore-errors` est obsolète, car elle ne suit pas la convention habituelle de désignation des variables de configuration."
-
-#, ignore-same, no-wrap
-#~ msgid "`default`, `myers`"
-#~ msgstr "`default`, `myers`"
-
-#, placeholders:'--color-moved':'linkgit:git-diff[1]'
-#~ msgid "If set to either a valid `<mode>` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in linkgit:git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored."
-#~ msgstr "Si mis à soit un `<mode>` valide ou une valeur vraie, les lignes déplacées dans un diff sont colorées différemment ; pour les détails des modes valides voir '--color-moved' dans linkgit:git-diff[1]. Si simplement à true, le mode couleur par défaut sera utilisé. Lorsqu'il est mis à faux, les lignes déplacées ne sont pas colorées."
-
-#, ignore-same, no-wrap
-#~ msgid "no"
-#~ msgstr "no"
-
-#~ msgid "See the \"EXAMPLES\" section below for examples of how to use bundles."
-#~ msgstr "Voir la section \"EXEMPLES\" ci-dessous pour plus des exemples d'utilisation des colis."
-
-#, no-wrap, placeholders:'++--server-option=++'
-#~ msgid "++--server-option=++__<option>__"
-#~ msgstr "++--server-option=++__<option>__"
-
-# ERROR: `--server-option= not found in translation
-#, placeholders:'++--server-option=++'
-#~ msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple ++--server-option=++__<option>__ are given, they are all sent to the other side in the order listed on the command line."
-#~ msgstr "Transmettre la chaîne donnée au serveur lors d'une communication utilisant la version 2 du protocole. La chaîne donnée ne doit pas contenir de caractère NUL ou LF. La gestion par le serveur des options du serveur, y compris les options inconnues, est spécifique au serveur. Lorsque plusieurs ++--server-option=++__<option>__ sont donnés, ils sont tous envoyés à l'autre côté dans l'ordre indiqué sur la ligne de commande."
-
-#, no-wrap, placeholders:'++--filter=++'
-#~ msgid "++--filter=++__<filter-spec>__"
-#~ msgstr "++--filter=++__<spéc. du filtre>__"
-
-#, no-wrap, placeholders:'++--template=++'
-#~ msgid "++--template=++__<template-directory>__"
-#~ msgstr "++--template=++__<répertoire-de-modèles>__"
-
-#, no-wrap, placeholders:'`-c`'
-#~ msgid "`-c` __<key>__++=++__<value>__"
-#~ msgstr "`-c` __<clé>__++=++__<valeur>__"
-
-#, no-wrap, placeholders:'++--shallow-since=++'
-#~ msgid "++--shallow-since=++__<date>__"
-#~ msgstr "++--shallow-since=++__<date>__"
-
-#, no-wrap, placeholders:'++--shallow-exclude=++'
-#~ msgid "++--shallow-exclude=++__<revision>__"
-#~ msgstr "++--shallow-exclude=++__<révision>__"
-
-#, no-wrap
-#~ msgid "`--`[`no-`]`single-branch`"
-#~ msgstr "`--`[`no-`]`single-branch`"
-
-#, no-wrap, placeholders:'{empty}'
-#~ msgid "`--separate-git-dir=`{empty}__<git-dir>__"
-#~ msgstr "`--separate-git-dir=`{empty}__<répertoire-git>__"
-
-#, no-wrap, placeholders:'++--ref-format=++'
-#~ msgid "++--ref-format=++__<format>__"
-#~ msgstr "++--ref-format=++__<format>__"
-
-#, no-wrap, placeholders:'++--shared'
-#~ msgid "++--shared++[++=++(`false`|`true`|`umask`|`group`|`all`|`world`|`everybody`|_<perm>_)]"
-#~ msgstr "++--shared++[++=++(`false`|`true`|`umask`|`group`|`all`|`world`|`everybody`|_<perm>_)]"
-
-# ERROR: `--server-option= not found in translation
-#, placeholders:'`--server-option='
-#~ msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
-#~ msgstr "Transmettre la chaîne donnée au serveur lors d'une communication utilisant la version 2 du protocole. La chaîne donnée ne doit pas contenir de caractère NUL ou LF. Lorsque plusieurs `--server-option=<option>` sont donnés, ils sont tous envoyés à l'autre côté dans l'ordre indiqué sur la ligne de commande."
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "++ssh://++{startsb}__<user>__++@++{endsb}__<host>__{startsb}++:++__<port>__{endsb}++/++__<path-to-git-repo>__"
-#~ msgstr "++ssh://++{startsb}__<utilisateur>__++@++{endsb}__<hôte>__{startsb}++:++__<port>__{endsb}++/++__<chemin-du-dépôt-git>__"
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "++http++{startsb}++s++{endsb}++://++__<host>__{startsb}++:++__<port>__{endsb}++/++__<path-to-git-repo>__"
-#~ msgstr "++http++{startsb}++s++{endsb}++://++__<hôtet>__{startsb}++:++__<port>__{endsb}++/++__<chemin-du-dépôt-git>__"
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "++ftp++{startsb}++s++{endsb}++://++__<host>__{startsb}++:++__<port>__{endsb}++/++__<path-to-git-repo>__"
-#~ msgstr "++ftp++{startsb}++s++{endsb}++://++__<hôte>__{startsb}++:++__<port>__{endsb}++/++__<chemin-du-dépôt-git>__"
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "++ssh://++{startsb}__<user>__++@++{endsb}__<host>__{startsb}++:++__<port>__{endsb}++/~++__<user>__++/++__<path-to-git-repo>__"
-#~ msgstr "++ssh://++{startsb}__<utilisateur>__++@++{endsb}__<hôte>__{startsb}++:++__<port>__{endsb}++/~++__<utilisateur>__++/++__<chemin-du-dépôt-git>__"
-
-#, placeholders:'[--value=':'--all':'--show-names'
-#~ msgid "Replaced by `git config get [--value=<pattern>] --all --show-names <name>`."
-#~ msgstr "Remplacé par `git config get [--value=<motif>] --all --show-names <nom>`."
-
-#~ msgid "Provide content or type and size information for repository objects."
-#~ msgstr "Fournir le contenu ou l'information de type et taille pour les objets du dépôt."
-
-#~ msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backslash and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
-#~ msgstr "Une ligne qui définit une valeur peut se poursuivre jusqu'à la ligne suivante en la terminant par un `\\` ; la barre arrière et la fin de la ligne sont supprimés. Les espaces après 'nom =', le reste de la ligne après le premier caractère de commentaire '#' ou ' ;', et les espaces de fin de ligne sont supprimés, sauf s'ils sont entre guillemets. Les espaces internes à l'intérieur de la valeur sont conservés textuellement."
-
-#, no-wrap, placeholders:'add.interactive.useBuiltin'
-#~ msgid "add.interactive.useBuiltin"
-#~ msgstr "add.interactive.useBuiltin"
-
-#, placeholders:'linkgit:git-add[1]'
-#~ msgid "Unused configuration variable. Used in Git versions v2.25.0 to v2.36.0 to enable the built-in version of linkgit:git-add[1]'s interactive mode, which then became the default in Git versions v2.37.0 to v2.39.0."
-#~ msgstr "Variable de configuration inutilisée. Utilisée dans Git versions v2.25.0 à v2.36.0 pour activer la version intégrée du mode interactif de linkgit:git-add[1], qui est devenu alors la valeur par défaut dans Git versions v2.37.0 à v2.39.0."
-
-#, placeholders:'`--exit-code`'
-#~ msgid "Disable all output of the program. Implies `--exit-code`."
-#~ msgstr "Désactiver toute sortie du programme. Implique `--exit-code`."
-
-#, ignore-same, no-wrap
-#~ msgid "--empty=(stop|drop|keep)"
-#~ msgstr "--empty=(stop|drop|keep)"
-
-#~ msgid "By default, or when the option is set to 'stop', the command errors out on an input e-mail message lacking a patch and stops in the middle of the current am session. When this option is set to 'drop', skip such an e-mail message instead. When this option is set to 'keep', create an empty commit, recording the contents of the e-mail message as its log."
-#~ msgstr "Par défaut, ou lorsque l'option est définie sur 'stop', la commande sort en erreur sur un message électronique d'entrée ne contenant pas de rustine et s'arrête au milieu de la session am en cours. Lorsque cette option est définie sur 'drop', ignorer un tel message électronique à la place. Lorsque cette option est définie sur 'keep', créer un commit vide, en enregistrant le contenu du message électronique comme message de validation."
-
-#, placeholders:'`--prefix`':'`--add-virtual-file`'
-#~ msgid "Add the specified contents to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-virtual-file` and `<path>`."
-#~ msgstr "Ajouter le contenu spécifié à l'archive. Peut être répété pour ajouter plusieurs fichiers. Le chemin du fichier dans l'archive est construit en concaténant la valeur de la dernière option `--prefix` (le cas échéant) avant ces `--add-virtual-file` et `<chemin>` ."
-
-# ERROR: --term-old` not found in translation
-# ERROR: --term-good` not found in translation
-#, placeholders:'--term-old`':'--term-good`'
-#~ msgid "You can get just the old (respectively new) term with `git bisect terms --term-old` or `git bisect terms --term-good`."
-#~ msgstr "Vous pouvez obtenir uniquement l'ancien terme (respectivement le nouveau) terme avec `git bisect --term-old` ou `git bisect --term-good`."
-
-#, placeholders:'`--allow-empty`'
-#~ msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`."
-#~ msgstr "Si un commit faisant l'objet d'un picorage duplique un commit déjà présent dans l'historique courant, celui-ci deviendra vide. Par défaut, ces commits redondants provoquent l'arrêt de `cherry-pick` pour que l'utilisateur puisse examiner le commit. Cette option surcharge ce comportement et crée un objet commit vide. Implique `--allow-empty`."
-
-#~ msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
-#~ msgstr "Montrer ce qui serait fait et nettoyer les fichiers de manière interactive. Voir \"Mode interactif\" pour plus de détails."
-
-#~ msgid "Don't actually remove anything, just show what would be done."
-#~ msgstr "Ne rien supprimer effectivement, montrer juste ce qui serait fait."
-
-#, no-wrap, placeholders:'[--type=':'[--fixed-value]':'[--show-origin]':'[--show-scope]':'--null]':'[--type=':'--add':'[--type=':'[--fixed-value]':'--replace-all':'[--type=':'[--show-origin]':'[--show-scope]':'--null]':'[--fixed-value]':'--get':'[--type=':'[--show-origin]':'[--show-scope]':'--null]':'[--fixed-value]':'--get-all':'[--type=':'[--show-origin]':'[--show-scope]':'--null]':'[--fixed-value]':'[--name-only]':'--get-regexp':'[--type=':'--null]':'--get-urlmatch':'[--fixed-value]':'--unset':'[--fixed-value]':'--unset-all':'--rename-section':'--remove-section':'[--show-origin]':'[--show-scope]':'--null]':'[--name-only]':'--list':'--get-color':'--get-colorbool':'--edit'
-#~ msgid ""
-#~ "'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n"
-#~ "'git config' [<file-option>] [--type=<type>] --add <name> <value>\n"
-#~ "'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n"
-#~ "'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n"
-#~ "'git config' [<file-option>] --rename-section <old-name> <new-name>\n"
-#~ "'git config' [<file-option>] --remove-section <name>\n"
-#~ "'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
-#~ "'git config' [<file-option>] --get-color <name> [<default>]\n"
-#~ "'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n"
-#~ "'git config' [<file-option>] -e | --edit\n"
-#~ msgstr ""
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <nom> [<valeur> [<motif-de-valeur>]]\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] --add <nom> <valeur>\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [--fixed-value] --replace-all <nom> <valeur> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <nom> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <nom> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <regex_de_nom> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] [--type=<type>] [-z|--null] --get-urlmatch <nom> <URL>\n"
-#~ "'git config' [<option-de-fichier>] [--fixed-value] --unset <nom> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] [--fixed-value] --unset-all <nom> [<motif-de-valeur>]\n"
-#~ "'git config' [<option-de-fichier>] --rename-section <ancien-nom> <nouveau-nom>\n"
-#~ "'git config' [<option-de-fichier>] --remove-section <nom>\n"
-#~ "'git config' [<option-de-fichier>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
-#~ "'git config' [<option-de-fichier>] --get-color <nom> [<défaut>]\n"
-#~ "'git config' [<option-de-fichier>] --get-colorbool <nom> [stdout-is-tty]\n"
-#~ "'git config' [<option-de-fichier>] -e | --edit\n"
-
-#~ msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
-#~ msgstr "Obtenir la valeur d'une clé donnée (éventuellement filtrée par une regex correspondant à la valeur). Renvoie le code d'erreur 1 si la clé n'a pas été trouvée et la dernière valeur si plusieurs valeurs de clé ont été trouvées."
-
-#, ignore-same, no-wrap
-#~ msgid "--get-all"
-#~ msgstr "--get-all"
-
-#, ignore-same, no-wrap
-#~ msgid "--unset"
-#~ msgstr "--unset"
-
-#~ msgid "Remove the line matching the key from config file."
-#~ msgstr "Supprimer la ligne correspondant à la clé du fichier de configuration."
-
-#, ignore-same, no-wrap
-#~ msgid "--unset-all"
-#~ msgstr "--unset-all"
-
-#~ msgid "Remove all lines matching the key from config file."
-#~ msgstr "Supprimer toutes les lignes correspondant à la clé du fichier de configuration."
-
-#, placeholders:'color.diff.new'
-#~ msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`."
-#~ msgstr "Trouver la couleur configurée pour `nom` (par exemple `color.diff.new`) et l'afficher comme séquence d'échappement de couleur ANSI sur la sortie standard. Le paramètre optionnel `défaut` est utilisé à la place, s'il n'y a pas de couleur configurée pour `nom`."
-
-#, placeholders:'`--type=color':'[--default=':'`--get-color`':'`--get-color`':'`--type=color`'
-#~ msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
-#~ msgstr "`--type=color [--default=<défaut>]` est préféré à `--get-color` (mais notez que `--get-color` omettra le caractère de nouvelle ligne final affiché par `--type=color`)."
-
-#, no-wrap, placeholders:'core.gitproxy':'kernel.org':'kernel.org'
-#~ msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
-#~ msgstr "% git config core.gitproxy '<\"ssh\" pour kernel.org>' 'for kernel.org$'\n"
-
-#, no-wrap, placeholders:'core.filemode'
-#~ msgid "% git config core.filemode\n"
-#~ msgstr "% git config core.filemode\n"
-
-#, no-wrap, placeholders:'core.gitproxy'
-#~ msgid "% git config core.gitproxy ssh '! for '\n"
-#~ msgstr "% git config core.gitproxy ssh '! for '\n"
-
-#~ msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
-#~ msgstr "Un chemin peut utiliser un guillemet de style C ; ceci est accepté dans tous les cas et obligatoire si le nom du fichier commence par un guillemet double ou contient `LF`. Dans le cas d'une citation de style C, le nom complet doit être entouré de guillemets doubles, et tout caractère `LF`, barre anti-oblique ou guillemet double doit être échappé en le faisant précéder d'une barre anti-oblique (par exemple, `\"path/with\\n, \\\\\\\\\\ et \\\" ; in it\"`)."
-
-#~ msgid "The value of `<path>` must be in canonical form. That is it must not:"
-#~ msgstr "La valeur de `<chemin>` doit être sous forme canonique. C'est-à-dire qu'elle ne doit pas :"
-
-#, ignore-same, no-wrap
-#~ msgid "--rfc"
-#~ msgstr "--rfc"
-
-#~ msgid "Prepends \"RFC\" to the subject prefix (producing \"RFC PATCH\" by default). RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
-#~ msgstr "Préfixe \"RFC\" au préfixe de sujet (créant \"RFC PATCH\" par défaut) . RFC signifie \"Request For Comments\" (demande de commentaires) ; utilisez ceci lorsque vous envoyez une rustine expérimentale pour une discussion plutôt que pour une application."
-
-#~ msgid "Search files in the current directory that is not managed by Git."
-#~ msgstr "Rechercher les fichiers dans le répertoire actuel qui n'est pas géré par Git."
-
-#, no-wrap
-#~ msgid "'umask' (or 'false')"
-#~ msgstr "'umask' (ou 'false')"
-
-#, no-wrap
-#~ msgid "'group' (or 'true')"
-#~ msgstr "'group' (ou 'true')"
-
-#, no-wrap
-#~ msgid "'all' (or 'world' or 'everybody')"
-#~ msgstr "'all' (ou 'world' ou 'everybody')"
-
-#, ignore-same, no-wrap
-#~ msgid "--heads"
-#~ msgstr "--heads"
-
-#, placeholders:'`--interactive`':'`--exec`':'`-i`':'`--interactive`'
-#~ msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by `--interactive`), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like `--exec`, will use the default of drop unless `-i`/`--interactive` is explicitly specified."
-#~ msgstr "Comment manipuler les commits qui ne sont pas initialement vides et ne sont pas des picorages propres d'un commit en amont, mais qui deviennent vides après le rebasage (parce qu'ils contiennent un sous-ensemble de modifications déjà en amont). Avec drop (par défaut), les commits qui deviennent vides sont supprimés. Avec keep, de tels commits sont gardés. Avec ask (impliqué par `--interactive ` ), la rebasage s'arrêtera lors de l'application d'un commit vide, vous permettant de choisir s'il y a lieu de l'abandonner, d'éditer encore les fichiers ou de simplement valider les modifications vides. D'autres options, comme `--exec`, utiliseront la valeur par défaut d'abandonner à moins que `-i`/`--interactive` soit explicitement spécifié."
-
-# ERROR: --branches[=pattern] not found in translation
-# ERROR: --branches[=pattern] not found in translation
-#, ignore-same, no-wrap
-#~ msgid "--branches[=pattern]"
-#~ msgstr "--branches[=pattern]"
-
-# ERROR: --tags[=pattern] not found in translation
-# ERROR: --tags[=pattern] not found in translation
-#, ignore-same, no-wrap
-#~ msgid "--tags[=pattern]"
-#~ msgstr "--tags[=pattern]"
-
-# ERROR: --remotes[=pattern] not found in translation
-# ERROR: --remotes[=pattern] not found in translation
-#, ignore-same, no-wrap
-#~ msgid "--remotes[=pattern]"
-#~ msgstr "--remotes[=pattern]"
-
-#~ msgid "Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are not mutually exclusive; when given both, references stored in \"refs/heads\" and \"refs/tags\" are displayed."
-#~ msgstr "Limiter à \"refs/heads\" et \"refs/tags\", respectivement. Ces options ne s'excluent pas mutuellement ; si les deux sont données, les références stockées dans \"refs/heads\" et \"refs/tags\" sont affichées."
-
-#, placeholders:'`$GIT_DIR`':'<<def_SHA1,':'MERGE_HEAD':'CHERRY_PICK_HEAD':'<<def_per_worktree_ref,':'git rev-parse':'MERGE_HEAD'
-#~ msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
-#~ msgstr "Les pseudorefs sont une classe de fichiers sous '$GIT_DIR' qui se comportent comme des refs à des fins de rev-parse, mais qui sont traités spécialement par git. Les pseudorefs ont des noms qui sont à la fois tout en majuscules et commencent toujours par une ligne composée d’un <<def_SHA1, SHA-1>> suivi d’un espace blanc. Donc, HEAD n’est pas une pseudoref, car c’est parfois une ref symbolique. Elles peuvent éventuellement contenir des données supplémentaires. « MERGE_HEAD » et « CHERRY_PICK_HEAD » en sont des exemples. Contrairement aux <<def_per_worktree_ref, refs-par-arbre-de-travail>>, ces fichiers ne peuvent pas être des refs symboliques et n’ont jamais de reflogs. Ils ne peuvent pas non plus être mis à jour via la machinerie de mise à jour de référence normale. Au lieu de cela, ils sont mis à jour en écrivant directement dans les fichiers. Cependant, ils peuvent être lus comme s’il s’agissait de refs, donc 'git rev-parse MERGE_HEAD' fonctionnera."
-
-#, placeholders:'`HEAD`'
-#~ msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
-#~ msgstr "Il existe quelques références spéciales qui ne commencent pas par `refs/`. L'exemple le plus notable est `HEAD`."
-
-#, no-wrap, placeholders:'[[def_special_ref]]'
-#~ msgid "[[def_special_ref]]special ref"
-#~ msgstr "[[def_special_ref]]réf spéciale"
-
-#~ msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
-#~ msgstr "Après une fusion ratée, afficher les références qui touchent les fichiers en conflit et qui n'existent pas sur toutes les têtes à fusionner."
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
-#~ msgstr "ssh://{startsb}compte@{endsb}hôte.xz{startsb}:port{endsb}/~{startsb}utilisateur{endsb}/chemin/du/dépôt.git/"
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
-#~ msgstr "git://hôte.xz{startsb}:port{endsb}/~{startsb}compte{endsb}/chemin/du/dépôt.git/"
-
-#, placeholders:'{startsb}':'{endsb}':'{startsb}':'{endsb}'
-#~ msgid "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
-#~ msgstr "{startsb}compte@{endsb}hôte.xz:/~{startsb}compte{endsb}/chemin/du/dépôt.git/"
-
-#~ msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
-#~ msgstr "Ignorer les blancs lors de la comparaison de lignes. Ceci ignore les différences même si une ligne contient des espaces alors que l'autre n'en a pas."
-
-#~ msgid "Fetch all remotes."
-#~ msgstr "Récupérer tous les distants."
-
-#~ msgid "The name of an existing branch to rename."
-#~ msgstr "Nom d'une branche existante à renommer."
-
-#~ msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
-#~ msgstr "ce qui veut dire que la branche n'est pas créée ou réinitialisée à moins que « git checkout » soit réussie."
-
-#~ msgid "Die, if the pack contains broken objects or links."
-#~ msgstr "Mourir, si le paquet contient des objets ou des liens brisés."
-
-#, ignore-same, no-wrap
-#~ msgid "--fsck-objects"
-#~ msgstr "--fsck-objects"
-
-#, placeholders:'--continue`'
-#~ msgid "The third syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
-#~ msgstr "La troisième syntaxe (\"`git merge --continue`\") ne peut être exécutée qu'après que la fusion ait entraîné des conflits."
-
-#, no-wrap
-#~ msgid "git file is."
-#~ msgstr "se trouve."
-
-#, no-wrap
-#~ msgid "keep file used as a lock to prevent the race with 'git repack'"
-#~ msgstr "le fichier .keep utilisé comme verrou pour éviter la course avec 'git repack'"
-
-#~ msgid "mentioned above."
-#~ msgstr "mentionnée ci-dessus."
-
-#~ msgid "Generate patch (see section titled"
-#~ msgstr "Générer une rustine (voir la section appelée"
-
-#~ msgid "\"Generating patch text with -p\")."
-#~ msgstr "\"Générer le texte de rustine avec -p\")."
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)"
-#~ msgstr "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=(off|none)"
-#~ msgstr "--diff-merges=(off|none)"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=first-parent"
-#~ msgstr "--diff-merges=first-parent"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=1"
-#~ msgstr "--diff-merges=1"
-
-#~ msgid "This option makes merge commits show the full diff with respect to the first parent only."
-#~ msgstr "Cette option fait en sorte que les commits de fusion montrent les différences complètes, mais seulement par rapport au premier parent."
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=separate"
-#~ msgstr "--diff-merges=separate"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=remerge"
-#~ msgstr "--diff-merges=remerge"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=r"
-#~ msgstr "--diff-merges=r"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=combined"
-#~ msgstr "--diff-merges=combined"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=c"
-#~ msgstr "--diff-merges=c"
-
-#, ignore-same, no-wrap
-#~ msgid "--diff-merges=cc"
-#~ msgstr "--diff-merges=cc"
-
-#, placeholders:'`-t`':'`-p`':'`-s`':'`--textconv`':'`--filters`'
-#~ msgid "In its first form, the command provides the content or the type of an object in the repository. The type is required unless `-t` or `-p` is used to find the object type, or `-s` is used to find the object size, or `--textconv` or `--filters` is used (which imply type \"blob\")."
-#~ msgstr "Dans sa première forme, la commande fournit le contenu ou le type d'un objet dans le dépôt. Le type est obligatoire sauf si `-t` ou `-p` est utilisé pour trouver le type de l'objet, ou `-s` est utilisé pour trouver la taille de l'objet, ou `--textconv` ou `--filters` est utilisé (ce qui implique le type \"blob\")."
-
-#, placeholders:'`--textconv`':'`--filters`'
-#~ msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single whitespace, so that the appropriate drivers can be determined."
-#~ msgstr "Dans la seconde forme, une liste d'objets (séparés par des sauts de ligne) est fournie sur stdin, et le SHA-1, le type et la taille de chaque objet sont imprimés sur la sortie standard. Le format de sortie peut être modifié en utilisant l'argument optionnel `<format>`. Si `--textconv` ou `--filters` a été spécifié, l'entrée est censée lister les noms d'objets suivis du nom du chemin, séparés par un simple espace, afin que les pilotes appropriés puissent être déterminés."
-
-#~ msgid "Report in more detail:"
-#~ msgstr "Rapporter plus en détail :"
-
-#~ msgid "Compares the content and mode of the blobs found via two tree objects."
-#~ msgstr "Compare le contenu et le mode des blobs trouvés via deux objets arbre."
-
-#~ msgid "recurse into sub-trees"
-#~ msgstr "parcourir récursivement les sous-arbres"
-
-#~ msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space). For convenience, the <token> can be a shortened string key (e.g., \"sign\") instead of the full string which should appear before the separator on the output (e.g., \"Signed-off-by\"). This can be configured using the 'trailer.<token>.key' configuration variable."
-#~ msgstr "Cela signifie que les <jeton> et <valeur> nettoyés seront séparés par `': '` (deux points suivis d'un espace). Pour plus de commodité, le <jeton> peut être une clé raccourcie (p. ex. \"sign\") au lieu de la chaîne complète qui doit apparaître devant le séparateur sur la sortie (p. ex. \"Signed-off-by\"). Cela peut être configuré à l'aide de la variable de configuration 'trailer.<jeton>.key'."
-
-#~ msgid "Remove any whitespace-continuation in trailers, so that each trailer appears on a line by itself with its full content."
-#~ msgstr "Retirer toute continuation par espace blanc dans les lignes terminales, de sorte que chaque ligne terminale apparaît sur une ligne en elle-même avec son contenu complet."
-
-#, placeholders:'`--only-trailers':'--only-input':'--unfold`'
-#~ msgid "A convenience alias for `--only-trailers --only-input --unfold`."
-#~ msgstr "Un alias de commodité pour `--only-trailers --only-input --unfold`."
-
-#, no-wrap
-#~ msgid ""
-#~ "Submodules have more state and instead report\n"
-#~ "\t\tM    the submodule has a different HEAD than\n"
-#~ "\t\t     recorded in the index\n"
-#~ "\t\tm    the submodule has modified content\n"
-#~ "\t\t?    the submodule has untracked files\n"
-#~ "since modified content or untracked files in a submodule cannot be added\n"
-#~ "via `git add` in the superproject to prepare a commit.\n"
-#~ msgstr ""
-#~ "Les sous-modules ont plus d'états et indiquent à la place\n"
-#~ "\t\tM    le sous-module a une HEAD différente de\n"
-#~ "\t\t     celle enregistrée dans l'index\n"
-#~ "\t\tm    le sous-module a un contenu modifié\n"
-#~ "\t\t?    le sous-module a des fichiers non suivis\n"
-#~ "puisque le contenu modifié ou les fichiers non suivis dans un sous-module ne peuvent pas être ajoutés\n"
-#~ "via `git add` dans le super-projet pour préparer une validation.\n"
-
-#, placeholders:'`--object-format=sha256`'
-#~ msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage.  A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories.  It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways.  Only use `--object-format=sha256` for testing purposes."
-#~ msgstr "CETTE OPTION EST EXPÉRIMENTALE ! Le support de SHA-256 est expérimental et encore à un stade précoce. Un dépôt SHA-256 ne sera en général pas en mesure de partager le travail avec des dépôts SHA-1 \"ordinaires\". Il faut supposer que, par exemple, les formats de fichiers internes de Git en relation avec les dépôts SHA-256 peuvent changer de manière non-rétrocompatible. N'utilisez `--object-format=sha256` qu'à des fins de test."
-
-#~ msgid "print a byte from a hex code"
-#~ msgstr "afficher un octet à partir d'un code hexagonal"
-
-#, placeholders:'{caret}':'`--not`'
-#~ msgid "Reverses the meaning of the '{caret}' prefix (or lack thereof)  for all following revision specifiers, up to the next `--not`."
-#~ msgstr "Inverser la signification du préfixe'{caret}' (ou son absence) pour tous les spécificateurs de révision suivants, jusqu'au prochain `--not`."
-
-#, placeholders:'`--merge-base`'
-#~ msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>."
-#~ msgstr "Juste au cas où vous feriez quelque chose d'exotique, il doit être noté que tous les <commit> dans la description ci-dessus, excepté dans le cas de `--merge-base` et dans les deux dernières formes qui utilisent les notations `..`, peuvent être n'importe quel <arbre>."
-
-#, placeholders:'`--trailer`'
-#~ msgid "Otherwise, this command applies the arguments passed using the `--trailer` option, if any, to the commit message part of each input file. The result is emitted on the standard output."
-#~ msgstr "Sinon, cette commande applique les arguments passés en utilisant l'option `---trailer`, le cas échéant, à la partie de message de validation de chaque fichier d'entrée. Le résultat est émis sur la sortie standard."
-
-#, no-wrap
-#~ msgid "message\n"
-#~ msgstr "message\n"
-
-#, no-wrap, placeholders:'git ls-remote':'--tags'
-#~ msgid ""
-#~ "$ git ls-remote --tags .\n"
-#~ "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-#~ "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-#~ "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-#~ "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-#~ "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-#~ msgstr ""
-#~ "$ git ls-remote --tags .\n"
-#~ "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-#~ "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-#~ "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-#~ "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-#~ "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-
-#, no-wrap, placeholders:'www.kernel.org':'git.git':'git ls-remote':'--tags'
-#~ msgid ""
-#~ "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-#~ "$ git ls-remote --tags korg v\\*\n"
-#~ "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-#~ "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-#~ "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-#~ "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-#~ msgstr ""
-#~ "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
-#~ "$ git ls-remote --tags korg v\\*\n"
-#~ "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
-#~ "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
-#~ "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
-#~ "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-
-#~ msgid "Append to the notes of an existing object (defaults to HEAD).  Creates a new notes object if needed."
-#~ msgstr "Ajouter aux notes d'un objet existant (valeur par défaut : HEAD). Crée un nouvel objet notes si nécessaire."
-
-#~ msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
-#~ msgstr "Prendre l'objet blob donné (par exemple, une autre note) comme message de la note. (Utilisez plutôt `git notes copy <objet>` pour copier des notes entre objets)."
-
-#~ msgid "The following 'update' procedures are only available via the `submodule.<name>.update` configuration variable:"
-#~ msgstr "Les procédures 'update' suivantes sont uniquement disponibles via la variable de configuration `submodule.<nom>.update` :"
-
-#~ msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
-#~ msgstr "une commande shell arbitraire qui prend un seul argument (le sha1 du commit enregistré dans le superprojet) est exécuté. Lorsque `submodule.<nom>.update`est réglé sur '!command', le reste après le point d'exclamation est la commande personnalisée."
-
-#~ msgid "the submodule is not updated."
-#~ msgstr "le sous-module n'est pas mis à jour."
-
-#~ msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy.  This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
-#~ msgstr "Lorsque <rév> n'est pas spécifié, la commande annote les modifications en arrière à partir de la copie de l'arbre de travail. Ce drapeau permet à la commande de faire croire que la copie de l'arbre de travail contient le contenu du fichier nommé (spécifier `-` pour que la commande lise à partir de l'entrée standard)."
-
-#~ msgid "Show three-way merge without touching index."
-#~ msgstr "Afficher la fusion à trois points sans modifier l'index."
-
-#, ignore-same
-#~ msgid "linkgit:git-apply[1]."
-#~ msgstr "linkgit:git-apply[1]."
-
-#, ignore-same
-#~ msgid "bc"
-#~ msgstr "bc"
-
-#, ignore-same
-#~ msgid "bc3"
-#~ msgstr "bc3"
-
-#, ignore-same
-#~ msgid "bc4"
-#~ msgstr "bc4"
-
-#, ignore-same
-#~ msgid "smerge"
-#~ msgstr "smerge"
-
-#~ msgid "Instead of the content, show the object size identified by `<object>`."
-#~ msgstr "Au lieu du contenu, afficher la taille de l'objet identifié par `<objet>`."
-
-#~ msgid "Show cached files in the output (default)"
-#~ msgstr "Afficher les fichiers mis en cache dans la sortie (défaut)"
-
-#~ msgid "Show deleted files in the output"
-#~ msgstr "Afficher les fichiers supprimés dans la sortie"
-
-#~ msgid "Show modified files in the output"
-#~ msgstr "Afficher les fichiers modifiés dans la sortie"
-
-#~ msgid "cached"
-#~ msgstr "cached"
-
-#~ msgid "unmerged"
-#~ msgstr "unmerged"
-
-#~ msgid "removed/deleted"
-#~ msgstr "supprimé/effacé"
-
-#~ msgid "modified/changed"
-#~ msgstr "modifié/changé"
-
-#, ignore-same
-#~ msgid "--[no-]autosquash"
-#~ msgstr "--[no-]autosquash"
-
-#, no-wrap, placeholders:'--super-prefix='
-#~ msgid "--super-prefix=<path>"
-#~ msgstr "--super-prefix=<chemin>"
-
-#~ msgid "Currently for internal use only.  Set a prefix which gives a path from above a repository down to its root.  One use is to give submodules context about the superproject that invoked it."
-#~ msgstr "Actuellement pour un usage interne seulement. Régler un préfixe qui fournit un chemin depuis un dépôt jusqu'à sa racine. Une utilisation est de fournir aux sous-modules du contexte à propos du super-projet qui l'a invoqué."
-
-#~ msgid "Prints a Git logical variable."
-#~ msgstr "Afficher un variable logique de Git."
-
-#, placeholders:'`--date=default`':'`--date=rfc2822`'
-#~ msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
-#~ msgstr "`--date=default` est le format par défaut, et est similaire à `--date=rfc2822`, avec quelques exceptions :"
-
-#~ msgid "there is no comma after the day-of-week"
-#~ msgstr "il n'y a pas de virgule après le jour de la semaine"
-
-#~ msgid "the time zone is omitted when the local time zone is used"
-#~ msgstr "le fuseau horaire est omis lorsque le fuseau horaire local est utilisé"
-
-#~ msgid "The `<pushurl>` is used for pushes only. It is optional and defaults to `<URL>`."
-#~ msgstr "Le `<url-poussée>` n'est utilisé que pour les poussées. Il est facultatif et sa valeur par défaut est `<URL>`."
-
-#, fuzzy, no-wrap
-#~ msgid "'git reflog' <subcommand> <options>\n"
-#~ msgstr "'git bisect' <sous-commande> <options>\n"
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 5bf843a0..d3efb3e8 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2021-01-19 16:32+0000\n"
 "Last-Translator: Lilian Wang <li330wang@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4767,49 +4767,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4821,7 +4832,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4918,91 +4929,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7770,7 +7785,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8521,7 +8536,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9149,7 +9164,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9179,7 +9194,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9662,7 +9677,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9826,7 +9841,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10276,7 +10291,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11063,7 +11078,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11470,7 +11485,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11501,7 +11516,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12229,7 +12244,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12398,7 +12413,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12942,7 +12957,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13680,7 +13695,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13939,7 +13954,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14127,7 +14142,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14194,7 +14209,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14482,7 +14497,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15408,7 +15423,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15606,7 +15621,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16016,7 +16031,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16229,7 +16244,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16259,7 +16274,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16467,7 +16482,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17104,7 +17119,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17263,7 +17278,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17434,7 +17449,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18265,7 +18280,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19552,7 +19567,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19649,7 +19664,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20374,7 +20389,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20557,7 +20572,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20984,7 +20999,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20992,25 +21007,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21721,7 +21736,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22293,7 +22308,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22588,7 +22603,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22660,7 +22675,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22849,7 +22864,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23097,7 +23112,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23256,10 +23271,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23682,7 +23703,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24083,7 +24104,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26443,7 +26464,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26639,7 +26660,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27120,7 +27141,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27979,7 +28000,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28110,7 +28131,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29034,7 +29055,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30349,7 +30370,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30373,7 +30394,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30671,7 +30692,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30899,7 +30920,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30929,7 +30950,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31658,7 +31679,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31874,7 +31895,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31967,7 +31988,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32390,7 +32411,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32841,7 +32862,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32961,7 +32982,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33111,7 +33132,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33222,13 +33243,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33245,31 +33266,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33314,7 +33335,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33545,7 +33566,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33569,7 +33590,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33889,7 +33910,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34048,7 +34069,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34890,7 +34911,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35232,7 +35253,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35915,7 +35936,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36124,7 +36145,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36349,7 +36370,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36544,7 +36565,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36666,7 +36687,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37018,7 +37039,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37206,7 +37227,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37260,7 +37281,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37313,7 +37334,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37337,7 +37358,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37440,7 +37461,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37590,7 +37611,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38100,7 +38121,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38626,7 +38647,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38722,7 +38743,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38770,7 +38791,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38850,7 +38871,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39019,7 +39040,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39562,7 +39583,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41107,7 +41128,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41715,7 +41736,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41793,7 +41814,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41902,7 +41923,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42016,7 +42037,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42076,7 +42097,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42184,7 +42205,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42342,7 +42363,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42354,7 +42375,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42514,7 +42535,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43471,7 +43492,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43563,7 +43584,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43984,7 +44005,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44594,7 +44615,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44629,25 +44650,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46539,7 +46560,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46975,7 +46996,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47169,7 +47190,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47493,7 +47514,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47894,7 +47915,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48184,7 +48205,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48456,7 +48477,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48588,7 +48609,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48606,7 +48627,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48877,7 +48898,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49629,7 +49650,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49888,7 +49909,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50022,7 +50043,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50184,7 +50205,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51204,7 +51225,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51441,7 +51462,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52442,7 +52463,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52591,7 +52612,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52745,7 +52766,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52787,7 +52808,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52835,7 +52856,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53030,7 +53051,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53331,7 +53352,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53391,7 +53412,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53715,7 +53736,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53853,7 +53874,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54027,7 +54048,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54051,7 +54072,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54585,7 +54606,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55403,7 +55424,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55557,7 +55578,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56223,7 +56244,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56453,7 +56474,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56495,31 +56516,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56555,7 +56576,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56567,7 +56588,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56579,7 +56600,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56591,7 +56612,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56603,7 +56624,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56615,31 +56636,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56651,25 +56672,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56681,13 +56702,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56695,13 +56716,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56713,31 +56734,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56749,7 +56770,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56761,7 +56782,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56773,7 +56794,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56791,19 +56812,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56815,7 +56836,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56827,13 +56848,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56845,7 +56866,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56857,7 +56878,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56869,13 +56890,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56893,13 +56914,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56911,19 +56932,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56935,7 +56956,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56947,19 +56968,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56971,7 +56992,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56983,7 +57004,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56995,7 +57016,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57013,7 +57034,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57025,7 +57046,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57037,7 +57058,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57049,7 +57070,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57061,7 +57082,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57073,7 +57094,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57085,19 +57106,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57115,7 +57136,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57127,7 +57148,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57139,7 +57160,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57151,7 +57172,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57163,7 +57184,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57262,7 +57283,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57285,7 +57306,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57373,7 +57394,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57385,19 +57406,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57415,13 +57436,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57441,7 +57462,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57459,7 +57480,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57471,25 +57492,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57501,37 +57522,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57543,13 +57564,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57561,13 +57582,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57628,7 +57649,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58183,7 +58204,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58484,7 +58505,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58583,7 +58604,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59130,7 +59151,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61120,7 +61141,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61153,7 +61174,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61213,7 +61234,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62130,7 +62151,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62451,7 +62472,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "git-update-server-info(1)"
@@ -62500,7 +62521,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62573,7 +62594,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62683,7 +62704,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62877,7 +62898,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62919,7 +62940,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63009,7 +63030,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63051,7 +63072,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63325,7 +63346,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63385,7 +63406,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64088,7 +64109,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68217,13 +68238,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71399,7 +71420,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71407,7 +71428,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71434,7 +71455,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 4216516c..a6e69c45 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-01-30 23:02+0000\n"
 "Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
 "Language-Team: none\n"
@@ -4759,49 +4759,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4813,7 +4824,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4910,91 +4921,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7757,7 +7772,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "Tambahkan isi berkas ke indeks"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8508,7 +8523,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Terapkan rangkaian tambalan dari kotak surat"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9136,7 +9151,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9166,7 +9181,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Terapkan tambalan pada berkas dan/atau pada indeks"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9649,7 +9664,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9813,7 +9828,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Buat arsip berkas dari pohon bernama"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10262,7 +10277,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Gunakan pencarian biner untuk mencari komit yang memasukkan bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11051,7 +11066,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Perlihatkan revisi dan pengarang apa yang terakhir kali mengubah setiap baris berkas"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11457,7 +11472,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11487,7 +11502,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12215,7 +12230,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "Kumpulkan informasi agar pengguna melaporkan laporan bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, fuzzy, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12380,7 +12395,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12922,7 +12937,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Sediakan isi atau informasi tipe dan ukuran berkas untuk objek repositori"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13661,7 +13676,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13920,7 +13935,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14108,7 +14123,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14175,7 +14190,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14463,7 +14478,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Ganti cabang atau kembalikan berkas pohon kerja"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15389,7 +15404,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15587,7 +15602,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -15996,7 +16011,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Cari komit yang belum diterapkan pada hulu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16209,7 +16224,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16239,7 +16254,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Hapus berkas tak terlacak dari pohon kerja"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16447,7 +16462,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "Salin repositori ke dalam direktori baru"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17078,7 +17093,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17237,7 +17252,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17408,7 +17423,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18238,7 +18253,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Dapatkan dan setel opsi repositori atau global"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19516,7 +19531,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19612,7 +19627,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20343,7 +20358,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20526,7 +20541,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Selamatkan data karena pengguna SCM lainnya yang suka membenci"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20954,7 +20969,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20962,25 +20977,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21691,7 +21706,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Peladen sederhana beneran untuk repositori Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22263,7 +22278,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "Berikan nama yang dapat dibaca manusia pada objek berdasarkan referensi yang ada"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22558,7 +22573,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22630,7 +22645,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22819,7 +22834,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23065,7 +23080,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "Bandingkan isi dan mode blob yang ditemukan lewat dua objek pohon"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23224,10 +23239,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Perlihatkan perubahan di antara komit-komit, komit dan pohon kerja, dll"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23648,7 +23669,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24049,7 +24070,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26409,7 +26430,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26605,7 +26626,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "Unduh objek dan referensi dari repositori yang lain"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27086,7 +27107,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27945,7 +27966,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28075,7 +28096,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -28998,7 +29019,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30311,7 +30332,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifikasi hubungan dan validitas objek di dalam basis data"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30335,7 +30356,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifikasi hubungan dan validitas objek di dalam basis data"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30633,7 +30654,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Bersihkan berkas yang tak perlu dan optimalkan repositori lokal"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30861,7 +30882,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30891,7 +30912,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31620,7 +31641,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Sebuah antarmuka grafis Git portabel"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31837,7 +31858,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Hitung ID objek dan buat blob dari berkas (opsional)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31930,7 +31951,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Perlihatkan bantuan mengenai Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32353,7 +32374,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32804,7 +32825,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32924,7 +32945,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Dorong objek lewat HTTP/DAV ke repositori lainnya"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33074,7 +33095,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Kirim koleksi tambalan dari masukan standar ke sebuah direktori IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33185,13 +33206,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33208,31 +33229,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33277,7 +33298,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Bangun berkas indeks pak dari arsip terpak yang sudah ada"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33508,7 +33529,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33532,7 +33553,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Buat repositori Git kosong atau inisialisasi ulang yang sudah ada"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33850,7 +33871,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Jelajahi repositori kerja Anda secara instan di gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34009,7 +34030,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34850,7 +34871,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35192,7 +35213,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Perlihatkan informasi mengenai berkas-berkas di dalam indeks dan pohon kerja"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35867,7 +35888,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36079,7 +36100,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36304,7 +36325,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Ekstrak berkas dan kepengarangan dari pesan surel tunggal"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36499,7 +36520,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36621,7 +36642,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Cari leluhur umum sebaik-baiknya untuk penggabungan"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36976,7 +36997,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37164,7 +37185,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37218,7 +37239,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37271,7 +37292,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37295,7 +37316,7 @@ msgstr "git-mergetool{litdd}lib(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37397,7 +37418,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Jalankan alat penyelesaian konflik penggabungan untuk menyelesaikan konflik penggabungan"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37547,7 +37568,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "Lakukan penggabungan tanpa menyentuh indeks atau pohon kerja"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38055,7 +38076,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "Gabungkan dua riwayat pengembangan atau lebih bersama-sama"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38581,7 +38602,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Buat objek tag dengan validasi ekstra"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38677,7 +38698,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "Bangun objek pohon dari teks berformat ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38725,7 +38746,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Pindahkan atau namai ulang berkas, direktori, atau tautan simbolik"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38805,7 +38826,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38974,7 +38995,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39517,7 +39538,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Impor dari dan kirimkan ke repositori Perfore"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41062,7 +41083,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41670,7 +41691,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41748,7 +41769,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Pak kepala dan tag untuk akses repositori yang efisien"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41856,7 +41877,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41970,7 +41991,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42030,7 +42051,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "Pangkas semua objek tak tercapai dari basis data objek"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42138,7 +42159,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Ambil dan integrasikan dengan repositori lain atau sebuah cabang lokal"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42296,7 +42317,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42308,7 +42329,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42468,7 +42489,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "Perbarui referensi remote bersama dengan objek yang terkait"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43425,7 +43446,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43517,7 +43538,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Bandingkan dua rentang komit (misalnya dua versi cabang)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43937,7 +43958,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44547,7 +44568,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Terapkan ulang komit-komit di atas dasar ujung yang lainnya"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44582,25 +44603,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46488,7 +46509,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46923,7 +46944,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47117,7 +47138,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47441,7 +47462,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47842,7 +47863,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48130,7 +48151,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Buat, daftar, hapus referensi untuk mengganti objek"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48401,7 +48422,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48533,7 +48554,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Gunakan ulang resolusi konflik penggabungan terekam"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48551,7 +48572,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48822,7 +48843,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Setel ulang HEAD saat ini ke keadaan yang disebutkan"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49574,7 +49595,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49833,7 +49854,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49967,7 +49988,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Daftar objek komit dalam urutan kronologis terbalik"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50128,7 +50149,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51148,7 +51169,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Hapus berkas dari pohon kerja dan indeks"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51385,7 +51406,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52386,7 +52407,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Dorong objek lewat protokol Git ke repositori lainnya"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52535,7 +52556,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Cangkang masuk terbatas untuk akses SSH hanya Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52689,7 +52710,7 @@ msgstr "git-sh-i18n{litdd}envsubst(1)"
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52731,7 +52752,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52779,7 +52800,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -52973,7 +52994,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53274,7 +53295,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53334,7 +53355,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53659,7 +53680,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53797,7 +53818,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -53971,7 +53992,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "Tambahkan isi berkas ke area penggelaran"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -53995,7 +54016,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "Stase perubahan di dalam direktori kerja"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54529,7 +54550,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55346,7 +55367,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55500,7 +55521,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56166,7 +56187,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Operasi dua arah antara repositori Subversion dan Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56396,7 +56417,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56438,31 +56459,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56498,7 +56519,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56510,7 +56531,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56522,7 +56543,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56534,7 +56555,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56546,7 +56567,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56558,31 +56579,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56594,25 +56615,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56624,13 +56645,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56638,13 +56659,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56656,31 +56677,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56692,7 +56713,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56704,7 +56725,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56716,7 +56737,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56734,19 +56755,19 @@ msgstr "--path"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56758,7 +56779,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56770,13 +56791,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56788,7 +56809,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56800,7 +56821,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56812,13 +56833,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56836,13 +56857,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56854,19 +56875,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56878,7 +56899,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56890,19 +56911,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56914,7 +56935,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56926,7 +56947,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56938,7 +56959,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56956,7 +56977,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56968,7 +56989,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -56980,7 +57001,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -56992,7 +57013,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57004,7 +57025,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57016,7 +57037,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57028,19 +57049,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57058,7 +57079,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57070,7 +57091,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57082,7 +57103,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57094,7 +57115,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57106,7 +57127,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57205,7 +57226,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57228,7 +57249,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57315,7 +57336,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57327,19 +57348,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57357,13 +57378,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57383,7 +57404,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57401,7 +57422,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57413,25 +57434,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57443,37 +57464,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57485,13 +57506,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57503,13 +57524,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57570,7 +57591,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58125,7 +58146,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58426,7 +58447,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58525,7 +58546,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "Buat, daftar, hapus atau verifikasi objek tag yang ditandatangani dengan GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59072,7 +59093,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61067,7 +61088,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61100,7 +61121,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61160,7 +61181,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62077,7 +62098,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62397,7 +62418,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62445,7 +62466,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62518,7 +62539,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62628,7 +62649,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62822,7 +62843,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62864,7 +62885,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62954,7 +62975,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -62996,7 +63017,7 @@ msgstr "git-web{litdd}browse(1)"
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63270,7 +63291,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Perlihatkan log dengan perbedaan yang dimasukkan setiap komit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63330,7 +63351,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64033,7 +64054,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68145,13 +68166,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71331,7 +71352,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71339,7 +71360,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71366,7 +71387,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.is.po b/po/documentation.is.po
index f608ec82..e138d8d3 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-12-22 15:16+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4782,49 +4782,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4836,7 +4847,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4933,91 +4944,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7786,7 +7801,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Bæta innihaldi skjala í atriðaskrána"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8632,7 +8647,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9260,7 +9275,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9290,7 +9305,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9773,7 +9788,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9937,7 +9952,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10386,7 +10401,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11178,7 +11193,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11584,7 +11599,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11614,7 +11629,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12342,7 +12357,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12507,7 +12522,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13049,7 +13064,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13786,7 +13801,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14045,7 +14060,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14233,7 +14248,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14299,7 +14314,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14587,7 +14602,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15513,7 +15528,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15711,7 +15726,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16120,7 +16135,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16333,7 +16348,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16363,7 +16378,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16572,7 +16587,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Einrita hirslu í nýja skrá"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17292,7 +17307,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17451,7 +17466,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17622,7 +17637,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18453,7 +18468,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19732,7 +19747,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19828,7 +19843,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20552,7 +20567,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20735,7 +20750,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21162,7 +21177,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21170,25 +21185,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21899,7 +21914,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22471,7 +22486,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22766,7 +22781,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22838,7 +22853,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23027,7 +23042,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23273,7 +23288,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23432,10 +23447,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23858,7 +23879,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24259,7 +24280,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26620,7 +26641,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26816,7 +26837,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27297,7 +27318,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28156,7 +28177,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28286,7 +28307,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29211,7 +29232,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30523,7 +30544,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30547,7 +30568,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30845,7 +30866,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31073,7 +31094,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31103,7 +31124,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31833,7 +31854,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32049,7 +32070,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32142,7 +32163,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32565,7 +32586,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33016,7 +33037,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33136,7 +33157,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33286,7 +33307,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33397,13 +33418,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33420,31 +33441,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33489,7 +33510,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33720,7 +33741,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, fuzzy, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33748,7 +33769,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Búa til tóma Git hirslu eða endurfrumstilla hirslu sem er til"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -34099,7 +34120,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34258,7 +34279,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35101,7 +35122,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35443,7 +35464,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36120,7 +36141,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36331,7 +36352,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36556,7 +36577,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36751,7 +36772,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36873,7 +36894,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37225,7 +37246,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37413,7 +37434,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37467,7 +37488,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, fuzzy, priority:100
 msgid "Examples:"
@@ -37520,7 +37541,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37544,7 +37565,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37646,7 +37667,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37796,7 +37817,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38305,7 +38326,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38831,7 +38852,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38927,7 +38948,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38975,7 +38996,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -39055,7 +39076,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39224,7 +39245,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39767,7 +39788,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41311,7 +41332,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41919,7 +41940,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41997,7 +42018,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42106,7 +42127,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42220,7 +42241,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42280,7 +42301,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42388,7 +42409,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42546,7 +42567,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42558,7 +42579,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42718,7 +42739,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43675,7 +43696,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43767,7 +43788,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44187,7 +44208,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44797,7 +44818,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44832,25 +44853,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46739,7 +46760,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47174,7 +47195,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47368,7 +47389,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47692,7 +47713,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48094,7 +48115,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48384,7 +48405,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48655,7 +48676,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48787,7 +48808,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48805,7 +48826,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49076,7 +49097,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49828,7 +49849,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50087,7 +50108,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50221,7 +50242,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50382,7 +50403,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51403,7 +51424,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51641,7 +51662,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52642,7 +52663,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52791,7 +52812,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52945,7 +52966,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52987,7 +53008,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53035,7 +53056,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53229,7 +53250,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53530,7 +53551,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53590,7 +53611,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53915,7 +53936,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54053,7 +54074,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54227,7 +54248,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54251,7 +54272,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54785,7 +54806,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55603,7 +55624,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55757,7 +55778,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56429,7 +56450,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56659,7 +56680,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56701,31 +56722,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56761,7 +56782,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56773,7 +56794,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56785,7 +56806,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56797,7 +56818,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56809,7 +56830,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56821,31 +56842,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56857,25 +56878,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56887,13 +56908,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56901,13 +56922,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56919,31 +56940,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56955,7 +56976,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56967,7 +56988,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56979,7 +57000,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56997,19 +57018,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57021,7 +57042,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57033,13 +57054,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57051,7 +57072,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57063,7 +57084,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57075,13 +57096,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57099,13 +57120,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57117,19 +57138,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57141,7 +57162,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57153,19 +57174,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57177,7 +57198,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57189,7 +57210,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57201,7 +57222,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57219,7 +57240,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57231,7 +57252,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57243,7 +57264,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57255,7 +57276,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57267,7 +57288,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57279,7 +57300,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57291,19 +57312,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57321,7 +57342,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr "--pathspec-from-file=<skjal>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57333,7 +57354,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57345,7 +57366,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57357,7 +57378,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57369,7 +57390,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57468,7 +57489,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57491,7 +57512,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57578,7 +57599,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57590,19 +57611,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57620,13 +57641,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57646,7 +57667,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57664,7 +57685,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57676,25 +57697,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57706,37 +57727,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57748,13 +57769,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57766,13 +57787,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57833,7 +57854,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58388,7 +58409,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58689,7 +58710,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58788,7 +58809,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59335,7 +59356,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61325,7 +61346,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61358,7 +61379,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61418,7 +61439,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62335,7 +62356,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62655,7 +62676,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62703,7 +62724,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62776,7 +62797,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62886,7 +62907,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63080,7 +63101,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63122,7 +63143,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63212,7 +63233,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63254,7 +63275,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63528,7 +63549,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63588,7 +63609,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64291,7 +64312,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68403,13 +68424,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71600,7 +71621,7 @@ msgstr "þar sem <fang> getur verið slóð, netþjónn og slóð, eða einhver
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Ef um er að ræða mikinn fjölda fjarlægra hirsla með svipuð heiti og þú vilt nota annað snið fyrir þær (svo að vefslóðirnar sem þú notar verði endurskrifaðar yfir í vefslóðir sem virka) geturðu búið til stillingareiningu með:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -71613,7 +71634,7 @@ msgstr ""
 "\t[url \"<raunverulegur veffangsgrunnur>\"]\n"
 "\t\tinsteadOf = <annar veffangsgrunnur>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71643,7 +71664,7 @@ msgstr "vefslóð eins og \"vinna:hirsla.git\" eða \"hýsill.xz:/slóð/til/hir
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Ef þú vilt endurskrifa vefslóðir einungis þegar þú stjakar, þá geturðu búið til stillingareiningu með sniðinu:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 877abf28..e319a773 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-12-22 11:50+0100\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4771,49 +4771,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, fuzzy, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono citati come spiegato per la variabile di configurazione `core.quotePath` (vedi linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4825,7 +4836,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4922,91 +4933,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7792,7 +7807,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "Aggiunge i contenuti del file all'indice"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8576,7 +8591,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Applica una serie di patch da una casella di posta"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9204,7 +9219,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9234,7 +9249,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Applica una patch ai file e/o all'indice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9717,7 +9732,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9881,7 +9896,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Crea un archivio di file da un albero con nome"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10330,7 +10345,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Usa la ricerca binaria per trovare il commit che ha introdotto un bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11117,7 +11132,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Visualizza quali revisione e autore hanno modificato ogni singola riga di un file per ultimi"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11523,7 +11538,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11553,7 +11568,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12281,7 +12296,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12446,7 +12461,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12988,7 +13003,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gli oggetti di un repository"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13725,7 +13740,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13984,7 +13999,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14172,7 +14187,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14238,7 +14253,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14526,7 +14541,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15452,7 +15467,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15650,7 +15665,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16059,7 +16074,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Trova commit che devono essere ancora applicati upstream"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16272,7 +16287,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16302,7 +16317,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Rimuove i file non tracciati dall'albero di lavoro"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16510,7 +16525,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "Clona un repository in una nuova directory"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17177,7 +17192,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17336,7 +17351,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17507,7 +17522,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit: registra le modifiche al repository"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18343,7 +18358,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19621,7 +19636,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19717,7 +19732,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20441,7 +20456,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20624,7 +20639,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Recupera i dati da un sistema di controllo di versione che le persone adorano odiare"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21051,7 +21066,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21059,25 +21074,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21788,7 +21803,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Un server veramente semplice per repository Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22360,7 +22375,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "Attribuisce un nome leggibile a un oggetto basandosi su un riferimento disponibile"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22655,7 +22670,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 #| msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]\n"
@@ -22728,7 +22743,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22917,7 +22932,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23163,7 +23178,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23322,10 +23337,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc."
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23751,7 +23772,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24152,7 +24173,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26512,7 +26533,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26708,7 +26729,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "Scarica oggetti e riferimenti da un altro repository"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27189,7 +27210,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28048,7 +28069,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28178,7 +28199,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29102,7 +29123,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30413,7 +30434,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la connessione e la validità degli oggetti nel database"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30437,7 +30458,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la connessione e la validità degli oggetti nel database"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30735,7 +30756,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Ripulisce file non necessari e ottimizza il repository locale"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30963,7 +30984,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30993,7 +31014,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31722,7 +31743,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Un'interfaccia grafica portabile per Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31938,7 +31959,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32031,7 +32052,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Visualizza una guida a Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32454,7 +32475,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32905,7 +32926,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33025,7 +33046,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33175,7 +33196,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33286,13 +33307,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33309,31 +33330,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33378,7 +33399,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33609,7 +33630,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33633,7 +33654,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -33962,7 +33983,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34121,7 +34142,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34962,7 +34983,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35304,7 +35325,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35980,7 +36001,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36193,7 +36214,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36418,7 +36439,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Estrae la patch e le informazioni sull'autore da un singolo messaggio e-mail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36613,7 +36634,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36735,7 +36756,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37087,7 +37108,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37275,7 +37296,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37329,7 +37350,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, fuzzy, priority:100
 msgid "Examples:"
@@ -37382,7 +37403,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37406,7 +37427,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37508,7 +37529,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Esegue gli strumenti di risoluzione conflitti di merge per risolvere i conflitti di merge"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37658,7 +37679,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "Visualizza un merge a tre vie senza modificare l'indice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38166,7 +38187,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "Unisce due o più cronologie di sviluppo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38692,7 +38713,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Crea un oggetto tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38788,7 +38809,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "Genera un oggetto albero da testo in formato ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38836,7 +38857,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38916,7 +38937,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39085,7 +39106,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39628,7 +39649,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Importa dati da, o invia dati a, repository Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41171,7 +41192,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41779,7 +41800,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41857,7 +41878,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Esegue il pack di head e tag per un accesso efficiente al repository"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41965,7 +41986,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42079,7 +42100,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42139,7 +42160,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42247,7 +42268,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Esegue il fetch e l'integrazione con un altro repository o un branch locale"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42405,7 +42426,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42417,7 +42438,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42577,7 +42598,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43534,7 +43555,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43626,7 +43647,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44046,7 +44067,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44656,7 +44677,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44691,25 +44712,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46597,7 +46618,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47032,7 +47053,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47226,7 +47247,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47550,7 +47571,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47951,7 +47972,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48239,7 +48260,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48510,7 +48531,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48642,7 +48663,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48660,7 +48681,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48931,7 +48952,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Ripristina l'HEAD corrente allo stato specificato"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49683,7 +49704,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49942,7 +49963,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50076,7 +50097,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 #| msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
@@ -50238,7 +50259,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51259,7 +51280,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Rimuove file dall'albero di lavoro e dall'indice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51496,7 +51517,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52497,7 +52518,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Esegue il push di oggetti su un altro repository tramite il protocollo Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52646,7 +52667,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Shell di login limitata per concedere accesso SSH solo per Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52800,7 +52821,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52842,7 +52863,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52890,7 +52911,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53084,7 +53105,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53389,7 +53410,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53449,7 +53470,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53773,7 +53794,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53911,7 +53932,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54085,7 +54106,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "Aggiunge i contenuti dei file all'area di staging"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54109,7 +54130,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54643,7 +54664,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
@@ -55465,7 +55486,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55619,7 +55640,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56287,7 +56308,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Operatività bidirezionale tra un repository Subversion e Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56515,7 +56536,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56557,31 +56578,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56617,7 +56638,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56629,7 +56650,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56641,7 +56662,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56653,7 +56674,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56665,7 +56686,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56677,31 +56698,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56713,25 +56734,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56743,13 +56764,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56757,13 +56778,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56775,31 +56796,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56811,7 +56832,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56823,7 +56844,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56835,7 +56856,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56853,19 +56874,19 @@ msgstr "--path"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56877,7 +56898,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56889,13 +56910,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56907,7 +56928,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56919,7 +56940,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56931,13 +56952,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56955,13 +56976,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56973,19 +56994,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56997,7 +57018,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57009,19 +57030,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57033,7 +57054,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57045,7 +57066,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57057,7 +57078,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57075,7 +57096,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57087,7 +57108,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57099,7 +57120,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57111,7 +57132,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57123,7 +57144,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57135,7 +57156,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57147,19 +57168,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57177,7 +57198,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57189,7 +57210,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57201,7 +57222,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57213,7 +57234,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57225,7 +57246,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57324,7 +57345,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57347,7 +57368,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57434,7 +57455,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57446,19 +57467,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57476,13 +57497,13 @@ msgstr "-l<num>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57502,7 +57523,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57520,7 +57541,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57532,25 +57553,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57562,37 +57583,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57604,13 +57625,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57622,13 +57643,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57689,7 +57710,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58244,7 +58265,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58545,7 +58566,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58644,7 +58665,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59191,7 +59212,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61185,7 +61206,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61218,7 +61239,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61278,7 +61299,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62195,7 +62216,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62515,7 +62536,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62563,7 +62584,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62636,7 +62657,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62746,7 +62767,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62940,7 +62961,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62982,7 +63003,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63072,7 +63093,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63114,7 +63135,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63388,7 +63409,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Visualizza i registri insieme alle differenze introdotte da ciascun commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63448,7 +63469,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64152,7 +64173,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68276,13 +68297,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71457,7 +71478,7 @@ msgstr "dove <indirizzo> può essere un percorso, un server e un percorso o una
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Se esiste un numero elevato di repository remoti con nomi simili e si desidera utilizzare un formato diverso per essi (in modo tale che gli URL utilizzati vengano riscritti in URL funzionanti), è possibile creare una sezione di configurazione del modulo:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 msgid ""
@@ -71467,7 +71488,7 @@ msgstr ""
 "\t[url \"<actual url base>\"]\n"
 "\t\tpushInsteadOf = <other url base>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, fuzzy, priority:300
 msgid "For example, with this:"
@@ -71497,7 +71518,7 @@ msgstr "un URL come \"work: repo.git\" o come \"host.xz: /path/to/repo.git\" ver
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Se si desidera riscrivere gli URL solo per push, è possibile creare una sezione di configurazione del modulo:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index 6d8c5b75..3c1e3f18 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-11-09 02:40+0000\n"
 "Last-Translator: alpha3166 <alpha31661@yahoo.co.jp>\n"
 "Language-Team: Japanese\n"
@@ -4800,9 +4800,9 @@ msgstr "リネーム/コピー が絡む場合、`file1` と `file2` はそれ
 msgid "It is followed by one or more extended header lines:"
 msgstr "それに続いて、1つまたは複数の拡張ヘッダーラインがあります。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4815,7 +4815,18 @@ msgstr "それに続いて、1つまたは複数の拡張ヘッダーライン
 #| "similarity index <number>\n"
 #| "dissimilarity index <number>\n"
 #| "index <hash>..<hash> <mode>\n"
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 "old mode <モード>\n"
 "new mode <モード>\n"
@@ -4829,45 +4840,45 @@ msgstr ""
 "dissimilarity index <数値>\n"
 "index <ハッシュ>..<ハッシュ> <モード>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, fuzzy, priority:280
 #| msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "ファイルモードは、ファイルタイプとファイルパーミッションビットを含む6桁の8進数で表示されます。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "拡張ヘッダーのパス名には、 `a/` および `b/` プレフィックスは含まれません。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "類似性指数は変化していない線の割合、非類似性指数は変化した線の割合です。これは、切り捨てられた整数の後にパーセント記号を付けたものです。したがって、類似度指数の値が100%の場合は、2つの等しいファイルのために予約され、一方、非類似度が100%の場合は、古いファイルから新しいファイルに入った行がないことを意味します。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, fuzzy, priority:280
 #| msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "インデックス行には、変更前と変更後のblobオブジェクト名が記載されています。ファイルモードが変更されない場合は、<モード>が含まれ、そうでない場合は、新旧のモードを別々の行で示します。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "\"異常な\"文字を含むパス名は、設定変数 `core.quotePath` の説明に従って引用されます（linkgit:git-config[1]を参照）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "出力に含まれるすべての `file1` ファイルはコミット前のファイルを指し、すべての `file2` ファイルはコミット後のファイルを指します。各変更を各ファイルに順次適用するのは正しくありません。例えば、このパッチは a と b を入れ替えます。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4885,7 +4896,7 @@ msgstr ""
 "rename from b\n"
 "rename to a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -5007,101 +5018,105 @@ msgstr "       diff --cc file\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "これに続いて、1つまたは複数の拡張ヘッダーラインが表示されます（この例では、2つの親を持つマージを示しています）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "index <hash>,<hash>..<hash>\n"
 #| "mode <mode>,<mode>..<mode>\n"
 #| "new file mode <mode>\n"
 #| "deleted file mode <mode>,<mode>\n"
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 "index <ハッシュ>,<ハッシュ>..<ハッシュ>\n"
 "mode <モード>,<モード>..<モード>\n"
 "new file mode <モード>\n"
 "deleted file mode <モード>,<モード>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, fuzzy, priority:280
 #| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format."
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "`mode <モード>,<モード>...<モード>` の行は、少なくとも一つの <モード> が残りのものとは異なる場合にのみ表示されます。コンテンツの移動を検出した情報(リネームやコピーの検出)を含む拡張ヘッダは、2つの <ツリー質> のdiffで動作するように設計されており、結合されたdiffフォーマットでは使用されません。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "これに続いて2行の 元ファイル/先ファイル ヘッダーがあります:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/file"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/file"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "従来の 'unified' diffフォーマットの2行ヘッダーと同様に、`/dev/null` はファイルの作成や削除を知らせるために使われます。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "ただし、--combined-all-pathsオプションを指定すると、2行の 元ファイル/先ファイル ではなく、N+1行の 元ファイル/先ファイル ヘッダーが表示されます（Nはマージコミットの親の数です）:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "この拡張フォーマットは、名前の変更やコピーの検出が有効な場合に便利で、ファイルの元の名前を異なる親で確認することができます。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "誤って `patch -p1` に与えてしまわないように、チャンクのヘッダ形式を変更しました。結合されたdiff形式は、マージコミットの変更点を確認するために作成されたもので、適用することを意図したものではありません。この変更は、拡張 'index' ヘッダーの変更と同様です。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <元ファイルの範囲> <元ファイルの範囲> <先ファイルの範囲> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "結合されたdiff形式のチャンクヘッダーには（親の数+ 1の） `@` 文字があります。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 "従来の'unified' diff形式とは異なり、2つのファイルAとBを、`-` (マイナス -- AにあるがBでは削除された)、`+` (プラス -- Aに無いがBに追加された)、`\" \"` (スペース -- 変更されていない)の接頭辞を持つ1つの列で表示するこの形式では、2つ以上のファイルfile1, file2,...と1つのファイルXを比較し、XがfileNのそれぞれとどのように異なるかを表示します。fileNのそれぞれの1列が出力行の前に付加され、Xの行がそれとどのように異なるかを記します。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "N列の `-` 文字は、その行がfileNに現れているが、結果には現れていないことを意味します。N列の `+` 文字は、その行が結果に現れ、fileNにはその行がないことを意味します（つまり、その親から見れば、その行は追加されたことになります）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "上記の出力例では、関数のシグネチャが両方のファイルから変更されています（そのため、ファイル1とファイル2の両方から2つの `-` が削除され、さらに、追加された1行がファイル1とファイル2のどちらにも現れないことを意味する `++` が追加されています）。また、他の8行は、ファイル1からは同じですが、ファイル2には現れません（そのため、前に `+` が付いています）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7964,7 +7979,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - ファイルの中身をインデックスに追加する"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8786,7 +8801,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9414,7 +9429,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9444,7 +9459,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9929,7 +9944,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10093,7 +10108,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10541,7 +10556,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11328,7 +11343,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11735,7 +11750,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11765,7 +11780,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12494,7 +12509,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12659,7 +12674,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13201,7 +13216,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13938,7 +13953,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14197,7 +14212,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14385,7 +14400,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14452,7 +14467,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14740,7 +14755,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15673,7 +15688,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15871,7 +15886,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16280,7 +16295,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16493,7 +16508,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16523,7 +16538,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16732,7 +16747,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - リポジトリを新しいディレクトリにクローンする"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 #| msgid ""
@@ -17432,7 +17447,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17591,7 +17606,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17762,7 +17777,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 #| msgid ""
@@ -18612,7 +18627,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19893,7 +19908,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19989,7 +20004,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20712,7 +20727,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20895,7 +20910,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21322,7 +21337,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21330,25 +21345,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22059,7 +22074,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22631,7 +22646,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22926,7 +22941,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22998,7 +23013,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23187,7 +23202,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23433,7 +23448,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23593,10 +23608,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -24026,7 +24047,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24427,7 +24448,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26788,7 +26809,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26984,7 +27005,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - 別のリポジトリからオブジェクトと参照をダウンロードします"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27469,7 +27490,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28328,7 +28349,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28458,7 +28479,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29378,7 +29399,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30689,7 +30710,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30713,7 +30734,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -31011,7 +31032,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31239,7 +31260,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31269,7 +31290,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr "git-grep - パターンに一致する行を出力する"
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -32001,7 +32022,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32217,7 +32238,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32310,7 +32331,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32739,7 +32760,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33190,7 +33211,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33310,7 +33331,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33460,7 +33481,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33571,13 +33592,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33594,31 +33615,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33663,7 +33684,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33895,7 +33916,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - 空のGitリポジトリを作成する"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33919,7 +33940,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - 空のGitリポジトリを作成、または既存のリポジトリを再初期化する"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -34269,7 +34290,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34428,7 +34449,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35270,7 +35291,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35612,7 +35633,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36290,7 +36311,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36500,7 +36521,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36725,7 +36746,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36920,7 +36941,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -37042,7 +37063,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37412,7 +37433,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37600,7 +37621,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37654,7 +37675,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37707,7 +37728,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37731,7 +37752,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37833,7 +37854,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37983,7 +38004,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38492,7 +38513,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -39018,7 +39039,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -39114,7 +39135,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39162,7 +39183,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -39242,7 +39263,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39411,7 +39432,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39956,7 +39977,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41499,7 +41520,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42107,7 +42128,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42185,7 +42206,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42293,7 +42314,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42407,7 +42428,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42467,7 +42488,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42575,7 +42596,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42733,7 +42754,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42745,7 +42766,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42905,7 +42926,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43864,7 +43885,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43956,7 +43977,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44381,7 +44402,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44991,7 +45012,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase - コミットを、別のベースの先端から再適用する"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -45026,25 +45047,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46931,7 +46952,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -47364,7 +47385,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47558,7 +47579,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47882,7 +47903,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48284,7 +48305,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48572,7 +48593,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48842,7 +48863,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48974,7 +48995,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48992,7 +49013,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49263,7 +49284,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -50015,7 +50036,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50274,7 +50295,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50409,7 +50430,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50570,7 +50591,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51591,7 +51612,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51829,7 +51850,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52830,7 +52851,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52979,7 +53000,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53132,7 +53153,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53174,7 +53195,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53222,7 +53243,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53418,7 +53439,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53720,7 +53741,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53781,7 +53802,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54105,7 +54126,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54243,7 +54264,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54417,7 +54438,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54441,7 +54462,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54975,7 +54996,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55791,7 +55812,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55945,7 +55966,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56613,7 +56634,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56841,7 +56862,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56883,31 +56904,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56943,7 +56964,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56955,7 +56976,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56967,7 +56988,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56979,7 +57000,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56991,7 +57012,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -57003,31 +57024,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -57039,25 +57060,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -57069,13 +57090,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57083,13 +57104,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57101,31 +57122,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57137,7 +57158,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57149,7 +57170,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -57161,7 +57182,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57179,19 +57200,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57203,7 +57224,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57215,13 +57236,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57233,7 +57254,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57245,7 +57266,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57257,13 +57278,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57281,13 +57302,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57299,19 +57320,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57323,7 +57344,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57335,19 +57356,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57359,7 +57380,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57371,7 +57392,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57383,7 +57404,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57401,7 +57422,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57413,7 +57434,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57425,7 +57446,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57437,7 +57458,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57449,7 +57470,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57461,7 +57482,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57473,19 +57494,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57503,7 +57524,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57515,7 +57536,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57527,7 +57548,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57539,7 +57560,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57551,7 +57572,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57650,7 +57671,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57673,7 +57694,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57760,7 +57781,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57772,19 +57793,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57802,13 +57823,13 @@ msgstr "-l<数>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57828,7 +57849,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57846,7 +57867,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57858,25 +57879,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57888,37 +57909,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57930,13 +57951,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57948,13 +57969,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -58014,7 +58035,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58569,7 +58590,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58870,7 +58891,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58969,7 +58990,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59516,7 +59537,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - あほコンテンツトラッカー"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61507,7 +61528,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61540,7 +61561,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61600,7 +61621,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62517,7 +62538,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62837,7 +62858,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62885,7 +62906,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -62957,7 +62978,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63067,7 +63088,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63261,7 +63282,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63303,7 +63324,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63393,7 +63414,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63435,7 +63456,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63709,7 +63730,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63769,7 +63790,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64472,7 +64493,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68583,13 +68604,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71780,7 +71801,7 @@ msgstr "ここで <アドレス> には、パス、サーバーとパス、あ
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "似たような名前のリモートリポジトリが多数あり、それらに異なるフォーマットを使用したい場合（使用するURLが機能的なURLに書き換えられるような場合）、フォームに設定セクションを作成することができます。"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -71793,7 +71814,7 @@ msgstr ""
 "\t[url \"<実際のURLベース>\"]\n"
 "\t\tinsteadOf = <他のURLベース>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71823,7 +71844,7 @@ msgstr "\"work:repo.git\" や \"host.xz:/path/to/repo.git\" のような URL は
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "プッシュのみでURLを書き換えたい場合は、フォームに設定項目を作ります。"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 83709547..ffcea359 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-11-22 16:43+0000\n"
 "Last-Translator: Eunsoo Eun <ewhk9887@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4795,49 +4795,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4849,7 +4860,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4946,91 +4957,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7802,7 +7817,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - 파일 내용들을 인덱스에 추가합니다"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8570,7 +8585,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "메일함에서 연속된 패치를 적용합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9198,7 +9213,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -9229,7 +9244,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "패치를 파일 및/또는 인덱스에 적용합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 #| msgid ""
@@ -9729,7 +9744,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9893,7 +9908,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "지정한 트리에 들어 있는 파일의 아카이브를 만듭니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10347,7 +10362,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "이진 탐색으로 버그를 만들어낸 커밋을 찾습니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11134,7 +11149,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "파일 줄마다 끝에 마지막으로 수정한 리비전과 작성자를 표시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, fuzzy, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 #| msgid ""
@@ -11551,7 +11566,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11581,7 +11596,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12309,7 +12324,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12474,7 +12489,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 #| msgid ""
@@ -13027,7 +13042,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "저장소 오브젝트에 대해 내용 또는 종류와 크기 정보를 표시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13764,7 +13779,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14023,7 +14038,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14211,7 +14226,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14278,7 +14293,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14572,7 +14587,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "브랜치를 전환하거나 작업 파일을 복구합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 #| msgid ""
@@ -15513,7 +15528,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15711,7 +15726,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16120,7 +16135,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "업스트림에 적용해야 할 커밋을 찾습니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16333,7 +16348,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16363,7 +16378,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "작업 폴더에서 추적되지 않는 파일을 제거합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16571,7 +16586,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "저장소를 복제해 새 디렉터리로 가져옵니다"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17207,7 +17222,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17366,7 +17381,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17540,7 +17555,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 #| msgid ""
@@ -18388,7 +18403,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "저장소 옵션 또는 전체 옵션을 보거나 설정합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19668,7 +19683,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19764,7 +19779,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache{litdd}daemon(1)"
@@ -20489,7 +20504,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20673,7 +20688,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "다른 소스 코드 관리 시스템에서 데이터 가져오기"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21105,7 +21120,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21113,25 +21128,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21842,7 +21857,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "깃 저장소에 대한 아주 간단한 서버"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 #| msgid ""
@@ -22443,7 +22458,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "사용 가능한 레퍼런스를 기준으로 오브젝트에 읽을 수 있는 이름을 부여합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22739,7 +22754,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22811,7 +22826,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23000,7 +23015,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23246,7 +23261,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "두 개의 트리 오브젝트에 있는 내용과 블롭의 모드를 비교합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23405,10 +23420,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "커밋과 커밋 사이, 커밋과 작업 내용 사이 등의 바뀐 점을 봅니다"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23830,7 +23851,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24231,7 +24252,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26591,7 +26612,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26787,7 +26808,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "다른 저장소에서 오브젝트와 레퍼런스를 다운로드합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27268,7 +27289,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28127,7 +28148,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28259,7 +28280,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29182,7 +29203,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, fuzzy, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 #| msgid ""
@@ -30542,7 +30563,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "연결을 확인하고 데이터베이스의 오브젝트가 올바른지 확인합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30566,7 +30587,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "연결을 확인하고 데이터베이스의 오브젝트가 올바른지 확인합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30864,7 +30885,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "불필요한 파일을 지우고 로컬 저장소를 최적화합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, fuzzy, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 #| msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31093,7 +31114,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31123,7 +31144,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 #| msgid ""
@@ -31895,7 +31916,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "깃의 포터블 그래픽 인터페이스"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32111,7 +32132,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "오브젝트 ID를 계산하고 선택적으로 파일의 블롭을 만듭니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 #| msgid ""
@@ -32209,7 +32230,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "깃의 도움말 정보를 표시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32632,7 +32653,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33084,7 +33105,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33204,7 +33225,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "오브젝트를 HTTP/DAV를 통해 다른 저장소로 푸시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33354,7 +33375,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "표준입력에서 패치 모음을 읽어 IMAP 폴더로 보냅니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33465,13 +33486,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33488,31 +33509,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33557,7 +33578,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "기존 묶음 아카이브에 대한 묶음 인덱스 파일을 만듭니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33788,7 +33809,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33812,7 +33833,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "빈 깃 저장소를 만들거나 기존 저장소를 다시 초기화합니다"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -34130,7 +34151,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "내 작업 저장소를 gitweb에서 즉시 살펴봅니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34289,7 +34310,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 #| msgid ""
@@ -35136,7 +35157,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35478,7 +35499,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "인덱스와 작업 폴더의 파일에 대한 정보를 표시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 #| msgid ""
@@ -36181,7 +36202,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36394,7 +36415,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36619,7 +36640,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "하나의 메일 메시지에서 패치와 작성자 정보를 뽑아냅니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36814,7 +36835,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36936,7 +36957,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "병합에 사용할 최선의 공통 과거 커밋을 찾습니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37288,7 +37309,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37476,7 +37497,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37530,7 +37551,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37583,7 +37604,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37607,7 +37628,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37709,7 +37730,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "병합 충돌 상황에서 병합 충돌 해결 도구를 실행합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37860,7 +37881,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38371,7 +38392,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "여러 개의 개발 내역을 하나로 합칩니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38903,7 +38924,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38999,7 +39020,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "ls-tree 포맷의 텍스트에서 tree-object를 만듭니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39047,7 +39068,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "파일, 디렉터리, 심볼릭 링크를 옮기거나 이름을 바꿉니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -39128,7 +39149,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39297,7 +39318,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 #| msgid ""
@@ -39865,7 +39886,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Perforce 저장소에서 가져오거나 저장소로 제출합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41408,7 +41429,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42016,7 +42037,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42094,7 +42115,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "효율적인 저장소 접근을 위해 헤드와 태그를 묶습니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42202,7 +42223,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42316,7 +42337,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42376,7 +42397,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "오브젝트 데이터베이스에서 도달할 수 없는 오브젝트를 모두 잘라냅니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42484,7 +42505,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "다른 저장소 또는 다른 로컬 브랜치에서 가져오거나 통합합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42642,7 +42663,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42654,7 +42675,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42814,7 +42835,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "원격 레퍼런스 및 그와 관련된 오브젝트를 업데이트합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43771,7 +43792,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43865,7 +43886,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44285,7 +44306,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 #| msgid ""
@@ -44902,7 +44923,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "커밋을 다른 베이스 끝의 최상위에서 적용합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44937,25 +44958,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46844,7 +46865,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47279,7 +47300,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47473,7 +47494,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47797,7 +47818,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48198,7 +48219,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48486,7 +48507,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "오브젝트를 바꾸는 레퍼런스를 만들거나, 표시하거나, 삭제합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48757,7 +48778,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48889,7 +48910,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "충돌하는 병합의 기록된 해결 방법을 다시 사용합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48907,7 +48928,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49178,7 +49199,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "현재 HEAD를 지정한 상태로 재설정화합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49934,7 +49955,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50196,7 +50217,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50330,7 +50351,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "시간 반대 순서에 따라 커밋 오브젝트를 열거합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50491,7 +50512,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51511,7 +51532,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "파일을 작업 폴더에서 제거하고 인덱스에서도 제거합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51751,7 +51772,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52752,7 +52773,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "오브젝트를 깃 프로토콜을 통해 다른 저장소로 푸시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52901,7 +52922,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "깃만 사용하는 SSH 접근에 필요한 제한된 로그인 셸"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53055,7 +53076,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53097,7 +53118,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53145,7 +53166,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53339,7 +53360,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53644,7 +53665,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53704,7 +53725,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54028,7 +54049,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54166,7 +54187,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54340,7 +54361,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "파일 내용을 스테이징 영역에 추가합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54364,7 +54385,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "작업 폴더의 변경 사항을 임시로 다른 곳에 저장합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 #| msgid ""
@@ -54924,7 +54945,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55741,7 +55762,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55895,7 +55916,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56562,7 +56583,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "서브버전 저장소와 깃 사이의 양방향 동작"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56792,7 +56813,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56834,31 +56855,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56894,7 +56915,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56906,7 +56927,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56918,7 +56939,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56930,7 +56951,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56942,7 +56963,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56954,31 +56975,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56990,25 +57011,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -57020,13 +57041,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57034,13 +57055,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57052,31 +57073,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57088,7 +57109,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57100,7 +57121,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -57112,7 +57133,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57130,19 +57151,19 @@ msgstr "-o <경로>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57154,7 +57175,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57166,13 +57187,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57184,7 +57205,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57196,7 +57217,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57208,13 +57229,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57232,13 +57253,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57250,19 +57271,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57274,7 +57295,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57286,19 +57307,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57310,7 +57331,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57322,7 +57343,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57334,7 +57355,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57352,7 +57373,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57364,7 +57385,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57376,7 +57397,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57388,7 +57409,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57400,7 +57421,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57412,7 +57433,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57424,19 +57445,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57454,7 +57475,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr "--file=<파일>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57466,7 +57487,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57478,7 +57499,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57490,7 +57511,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57502,7 +57523,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57601,7 +57622,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57624,7 +57645,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57711,7 +57732,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57723,19 +57744,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57753,13 +57774,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57779,7 +57800,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57797,7 +57818,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57809,25 +57830,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57839,37 +57860,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57881,13 +57902,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57899,13 +57920,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57966,7 +57987,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58521,7 +58542,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58822,7 +58843,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58921,7 +58942,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "태그를 만들거나, 표시하거나, 삭제하거나, GPG 서명을 검증합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 #| msgid ""
@@ -59487,7 +59508,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61476,7 +61497,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61509,7 +61530,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61569,7 +61590,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 #| msgid ""
@@ -62523,7 +62544,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62843,7 +62864,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62891,7 +62912,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62964,7 +62985,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63074,7 +63095,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63268,7 +63289,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63310,7 +63331,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63400,7 +63421,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63442,7 +63463,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63716,7 +63737,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "각 커밋으로 발생하는 차이점마다 기록을 표시합니다"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63776,7 +63797,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64479,7 +64500,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68640,13 +68661,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71820,7 +71841,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71828,7 +71849,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71855,7 +71876,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index f772b16d..8eef124e 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-12-22 14:39+0100\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi\n"
@@ -4768,49 +4768,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4822,7 +4833,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4919,91 +4930,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7769,7 +7784,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - निर्देशांकात फाईल सामग्री जोडा"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8522,7 +8537,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9150,7 +9165,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9180,7 +9195,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9663,7 +9678,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9827,7 +9842,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10277,7 +10292,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11064,7 +11079,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11471,7 +11486,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11502,7 +11517,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12230,7 +12245,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12399,7 +12414,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12943,7 +12958,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13681,7 +13696,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13940,7 +13955,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14128,7 +14143,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14195,7 +14210,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14483,7 +14498,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15409,7 +15424,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15607,7 +15622,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16017,7 +16032,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16230,7 +16245,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16260,7 +16275,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16468,7 +16483,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17106,7 +17121,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17265,7 +17280,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17436,7 +17451,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18267,7 +18282,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19555,7 +19570,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19652,7 +19667,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20377,7 +20392,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20560,7 +20575,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20987,7 +21002,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20995,25 +21010,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21724,7 +21739,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22296,7 +22311,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22591,7 +22606,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22663,7 +22678,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22852,7 +22867,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23098,7 +23113,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23257,10 +23272,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23683,7 +23704,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24084,7 +24105,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26444,7 +26465,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26640,7 +26661,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27121,7 +27142,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27980,7 +28001,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28111,7 +28132,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29037,7 +29058,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30350,7 +30371,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30374,7 +30395,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30672,7 +30693,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30900,7 +30921,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30930,7 +30951,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31659,7 +31680,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31875,7 +31896,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31968,7 +31989,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32391,7 +32412,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32842,7 +32863,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32962,7 +32983,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33112,7 +33133,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33223,13 +33244,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33246,31 +33267,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33315,7 +33336,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33546,7 +33567,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33570,7 +33591,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33890,7 +33911,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34049,7 +34070,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34891,7 +34912,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35233,7 +35254,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35916,7 +35937,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36126,7 +36147,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36351,7 +36372,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36546,7 +36567,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36668,7 +36689,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37020,7 +37041,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37208,7 +37229,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37262,7 +37283,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37315,7 +37336,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37339,7 +37360,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37442,7 +37463,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37592,7 +37613,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38103,7 +38124,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38629,7 +38650,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38725,7 +38746,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38773,7 +38794,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38853,7 +38874,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39022,7 +39043,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39565,7 +39586,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41110,7 +41131,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41718,7 +41739,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41796,7 +41817,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41905,7 +41926,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42019,7 +42040,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42079,7 +42100,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42187,7 +42208,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42345,7 +42366,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42357,7 +42378,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42517,7 +42538,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43474,7 +43495,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43566,7 +43587,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43987,7 +44008,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44597,7 +44618,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44632,25 +44653,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46543,7 +46564,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46978,7 +46999,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47172,7 +47193,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47496,7 +47517,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47897,7 +47918,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48187,7 +48208,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48458,7 +48479,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48590,7 +48611,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48608,7 +48629,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48879,7 +48900,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49631,7 +49652,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49890,7 +49911,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50024,7 +50045,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50186,7 +50207,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51207,7 +51228,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51444,7 +51465,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52445,7 +52466,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52594,7 +52615,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52748,7 +52769,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52790,7 +52811,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52838,7 +52859,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53033,7 +53054,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53334,7 +53355,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53394,7 +53415,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53718,7 +53739,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53856,7 +53877,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54030,7 +54051,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54054,7 +54075,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54588,7 +54609,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55406,7 +55427,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55560,7 +55581,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56226,7 +56247,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56456,7 +56477,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56498,31 +56519,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56558,7 +56579,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56570,7 +56591,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56582,7 +56603,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56594,7 +56615,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56606,7 +56627,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56618,31 +56639,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56654,25 +56675,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56684,13 +56705,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56698,13 +56719,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56716,31 +56737,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56752,7 +56773,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56764,7 +56785,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56776,7 +56797,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56794,19 +56815,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56818,7 +56839,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56830,13 +56851,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56848,7 +56869,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56860,7 +56881,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56872,13 +56893,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56896,13 +56917,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56914,19 +56935,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56938,7 +56959,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56950,19 +56971,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56974,7 +56995,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56986,7 +57007,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56998,7 +57019,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57016,7 +57037,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57028,7 +57049,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57040,7 +57061,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57052,7 +57073,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57064,7 +57085,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57076,7 +57097,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57088,19 +57109,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57118,7 +57139,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57130,7 +57151,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57142,7 +57163,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57154,7 +57175,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57166,7 +57187,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57265,7 +57286,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57288,7 +57309,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57376,7 +57397,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57388,19 +57409,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57418,13 +57439,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57444,7 +57465,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57462,7 +57483,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57474,25 +57495,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57504,37 +57525,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57546,13 +57567,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57564,13 +57585,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57631,7 +57652,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58186,7 +58207,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58487,7 +58508,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58586,7 +58607,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59133,7 +59154,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61123,7 +61144,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61156,7 +61177,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61216,7 +61237,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62133,7 +62154,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62454,7 +62475,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "git-update-server-info(1)"
@@ -62503,7 +62524,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62576,7 +62597,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62686,7 +62707,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62880,7 +62901,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62922,7 +62943,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63012,7 +63033,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63054,7 +63075,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63328,7 +63349,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63388,7 +63409,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64091,7 +64112,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68218,13 +68239,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71401,7 +71422,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71409,7 +71430,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71436,7 +71457,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 593fc054..f4bdddb1 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2019-10-14 23:28+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4766,49 +4766,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4820,7 +4831,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4917,91 +4928,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7769,7 +7784,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8520,7 +8535,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9148,7 +9163,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9178,7 +9193,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9661,7 +9676,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9826,7 +9841,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10277,7 +10292,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11064,7 +11079,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11471,7 +11486,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11502,7 +11517,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12230,7 +12245,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12399,7 +12414,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12943,7 +12958,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13682,7 +13697,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13942,7 +13957,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14130,7 +14145,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14197,7 +14212,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14485,7 +14500,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15413,7 +15428,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15611,7 +15626,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16021,7 +16036,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16234,7 +16249,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16264,7 +16279,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16472,7 +16487,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17109,7 +17124,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17268,7 +17283,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17439,7 +17454,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18270,7 +18285,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19558,7 +19573,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19655,7 +19670,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20380,7 +20395,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20563,7 +20578,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20990,7 +21005,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20998,25 +21013,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21727,7 +21742,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22299,7 +22314,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22594,7 +22609,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22666,7 +22681,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22855,7 +22870,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23103,7 +23118,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23262,10 +23277,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23688,7 +23709,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24089,7 +24110,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26449,7 +26470,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26645,7 +26666,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27126,7 +27147,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27985,7 +28006,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28116,7 +28137,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29042,7 +29063,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30357,7 +30378,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30381,7 +30402,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30679,7 +30700,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30907,7 +30928,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30937,7 +30958,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31666,7 +31687,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31882,7 +31903,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31975,7 +31996,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32398,7 +32419,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32849,7 +32870,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32969,7 +32990,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33119,7 +33140,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33230,13 +33251,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33253,31 +33274,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33322,7 +33343,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33553,7 +33574,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33577,7 +33598,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33897,7 +33918,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34056,7 +34077,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34898,7 +34919,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35240,7 +35261,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35923,7 +35944,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36132,7 +36153,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36357,7 +36378,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36552,7 +36573,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36674,7 +36695,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37026,7 +37047,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37214,7 +37235,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37268,7 +37289,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37321,7 +37342,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37345,7 +37366,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37448,7 +37469,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37598,7 +37619,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38108,7 +38129,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38634,7 +38655,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38730,7 +38751,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38778,7 +38799,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38858,7 +38879,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39027,7 +39048,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39570,7 +39591,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41115,7 +41136,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41723,7 +41744,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41801,7 +41822,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41910,7 +41931,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42024,7 +42045,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42084,7 +42105,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42192,7 +42213,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42350,7 +42371,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42362,7 +42383,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42522,7 +42543,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43479,7 +43500,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43571,7 +43592,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43992,7 +44013,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44602,7 +44623,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44637,25 +44658,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46547,7 +46568,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46983,7 +47004,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47177,7 +47198,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47501,7 +47522,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47902,7 +47923,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48192,7 +48213,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48464,7 +48485,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48596,7 +48617,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48614,7 +48635,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48885,7 +48906,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49637,7 +49658,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49897,7 +49918,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50031,7 +50052,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50193,7 +50214,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51213,7 +51234,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51450,7 +51471,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52451,7 +52472,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52600,7 +52621,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52754,7 +52775,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52796,7 +52817,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52844,7 +52865,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53039,7 +53060,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53340,7 +53361,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53400,7 +53421,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53724,7 +53745,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53862,7 +53883,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54036,7 +54057,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54060,7 +54081,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54594,7 +54615,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55412,7 +55433,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55566,7 +55587,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56233,7 +56254,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56463,7 +56484,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56505,31 +56526,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56565,7 +56586,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56577,7 +56598,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56589,7 +56610,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56601,7 +56622,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56613,7 +56634,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56625,31 +56646,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56661,25 +56682,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56691,13 +56712,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56705,13 +56726,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56723,31 +56744,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56759,7 +56780,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56771,7 +56792,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56783,7 +56804,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56801,19 +56822,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56825,7 +56846,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56837,13 +56858,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56855,7 +56876,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56867,7 +56888,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56879,13 +56900,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56903,13 +56924,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56921,19 +56942,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56945,7 +56966,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56957,19 +56978,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56981,7 +57002,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56993,7 +57014,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57005,7 +57026,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57023,7 +57044,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57035,7 +57056,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57047,7 +57068,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57059,7 +57080,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57071,7 +57092,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57083,7 +57104,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57095,19 +57116,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57125,7 +57146,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57137,7 +57158,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57149,7 +57170,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57161,7 +57182,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57173,7 +57194,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57272,7 +57293,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57295,7 +57316,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57383,7 +57404,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57395,19 +57416,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57425,13 +57446,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57451,7 +57472,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57469,7 +57490,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57481,25 +57502,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57511,37 +57532,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57553,13 +57574,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57571,13 +57592,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57638,7 +57659,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58193,7 +58214,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58498,7 +58519,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58597,7 +58618,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59144,7 +59165,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61135,7 +61156,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61168,7 +61189,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61228,7 +61249,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62145,7 +62166,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62466,7 +62487,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "git-update-server-info(1)"
@@ -62515,7 +62536,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62588,7 +62609,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62698,7 +62719,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62892,7 +62913,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62934,7 +62955,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63024,7 +63045,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63066,7 +63087,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63340,7 +63361,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63400,7 +63421,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64103,7 +64124,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68246,13 +68267,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71429,7 +71450,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71437,7 +71458,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71464,7 +71485,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 385ac105..7cc5930e 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4758,49 +4758,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4812,7 +4823,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4909,91 +4920,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7746,7 +7761,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8507,7 +8522,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9135,7 +9150,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9165,7 +9180,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9648,7 +9663,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9812,7 +9827,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10260,7 +10275,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11047,7 +11062,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11453,7 +11468,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11483,7 +11498,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12211,7 +12226,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12376,7 +12391,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12918,7 +12933,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13655,7 +13670,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13914,7 +13929,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14102,7 +14117,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14168,7 +14183,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14456,7 +14471,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15382,7 +15397,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15580,7 +15595,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -15989,7 +16004,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16202,7 +16217,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16232,7 +16247,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16440,7 +16455,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17066,7 +17081,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17225,7 +17240,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17396,7 +17411,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18227,7 +18242,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19505,7 +19520,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19601,7 +19616,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20325,7 +20340,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20508,7 +20523,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20935,7 +20950,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20943,25 +20958,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21672,7 +21687,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22244,7 +22259,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22539,7 +22554,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22611,7 +22626,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22800,7 +22815,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23046,7 +23061,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23205,10 +23220,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23629,7 +23650,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24030,7 +24051,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26390,7 +26411,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26586,7 +26607,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27067,7 +27088,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27926,7 +27947,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28056,7 +28077,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -28979,7 +29000,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30290,7 +30311,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30314,7 +30335,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30612,7 +30633,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30840,7 +30861,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30870,7 +30891,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31599,7 +31620,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31815,7 +31836,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31908,7 +31929,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32331,7 +32352,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32782,7 +32803,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32902,7 +32923,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33052,7 +33073,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33163,13 +33184,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33186,31 +33207,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33255,7 +33276,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33486,7 +33507,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33510,7 +33531,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33826,7 +33847,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -33985,7 +34006,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34826,7 +34847,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35168,7 +35189,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35844,7 +35865,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36053,7 +36074,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36278,7 +36299,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36473,7 +36494,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36595,7 +36616,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36947,7 +36968,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37135,7 +37156,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37189,7 +37210,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37242,7 +37263,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37266,7 +37287,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37368,7 +37389,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37518,7 +37539,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38026,7 +38047,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38552,7 +38573,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38648,7 +38669,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38696,7 +38717,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38776,7 +38797,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38945,7 +38966,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39488,7 +39509,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41031,7 +41052,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41639,7 +41660,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41717,7 +41738,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41825,7 +41846,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41939,7 +41960,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -41999,7 +42020,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42107,7 +42128,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42265,7 +42286,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42277,7 +42298,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42437,7 +42458,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43394,7 +43415,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43486,7 +43507,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43906,7 +43927,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44516,7 +44537,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44551,25 +44572,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46458,7 +46479,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46893,7 +46914,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47087,7 +47108,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47411,7 +47432,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47812,7 +47833,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48100,7 +48121,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48371,7 +48392,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48503,7 +48524,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48521,7 +48542,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48792,7 +48813,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49544,7 +49565,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49803,7 +49824,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49937,7 +49958,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50098,7 +50119,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51118,7 +51139,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51355,7 +51376,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52356,7 +52377,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52505,7 +52526,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52658,7 +52679,7 @@ msgstr "git-init-db(1)"
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52700,7 +52721,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52748,7 +52769,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -52942,7 +52963,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53243,7 +53264,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53303,7 +53324,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53627,7 +53648,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53765,7 +53786,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -53939,7 +53960,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -53963,7 +53984,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54497,7 +54518,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55315,7 +55336,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55469,7 +55490,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56135,7 +56156,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56363,7 +56384,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56405,31 +56426,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56465,7 +56486,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56477,7 +56498,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr "--log-size"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56489,7 +56510,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56501,7 +56522,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56513,7 +56534,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56525,31 +56546,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56561,25 +56582,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56591,13 +56612,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr "--commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56605,13 +56626,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56623,31 +56644,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56659,7 +56680,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56671,7 +56692,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56683,7 +56704,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56701,19 +56722,19 @@ msgstr "--path"
 msgid "--destination=<path>"
 msgstr "--stdin-paths"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56725,7 +56746,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56737,13 +56758,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56755,7 +56776,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56767,7 +56788,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56779,13 +56800,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56803,13 +56824,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56821,19 +56842,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, fuzzy, priority:100
 msgid "New features:"
@@ -56845,7 +56866,7 @@ msgstr "`feature`"
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56857,19 +56878,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56881,7 +56902,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56893,7 +56914,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56905,7 +56926,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56923,7 +56944,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56935,7 +56956,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -56947,7 +56968,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -56959,7 +56980,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -56971,7 +56992,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -56983,7 +57004,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -56995,19 +57016,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57025,7 +57046,7 @@ msgstr "`filerename`"
 msgid "--file=<filename>"
 msgstr "--full-name"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57037,7 +57058,7 @@ msgstr ""
 msgid "'info'"
 msgstr "--info"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57049,7 +57070,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57061,7 +57082,7 @@ msgstr ""
 msgid "'propget'"
 msgstr "'set'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57073,7 +57094,7 @@ msgstr ""
 msgid "'propset'"
 msgstr "'set'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57172,7 +57193,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57195,7 +57216,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57282,7 +57303,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57294,19 +57315,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57324,13 +57345,13 @@ msgstr "--numbered"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57350,7 +57371,7 @@ msgstr "`filerename`"
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57368,7 +57389,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57380,25 +57401,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57410,37 +57431,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57452,13 +57473,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57470,13 +57491,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57537,7 +57558,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58092,7 +58113,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58393,7 +58414,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58492,7 +58513,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59038,7 +59059,7 @@ msgstr "git-init(1)"
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61027,7 +61048,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61060,7 +61081,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61120,7 +61141,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62037,7 +62058,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62357,7 +62378,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62405,7 +62426,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62478,7 +62499,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62588,7 +62609,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62782,7 +62803,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62824,7 +62845,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62914,7 +62935,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -62956,7 +62977,7 @@ msgstr "git-bisect(1)"
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63230,7 +63251,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63290,7 +63311,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -63993,7 +64014,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68104,13 +68125,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71284,7 +71305,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71292,7 +71313,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71319,7 +71340,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index c4d1ef8e..6302123c 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-12-22 14:43+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4758,49 +4758,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4812,7 +4823,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4909,91 +4920,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7751,7 +7766,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Dodaj zawartość pliku do indeksu"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8509,7 +8524,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Zastosuj serię łatek ze skrzynki pocztowej"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9137,7 +9152,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9167,7 +9182,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Zastosuj łatkę do plików i/lub indeksu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9650,7 +9665,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9814,7 +9829,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Utwórz archiwum plików z nazwanego drzewa"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10263,7 +10278,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Użyj wyszukiwania binarnego, aby znaleźć zapis, który wprowadził błędy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11050,7 +11065,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Obwiń, kto i w jakiej rewizji ostatnio zmienił każdy wiersz pliku"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11456,7 +11471,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11486,7 +11501,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12214,7 +12229,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "Zbierz za użytkownika informacje, żeby zgłosić błąd"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12379,7 +12394,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12921,7 +12936,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Dostarcz informacje o zawartości lub rodzaju i rozmiarze obiektów repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13658,7 +13673,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13917,7 +13932,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14105,7 +14120,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14171,7 +14186,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14459,7 +14474,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Przełącz gałąź lub przywróć pliki drzewa roboczego"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15385,7 +15400,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15583,7 +15598,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -15992,7 +16007,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Znajdź zapisy jeszcze do zastosowania w górnym biegu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16205,7 +16220,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16235,7 +16250,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Usuń nieśledzone pliki z drzewa roboczego"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16443,7 +16458,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Klonuj repozytorium do nowej biblioteki"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17079,7 +17094,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17238,7 +17253,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17409,7 +17424,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18243,7 +18258,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Podaj lub ustaw opcje repozytorium lub globalne"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19521,7 +19536,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19617,7 +19632,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20341,7 +20356,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20524,7 +20539,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Ocal swoje dane przed innym systemem kontroli wersji, który ludzie uwielbiają nienawidzić"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20951,7 +20966,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20959,25 +20974,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21688,7 +21703,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Naprawdę prosty serwer do repozytoriów Gita"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22260,7 +22275,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "Nadaj obiektowi nazwę czytelną dla człowieka opartą o dostępną referencję"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22555,7 +22570,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22627,7 +22642,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22816,7 +22831,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23062,7 +23077,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "Porównuje zawartość i tryb blobów znalezionych przez dwa obiekty drzewa"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23221,10 +23236,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Pokaż zmiany pomiędzy zapisami, zapisem i drzewem roboczym itp."
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23650,7 +23671,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24051,7 +24072,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26411,7 +26432,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26607,7 +26628,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "Pobierz obiekty i referencje z innego repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27088,7 +27109,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27947,7 +27968,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28077,7 +28098,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29000,7 +29021,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30311,7 +30332,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Sprawdza spójność i poprawność obiektów w bazie danych"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30335,7 +30356,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Sprawdza spójność i poprawność obiektów w bazie danych"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30633,7 +30654,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Wyczyść niepotrzebne pliki i zoptymalizuj lokalne repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30861,7 +30882,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30891,7 +30912,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31620,7 +31641,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Przenośny interfejs graficzny do Gita"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31836,7 +31857,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Oblicz identyfikator obiektu i opcjonalnie utwórz blob z pliku"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31929,7 +31950,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Wyświetl pomocne informacje o Gicie"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32352,7 +32373,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32803,7 +32824,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32923,7 +32944,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Wypchnij obiekty po HTTP/DAV do innego repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33073,7 +33094,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Wyślij zbiór łatek ze standardowego wejścia do katalogu IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33184,13 +33205,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33207,31 +33228,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33276,7 +33297,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Zbuduj plik indeksu paczki istniejącemu spakowanemu archiwum"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33507,7 +33528,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33531,7 +33552,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Utwórz puste repozytorium Gita lub przeinicjuj istniejące"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33847,7 +33868,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Przeglądaj na miejscu swoje robocze repozytorium w gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34006,7 +34027,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34847,7 +34868,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35189,7 +35210,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Pokaż informacje o plikach w indeksie i drzewie roboczym"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35864,7 +35885,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36076,7 +36097,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36301,7 +36322,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Wydobądź łatkę i autorstwo z pojedynczego listu e-mail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36496,7 +36517,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36618,7 +36639,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Znajdź najlepszych możliwych przodków scalenia"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36970,7 +36991,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37158,7 +37179,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37212,7 +37233,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, fuzzy, priority:100
 msgid "Examples:"
@@ -37265,7 +37286,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37289,7 +37310,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37391,7 +37412,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Uruchom narzędzia do rozwiązywania konfliktów, aby rozwiązać konflikty scalania"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37541,7 +37562,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38049,7 +38070,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "Połącz ze sobą dwie lub więcej historii rozwoju"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38575,7 +38596,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Tworzy obiekt tagu z dodatkowymi sprawdzeniami"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, fuzzy, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38671,7 +38692,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "Zbuduj obiekt drzewa z tekstu sformatowanego jak ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38719,7 +38740,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Przenieś plik, katalog lub dowiązanie albo zmień jego nazwę"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38799,7 +38820,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38968,7 +38989,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39511,7 +39532,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Importuj z repozytoriów Perforce i przesyłaj do nich"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41054,7 +41075,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41662,7 +41683,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41740,7 +41761,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Spakuj czoła i tagi do wydajnego dostępu do repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41848,7 +41869,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41962,7 +41983,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42022,7 +42043,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "Przytnij wszystkie nieosiągalne obiekty z bazy danych obiektów"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42130,7 +42151,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Pobierz i zintegruj zmiany z innego repozytorium lub lokalnej gałęzi"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42288,7 +42309,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42300,7 +42321,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42462,7 +42483,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "Zaktualizuj zdalne referencje razem z przypisanymi obiektami"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43429,7 +43450,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43521,7 +43542,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Porównaj dwa zakresy zapisów (np. dwie wersje gałęzi)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43966,7 +43987,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44576,7 +44597,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Ponownie zastosuj zapisy na czubku innej gałęzi"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44611,25 +44632,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46518,7 +46539,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46953,7 +46974,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47147,7 +47168,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47471,7 +47492,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47872,7 +47893,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48160,7 +48181,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Utwórz, wypisz, usuń referencje do obiektów zamiennych"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48431,7 +48452,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48563,7 +48584,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Użyj ponownie zapisanego rozwiązania skonfliktowanych scaleń"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48581,7 +48602,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48852,7 +48873,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Zresetuj bieżący HEAD do podanego stanu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49604,7 +49625,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49863,7 +49884,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49997,7 +50018,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Wypisz zapisy w odwrotnej kolejności chronologicznej"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50158,7 +50179,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51178,7 +51199,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Usuń pliki z drzewa roboczego i z indeksu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51415,7 +51436,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52416,7 +52437,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Wypchnij obiekty po protokole Gita do innego repozytorium"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52565,7 +52586,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Ograniczona powłoka logowania do dostępu przez SSH tylko do Gita"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52719,7 +52740,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52761,7 +52782,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52809,7 +52830,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53003,7 +53024,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53304,7 +53325,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53364,7 +53385,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53688,7 +53709,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53826,7 +53847,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54000,7 +54021,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "Dodaj zawartość pliku do obszaru przygotowania"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54024,7 +54045,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "Przenieś do schowka zmiany z brudnego drzewa roboczego"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54561,7 +54582,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55378,7 +55399,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55532,7 +55553,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56198,7 +56219,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Dwukierunkowa operacja między repozytorium Subversion i Gita"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56426,7 +56447,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56468,31 +56489,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56528,7 +56549,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56540,7 +56561,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56552,7 +56573,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56564,7 +56585,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56576,7 +56597,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56588,31 +56609,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56624,25 +56645,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56654,13 +56675,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56668,13 +56689,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56686,31 +56707,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56722,7 +56743,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56734,7 +56755,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56746,7 +56767,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56764,19 +56785,19 @@ msgstr "-o <nazwa>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56788,7 +56809,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56800,13 +56821,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56818,7 +56839,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56830,7 +56851,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56842,13 +56863,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56866,13 +56887,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56884,19 +56905,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56908,7 +56929,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56920,19 +56941,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56944,7 +56965,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56956,7 +56977,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56968,7 +56989,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56986,7 +57007,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56998,7 +57019,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57010,7 +57031,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57022,7 +57043,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57034,7 +57055,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57046,7 +57067,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57058,19 +57079,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57088,7 +57109,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr "--pathspec-from-file=<file>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57100,7 +57121,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57112,7 +57133,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57124,7 +57145,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57136,7 +57157,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57235,7 +57256,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57258,7 +57279,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57345,7 +57366,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57357,19 +57378,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57387,13 +57408,13 @@ msgstr "-l<num>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57413,7 +57434,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57431,7 +57452,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57443,25 +57464,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57473,37 +57494,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57515,13 +57536,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57533,13 +57554,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57600,7 +57621,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58155,7 +58176,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58456,7 +58477,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58555,7 +58576,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "Utwórz, wypisz, usuń lub zweryfikuj obiekt tagu podpisany GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59102,7 +59123,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61097,7 +61118,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61130,7 +61151,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61190,7 +61211,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62107,7 +62128,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62427,7 +62448,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62475,7 +62496,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62548,7 +62569,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62658,7 +62679,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62852,7 +62873,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62894,7 +62915,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62984,7 +63005,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63026,7 +63047,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63300,7 +63321,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Pokaż dzienniki z różnicami, które wprowadza każdy zapis"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63360,7 +63381,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64063,7 +64084,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68174,13 +68195,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71411,7 +71432,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71419,7 +71440,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71446,7 +71467,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.pot b/po/documentation.pot
index 6addaf0c..00eddd1e 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -5,7 +5,7 @@
 #
 #, fuzzy
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2024-12-17 15:04+0100\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2024-12-25 19:35+0100\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/git-instaweb.txt:45 en/git-ls-remote.txt:24
@@ -4230,48 +4230,49 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap
+msgid "old mode <mode>\nnew mode <mode>\ndeleted file mode <mode>\nnew file mode <mode>\ncopy from <path>\ncopy to <path>\nrename from <path>\nrename to <path>\nsimilarity index <number>\ndissimilarity index <number>\nindex <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap
 msgid "diff --git a/a b/b\nrename from a\nrename to b\ndiff --git a/b b/a\nrename from b\nrename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
 msgstr ""
@@ -4337,79 +4338,80 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap
+msgid "index <hash>,<hash>..<hash>\nmode <mode>,<mode>`..`<mode>\nnew file mode <mode>\ndeleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165
 #: en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
 msgstr ""
@@ -7295,7 +7297,7 @@ msgstr ""
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, no-wrap
 msgid "git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n\t[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t[--] [<pathspec>...]\n"
@@ -7993,7 +7995,7 @@ msgstr ""
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, no-wrap
 msgid "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]\n\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n\t [--quoted-cr=<action>]\n\t [--empty=(stop|drop|keep)]\n\t [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)\n"
@@ -8588,7 +8590,7 @@ msgstr ""
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -8615,7 +8617,7 @@ msgstr ""
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, no-wrap
 msgid "'git apply' [--stat] [--numstat] [--summary] [--check]\n\t  [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]\n\t  [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n\t  [--allow-binary-replacement | --binary] [--reject] [-z]\n\t  [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n\t  [--ignore-space-change | --ignore-whitespace]\n\t  [--whitespace=(nowarn|warn|fix|error|error-all)]\n\t  [--exclude=<path>] [--include=<path>] [--directory=<root>]\n\t  [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]\n"
@@ -9048,7 +9050,7 @@ msgstr ""
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, no-wrap
 msgid "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]\n\t       <archive>/<branch>[:<git-branch>]...\n"
@@ -9192,7 +9194,7 @@ msgstr ""
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, no-wrap
 msgid "'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n\t      [-o <file> | --output=<file>] [--worktree-attributes]\n\t      [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>\n\t      [<path>...]\n"
@@ -9600,7 +9602,7 @@ msgstr ""
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap
 msgid "'git bisect' <subcommand> <options>\n"
@@ -10247,7 +10249,7 @@ msgstr ""
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap
 msgid "'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n\t    [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]\n\t    [--ignore-rev <rev>] [--ignore-revs-file <file>]\n\t    [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]\n\t    [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>\n"
@@ -10597,7 +10599,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
 msgstr ""
@@ -10624,7 +10626,7 @@ msgstr ""
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, no-wrap
 msgid "'git branch' [--color[=<when>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<options>] | --no-column] [--sort=<key>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <object>] [--format=<format>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<pattern>...]\n'git branch' [--track[=(direct|inherit)] | --no-track] [-f]\n\t[--recurse-submodules] <branchname> [<start-point>]\n'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n'git branch' --unset-upstream [<branchname>]\n'git branch' (-m | -M) [<oldbranch>] <newbranch>\n'git branch' (-c | -C) [<oldbranch>] <newbranch>\n'git branch' (-d | -D) [-r] <branchname>...\n'git branch' --edit-description [<branchname>]\n"
@@ -11271,7 +11273,7 @@ msgstr ""
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap
 msgid "'git bugreport' [(-o | --output-directory) <path>]\n\t\t[(-s | --suffix) <format> | --no-suffix]\n\t\t[--diagnose[=<mode>]]\n"
@@ -11415,7 +11417,7 @@ msgstr ""
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, no-wrap
 msgid "'git bundle' create [-q | --quiet | --progress]\n\t\t    [--version=<version>] <file> <git-rev-list-args>\n'git bundle' verify [-q | --quiet] <file>\n'git bundle' list-heads <file> [<refname>...]\n'git bundle' unbundle [--progress] <file> [<refname>...]\n"
@@ -11876,7 +11878,7 @@ msgstr ""
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap
 msgid "'git cat-file' <type> <object>\n'git cat-file' (-e | -p) <object>\n'git cat-file' (-t | -s) [--allow-unknown-type] <object>\n'git cat-file' (--textconv | --filters)\n\t     [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]\n'git cat-file' (--batch | --batch-check | --batch-command) [--batch-all-objects]\n\t     [--buffer] [--follow-symlinks] [--unordered]\n\t     [--textconv | --filters] [-Z]\n"
@@ -12518,7 +12520,7 @@ msgstr ""
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, no-wrap
 msgid "'git check-attr' [--source <tree-ish>] [-a | --all | <attr>...] [--] <pathname>...\n'git check-attr' --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]\n"
@@ -12744,7 +12746,7 @@ msgstr ""
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, no-wrap
 msgid "'git check-ignore' [<options>] <pathname>...\n'git check-ignore' [<options>] --stdin\n"
@@ -12910,7 +12912,7 @@ msgstr ""
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, no-wrap
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -12969,7 +12971,7 @@ msgstr ""
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, no-wrap
 msgid "'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n\t\t   [--stage=<number>|all]\n\t\t   [--temp]\n\t\t   [--ignore-skip-worktree-bits]\n\t\t   [-z] [--stdin]\n\t\t   [--] [<file>...]\n"
@@ -13223,7 +13225,7 @@ msgstr ""
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, no-wrap
 msgid "'git checkout' [-q] [-f] [-m] [<branch>]\n'git checkout' [-q] [-f] [-m] --detach [<branch>]\n'git checkout' [-q] [-f] [-m] [--detach] <commit>\n'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]\n'git checkout' [-f] <tree-ish> [--] <pathspec>...\n'git checkout' [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>...\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]\n'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
@@ -13996,7 +13998,7 @@ msgstr ""
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap
 msgid "'git check-ref-format' [--normalize]\n       [--[no-]allow-onelevel] [--refspec-pattern]\n       <refname>\n'git check-ref-format' --branch <branchname-shorthand>\n"
@@ -14163,7 +14165,7 @@ msgstr ""
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, no-wrap
 msgid "'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n\t\t  [-S[<keyid>]] <commit>...\n'git cherry-pick' (--continue | --skip | --abort | --quit)\n"
@@ -14530,7 +14532,7 @@ msgstr ""
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -14689,7 +14691,7 @@ msgstr ""
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap
 msgid "'git citool'\n"
@@ -14716,7 +14718,7 @@ msgstr ""
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, no-wrap
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -14900,7 +14902,7 @@ msgstr ""
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap
 msgid "git clone [--template=<template-directory>]\n\t  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n\t  [--dissociate] [--separate-git-dir <git-dir>]\n\t  [--depth <depth>] [--[no-]single-branch] [--no-tags]\n\t  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n\t  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t  [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>\n\t  [<directory>]\n"
@@ -15451,7 +15453,7 @@ msgstr ""
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap
 msgid "'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]\n\t     [--indent=<string>] [--nl=<string>] [--padding=<n>]\n"
@@ -15583,7 +15585,7 @@ msgstr ""
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, no-wrap
 msgid "'git commit-tree' <tree> [(-p <parent>)...]\n'git commit-tree' [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n\t\t  [(-F <file>)...] <tree>\n"
@@ -15735,7 +15737,7 @@ msgstr ""
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, no-wrap
 msgid "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n\t   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]\n\t   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n\t   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n\t   [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n\t   [--] [<pathspec>...]\n"
@@ -16451,7 +16453,7 @@ msgstr ""
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap
 msgid "'git config list' [<file-option>] [<display-option>] [--includes]\n'git config get' [<file-option>] [<display-option>] [--includes] [--all] [--regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>\n'git config set' [<file-option>] [--type=<type>] [--all] [--value=<value>] [--fixed-value] <name> <value>\n'git config unset' [<file-option>] [--all] [--value=<value>] [--fixed-value] <name>\n'git config rename-section' [<file-option>] <old-name> <new-name>\n'git config remove-section' [<file-option>] <name>\n'git config edit' [<file-option>]\n'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n"
@@ -17568,7 +17570,7 @@ msgstr ""
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -17652,7 +17654,7 @@ msgstr ""
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -18280,7 +18282,7 @@ msgstr ""
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap
 msgid "'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]\n\t[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>\n"
@@ -18435,7 +18437,7 @@ msgstr ""
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap
 msgid "'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]\n\t      [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]\n\t      [-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n\t      [-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]\n\t      [-r <remote>] [-R] [<CVS-module>]\n"
@@ -18803,29 +18805,29 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap
 msgid "export CVS_SERVER=\"git cvsserver\"\n'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, no-wrap
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -19448,7 +19450,7 @@ msgstr ""
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, no-wrap
 msgid "'git daemon' [--verbose] [--syslog] [--export-all]\n\t     [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n\t     [--strict-paths] [--base-path=<path>] [--base-path-relaxed]\n\t     [--user-path | --user-path=<path>]\n\t     [--interpolated-path=<pathtemplate>]\n\t     [--reuseaddr] [--detach] [--pid-file=<file>]\n\t     [--enable=<service>] [--disable=<service>]\n\t     [--allow-override=<service>] [--forbid-override=<service>]\n\t     [--access-hook=<path>] [--[no-]informative-errors]\n\t     [--inetd |\n\t      [--listen=<host-or-ipaddr>] [--port=<n>]\n\t      [--user=<user> [--group=<group>]]]\n\t     [--log-destination=(stderr|syslog|none)]\n\t     [<directory>...]\n"
@@ -19940,7 +19942,7 @@ msgstr ""
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, no-wrap
 msgid "'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]\n'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n'git describe' <blob>\n"
@@ -20194,7 +20196,7 @@ msgstr ""
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, no-wrap
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -20260,7 +20262,7 @@ msgstr ""
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, no-wrap
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -20421,7 +20423,7 @@ msgstr ""
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, no-wrap
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -20645,7 +20647,7 @@ msgstr ""
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, no-wrap
 msgid "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n\t      [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n\t      [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
@@ -20779,9 +20781,10 @@ msgstr ""
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, no-wrap
+msgid "git diff [<options>] [<commit>] [--] [<path>...]\ngit diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\ngit diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\ngit diff [<options>] <commit>...<commit> [--] [<path>...]\ngit diff [<options>] <blob> <blob>\ngit diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -21148,7 +21151,7 @@ msgstr ""
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -21499,7 +21502,7 @@ msgstr ""
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -23527,7 +23530,7 @@ msgstr ""
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, no-wrap
 msgid "'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]\n\t[--upload-pack=<git-upload-pack>]\n\t[--depth=<n>] [--no-progress]\n\t[-v] <repository> [<refs>...]\n"
@@ -23698,7 +23701,7 @@ msgstr ""
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, no-wrap
 msgid "'git fetch' [<options>] [<repository> [<refspec>...]]\n'git fetch' [<options>] <group>\n'git fetch' --multiple [<options>] [(<repository> | <group>)...]\n'git fetch' --all [<options>]\n"
@@ -24109,7 +24112,7 @@ msgstr ""
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, no-wrap
 msgid "'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n\t[--env-filter <command>] [--tree-filter <command>]\n\t[--index-filter <command>] [--parent-filter <command>]\n\t[--msg-filter <command>] [--commit-filter <command>]\n\t[--tag-name-filter <command>] [--prune-empty]\n\t[--original <namespace>] [-d <directory>] [-f | --force]\n\t[--state-branch <branch>] [--] [<rev-list-options>...]\n"
@@ -24815,7 +24818,7 @@ msgstr ""
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap
 msgid "'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]\n'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>\n"
@@ -24930,7 +24933,7 @@ msgstr ""
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, no-wrap
 msgid "'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n\t\t   [(--sort=<key>)...] [--format=<format>]\n\t\t   [--include-root-refs] [ --stdin | <pattern>... ]\n\t\t   [--points-at=<object>]\n\t\t   [--merged[=<object>]] [--no-merged[=<object>]]\n\t\t   [--contains[=<object>]] [--no-contains[=<object>]]\n\t\t   [--exclude=<pattern> ...]\n"
@@ -25699,7 +25702,7 @@ msgstr ""
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap
 msgid "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n\t\t   [--no-thread | --thread[=<style>]]\n\t\t   [(--attach|--inline)[=<boundary>] | --no-attach]\n\t\t   [-s | --signoff]\n\t\t   [--signature=<signature> | --no-signature]\n\t\t   [--signature-file=<file>]\n\t\t   [-n | --numbered | -N | --no-numbered]\n\t\t   [--start-number <n>] [--numbered-files]\n\t\t   [--in-reply-to=<message-id>] [--suffix=.<sfx>]\n\t\t   [--ignore-if-in-upstream] [--always]\n\t\t   [--cover-from-description=<mode>]\n\t\t   [--rfc[=<rfc>]] [--subject-prefix=<subject-prefix>]\n\t\t   [(--reroll-count|-v) <n>]\n\t\t   [--to=<email>] [--cc=<email>]\n\t\t   [--[no-]cover-letter] [--quiet]\n\t\t   [--[no-]encode-email-headers]\n\t\t   [--no-notes | --notes[=<ref>]]\n\t\t   [--interdiff=<previous>]\n\t\t   [--range-diff=<previous> [--creation-factor=<percent>]]\n\t\t   [--filename-max-length=<n>]\n\t\t   [--progress]\n\t\t   [<common-diff-options>]\n\t\t   [ <since> | <revision-range> ]\n"
@@ -26808,7 +26811,7 @@ msgstr ""
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, no-wrap
 msgid "'git fsck-objects' ...\n"
@@ -26830,7 +26833,7 @@ msgstr ""
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, no-wrap
 msgid "'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n\t [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n\t [--[no-]name-objects] [<object>...]\n"
@@ -27096,7 +27099,7 @@ msgstr ""
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -27297,7 +27300,7 @@ msgstr ""
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap
 msgid "'git get-tar-commit-id'\n"
@@ -27324,7 +27327,7 @@ msgstr ""
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, no-wrap
 msgid "'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n\t   [-v | --invert-match] [-h|-H] [--full-name]\n\t   [-E | --extended-regexp] [-G | --basic-regexp]\n\t   [-P | --perl-regexp]\n\t   [-F | --fixed-strings] [-n | --line-number] [--column]\n\t   [-l | --files-with-matches] [-L | --files-without-match]\n\t   [(-O | --open-files-in-pager) [<pager>]]\n\t   [-z | --null]\n\t   [ -o | --only-matching ] [-c | --count] [--all-match] [-q | --quiet]\n\t   [--max-depth <depth>] [--[no-]recursive]\n\t   [--color[=<when>] | --no-color]\n\t   [--break] [--heading] [-p | --show-function]\n\t   [-A <post-context>] [-B <pre-context>] [-C <context>]\n\t   [-W | --function-context]\n\t   [(-m | --max-count) <num>]\n\t   [--threads <num>]\n\t   [-f <file>] [-e] <pattern>\n\t   [--and|--or|--not|(|)|-e <pattern>...]\n\t   [--recurse-submodules] [--parent-basename <basename>]\n\t   [ [--[no-]exclude-standard] [--cached | --untracked | --no-index] | <tree>...]\n\t   [--] [<pathspec>...]\n"
@@ -27970,7 +27973,7 @@ msgstr ""
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -28167,7 +28170,7 @@ msgstr ""
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, no-wrap
 msgid "'git hash-object' [-t <type>] [-w] [--path=<file> | --no-filters]\n\t\t[--stdin [--literally]] [--] <file>...\n'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
@@ -28248,7 +28251,7 @@ msgstr ""
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap
 msgid "'git help' [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]\n'git help' [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]\n'git help' [-g|--guides]\n'git help' [-c|--config]\n'git help' [--user-interfaces]\n'git help' [--developer-interfaces]\n"
@@ -28612,7 +28615,7 @@ msgstr ""
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap
 msgid "'git http-backend'\n"
@@ -28943,7 +28946,7 @@ msgstr ""
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -29052,7 +29055,7 @@ msgstr ""
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, no-wrap
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -29181,7 +29184,7 @@ msgstr ""
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -29267,12 +29270,12 @@ msgstr ""
 msgid "[imap]\n    folder = \"INBOX.Drafts\"\n    host = imaps://imap.example.com\n    user = bob\n    pass = p4ssw0rd\n    port = 123\n    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 msgid "Using Gmail's IMAP interface:"
 msgstr ""
@@ -29283,28 +29286,28 @@ msgstr ""
 msgid "[imap]\n\tfolder = \"[Gmail]/Drafts\"\n\thost = imaps://imap.gmail.com\n\tuser = user@gmail.com\n\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
 msgstr ""
@@ -29342,7 +29345,7 @@ msgstr ""
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap
 msgid "'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n\t\t  [--[no-]rev-index] [<pack-file>]\n"
@@ -29546,7 +29549,7 @@ msgstr ""
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -29568,7 +29571,7 @@ msgstr ""
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap
 msgid "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n\t [--separate-git-dir <git-dir>] [--object-format=<format>]\n\t [--ref-format=<format>]\n\t [-b <branch-name> | --initial-branch=<branch-name>]\n\t [--shared[=<permissions>]] [<directory>]\n"
@@ -29841,7 +29844,7 @@ msgstr ""
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap
 msgid "'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]\n               [--browser=<browser>]\n'git instaweb' [--start] [--stop] [--restart]\n"
@@ -29979,7 +29982,7 @@ msgstr ""
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, no-wrap
 msgid "'git interpret-trailers' [--in-place] [--trim-empty]\n\t\t\t[(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n\t\t\t[--parse] [<file>...]\n"
@@ -30665,7 +30668,7 @@ msgstr ""
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, no-wrap
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -30976,7 +30979,7 @@ msgstr ""
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, no-wrap
 msgid "'git ls-files' [-z] [-t] [-v] [-f]\n\t\t[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]\n\t\t[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]\n\t\t[--resolve-undo]\n\t\t[--directory [--no-empty-directory]] [--eol]\n\t\t[--deduplicate]\n\t\t[-x <pattern>|--exclude=<pattern>]\n\t\t[-X <file>|--exclude-from=<file>]\n\t\t[--exclude-per-directory=<file>]\n\t\t[--exclude-standard]\n\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n\t\t[--full-name] [--recurse-submodules]\n\t\t[--abbrev[=<n>]] [--format=<format>] [--] [<file>...]\n"
@@ -31569,7 +31572,7 @@ msgstr ""
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, no-wrap
 msgid "'git ls-remote' [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n\t      [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n\t      [--symref] [<repository> [<patterns>...]]\n"
@@ -31742,7 +31745,7 @@ msgstr ""
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, no-wrap
 msgid "'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n\t    [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<format>]\n\t    <tree-ish> [<path>...]\n"
@@ -31936,7 +31939,7 @@ msgstr ""
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap
 msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n\t       [--[no-]scissors] [--quoted-cr=<action>]\n\t       <msg> <patch>\n"
@@ -32100,7 +32103,7 @@ msgstr ""
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, no-wrap
 msgid "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
@@ -32209,7 +32212,7 @@ msgstr ""
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, no-wrap
 msgid "'git merge-base' [-a | --all] <commit> <commit>...\n'git merge-base' [-a | --all] --octopus <commit>...\n'git merge-base' --is-ancestor <commit> <commit>\n'git merge-base' --independent <commit>...\n'git merge-base' --fork-point <ref> [<commit>]\n"
@@ -32483,7 +32486,7 @@ msgstr ""
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap
 msgid "'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]\n\t[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]\n\t[--[no-]diff3] [--object-id] <current> <base> <other>\n"
@@ -32644,7 +32647,7 @@ msgstr ""
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, no-wrap
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -32690,7 +32693,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 msgid "Examples:"
 msgstr ""
@@ -32728,7 +32731,7 @@ msgstr ""
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap
 msgid "'git merge-one-file'\n"
@@ -32750,7 +32753,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -32843,7 +32846,7 @@ msgstr ""
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, no-wrap
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -32976,7 +32979,7 @@ msgstr ""
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap
 msgid "'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n"
@@ -33397,7 +33400,7 @@ msgstr ""
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, no-wrap
 msgid "'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n\t[--[no-]allow-unrelated-histories]\n\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]\n\t[--into-name <branch>] [<commit>...]\n'git merge' (--continue | --abort | --quit)\n"
@@ -33810,7 +33813,7 @@ msgstr ""
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap
 msgid "'git mktag'\n"
@@ -33891,7 +33894,7 @@ msgstr ""
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -33934,7 +33937,7 @@ msgstr ""
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, no-wrap
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -34002,7 +34005,7 @@ msgstr ""
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, no-wrap
 msgid "'git name-rev' [--tags] [--refs=<pattern>]\n\t       ( --all | --annotate-stdin | <commit-ish>... )\n"
@@ -34145,7 +34148,7 @@ msgstr ""
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, no-wrap
 msgid "'git notes' [list [<object>]]\n'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]\n'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n'git notes' append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]\n'git notes' edit [--allow-empty] [<object>] [--[no-]stripspace]\n'git notes' show [<object>]\n'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
@@ -34611,7 +34614,7 @@ msgstr ""
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, no-wrap
 msgid "'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...\n'git p4 sync' [<sync-options>] [<p4-depot-path>...]\n'git p4 rebase'\n'git p4 submit' [<submit-options>] [<master-branch-name>]\n"
@@ -35984,7 +35987,7 @@ msgstr ""
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap
 msgid "'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n\t[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n\t[--cruft] [--cruft-expiration=<time>]\n\t[--stdout [--filter=<filter-spec>] | <base-name>]\n\t[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>\n"
@@ -36513,7 +36516,7 @@ msgstr ""
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, no-wrap
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -36581,7 +36584,7 @@ msgstr ""
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -36674,7 +36677,7 @@ msgstr ""
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -36775,7 +36778,7 @@ msgstr ""
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -36827,7 +36830,7 @@ msgstr ""
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, no-wrap
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -36922,7 +36925,7 @@ msgstr ""
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, no-wrap
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -37053,7 +37056,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
 msgstr ""
@@ -37064,7 +37067,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 msgid "This is shorthand for --rebase=false."
 msgstr ""
@@ -37201,7 +37204,7 @@ msgstr ""
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, no-wrap
 msgid "'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n\t   [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-q | --quiet] [-v | --verbose]\n\t   [-u | --set-upstream] [-o <string> | --push-option=<string>]\n\t   [--[no-]signed|--signed=(true|false|if-asked)]\n\t   [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n\t   [--no-verify] [<repository> [<refspec>...]]\n"
@@ -38019,7 +38022,7 @@ msgstr ""
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap
 msgid "'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]\n\t\t[--series <file>] [--keep-non-patch]\n"
@@ -38099,7 +38102,7 @@ msgstr ""
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, no-wrap
 msgid "'git range-diff' [--color=[<when>]] [--no-color] [<diff-options>]\n\t[--no-dual-color] [--creation-factor=<factor>]\n\t[--left-only | --right-only]\n\t( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n\t[[--] <path>...]\n"
@@ -38439,7 +38442,7 @@ msgstr ""
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap
 msgid "'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
@@ -38936,7 +38939,7 @@ msgstr ""
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap
 msgid "'git rebase' [-i | --interactive] [<options>] [--exec <cmd>]\n\t[--onto <newbase> | --keep-base] [<upstream> [<branch>]]\n'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]\n\t--root [<branch>]\n'git rebase' (--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)\n"
@@ -38962,22 +38965,22 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 msgid "Assume the following history exists and the current branch is \"topic\":"
 msgstr ""
@@ -40554,7 +40557,7 @@ msgstr ""
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap
 msgid "'git receive-pack' <git-dir>\n"
@@ -40918,7 +40921,7 @@ msgstr ""
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, no-wrap
 msgid "'git reflog' [show] [<log-options>] [<ref>]\n'git reflog list'\n'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n\t[--rewrite] [--updateref] [--stale-fix]\n\t[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]\n'git reflog delete' [--rewrite] [--updateref]\n\t[--dry-run | -n] [--verbose] <ref>@{<specifier>}...\n'git reflog exists' <ref>\n"
@@ -41084,7 +41087,7 @@ msgstr ""
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, no-wrap
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -41378,7 +41381,7 @@ msgstr ""
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, no-wrap
 msgid "'git remote' [-v | --verbose]\n'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>\n'git remote rename' [--[no-]progress] <old> <new>\n'git remote remove' <name>\n'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n'git remote set-branches' [--add] <name> <branch>...\n'git remote get-url' [--push] [--all] <name>\n'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n'git remote set-url --add' [--push] <name> <newurl>\n'git remote set-url --delete' [--push] <name> <URL>\n'git remote' [-v | --verbose] 'show' [-n] <name>...\n'git remote prune' [-n | --dry-run] <name>...\n'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
@@ -41693,7 +41696,7 @@ msgstr ""
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -41944,7 +41947,7 @@ msgstr ""
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, no-wrap
 msgid "'git replace' [-f] <object> <replacement>\n'git replace' [-f] --edit <object>\n'git replace' [-f] --graft <commit> [<parent>...]\n'git replace' [-f] --convert-graft-file\n'git replace' -d <object>...\n'git replace' [--format=<format>] [-l [<pattern>]]\n"
@@ -42176,7 +42179,7 @@ msgstr ""
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -42295,7 +42298,7 @@ msgstr ""
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, no-wrap
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -42311,7 +42314,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
 msgstr ""
@@ -42528,7 +42531,7 @@ msgstr ""
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, no-wrap
 msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
@@ -43098,7 +43101,7 @@ msgstr ""
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, no-wrap
 msgid "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
@@ -43322,7 +43325,7 @@ msgstr ""
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, no-wrap
 msgid "'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n'git revert' (--continue | --skip | --abort | --quit)\n"
@@ -43439,7 +43442,7 @@ msgstr ""
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, no-wrap
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -43571,7 +43574,7 @@ msgstr ""
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, no-wrap
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -44474,7 +44477,7 @@ msgstr ""
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, no-wrap
 msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n\t  [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t  [--] [<pathspec>...]\n"
@@ -44681,7 +44684,7 @@ msgstr ""
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, no-wrap
 msgid "'git send-email' [<options>] (<file>|<directory>)...\n'git send-email' [<options>] <format-patch-options>\n'git send-email' --dump-aliases\n'git send-email' --translate-aliases\n"
@@ -45560,7 +45563,7 @@ msgstr ""
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, no-wrap
 msgid "'git send-pack' [--mirror] [--dry-run] [--force]\n\t\t[--receive-pack=<git-receive-pack>]\n\t\t[--verbose] [--thin] [--atomic]\n\t\t[--[no-]signed | --signed=(true|false|if-asked)]\n\t\t[<host>:]<directory> (--all | <ref>...)\n"
@@ -45684,7 +45687,7 @@ msgstr ""
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap
 msgid "'chsh' -s $(command -v git-shell) <user>\n'git clone' <user>`@localhost:/path/to/repo.git`\n'ssh' <user>`@localhost`\n"
@@ -45803,7 +45806,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap
 msgid "eval_gettext () {\n\tprintf \"%s\" \"$1\" | (\n\t\texport PATH $('git sh-i18n{litdd}envsubst' --variables \"$1\");\n\t\t'git sh-i18n{litdd}envsubst' \"$1\"\n\t)\n}\n"
@@ -45835,7 +45838,7 @@ msgstr ""
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -45879,7 +45882,7 @@ msgstr ""
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, no-wrap
 msgid "'git shortlog' [<options>] [<revision-range>] [[--] <path>...]\ngit log --pretty=short | 'git shortlog' [<options>]\n"
@@ -46047,7 +46050,7 @@ msgstr ""
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, no-wrap
 msgid "'git show-branch' [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics]\n\t\t[(<rev> | <glob>)...]\n'git show-branch' (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]\n"
@@ -46293,7 +46296,7 @@ msgstr ""
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -46345,7 +46348,7 @@ msgstr ""
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, no-wrap
 msgid "'git show-ref' [--head] [-d | --dereference]\n\t     [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n\t     [--] [<pattern>...]\n'git show-ref' --verify [-q | --quiet] [-d | --dereference]\n\t     [-s | --hash[=<n>]] [--abbrev[=<n>]]\n\t     [--] [<ref>...]\n'git show-ref' --exclude-existing[=<pattern>]\n'git show-ref' --exists <ref>\n"
@@ -46610,7 +46613,7 @@ msgstr ""
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, no-wrap
 msgid "'git show' [<options>] [<object>...]\n"
@@ -46733,7 +46736,7 @@ msgstr ""
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -46892,7 +46895,7 @@ msgstr ""
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, no-wrap
 msgid "'git stage' <arg>...\n"
@@ -46914,7 +46917,7 @@ msgstr ""
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, no-wrap
 msgid "'git stash' list [<log-options>]\n'git stash' show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]\n'git stash' drop [-q | --quiet] [<stash>]\n'git stash' pop [--index] [-q | --quiet] [<stash>]\n'git stash' apply [--index] [-q | --quiet] [<stash>]\n'git stash' branch <branchname> [<stash>]\n'git stash' [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n\t     [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]\n\t     [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t     [--] [<pathspec>...]]\n'git stash' save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]\n\t     [-u | --include-untracked] [-a | --all] [<message>]\n'git stash' clear\n'git stash' create [<message>]\n'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit>\n"
@@ -47342,7 +47345,7 @@ msgstr ""
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, no-wrap
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -47989,7 +47992,7 @@ msgstr ""
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap
 msgid "'git stripspace' [-s | --strip-comments]\n'git stripspace' [-c | --comment-lines]\n"
@@ -48101,7 +48104,7 @@ msgstr ""
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, no-wrap
 msgid "'git submodule' [--quiet] [--cached]\n'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]\n'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]\n'git submodule' [--quiet] init [--] [<path>...]\n'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)\n'git submodule' [--quiet] update [<options>] [--] [<path>...]\n'git submodule' [--quiet] set-branch [<options>] [--] <path>\n'git submodule' [--quiet] set-url [--] <path> <newurl>\n'git submodule' [--quiet] summary [<options>] [--] [<path>...]\n'git submodule' [--quiet] foreach [--recursive] <command>\n'git submodule' [--quiet] sync [--recursive] [--] [<path>...]\n'git submodule' [--quiet] absorbgitdirs [--] [<path>...]\n"
@@ -48680,7 +48683,7 @@ msgstr ""
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -48890,7 +48893,7 @@ msgstr ""
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
 msgstr ""
@@ -48927,29 +48930,29 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
@@ -48983,7 +48986,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -48995,7 +48998,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
 msgstr ""
@@ -49006,7 +49009,7 @@ msgstr ""
 msgid "'clone'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
 msgstr ""
@@ -49017,7 +49020,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
 msgstr ""
@@ -49028,7 +49031,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
 msgstr ""
@@ -49039,27 +49042,27 @@ msgstr ""
 msgid "'rebase'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
 msgstr ""
@@ -49070,22 +49073,22 @@ msgstr ""
 msgid "'dcommit'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 msgid "After committing, do not rebase or reset."
 msgstr ""
@@ -49096,23 +49099,23 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap
 msgid "config key: svn-remote.<name>.commiturl\nconfig key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
 msgstr ""
@@ -49123,28 +49126,28 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
 msgstr ""
@@ -49155,7 +49158,7 @@ msgstr ""
 msgid "'branch'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 msgid "Create a branch in the SVN repository."
 msgstr ""
@@ -49166,7 +49169,7 @@ msgstr ""
 msgid "--message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 msgid "Allows to specify the commit message."
 msgstr ""
@@ -49177,7 +49180,7 @@ msgstr ""
 msgid "--tag"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
 msgstr ""
@@ -49194,17 +49197,17 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
 msgstr ""
@@ -49215,7 +49218,7 @@ msgstr ""
 msgid "--username"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
 msgstr ""
@@ -49226,12 +49229,12 @@ msgstr ""
 msgid "--commit-url"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 msgid "git config --get-all svn-remote.<name>.commiturl"
 msgstr ""
@@ -49242,7 +49245,7 @@ msgstr ""
 msgid "--parents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
 msgstr ""
@@ -49253,7 +49256,7 @@ msgstr ""
 msgid "'tag'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
 msgstr ""
@@ -49264,12 +49267,12 @@ msgstr ""
 msgid "'log'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 msgid "The following features from `svn log' are supported:"
 msgstr ""
@@ -49286,12 +49289,12 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
 msgstr ""
@@ -49302,17 +49305,17 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 msgid "New features:"
 msgstr ""
@@ -49323,7 +49326,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 msgid "shows the Git commit sha1, as well"
 msgstr ""
@@ -49334,17 +49337,17 @@ msgstr ""
 msgid "--oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 msgid "Any other arguments are passed directly to 'git log'"
 msgstr ""
@@ -49355,7 +49358,7 @@ msgstr ""
 msgid "'blame'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
 msgstr ""
@@ -49366,7 +49369,7 @@ msgstr ""
 msgid "--git-format"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
 msgstr ""
@@ -49377,7 +49380,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
 msgstr ""
@@ -49394,7 +49397,7 @@ msgstr ""
 msgid "--before"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
 msgstr ""
@@ -49405,7 +49408,7 @@ msgstr ""
 msgid "--after"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
 msgstr ""
@@ -49416,7 +49419,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
 msgstr ""
@@ -49427,7 +49430,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
 msgstr ""
@@ -49438,7 +49441,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
 msgstr ""
@@ -49449,7 +49452,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
 msgstr ""
@@ -49460,17 +49463,17 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
 msgstr ""
@@ -49487,7 +49490,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
 msgstr ""
@@ -49498,7 +49501,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
 msgstr ""
@@ -49509,7 +49512,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
 msgstr ""
@@ -49520,7 +49523,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
 msgstr ""
@@ -49531,7 +49534,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
 msgstr ""
@@ -49617,7 +49620,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap
 msgid "git svn reset -r2 -p\ngit svn fetch\n"
@@ -49634,7 +49637,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -49712,7 +49715,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
 msgstr ""
@@ -49722,18 +49725,18 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap
 msgid "config key: svn.edit\n"
@@ -49751,12 +49754,12 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap
 msgid "config key: svn.l\nconfig key: svn.findcopiesharder\n"
@@ -49774,7 +49777,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
 msgstr ""
@@ -49790,7 +49793,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap
 msgid "config key: svn.authorsfile\n"
@@ -49802,23 +49805,23 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
 msgstr ""
@@ -49829,32 +49832,32 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
 msgstr ""
@@ -49865,12 +49868,12 @@ msgstr ""
 msgid "--use-log-author"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap
 msgid "config key: svn.useLogAuthor\n"
@@ -49882,12 +49885,12 @@ msgstr ""
 msgid "--add-author-from"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap
 msgid "config key: svn.addAuthorFrom\n"
@@ -49944,7 +49947,7 @@ msgstr ""
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap
 msgid "config key: svn.followparent\n"
@@ -50380,7 +50383,7 @@ msgstr ""
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap
 msgid "'git switch' [<options>] [--no-guess] <branch>\n'git switch' [<options>] --detach [<start-point>]\n'git switch' [<options>] (-c|-C) <new-branch> [<start-point>]\n'git switch' [<options>] --orphan <new-branch>\n"
@@ -50635,7 +50638,7 @@ msgstr ""
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap
 msgid "'git symbolic-ref' [-m <reason>] <name> <ref>\n'git symbolic-ref' [-q] [--short] [--no-recurse] <name>\n'git symbolic-ref' --delete [-q] <name>\n"
@@ -50719,7 +50722,7 @@ msgstr ""
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, no-wrap
 msgid "'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n\t[(--trailer <token>[(=|:)<value>])...]\n\t<tagname> [<commit> | <object>]\n'git tag' -d <tagname>...\n'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n\t[--points-at <object>] [--column[=<options>] | --no-column]\n\t[--create-reflog] [--sort=<key>] [--format=<format>]\n\t[--merged <commit>] [--no-merged <commit>] [<pattern>...]\n'git tag' -v [--format=<format>] <tagname>...\n"
@@ -51186,7 +51189,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap
 msgid "'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n    [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n    [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n    [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n    [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]\n    <command> [<args>]\n"
@@ -52966,7 +52969,7 @@ msgstr ""
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap
 msgid "'git unpack-file' <blob>\n"
@@ -52994,7 +52997,7 @@ msgstr ""
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -53046,7 +53049,7 @@ msgstr ""
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, no-wrap
 msgid "'git update-index'\n\t     [--add] [--remove | --force-remove] [--replace]\n\t     [--refresh] [-q] [--unmerged] [--ignore-missing]\n\t     [(--cacheinfo <mode>,<object>,<file>)...]\n\t     [--chmod=(+|-)x]\n\t     [--[no-]assume-unchanged]\n\t     [--[no-]skip-worktree]\n\t     [--[no-]ignore-skip-worktree-entries]\n\t     [--[no-]fsmonitor-valid]\n\t     [--ignore-submodules]\n\t     [--[no-]split-index]\n\t     [--[no-|test-|force-]untracked-cache]\n\t     [--[no-]fsmonitor]\n\t     [--really-refresh] [--unresolve] [--again | -g]\n\t     [--info-only] [--index-info]\n\t     [-z] [--stdin] [--index-version <n>]\n\t     [--show-index-version]\n\t     [--verbose]\n\t     [--] [<file>...]\n"
@@ -53820,7 +53823,7 @@ msgstr ""
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -54076,7 +54079,7 @@ msgstr ""
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap
 msgid "'git update-server-info' [-f | --force]\n"
@@ -54118,7 +54121,7 @@ msgstr ""
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap
 msgid "'git upload-archive' <repository>\n"
@@ -54180,7 +54183,7 @@ msgstr ""
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap
 msgid "'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n\t\t  [--advertise-refs] <directory>\n"
@@ -54275,7 +54278,7 @@ msgstr ""
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap
 msgid "'git var' (-l | <variable>)\n"
@@ -54450,7 +54453,7 @@ msgstr ""
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, no-wrap
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -54487,7 +54490,7 @@ msgstr ""
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, no-wrap
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -54569,7 +54572,7 @@ msgstr ""
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, no-wrap
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -54607,7 +54610,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, no-wrap
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -54848,7 +54851,7 @@ msgstr ""
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, no-wrap
 msgid "'git whatchanged' <option>...\n"
@@ -54902,7 +54905,7 @@ msgstr ""
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, no-wrap
 msgid "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n\t\t   [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]\n'git worktree list' [-v | --porcelain [-z]]\n'git worktree lock' [--reason <string>] <worktree>\n'git worktree move' <worktree> <new-path>\n'git worktree prune' [-n] [-v] [--expire <expire>]\n'git worktree remove' [-f] <worktree>\n'git worktree repair' [<path>...]\n'git worktree unlock' <worktree>\n"
@@ -55474,7 +55477,7 @@ msgstr ""
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -59129,12 +59132,12 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
 msgstr ""
@@ -61824,13 +61827,13 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap
 msgid "\t[url \"__<actual-url-base>__\"]\n\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 msgid "For example, with this:"
 msgstr ""
@@ -61851,7 +61854,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap
 msgid "\t[url \"__<actual-url-base>__\"]\n\t\tpushInsteadOf = _<other-url-base>_\n"
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 4c2e9dc1..210cd077 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-05-17 10:02+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: none\n"
@@ -4877,9 +4877,9 @@ msgstr "Quando há um envolvimento no processo de renomear ou copiar, `arquivo1`
 msgid "It is followed by one or more extended header lines:"
 msgstr "É seguido por uma ou mais linhas estendidas do cabeçalho:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4892,7 +4892,18 @@ msgstr "É seguido por uma ou mais linhas estendidas do cabeçalho:"
 #| "similarity index <number>\n"
 #| "dissimilarity index <number>\n"
 #| "index <hash>..<hash> <mode>\n"
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 "modo antigo               <modo>\n"
 "modo novo                 <modo>\n"
@@ -4906,45 +4917,45 @@ msgstr ""
 "índice de dissimilaridade <quantidade>\n"
 "índice                    <hash>..<hash> <modo>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, fuzzy, priority:280
 #| msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "Os modos dos arquivo são impressos como números octais com 6 dígitos, incluindo o tipo do arquivo e dos bits de permissão do arquivo."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "Os nomes do caminho nos cabeçalhos estendidos não incluem os prefixos `a/` e `b/`."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "O índice de similaridade é a porcentagem das linhas inalteradas e o índice de dissimilaridade é a porcentagem das linhas alteradas. É um número inteiro arredondado, seguido por um sinal de porcentagem. O valor do índice de similaridade de 100% é reservado para dois arquivos iguais, enquanto a dissimilaridade de 100% significa que nenhuma linha do arquivo antigo chegou ao novo."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, fuzzy, priority:280
 #| msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "A linha do índice inclui os nomes dos objetos bolha antes e depois da alteração. O `<modo>` será incluído caso o modo do arquivo não seja alterado; caso contrário, linhas separadas indicam o modo antigo e o novo."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Os nomes dos caminhos com caracteres \"incomuns\" são citados como já explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "Todos os arquivos `arquivo1` na saída se referem aos arquivos antes do commit e todos os arquivos `arquivo2` se referem aos arquivos após o commit. É incorreto aplicar cada alteração em cada arquivo sequencialmente. Por exemplo, este patch irá substituir a e b:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4962,7 +4973,7 @@ msgstr ""
 "renomeie a partir do b\n"
 "renomeie para a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -5084,101 +5095,105 @@ msgstr "       diff --cc arquivo\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "Ele é seguido por uma ou mais linhas estendidas do cabeçalho (este exemplo exibe uma mesclagem com duas origens):"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "index <hash>,<hash>..<hash>\n"
 #| "mode <mode>,<mode>..<mode>\n"
 #| "new file mode <mode>\n"
 #| "deleted file mode <mode>,<mode>\n"
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 "índice <hash>,<hash>..<hash>\n"
 "modo <modo>,<modo>..<modo>\n"
 "modo novo arquivo <modo>\n"
 "modo arquivo excluído <modo>,<modo>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, fuzzy, priority:280
 #| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format."
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "A linha `modo <modo>,<modo>..<modo>` aparece apenas caso pelo menos um dos <modos> seja diferente do restante. Os cabeçalhos estendidos com informações sobre a movimentação do conteúdo detectado (renomeação e detecção da cópia) são projetados para trabalhar com o diff com duas `<árvore>s` e não são utilizados pela combinação do formato diff."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "É seguido por duas linhas do cabeçalho do arquivo/para o arquivo:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/arquivo"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/arquivo"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "Semelhante ao cabeçalho de duas linhas para o formato diff tradicional 'unificado', o `/dev/null` é utilizado para sinalizar os arquivos criados ou excluídos."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "No entanto, caso a opção `--combined-all-paths` seja utilizada, em vez de duas linhas do arquivo/para o arquivo, será obtido um cabeçalho `N+1` do cabeçalho do arquivo de \"origem\" para o arquivo de \"destino\" onde N é a quantidade de origens na mesclagem do commit:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "Este formato estendido pode ser útil caso a detecção da renomeação ou cópia esteja ativa, permitindo que você veja o nome original do arquivo em diferentes origens."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "O formato do cabeçalho do pedaço é modificado para prevenir que as pessoas o alimentem acidentalmente com `patch -p1`. O formato diff combinado foi criado para revisar as alterações da mesclagem dos commits e não era para ser aplicado. A alteração é semelhante a alteração no cabeçalho estendido do 'índice':"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "Existem (a quantidade de origens + 1) caracteres `@` no cabeçalho do bloco para o formato diff combinado."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 "Diferente do formato diff 'unificado' tradicional que exiba os dois arquivos A e B com uma única coluna que possua o sinal de menos `-` (o sinal de menos -- aparece em A mas é removido em B), `+` (o sinal de mais -- ausente em A, mas adicionado em B), ou o prefixo `\" \"` (sem alteração -- de espaço), este formato compara dois ou mais arquivos arquivo1, arquivo2, ... com um arquivo X e exibe como X difere de cada arquivoN. Uma coluna para cada arquivoN é anexada à linha de saída para observar como a linha de X é diferente dela."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "Um caractere `-` na coluna N significa que a linha aparece no \"arquivoN\", mas não aparece no resultado. Um caractere `+` na coluna N significa que a linha aparece no resultado e o arquivoN não possui essa linha (em outras palavras, a linha foi adicionada, do ponto de vista dessa origem)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "Na saída do exemplo acima, a assinatura da função foi alterada nos dois arquivos (portanto, duas remoções `-` do arquivo1 e do arquivo2, mais `++` significa que uma linha que foi adicionada não aparece no arquivo1 ou no arquivo2). Assim como, outras oito linhas também são iguais no arquivo1, mas não aparecem no arquivo2 (portanto, prefixadas com `+`)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -8102,7 +8117,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Adicione o conteúdo do arquivo ao índice"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8923,7 +8938,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "git-am - Aplica uma série de patches vindas de um mailbox (caixa de correio unix)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 #| msgid ""
@@ -9574,7 +9589,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr "git-annotate - Anote linhas do arquivo com as informações do commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9604,7 +9619,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - Aplica um patch aos arquivos e/ou ao índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 #| msgid ""
@@ -10105,7 +10120,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr "git-archimport - Importe um repositório do GNU Arch para o Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10271,7 +10286,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "git-archive - Cria um arquivo dos arquivos vindos de uma determinada árvore"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10724,7 +10739,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "git-bisect - Utilize a pesquisa binária para localizar o commit que introduziu um bug"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11597,7 +11612,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "git-blame - Exiba qual revisão e qual foi o autor que alterou cada linha de um arquivo pela última vez"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -12020,7 +12035,7 @@ msgstr "\"nome do arquivo\" <citação-do-nome-do-arquivo-com-espaço-em-branco-
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr "logo, é realmente muito fácil analisar alguma linha algo que seja orientado por palavra (que deve ser bastante natural para a maioria das linguagens de script)."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -12050,7 +12065,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr "git-branch - Lista, cria ou exclui ramificações"
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12804,7 +12819,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "git-bugreport - Colete informações para que o usuário arquive um relatório de erro"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, fuzzy, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 #| msgid ""
@@ -12975,7 +12990,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr "git-bundle - Mova os objetos e as refs através do arquivo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13549,7 +13564,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "git-cat-file - Forneça as informações ou detalhes dos objetos do repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -14316,7 +14331,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr "git-check-attr - Exiba as informações sobre os gitattributes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14596,7 +14611,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr "git-check-ignore - Depure o gitignorar / excluir arquivos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14787,7 +14802,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr "git-check-mailmap - Exiba os nomes canônicos e os endereços de e-mail dos contatos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14856,7 +14871,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr "git-checkout-index - Copie os arquivos do índice para a árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -15150,7 +15165,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - Alterne entre os ramos ou restaure os arquivos da árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -16155,7 +16170,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr "git-check-ref-format - Garanta que um nome da referência esteja bem formado"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -16359,7 +16374,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr "git-cherry-pick - Aplique as alterações introduzidas por alguns commits existentes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16777,7 +16792,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "git-cherry - Encontre os commits que ainda serão aplicados na upstream"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -17029,7 +17044,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr "git-citool - Alternativa gráfica para git-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -17059,7 +17074,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - Remove arquivos não rastreados da árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -17272,7 +17287,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Clona um repositório num novo diretório"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 #| msgid ""
@@ -17970,7 +17985,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr "git-column - Exibe os dados em colunas"
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -18144,7 +18159,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr "git-commit-tree - Cria um novo objeto commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -18319,7 +18334,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - Grava as alterações feitas no repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 #| msgid ""
@@ -19192,7 +19207,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config - Obtenha e defina opções globais ou do repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -20552,7 +20567,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr "git-count-objects - Conta a quantidade dos objetos não empacotados e o seu consumo no disco"
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -20648,7 +20663,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr "git-credential-cache--daemon - Armazene temporariamente as credenciais do usuário na memória"
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -21396,7 +21411,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr "git-cvsexportcommit - Exportar um único commit para uma averiguação do CVS"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -21588,7 +21603,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport - Recupere seus dados de outro SCM que as pessoas amam odiar"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -22022,7 +22037,7 @@ msgstr "git-cvsserver - Um emulador CVS para o Git"
 msgid "SSH:"
 msgstr "SSH:"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -22032,25 +22047,25 @@ msgstr ""
 "export CVS_SERVER=\"git cvsserver\"\n"
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr "pserver (/etc/inetd.conf):"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr "Uso:"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22776,7 +22791,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "git-daemon - Um servidor realmente simples para os repositórios Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -23380,7 +23395,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - Atribua a um objeto um nome legível para humanos com base num \"ref\" disponível"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -23688,7 +23703,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr "git-diff-files - Compara os arquivos na árvore de trabalho e no índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -23760,7 +23775,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr "git-diff-index - Compara uma árvore com a árvore ou índice de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23958,7 +23973,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr "git-difftool - Exiba as alterações utilizando as ferramentas comuns do diff"
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -24205,7 +24220,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "git-diff-tree - Compara o conteúdo e o modo das bolhas encontradas através de dois objetos árvore"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -24368,9 +24383,9 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Exibe as mudanças entre os commits, o commit, a árvore de trabalho, etc"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, fuzzy, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
 #| msgid ""
 #| "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 #| "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
@@ -24378,7 +24393,13 @@ msgstr "git-diff - Exibe as mudanças entre os commits, o commit, a árvore de t
 #| "'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 #| "'git diff' [<options>] <blob> <blob>\n"
 #| "'git diff' [<options>] --no-index [--] <path> <path>\n"
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 "'git diff' [<options>] [<commit>] [--] [<caminho>...]\n"
 "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<caminho>...]\n"
@@ -24844,7 +24865,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr "git-fast-export - Exportador de dados do Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -25257,7 +25278,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr "git-fast-import - Estrutura para os importadores de dados rápidos do Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -27714,7 +27735,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr "git-fetch-pack - Recebe os objetos ausentes vindos de um outro repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -27914,7 +27935,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - Faz o download dos objetos e `refs` do outro repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -28417,7 +28438,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr "git-filter-branch - Reescreve os ramos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -29331,7 +29352,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr "git-fmt-merge-msg - Gera uma mensagem de commit da mesclagem"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -29465,7 +29486,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr "git-for-each-ref - Informações de saída de cada referência"
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 #| msgid ""
@@ -30453,7 +30474,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr "git-format-patch - Preparar os patches para o envio de e-mails"
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, fuzzy, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 #| msgid ""
@@ -31858,7 +31879,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - Verifica a conectividade e validade dos objetos no banco de dados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -31882,7 +31903,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck - Verifica a conectividade e a validade dos objetos no banco de dados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -32184,7 +32205,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "git-gc - Limpa os arquivos desnecessários e otimiza o repositório local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, fuzzy, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 #| msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -32413,7 +32434,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr "git-get-tar-commit-id - Extrai o ID do commit de um arquivo criado utilizando o comando git-archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -32443,7 +32464,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr "git-grep - Imprima linhas que coincidam com um padrão"
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 #| msgid ""
@@ -33220,7 +33241,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "git-gui - Uma interface gráfica portátil para o Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -33437,7 +33458,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "git-hash-object - calcula o ID do objeto, e opcionalmente, cria um objeto a partir de um arquivo"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -33533,7 +33554,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "git-help - Exiba informações de ajuda sobre o Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -33971,7 +33992,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr "git-http-backend - Implementação do servidor do Git sobre HTTP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -34507,7 +34528,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr "git-http-fetch - Faça o download de um repositório Git remoto através de HTTP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -34627,7 +34648,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "git-http-push - Impulsiona os objetos por HTTP/DAV para um outro repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -34777,7 +34798,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "git-imap-send - Envia uma coleção de patches do stdin para um diretório IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -34903,13 +34924,13 @@ msgstr ""
 "    port = 123\n"
 "    ; sslVerify = false\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr "Você pode querer utilizar `sslVerify=false` durante a resolução de problemas, caso suspeite que a fonte dos seu problemas de conexão é porque talvez haja um erro de verificação no certificado que você utiliza no servidor privado `example.com` que você está tentando configurar (ou já configurou)."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -34931,31 +34952,31 @@ msgstr ""
 "\tuser = user@gmail.com\n"
 "\tport = 993\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr "Você pode precisar utilizar: `folder = \"[Google Mail]/Drafts\"` caso receba um erro indicando que a \"O diretório não existe\"."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr "Caso a sua conta do Gmail esteja definida para outro idioma que não o inglês, o nome da pasta \"Drafts\" será localizado para \"Rascunhos\"."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr "Quando os commits estiverem prontos para serem enviados, execute o seguinte comando:"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -35003,7 +35024,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "git-index-pack - Construa um pacote do arquivo do índice para um arquivo compactado já existente"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -35237,7 +35258,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - Cria um repositório Git vazio"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -35261,7 +35282,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Cria um repositório Git vazio ou reinicializa um já existente"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -35611,7 +35632,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "git-instaweb - Navegue instantaneamente no seu repositório de trabalho com o gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -35779,7 +35800,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "git-interpret-trailers - Adiciona ou analisa informação estruturada em mensagens de commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 #| msgid ""
@@ -36714,7 +36735,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr "git-log - Exibe os registros log do commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -37056,7 +37077,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "git-ls-files - Exiba as informações sobre os arquivos no índice e na árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -37747,7 +37768,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr "git-ls-remote - Liste referências num repositório remoto"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 #| msgid ""
@@ -37980,7 +38001,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr "git-ls-tree - Lista o conteúdo de um objeto na árvore"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -38208,7 +38229,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "git-mailinfo - Extrai o patch e a autoria de uma única mensagem de e-mail"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -38406,7 +38427,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr "git-mailsplit - Simples Programa separador do mbox UNIX"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -38530,7 +38551,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "git-merge-base - Encontre o melhor ancestral comum possível para uma mesclagem"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -38928,7 +38949,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr "git-merge-file - Executa uma mesclagem do arquivo com três vias"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -39124,7 +39145,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr "git-merge-index - Executa uma mesclagem para os arquivos que precisam ser mesclados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -39178,7 +39199,7 @@ msgstr "Um script de exemplo chamado 'git merge-one-file' está incluso na distr
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr "ALERTA ALERTA ALERTA! A \"ordem da mesclagem dos objetos\" do Git é diferente da ordem de mesclagem do objeto no programa RCS 'merge'. Na ordem acima, o original é o primeiro. Porém, a ordem das opções para o programa de mesclagem 'merge' de três vias é ter o original no meio. Não me pergunte o por quê."
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -39242,7 +39263,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr "git-merge-one-file - O programa auxiliar predefinido que será utilizado com o comando git-merge-index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -39266,7 +39287,7 @@ msgstr "git-mergetool{litdd}lib(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr "git-mergetool--lib - Scriptlets do shell, ferramentas de mesclagem comuns do Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -39368,7 +39389,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "git-mergetool - Execute ferramentas para a resolução de problemas quando houver conflitos de mesclagem"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -39518,7 +39539,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "git-merge-tree - Realiza a mesclagem sem tocar no índice ou na árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -40052,7 +40073,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge - Une dois ou mais históricos de desenvolvimento"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -40630,7 +40651,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "git-mktag - Cria um objeto tag com validação extra"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -40732,7 +40753,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-mktree - Constrói um objeto árvore a partir do texto formatado em ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -40780,7 +40801,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - Move ou renomeia um arquivo, um diretório ou um link simbólico"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -40862,7 +40883,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr "git-name-rev - Encontre os nomes simbólicos para determinadas \"revs\""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -41044,7 +41065,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr "git-notes - Adiciona ou inspeciona as anotações dos objeto"
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 #| msgid ""
@@ -41623,7 +41644,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-p4 - Importe e envie para os repositórios Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -43197,7 +43218,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr "git-pack-objects - Crie um arquivo compactado dos objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -43819,7 +43840,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr "git-pack-redundant - Encontre os arquivos dos pacotes redundantes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -43897,7 +43918,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "git-pack-refs - Embale os cabeçalhos e a tags do pacote para acesso eficiente ao repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, fuzzy, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 #| msgid "'git pack-refs' [--all] [--no-prune] [--include <pattern>] [--exclude <pattern>]\n"
@@ -44006,7 +44027,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr "git-patch-id - Calcula o ID exclusivo de um patch"
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -44120,7 +44141,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr "git-prune-packed - Remove os objetos extras que já estão nos pacotes dos arquivos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -44180,7 +44201,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-prune - Remove todos os objetos inacessíveis do banco de dados de objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -44288,7 +44309,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull - Busque e integre-se a outro repositório ou num ramo local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -44454,7 +44475,7 @@ msgstr "Quando `interactive` (interativo) , ative o modo interativo da reconstru
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr "Consulte `pull.rebase`, `branch.<nome>.rebase` e `branch.autoSetupRebase` no linkgit:git-config[1] caso queira fazer o `git pull`, sempre utilize o comando `--rebase` em vez de mesclar ."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -44466,7 +44487,7 @@ msgstr "Este é um modo de operação potencialmente _perigoso_. Ele reescreve o
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -44630,7 +44651,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push - Atualiza as refs remotas junto com os objetos associados a ela"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -45615,7 +45636,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr "git-quiltimport - Aplica um conjunto de patches no ramo atual"
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -45709,7 +45730,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "git-range-diff - Compara os dois intervalos de um commit (as duas versões de um ramo por exemplo)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -46171,7 +46192,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr "git-read-tree - Lê as informações da árvore no índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -46828,7 +46849,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase - Reaplique os commits em cima do topo de outra base"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, fuzzy, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 #| msgid ""
@@ -46874,25 +46895,25 @@ msgstr "Todas as alterações feitas por commits no ramo atual, mas que não est
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr "O ramo atual é redefinido para `<upstream>` ou `<newbase>` caso a opção `--onto` tenha sido usada. Isso tem exatamente o mesmo efeito que `git reset --hard <upstream>` (ou `<newbase>`). O `ORIG_HEAD` é definido para apontar para o cume do ramo antes da reinicialização."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr "Não é garantido que `ORIG_HEAD` ainda aponte para o cume de uma ramificação anterior no final do \"rebase\" caso os outros comandos que escrevem essa pseudo-ref (`git reset` por exemplo) sejam usados durante o \"rebase\". O cume da ramificação anterior, no entanto, é acessível usando o \"reflog\" da ramificação atual (ou seja, `@{1}`, consulte linkgit:gitrevisions[7])."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr "Os commits que foram salvos anteriormente na área temporária são reaplicadas no ramo atual, uma por uma e em ordem. Observe que quaisquer commits no `HEAD` que introduzam as mesmas alterações textuais que um commit no `HEAD..<upstream>` são omitidas (ou seja, um patch já aceito na inicial com uma mensagem de commit ou carimbo de data e hora diferente, serão ignorados)."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr "É possível que uma falha na mesclagem impeça que este processo seja totalmente automático. Você terá que resolver qualquer falha na mesclagem e executar o comando `git rebase --continue`. Outra opção é ignorar o commit que causou a falha na mesclagem com comando `git rebase --skip`. Para verificar o `<ramo>` original e remover os arquivos de trabalho `.git/rebase-apply`, use o comando `git rebase --abort`."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -48902,7 +48923,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr "git-receive-pack - Recebe o que for impulsionado para o repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -49361,7 +49382,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr "git-reflog - Gerencie informações do reflog"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 #| msgid ""
@@ -49570,7 +49591,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr "git-remote-ext - Ponte de transporte inteligente para um comando externo."
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -49894,7 +49915,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr "git-remote - Gerencie o conjunto dos repositórios monitorados"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -50339,7 +50360,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr "git-repack - Empacota os objetos descompactados num repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -50628,7 +50649,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "git-replace - Crie, liste, exclua as refs para substituir os objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -50905,7 +50926,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr "git-request-pull - Gera um resumo das alterações que ainda estão pendentes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -51037,7 +51058,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "git-rerere - Reutilize a resolução registrada das mesclagens conflitantes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -51055,7 +51076,7 @@ msgstr "Em um fluxo de trabalho que utiliza ramificações do tópico com vida 
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr "Este comando auxilia o desenvolvedor neste processo, registrando os resultados conflitantes do \"automerge\" e os resultados correspondentes da resolução manual na mesclagem manual inicial e aplicando as resoluções práticas gravadas anteriormente aos resultados correspondentes do \"automerge\"."
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -51357,7 +51378,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset - Redefine o `HEAD` atual para a condição usada"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -52225,7 +52246,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "git-restore - Restaura os arquivos das árvores de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -52491,7 +52512,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr "git-revert - Reverte alguns commits existentes"
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -52627,7 +52648,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "git-rev-list - Lista os objetos commits em ordem reversa cronologicamente"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -52805,7 +52826,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr "git-rev-parse - Escolha e trabalhe os parâmetros"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 #| msgid "'git rev-parse' [<options>] <args>...\n"
@@ -53855,7 +53876,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - Remove os arquivos da árvore de trabalho e do índice"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -54095,7 +54116,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr "git-send-email - Envia uma coleção de patches como e-mails"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 #| msgid ""
@@ -55134,7 +55155,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "git-send-pack - Impulsiona (push) os objetos através do protocolo Git para um outro repositório"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -55288,7 +55309,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "git-shell - Shell de login restrito para acesso SSH, apenas para o Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -55464,7 +55485,7 @@ msgstr "git-sh-i18n{litdd}envsubst(1)"
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr "git-sh-i18n--envsubst - O próprio envsubst(1) do Git para fallbacks do i18n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -55512,7 +55533,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr "git-sh-i18n - Código de configuração i18n para os scripts shell"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -55560,7 +55581,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr "git-shortlog - Resume a saída do comando 'git log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -55756,7 +55777,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr "git-show-branch - Exibe as ramificações e o seus commits"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -56083,7 +56104,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr "git-show-index - Exibe o índice do arquivo empacotado"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -56143,7 +56164,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr "git-show-ref - Liste as referências no repositório local"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 #| msgid ""
@@ -56508,7 +56529,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr "git-show - Exibe vários tipos de objetos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -56647,7 +56668,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr "git-sh-setup - Código de configuração do shell script comum ao Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -56821,7 +56842,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - Adicione o conteúdo do arquivo na área de preparação"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -56845,7 +56866,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - Guarda as alterações em um outro diretório de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -57439,7 +57460,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr "git-status - Exibe o a condição da árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -58342,7 +58363,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr "git-stripspace - Remove os espaços desnecessários"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -58524,7 +58545,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr "git-submodule - Inicialize, atualize ou inspecione os submódulos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -59204,7 +59225,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "git-svn - Operação bidirecional entre um repositório do Subversion e o Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -59432,7 +59453,7 @@ msgstr "'fetch'"
 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 "Obtém revisões não lançadas do Subversion remoto que estamos rastreando. O nome da seção [svn-remote \"...\"] no arquivo `$GIT_DIR/config` pode ser especificado como um argumento opcional na linha de comando."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -59474,31 +59495,31 @@ msgstr "Busque apenas do parente do SVN do HEAD atual."
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr "Ignore as refs para as ramificações ou as tags coincidentes com a expressão regular Perl. Uma \"declaração negativa de antecipação\" como `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` Pode ser utilizada para permitir apenas determinadas referências."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr "config key: svn-remote.<nome>.ignore-refs\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr "Caso a chave de configuração 'ignore-refs' estiver definida e a opção da linha de comandos também for utilizada, ambas as expressões regulares serão utilizadas."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr "Esta permite especificar uma expressão regular Perl que fará com que todos os caminhos correspondentes sejam ignorados no 'checkout' do SVN. A opção `--ignore-paths` deve corresponder a cada 'fetch' (incluindo fetchs automáticos por causa dos comandos 'clone', 'dcommit', 'rebase', etc.) num determinado repositório."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr "config key: svn-remote.<nome>.ignore-paths\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -59534,7 +59555,7 @@ msgstr "--ignore-paths=\"^[^/]+/(?:branches|tags)\"\n"
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr "Esta permite especificar uma expressão regular Perl que causará a inclusão apenas dos caminhos correspondentes do 'checkout' do SVN. A opção `--include-paths` deve corresponder a cada 'fetch' (incluindo fetchs automáticos por causa dos comandos 'clone', 'dcommit', 'rebase', etc.) num determinado repositório. A opção `--ignore-paths` tem precedência sobre o a opção `--include-paths`."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -59546,7 +59567,7 @@ msgstr "config key: svn-remote.<nome>.include-paths\n"
 msgid "--log-window-size=<n>"
 msgstr "--log-window-size=<n>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -59558,7 +59579,7 @@ msgstr "Obtenha `<n>` entradas de registro por solicitação ao examinar o hist
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -59570,7 +59591,7 @@ msgstr "Executa o 'init' e o 'fetch'. Ele criará automaticamente um diretório
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -59582,7 +59603,7 @@ msgstr "Crie um arquivo de espaço reservado no repositório local do Git para c
 msgid "--placeholder-filename=<filename>"
 msgstr "--placeholder-filename=<nome-do-arquivo>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -59594,31 +59615,31 @@ msgstr "Defina o nome dos arquivos no espaço reservado criados pela opção `--
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr "Busca as revisões do pai SVN do HEAD atual e reconstrói o atual (não comprometido com o SVN) contra ele."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr "Funciona da mesma maneira que o comando `svn update` ou o 'git pull', exceto que preserva o histórico linear com o comando 'git rebase' em vez do 'git merge' para facilitar a comunicação com comando 'git svn'."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr "Este aceita todas as opções que o comando 'git svn fetch' e o comando 'git rebase' aceitam. No entanto, o `--fetch-all` obtém apenas as definições do [svn-remote] atual, e não todas as definições do [svn-remote]."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr "Como 'git rebase'; isso requer que a árvore de trabalho esteja limpa e não tenha alterações em commits não realizados."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -59630,25 +59651,25 @@ msgstr "Não busque remotamente; execute apenas o comando 'git rebase' no últim
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr "Faça o commit de cada diff do ramo atual diretamente no repositório SVN e, em seguida, faça o 'rebase' ou 'reset' (dependendo se há ou não um diff entre o SVN e o `HEAD`). Esta ação criará uma revisão no SVN para cada commit no Git."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr "Quando um nome do ramo do Git for opcional (ou um nome de objeto de commit do Git) é especificado como um argumento, o subcomando funciona no ramo especificado, não no ramo atual."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr "A utilização do 'dcommit' é o preferido para o 'set-tree' (abaixo)."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -59660,13 +59681,13 @@ msgstr "Após fazer o commit, não reconstrua ou redefina."
 msgid "--commit-url <URL>"
 msgstr "--commit-url <URL>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr "Faça o commit para esta URL do SVN (o caminho completo). Esta é a intenção de permitir que os repositórios 'git svn' existentes criados com um método de transporte (`svn://` ou `http://` para leitura anônima por exemplo) sejam reutilizados se um usuário receber posteriormente acesso a um método de transporte alternativo (`svn+ssh://` ou `https://` por exemplo) para commit."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -59676,13 +59697,13 @@ msgstr ""
 "config key: svn-remote.<nome>.commiturl\n"
 "config key: svn.commiturl (sobrescreve todas as opções svn-remote.<nome>.commiturl)\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr "Observe que a URL do SVN da chave de configuração 'commiturl' inclui a ramificação do SVN. Caso queira definir a URL do commit para um repositório SVN inteiro, use `svn-remote.<nome>.pushurl`."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -59694,31 +59715,31 @@ msgstr "O uso desta opção para qualquer outra finalidade (não pergunte) é ve
 msgid "--mergeinfo=<mergeinfo>"
 msgstr "--mergeinfo=<mergeinfo>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr "Adicione as informações da mesclagem informadas durante o 'dcommit' (por exemplo, `--mergeinfo=\"/branches/foo:1-10\"`). Todas as versões do servidor svn podem armazenar estas informações (como uma propriedade) e a partir da versão 1.5 os clientes svn também podem usá-las. Para definir as informações da mesclagem das várias ramificações, utilize um caractere de espaço simples entre as ramificações (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr "config key: svn.pushmergeinfo\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr "Esta opção fará com que o 'git-svn' tente preencher automaticamente a propriedade do 'svn:mergeinfo' no repositório SVN, quando for possível. Atualmente, isso só pode ser feito quando 'dcommitting' as mesclagens de avanço não rápido onde todos os pais, exceto o primeiro, já tenha sido inseridos no SVN."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr "Peça ao usuário para confirmar que um conjunto de correções deve realmente ser enviado ao SVN. Para cada correção, é possível responder \"yes\" (aceitar esta correção), \"no\" (descartar esta correção), \"all\" (aceitar todas as correções) ou \"quit\"."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -59730,7 +59751,7 @@ msgstr "O comando 'git svn dcommit' retorna imediatamente caso a resposta seja \
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -59742,7 +59763,7 @@ msgstr "Crie um ramo no repositório SVN."
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -59754,7 +59775,7 @@ msgstr "Permite definir a mensagem do commit."
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -59772,19 +59793,19 @@ msgstr "-d<caminho>"
 msgid "--destination=<path>"
 msgstr "--destination=<caminho>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr "Se mais de uma opção `--branches` (ou `--tags`) tiver sido dada ao comando 'init' ou 'clone', você deverá fornecer o local do ramo (ou a etiqueta) que deseja criar no repositório SVN. O `<caminho>` define o caminho que será usado para criar a ramificação ou a etiqueta, deve corresponder ao padrão no lado esquerdo de uma das ramificações ou etiquetas configuradas 'refspecs'. Você pode ver estas 'refspecs' com os comandos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr "git config --get-all svn-remote.<nome>.branches git config --get-all svn-remote.<nome>.tags"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -59796,7 +59817,7 @@ msgstr "onde <nome> é o nome do repositório SVN, conforme definido pela opçã
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -59808,13 +59829,13 @@ msgstr "Especifique o nome de usuário do SVN para realizar o commit. Esta opç
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr "Use a URL especificado para se conectar ao repositório de destino do Subversion. Esta é uma opção útil nos casos onde o repositório SVN de origem seja somente leitura. Esta opção substitui a propriedade de configuração 'commiturl'."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -59826,7 +59847,7 @@ msgstr "git config --get-all svn-remote.<nome>.commiturl"
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -59838,7 +59859,7 @@ msgstr "Crie diretórios parentes. Este parâmetro é equivalente a `--parents`
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -59850,13 +59871,13 @@ msgstr "Crie uma tag no repositório SVN. Esta é uma abreviação para 'branch
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr "Isso deve facilitar a consulta das mensagens 'svn log' quando os usuários svn se referem ao `-r/--revision numbers`."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -59874,13 +59895,13 @@ msgstr "-r <n>[:<n>]"
 msgid "--revision=<n>[:<n>]"
 msgstr "--revision=<n>[:<n>]"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr "é compatível, argumentos não numéricos não são: `HEAD`, `NEXT`, `BASE`, `PREV`, etc ..."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -59892,19 +59913,19 @@ msgstr "não é completamente compatível com a saída `--verbose` no 'svn log',
 msgid "--limit=<n>"
 msgstr "--limit=<n>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr "NÃO é o mesmo que a opção `--max-count`, não conta os commits que foram mesclados/excluídos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr "compatível"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -59916,7 +59937,7 @@ msgstr "Novos recursos:"
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -59928,19 +59949,19 @@ msgstr "exiba o SHA1 do commit do Git, também"
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr "a nossa versão do `--pretty=oneline`"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr "O próprio SVN armazena apenas os horários em UTC e mais nada. O cliente svn comum converte a hora UTC em hora local (ou com base no ambiente 'TZ='). Este comando tem o mesmo comportamento."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -59952,7 +59973,7 @@ msgstr "Quaisquer outros argumentos são passados diretamente para o comando 'gi
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -59964,7 +59985,7 @@ msgstr "Exiba quais foram as últimas modificações feitas em cada linha de um
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -59976,7 +59997,7 @@ msgstr "Gere a saída no mesmo formato que o comando 'git blame', porém com nú
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -59994,7 +60015,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -60006,7 +60027,7 @@ msgstr "Não exija uma coincidência exata caso receba uma revisão SVN; em vez
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -60018,7 +60039,7 @@ msgstr "Não exija uma coincidência exata caso receba uma revisão SVN; caso n
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -60030,7 +60051,7 @@ msgstr "Você deve considerar o uso de 'dcommit' em vez de esta. Comprometer o c
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, fuzzy, placeholders:'.gitignore':'--revision', priority:100
 #| msgid "Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -60043,7 +60064,7 @@ msgstr "Localiza de forma recursiva a propriedade 'svn:ignore' nos diretórios e
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, fuzzy, placeholders:'$GIT_DIR/info/exclude', priority:100
 #| msgid "Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -60056,7 +60077,7 @@ msgstr "Localiza e lista recursivamente a propriedade 'svn:ignore' nos diretóri
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -60068,19 +60089,19 @@ msgstr "Tenta recriar diretórios vazios que o núcleo do Git não pode rastrear
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr "Faz o commit da diferença de dois argumentos em forma de árvore a partir da linha de comando. Este comando não depende de estar num repositório `git svn init`. Este comando recebe três argumentos: (a) a árvore original a ser comparada com o diff, (b) o resultado da nova árvore, (c) o URL do repositório Subversion de destino. O argumento final (URL) pode ser omitido se você estiver trabalhando num repositório que reconhece o comando `git svn` (que foi `iniciado` com o comando `git svn`). A opção -r<revisão> é necessária para isso."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr "A mensagem do commit é informada diretamente com a opção `-m` ou `-F`, ou indiretamente da tag ou commit quando a segunda 'tree-ish' denota este objeto ou é solicitada pela chamada de um editor (consulte a opção `--edit` abaixo)."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -60098,7 +60119,7 @@ msgstr "-F <nome-do-arquivo>"
 msgid "--file=<filename>"
 msgstr "--file=<nome-do-arquivo>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -60110,7 +60131,7 @@ msgstr "Pega a mensagem de commit vindo de um determinado arquivo. This option d
 msgid "'info'"
 msgstr "'info'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -60122,7 +60143,7 @@ msgstr "Mostra informações sobre um arquivo ou diretório semelhantes às forn
 msgid "'proplist'"
 msgstr "'proplist'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -60134,7 +60155,7 @@ msgstr "Lista as propriedades armazenadas no repositório do Subversion sobre um
 msgid "'propget'"
 msgstr "'propget'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -60146,7 +60167,7 @@ msgstr "Obtém a propriedade do Subversion fornecida como o primeiro argumento,
 msgid "'propset'"
 msgstr "'propset'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -60248,7 +60269,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr "Corrija o problema de ignorar os caminhos ou as permissões do SVN que fez com que o \"r2\" ficasse incompleto em primeiro lugar. Então:"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -60276,7 +60297,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr "Em seguida, corrija o 'master' usando o comando `git rebase`. NÃO use o comando `git merge` ou seu histórico não será compatível com 'dcommit' no futuro!"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -60366,7 +60387,7 @@ msgstr "Lê uma lista de commits do stdin e faz os commit na ordem inversa. Apen
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -60378,19 +60399,19 @@ msgstr "Utilizado apenas com os comandos 'dcommit', 'set-tree' e 'commit-diff'."
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr "Remover diretórios da árvore SVN se não houver arquivos deixados para trás. O SVN pode \"versionar\" os diretórios vazios, e eles não são removidos por padrão se não houver arquivos neles. O Git não pode \"versionar\" diretórios vazios. A ativação desta opção fará com que o commit no SVN funcione igual ao Git."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr "config key: svn.rmdir\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr "Edite a mensagem do commit antes de fazer o commit no SVN. Isso é desativado por padrão para objetos que são commits e a sua ativação é imposta ao fazer os commits de objetos na árvore."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -60408,13 +60429,13 @@ msgstr "-l<num>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr "Ambos são repassados diretamente para 'git diff-tree'; para mais informações consulte linkgit:git-diff-tree[1]."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -60436,7 +60457,7 @@ msgstr "-A<nome-do-arquivo>"
 msgid "--authors-file=<filename>"
 msgstr "--authors-file=<nome-do-arquivo>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -60454,7 +60475,7 @@ msgstr "\tloginname = Joe User <user@example.com>\n"
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr "Se essa opção for especificada e o comando `git svn` encontrar um nome de quem fez o commit SVN que não exista no arquivo de autores, o comando `git svn` interromperá a operação. O usuário terá que adicionar a entrada apropriada. A operação será continuada ao executar novamente o comando `git svn` anterior após a alteração do arquivo dos autores."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -60466,25 +60487,25 @@ msgstr "config key: svn.authorsfile\n"
 msgid "--authors-prog=<filename>"
 msgstr "--authors-prog=<nome-do-arquivo>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr "Caso esta opção seja usada, para cada nome de committer do SVN que não existir no arquivo dos autores, o arquivo informado será executado com o nome de quem fez o commit como o primeiro argumento. Espera-se que o programa retorne uma única linha com o formato 'Nome <email>' ou 'Nome <>', que será tratada como se estivesse incluída no arquivo dos autores."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr "Devido a razões históricas, um 'nome do arquivo' relativo é o primeiro pesquisado em relação ao diretório atual através do 'init' e 'clone' em relação à raiz da árvore de trabalho para uma 'busca'. Caso o 'filename' não seja encontrado, ele será pesquisado como qualquer outro comando no '$PATH'."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr "config key: svn.authorsProg\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -60496,37 +60517,37 @@ msgstr "Torne 'git svn' menos loquaz. Defina uma segunda vez para torná-lo aind
 msgid "-s<strategy>"
 msgstr "-s<estratégia>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr "Estes são usados apenas com os comandos 'dcommit' e 'rebase'."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr "Passado diretamente para o comando 'git rebase' ao utilizar o 'dcommit' caso um 'git reset' não puder ser utilizado (consulte 'dcommit')."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr "Isso pode ser usado com os comandos 'dcommit', 'rebase', 'branch' e 'tag'."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr "Para o 'dcommit', imprima a série de opções Git que exibiriam quais os \"diffs\" seriam feitos os commits para o SVN."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr "Para 'rebase', exiba o ramo local associado ao repositório 'svn upstream' associado à ramificação atual e a URL do repositório svn que será buscado."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -60538,13 +60559,13 @@ msgstr "Para 'ramo' e 'tag', exiba as URLs que serão utilizados para copiar dur
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr "Ao recuperar commits svn no Git (como parte das operações 'fetch', 'rebase' ou 'dcommit'), procure pela primeira linha `From:` ou `Signed-off-by` na mensagem do registro log e use-a como texto do autor."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -60556,13 +60577,13 @@ msgstr "config key: svn.useLogAuthor\n"
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr "Ao fazer o commit do Git para o svn (como parte das operações 'set-tree' ou 'dcommit'), se a mensagem de registro existente ainda não tiver um trailer `From:` ou `Signed-off-by`, acrescente uma linha `From:` com base na string de autor do commit do Git. Se você usar isso, então a opção `--use-log-author` recuperará uma string válida do autor para todos os commits."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -60622,7 +60643,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr "Essa opção só é relevante se estivermos rastreando ramificações (usando uma das opções de layout do repositório `--trunk`, `--tags`, `--branches`, `--stdlayout`). Para cada ramificação rastreada, tente descobrir de onde a sua revisão foi copiada e defina um ramo principal adequado no primeiro commit do Git para a ramificação. Isso é especialmente útil quando estamos rastreando um diretório que foi movido dentro do repositório. Se este recurso estiver desativado, as ramificações criadas pelo comando `git svn` serão todas lineares e não compartilharão nenhum histórico, o que significa que não haverá informações sobre onde as ramificações foram divididas ou mescladas. No entanto, seguir históricos longos/convolutos pode levar muito tempo, portanto, a desativação deste recurso pode acelerar o processo de clonagem. Esse recurso é ativado por padrão; use a opção `--no-follow-parent` para desativá-lo."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -61263,7 +61284,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr "git-switch - Alterna entre ramos"
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -61583,7 +61604,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr "git-symbolic-ref - Lê, altera e exclui refs simbólicas"
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -61685,7 +61706,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag - Crie, liste, exclua or verifique um objeto tag assinado com GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 #| msgid ""
@@ -62257,7 +62278,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - o monitor estúpido de conteúdo"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 #| msgid ""
@@ -64272,7 +64293,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr "git-unpack-file - Cria um arquivo temporário com o conteúdo de uma bolha"
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -64308,7 +64329,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr "git-unpack-objects - Descompacte os objetos de um arquivo compactado"
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -64368,7 +64389,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr "git-update-index - Registra o conteúdo do arquivo no índice da árvore de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 #| msgid ""
@@ -65344,7 +65365,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr "git-update-ref - Atualize o nome do objeto armazenado em uma \"ref\" com segurança"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, fuzzy, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 #| msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
@@ -65716,7 +65737,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr "git-update-server-info - Atualize o arquivo de informações auxiliares para ajudar os servidores burros"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -65764,7 +65785,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr "git-upload-archive - Envia um arquivo de volta para o git-archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -65836,7 +65857,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr "git-upload-pack - Envia os objetos compactados de volta para o git-fetch-pack"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -65948,7 +65969,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr "git-var - Exibe a variável lógica do Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -66147,7 +66168,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr "git-verify-commit - Verifique a assinatura GPG dos commits"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -66189,7 +66210,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr "git-verify-pack - Valide os arquivos compactados do Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -66279,7 +66300,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr "git-verify-tag - Verifique a assinatura GPG das tags"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -66321,7 +66342,7 @@ msgstr "git-web{litdd}browse(1)"
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr "git-web--browse - Script assistente do Git para iniciar um navegador da web"
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -66600,7 +66621,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "git-whatchanged - Exibe os registros logs com as diferenças que cada commit introduz"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -66660,7 +66681,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr "git-worktree - Gerencie as várias árvores de trabalho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -67421,7 +67442,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr "git-write-tree - Crie um objeto árvore do índice atual"
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -71567,13 +71588,13 @@ msgstr "Ao contrário quando impulsionamos com o linkgit:git-push[1], não exist
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr "Assim como impulsionar com linkgit:git-push[1], todas as regras descritas acima sobre o que não é permitido como uma atualização pode ser sobrescrito ao adicionar um caractere opcional no \"refspec\" começando com `+` (ou ao utilizar a opção `--force` na linha de comando). A única exceção a isso é que nenhuma quantidade de imposição fará com que o espaço de nomes `refs/heads/*` aceite um objeto que não seja um commit."
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr "Quando o ramo remoto que você deseja obter com 'fetch' for conhecido por ser rebobinado ter feito um 'rebase' regularmente, espera-se que o novo cume não seja descendente do cume anterior (conforme foi armazenado no último 'fetch' que você fez no ramo rastreado remotamente). Você deve usar o sinal `+` para indicar que serão necessárias atualizações que não sejam de avanço rápido para estas ramificações. Não há nenhuma maneira de determinar ou declarar que um ramo será disponibilizado num repositório com este comportamento; o usuário que o extrai simplesmente deve saber que esse é o padrão de uso esperado para um ramo."
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -74932,7 +74953,7 @@ msgstr "onde <endereço> pode ser um caminho, um servidor e um caminho ou uma se
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Se houver um grande número de repositórios remotos com nomes semelhantes e caso queira usar um formato diferente para eles (de modo que as URLs utilizadas sejam reescritas nas URLs que funcionam), você poderá criar uma seção de configuração da opção:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -74945,7 +74966,7 @@ msgstr ""
 "\t[url \"<url-da-base-atual>\"]\n"
 "\t\tinsteadOf = <url-da-outra-base>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -74975,7 +74996,7 @@ msgstr "uma URL como \"work:repo.git\" ou como \"host.xz:/caminho/para/o/reposit
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Caso queira reescrever apenas as URLs para envio por \"push\" (impulsionamento), é possível criar uma seção de configuração da opção:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 9acd208d..54263fc0 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2020-02-08 19:43+0100\n"
 "Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
 "Language-Team: pt_PT\n"
@@ -4764,49 +4764,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4818,7 +4829,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4915,91 +4926,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7765,7 +7780,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8516,7 +8531,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9144,7 +9159,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9174,7 +9189,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9657,7 +9672,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9821,7 +9836,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10271,7 +10286,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11058,7 +11073,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11465,7 +11480,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11495,7 +11510,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12223,7 +12238,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12391,7 +12406,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12934,7 +12949,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13671,7 +13686,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13930,7 +13945,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14118,7 +14133,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14185,7 +14200,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14473,7 +14488,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15399,7 +15414,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15597,7 +15612,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16007,7 +16022,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16220,7 +16235,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16250,7 +16265,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16458,7 +16473,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17093,7 +17108,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17252,7 +17267,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17423,7 +17438,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18254,7 +18269,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19541,7 +19556,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19638,7 +19653,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20363,7 +20378,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20546,7 +20561,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20973,7 +20988,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20981,25 +20996,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21710,7 +21725,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22282,7 +22297,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22577,7 +22592,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22649,7 +22664,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22838,7 +22853,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23084,7 +23099,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23243,10 +23258,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23669,7 +23690,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24070,7 +24091,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26430,7 +26451,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26626,7 +26647,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27107,7 +27128,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27966,7 +27987,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28097,7 +28118,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29021,7 +29042,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30336,7 +30357,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30360,7 +30381,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30658,7 +30679,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30886,7 +30907,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30916,7 +30937,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31645,7 +31666,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31861,7 +31882,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31954,7 +31975,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32377,7 +32398,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32828,7 +32849,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32948,7 +32969,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33098,7 +33119,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33209,13 +33230,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33232,31 +33253,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33301,7 +33322,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33532,7 +33553,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33556,7 +33577,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33874,7 +33895,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34033,7 +34054,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34875,7 +34896,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35217,7 +35238,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35898,7 +35919,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36107,7 +36128,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36332,7 +36353,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36527,7 +36548,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36649,7 +36670,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37001,7 +37022,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37189,7 +37210,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37243,7 +37264,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37296,7 +37317,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37320,7 +37341,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37423,7 +37444,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37573,7 +37594,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38083,7 +38104,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38609,7 +38630,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38705,7 +38726,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38753,7 +38774,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38833,7 +38854,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39002,7 +39023,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39545,7 +39566,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41090,7 +41111,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41698,7 +41719,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41776,7 +41797,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41885,7 +41906,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41999,7 +42020,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42059,7 +42080,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42167,7 +42188,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42325,7 +42346,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42337,7 +42358,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42497,7 +42518,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43454,7 +43475,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43546,7 +43567,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43967,7 +43988,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44577,7 +44598,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44612,25 +44633,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46521,7 +46542,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46956,7 +46977,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47150,7 +47171,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47474,7 +47495,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47875,7 +47896,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48165,7 +48186,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48437,7 +48458,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48569,7 +48590,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48587,7 +48608,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48858,7 +48879,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49610,7 +49631,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49869,7 +49890,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50003,7 +50024,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50165,7 +50186,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51185,7 +51206,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51422,7 +51443,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52423,7 +52444,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52572,7 +52593,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52726,7 +52747,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52768,7 +52789,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52816,7 +52837,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53011,7 +53032,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53312,7 +53333,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53372,7 +53393,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53696,7 +53717,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53834,7 +53855,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54008,7 +54029,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54032,7 +54053,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54566,7 +54587,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55384,7 +55405,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55538,7 +55559,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56204,7 +56225,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56434,7 +56455,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56476,31 +56497,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56536,7 +56557,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56548,7 +56569,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56560,7 +56581,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56572,7 +56593,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56584,7 +56605,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56596,31 +56617,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56632,25 +56653,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56662,13 +56683,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56676,13 +56697,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56694,31 +56715,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56730,7 +56751,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56742,7 +56763,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56754,7 +56775,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56772,19 +56793,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56796,7 +56817,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56808,13 +56829,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56826,7 +56847,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56838,7 +56859,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56850,13 +56871,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56874,13 +56895,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56892,19 +56913,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56916,7 +56937,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56928,19 +56949,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56952,7 +56973,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56964,7 +56985,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56976,7 +56997,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56994,7 +57015,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57006,7 +57027,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57018,7 +57039,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57030,7 +57051,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57042,7 +57063,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57054,7 +57075,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57066,19 +57087,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57096,7 +57117,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57108,7 +57129,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57120,7 +57141,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57132,7 +57153,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57144,7 +57165,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57243,7 +57264,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57266,7 +57287,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57354,7 +57375,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57366,19 +57387,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57396,13 +57417,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57422,7 +57443,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57440,7 +57461,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57452,25 +57473,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57482,37 +57503,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57524,13 +57545,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57542,13 +57563,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57609,7 +57630,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58164,7 +58185,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58465,7 +58486,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58564,7 +58585,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59111,7 +59132,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61101,7 +61122,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61134,7 +61155,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61194,7 +61215,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62111,7 +62132,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62432,7 +62453,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62480,7 +62501,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62553,7 +62574,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62663,7 +62684,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62857,7 +62878,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62899,7 +62920,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62989,7 +63010,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63031,7 +63052,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63305,7 +63326,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63365,7 +63386,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64068,7 +64089,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68197,13 +68218,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71379,7 +71400,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71387,7 +71408,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71414,7 +71435,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.ro.po b/po/documentation.ro.po
index dd670492..f768cdbc 100644
--- a/po/documentation.ro.po
+++ b/po/documentation.ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-12-22 14:44+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4817,9 +4817,9 @@ msgstr "Atunci când este vorba de redenumire/copiere, `fișier1` și `fișier2`
 msgid "It is followed by one or more extended header lines:"
 msgstr "Acesta este urmat de una sau mai multe linii de antet extinse:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4832,7 +4832,18 @@ msgstr "Acesta este urmat de una sau mai multe linii de antet extinse:"
 #| "similarity index <number>\n"
 #| "dissimilarity index <number>\n"
 #| "index <hash>..<hash> <mode>\n"
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 "modul vechi <modul>\n"
 "modul nou <modul>\n"
@@ -4846,47 +4857,47 @@ msgstr ""
 "indice de disimilaritate <număr>\n"
 "index <hash>..<hash> <mode>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, fuzzy, priority:280
 #| msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "Modurile de fișier sunt tipărite ca numere octale din 6 cifre, inclusiv tipul de fișier și biții de permisiune ai fișierului."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "Numele căilor de acces din antetele extinse nu includ prefixele `a/` și `b/`."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, fuzzy, priority:280
 #| msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines.  It is a rounded down integer, followed by a percent sign.  The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "Indicele de similaritate reprezintă procentul de linii neschimbate, iar indicele de disimilaritate reprezintă procentul de linii modificate. Este un număr întreg rotunjit în jos, urmat de un semn de procent. Astfel, indicele de similitudine de 100% este rezervat pentru două fișiere egale, în timp ce o valoare de disimilaritate de 100% înseamnă că nicio linie din vechiul fișier nu a fost inclusă în cel nou."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, fuzzy, priority:280
 #| msgid "The index line includes the blob object names before and after the change.  The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "Linia indexului include numele obiectelor blob înainte și după modificare. <mode> este inclus dacă modul de fișier nu se schimbă; în caz contrar, linii separate indică vechiul și noul mod."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "Numele de drum cu caractere \"neobișnuite\" sunt citate așa cum se explică pentru variabila de configurare `core.quotePath` (vezi linkgit:git-config[1])."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, fuzzy, priority:280
 #| msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit.  It is incorrect to apply each change to each file sequentially.  For example, this patch will swap a and b:"
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "Toate fișierele `file1` din ieșire se referă la fișierele dinainte de confirmare, iar toate fișierele `file2` se referă la fișierele de după confirmare. Nu este corect să se aplice fiecare modificare fiecărui fișier în mod secvențial. De exemplu, acest patch va schimba a și b:"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4904,7 +4915,7 @@ msgstr ""
 "redenumire din b\n"
 "redenumire în a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, fuzzy, placeholders:'linkgit:gitattributes[5]', priority:280
 #| msgid "Hunk headers mention the name of the function to which the hunk applies.  See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor to this to specific languages."
@@ -5029,107 +5040,111 @@ msgstr "       diff --cc fișier\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "Acesta este urmat de una sau mai multe linii de antet extinse (acest exemplu arată o fuziune cu doi ascendenți):"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "index <hash>,<hash>..<hash>\n"
 #| "mode <mode>,<mode>..<mode>\n"
 #| "new file mode <mode>\n"
 #| "deleted file mode <mode>,<mode>\n"
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 "index <hash>,<hash>..<hash>\n"
 "mode <mode>,<mode>..<mode>\n"
 "noul mod de fișier <mode>\n"
 "mod fișier șters <mode>,<mode>,<mode>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, fuzzy, priority:280
 #| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "Linia `mode <mode>,<mode>..<mode>` apare numai dacă cel puțin unul dintre <mode> este diferit de restul. Antetele extinse cu informații despre mișcările de conținut detectate (redenumiri și detectarea copierii) sunt concepute pentru a funcționa cu diff de două <tree-ish> și nu sunt utilizate de formatul diff combinat."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, fuzzy, priority:280
 #| msgid "It is followed by two-line from-file/to-file header"
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "Acesta este urmat de un antet de două rânduri de la fișier/la fișier"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/fișier"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/fișier"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, fuzzy, priority:280
 #| msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "Similar cu antetul de două linii pentru formatul tradițional \"unificat\" diff, `/dev/null` este utilizat pentru a semnala fișierele create sau șterse."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, fuzzy, placeholders:'--combined-all-paths', priority:280
 #| msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "Cu toate acestea, dacă este furnizată opțiunea --combined-all-paths, în loc de un antet de două linii from-file/to-file veți obține un antet de N+1 linii from-file/to-file, unde N este numărul de surse din comisionul de fuziune"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "Acest format extins poate fi util în cazul în care detectarea redenumirii sau a copierii este activă, pentru a vă permite să vedeți numele original al fișierului în diferiți ascendenți."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "Formatul antetului Chunk este modificat pentru a preveni ca oamenii să nu-l introducă accidental în `patch -p1`. Formatul Combined diff a fost creat pentru revizuirea modificărilor de comisionare a fuziunii și nu a fost conceput pentru a fi aplicat. Modificarea este similară cu cea din antetul extins \"index\":"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <de la-fila-range> <de la-fila-range> <de la-fila-range> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "Există (numărul de autori + 1) caractere `@` în antetul chunk pentru formatul de diferență combinat."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, fuzzy, ignore-ellipsis, priority:280
 #| 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."
 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 "Spre deosebire de formatul tradițional \"unificat\" diff, care prezintă două fișiere A și B cu o singură coloană care are prefixul `-` (minus -- apare în A, dar este eliminat în B), `+` (plus -- lipsește în A, dar este adăugat în B) sau `\"\"` (spațiu -- neschimbat), acest format compară două sau mai multe fișiere file1, file2,... cu un singur fișier X și arată în ce fel diferă X de fiecare din fileN. O coloană pentru fiecare dintre fișiereleN este adăugată la linia de ieșire pentru a nota modul în care linia lui X este diferită de aceasta."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, fuzzy, priority:280
 #| msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result.  A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "Un caracter `-` în coloana N înseamnă că linia apare în fișierulN, dar nu apare în rezultat. Un caracter `+` în coloana N înseamnă că linia apare în rezultat, iar fișierulN nu are acea linie (cu alte cuvinte, linia a fost adăugată, din punctul de vedere al ascendentului respectiv)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, fuzzy, priority:280
 #| msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "În exemplul de ieșire de mai sus, semnătura funcției a fost modificată în ambele fișiere (de aici două eliminări `-` atât din fișierul1, cât și din fișierul2, plus `++` pentru a însemna că o linie care a fost adăugată nu apare nici în fișierul1, nici în fișierul2). De asemenea, alte opt linii sunt aceleași din fișierul1, dar nu apar în fișierul2 (de unde și prefixarea cu `+`)."
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, fuzzy, placeholders:'git diff-tree':'git diff-files', priority:280
 #| msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents).  When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7942,7 +7957,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Adaugă conținutul fișierului la index"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8785,7 +8800,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9413,7 +9428,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9443,7 +9458,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9927,7 +9942,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10091,7 +10106,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10540,7 +10555,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11327,7 +11342,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11733,7 +11748,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11763,7 +11778,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12491,7 +12506,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12656,7 +12671,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13198,7 +13213,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13935,7 +13950,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14194,7 +14209,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14382,7 +14397,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14449,7 +14464,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14737,7 +14752,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15663,7 +15678,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15861,7 +15876,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16270,7 +16285,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16483,7 +16498,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16513,7 +16528,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16722,7 +16737,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Clonează un depozit într-un nou director"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17444,7 +17459,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17603,7 +17618,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17774,7 +17789,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18605,7 +18620,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19883,7 +19898,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19979,7 +19994,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20703,7 +20718,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20886,7 +20901,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21313,7 +21328,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21321,25 +21336,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22050,7 +22065,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22622,7 +22637,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22917,7 +22932,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22989,7 +23004,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -23178,7 +23193,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23424,7 +23439,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23584,10 +23599,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -24010,7 +24031,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24411,7 +24432,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26772,7 +26793,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26968,7 +26989,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27449,7 +27470,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28308,7 +28329,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28438,7 +28459,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29363,7 +29384,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30676,7 +30697,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30700,7 +30721,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30998,7 +31019,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31227,7 +31248,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31257,7 +31278,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31987,7 +32008,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32203,7 +32224,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32296,7 +32317,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32719,7 +32740,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33170,7 +33191,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33290,7 +33311,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33440,7 +33461,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33551,13 +33572,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33574,31 +33595,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33643,7 +33664,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33875,7 +33896,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, fuzzy, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33903,7 +33924,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Creează un depozit Git gol sau reinitializează unul existent"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -34249,7 +34270,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34408,7 +34429,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35251,7 +35272,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35593,7 +35614,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36270,7 +36291,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36481,7 +36502,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36706,7 +36727,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36901,7 +36922,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -37023,7 +37044,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37375,7 +37396,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37563,7 +37584,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37617,7 +37638,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, fuzzy, priority:100
 msgid "Examples:"
@@ -37670,7 +37691,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37694,7 +37715,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37796,7 +37817,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37946,7 +37967,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38455,7 +38476,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38981,7 +39002,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -39077,7 +39098,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39125,7 +39146,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -39205,7 +39226,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39374,7 +39395,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39917,7 +39938,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41461,7 +41482,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42069,7 +42090,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42147,7 +42168,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42256,7 +42277,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42370,7 +42391,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42430,7 +42451,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42538,7 +42559,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42696,7 +42717,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42708,7 +42729,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42868,7 +42889,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43825,7 +43846,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43917,7 +43938,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44337,7 +44358,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44947,7 +44968,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44982,25 +45003,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46889,7 +46910,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47324,7 +47345,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47518,7 +47539,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47842,7 +47863,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48244,7 +48265,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48532,7 +48553,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48803,7 +48824,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48935,7 +48956,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48953,7 +48974,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49224,7 +49245,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49976,7 +49997,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50235,7 +50256,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50369,7 +50390,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50530,7 +50551,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51551,7 +51572,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51790,7 +51811,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52791,7 +52812,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52940,7 +52961,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53094,7 +53115,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53136,7 +53157,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53184,7 +53205,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53378,7 +53399,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53679,7 +53700,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53740,7 +53761,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54065,7 +54086,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54203,7 +54224,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54377,7 +54398,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54401,7 +54422,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54935,7 +54956,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55753,7 +55774,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55907,7 +55928,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56579,7 +56600,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56809,7 +56830,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56851,31 +56872,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56911,7 +56932,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56923,7 +56944,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56935,7 +56956,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56947,7 +56968,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56959,7 +56980,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56971,31 +56992,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -57007,25 +57028,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -57037,13 +57058,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57051,13 +57072,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57069,31 +57090,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57105,7 +57126,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57117,7 +57138,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -57129,7 +57150,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57147,19 +57168,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57171,7 +57192,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57183,13 +57204,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57201,7 +57222,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57213,7 +57234,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57225,13 +57246,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57249,13 +57270,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57267,19 +57288,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57291,7 +57312,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57303,19 +57324,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57327,7 +57348,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57339,7 +57360,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57351,7 +57372,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57369,7 +57390,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57381,7 +57402,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57393,7 +57414,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57405,7 +57426,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57417,7 +57438,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57429,7 +57450,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57441,19 +57462,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57471,7 +57492,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57483,7 +57504,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57495,7 +57516,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57507,7 +57528,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57519,7 +57540,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57618,7 +57639,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57641,7 +57662,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57728,7 +57749,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57740,19 +57761,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57770,13 +57791,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57796,7 +57817,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57814,7 +57835,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57826,25 +57847,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57856,37 +57877,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57898,13 +57919,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57916,13 +57937,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57983,7 +58004,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58538,7 +58559,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58839,7 +58860,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58938,7 +58959,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59485,7 +59506,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61475,7 +61496,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61508,7 +61529,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61568,7 +61589,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62485,7 +62506,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62805,7 +62826,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62853,7 +62874,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62926,7 +62947,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63036,7 +63057,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63230,7 +63251,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63272,7 +63293,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63362,7 +63383,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63404,7 +63425,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63678,7 +63699,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63738,7 +63759,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64441,7 +64462,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68553,13 +68574,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71750,7 +71771,7 @@ msgstr "unde <address> poate fi o cale, un server și o cale sau un șir arbitra
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "Dacă există un număr mare de depozite la distanță cu nume similare și doriți să utilizați un format diferit pentru acestea (astfel încât URL-urile pe care le utilizați să fie rescrise în URL-uri care funcționează), puteți crea o secțiune de configurare a formularului:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -71763,7 +71784,7 @@ msgstr ""
 "\t[url \"<actual url base>\"]\n"
 "\t\tinsteadOf = <other url base>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71793,7 +71814,7 @@ msgstr "o adresă URL de tipul \"work:repo.git\" sau \"host.xz:/path/to/repo.git
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "Dacă doriți să rescrieți URL-urile doar pentru push, puteți crea o secțiune de configurare a formularului:"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 828cfa30..eaf300df 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -2,7 +2,19 @@
 # Copyright (C) 2019
 # This file is distributed under the same license as the Git package.
 msgid ""
-msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-12-17 15:04+0100\nPO-Revision-Date: 2024-12-25 18:08+0000\nLast-Translator: Golubev Alexander <fatzer2@gmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: ru\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\nX-Generator: Weblate 5.10-dev\n"
+msgstr ""
+"Project-Id-Version: Git Documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
+"PO-Revision-Date: 2024-12-25 18:08+0000\n"
+"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/git-instaweb.txt:45 en/git-ls-remote.txt:24 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31
@@ -3113,7 +3125,9 @@ msgstr "\tЭквивалентно параметру `--ignore-errors` linkgit:
 msgid ""
 "\t`add.ignore-errors` is deprecated, as it does not follow the usual\n"
 "\tnaming convention for configuration variables.\n"
-msgstr "\t`add.ignore-errors` считается устаревшим (deprecated), так как он не следует\n\tустоявшимся конвенциям наименования переменных конфигурации.\n"
+msgstr ""
+"\t`add.ignore-errors` считается устаревшим (deprecated), так как он не следует\n"
+"\tустоявшимся конвенциям наименования переменных конфигурации.\n"
 
 #. type: Labeled list
 #: en/config/clone.txt:1
@@ -4747,49 +4761,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4801,7 +4826,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4898,91 +4923,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7743,7 +7772,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add — Добавить содержимое файла в индекс"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8554,7 +8583,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Применение серии патчей из почтового сообщения"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -8568,7 +8597,17 @@ msgid ""
 "\t [--empty=(stop|drop|keep)]\n"
 "\t [(<mbox> | <Maildir>)...]\n"
 "'git am' (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)\n"
-msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n\t[--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t[--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t[--whitespace=<действие>] [-C<число>] [-p<число>] [--directory=<каталог>]\n\t[--exclude=<путь>] [--include=<путь>] [--reject] [-q | --quiet]\n\t[--[no-]scissors] [-S[<id-ключа>]] [--patch-format=<формат>]\n\t[--quoted-cr=<действие>]\n\t[--empty=(stop|drop|keep)]\n\t[(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)\n"
+msgstr ""
+"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n"
+"\t[--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+"\t[--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+"\t[--whitespace=<действие>] [-C<число>] [-p<число>] [--directory=<каталог>]\n"
+"\t[--exclude=<путь>] [--include=<путь>] [--reject] [-q | --quiet]\n"
+"\t[--[no-]scissors] [-S[<id-ключа>]] [--patch-format=<формат>]\n"
+"\t[--quoted-cr=<действие>]\n"
+"\t[--empty=(stop|drop|keep)]\n"
+"\t[(<mbox> | <Maildir>)...]\n"
+"'git am' (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)\n"
 
 #. type: Plain text
 #: en/git-am.txt:30
@@ -9182,7 +9221,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr "git-annotate - Аннотирование строк файла информацией о коммитах"
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -9213,7 +9252,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - Применить патч к файлам и/или индексу"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 #| msgid ""
@@ -9715,7 +9754,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9879,7 +9918,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Создание архива файлов из указанного дерева"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10327,7 +10366,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Выполнение двоичного поиска коммита, который вносит ошибку"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11114,7 +11153,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Показ редакции и автора последнего изменившего каждую строку файла"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11520,7 +11559,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11550,7 +11589,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12278,7 +12317,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12443,7 +12482,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12985,7 +13024,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Вывод содержимого или типа и информации о размере для объектов репозитория"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13722,7 +13761,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13981,7 +14020,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14169,7 +14208,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14235,7 +14274,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14524,7 +14563,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Переключение веток или восстановление файлов в рабочем каталоге"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15450,7 +15489,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15648,7 +15687,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16057,7 +16096,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Поиск коммитов которые еще не применены вышестоящим репозиторием"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16270,7 +16309,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16300,7 +16339,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Удаление неотслеживаемых файлов из рабочего каталога"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16509,7 +16548,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - Клонирование репозитория в новый каталог"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17158,7 +17197,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17317,7 +17356,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17488,7 +17527,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit — Запись изменений в репозиторий"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -17500,7 +17539,15 @@ msgid ""
 "\t   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "\t   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
 "\t   [--] [<pathspec>...]\n"
-msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<режим>] [--amend]\n\t   [--dry-run] [(-c | -C | --squash) <коммит> | --fixup [(amend|reword):]<коммит>]\n\t   [-F <файл> | -m <сообщение>] [--reset-author] [--allow-empty]\n\t   [--allow-empty-message] [--no-verify] [-e] [--author=<автор>]\n\t   [--date=<дата>] [--cleanup=<режим>] [--[no-]status]\n\t   [-i | -o] [--pathspec-from-file=<файл> [--pathspec-file-nul]]\n\t   [(--trailer <лексема>[(=|:)<значение>])...] [-S[<id-ключа>]]\n\t   [--] [<спецификатор-пути>...]\n"
+msgstr ""
+"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<режим>] [--amend]\n"
+"\t   [--dry-run] [(-c | -C | --squash) <коммит> | --fixup [(amend|reword):]<коммит>]\n"
+"\t   [-F <файл> | -m <сообщение>] [--reset-author] [--allow-empty]\n"
+"\t   [--allow-empty-message] [--no-verify] [-e] [--author=<автор>]\n"
+"\t   [--date=<дата>] [--cleanup=<режим>] [--[no-]status]\n"
+"\t   [-i | -o] [--pathspec-from-file=<файл> [--pathspec-file-nul]]\n"
+"\t   [(--trailer <лексема>[(=|:)<значение>])...] [-S[<id-ключа>]]\n"
+"\t   [--] [<спецификатор-пути>...]\n"
 
 #. type: Plain text
 #: en/git-commit.txt:28
@@ -18319,7 +18366,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Получение и установка глобальных опций или опций репозитория"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19598,7 +19645,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19694,7 +19741,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20418,7 +20465,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20601,7 +20648,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport — Спасение ваших данных из другой СКВ которую люди любят ненавидеть"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21028,7 +21075,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21036,25 +21083,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21765,7 +21812,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Очень простой сервер для Git репозиториев"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22337,7 +22384,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - Присвоение объекту удобочитаемого имени на основе доступной ссылки"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22642,7 +22689,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr "git-diff-files - Сравнить файлы в рабочем каталоге с индексом"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22714,7 +22761,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22903,7 +22950,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23149,7 +23196,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23308,10 +23355,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Вывод разницы между коммитами, коммитом и рабочим каталогом и так далее"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23735,7 +23788,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24136,7 +24189,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26496,7 +26549,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26692,7 +26745,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - Загрузка объектов и ссылок из другого репозитория"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27175,7 +27228,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28039,7 +28092,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28169,7 +28222,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29098,7 +29151,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -29235,9 +29288,10 @@ msgstr ""
 msgid "-o <dir>"
 msgstr ""
 
+# ERROR: --output-directory not found in translation
 #. type: Labeled list
 #: en/git-format-patch.txt:114
-#, no-wrap, placeholders:'--output-directory', priority:100
+#, fuzzy, no-wrap, placeholders:'--output-directory', priority:100
 msgid "--output-directory <dir>"
 msgstr "--no-empty-directory <каталог>"
 
@@ -30409,7 +30463,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - Проверка связности и валидности объектов в базе данных"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30434,7 +30488,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck — Проверка связности и валидности объектов в базе данных"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30732,7 +30786,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Очистка ненужных файлов и оптимизация локального репозитория"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30960,7 +31014,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30990,7 +31044,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31719,7 +31773,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Портативный графический интерфейс для Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31935,7 +31989,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32028,7 +32082,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Отображение справочной информации о Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32451,7 +32505,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32902,7 +32956,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33022,7 +33076,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33172,7 +33226,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33283,13 +33337,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33306,31 +33360,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33375,7 +33429,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Построение файла индекса для существующего упакованного архива"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33606,7 +33660,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - Создание пустого репозитория Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, fuzzy, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33631,7 +33685,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - Создание пустого репозитория Git или переинициализация существующего"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33640,7 +33694,12 @@ msgid ""
 "\t [--ref-format=<format>]\n"
 "\t [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t [--shared[=<permissions>]] [<directory>]\n"
-msgstr "'git init' [-q | --quiet] [--bare] [--template=<каталог_шаблонов>]\n\t[--separate-git-dir <каталог_git>] [--object-format=<формат>]\n\t[--ref-format=<формат>]\n\t[-b <ветка> | --initial-branch=<ветка>]\n\t[--shared[=<права_доступа>]] [каталог]\n"
+msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<каталог_шаблонов>]\n"
+"\t[--separate-git-dir <каталог_git>] [--object-format=<формат>]\n"
+"\t[--ref-format=<формат>]\n"
+"\t[-b <ветка> | --initial-branch=<ветка>]\n"
+"\t[--shared[=<права_доступа>]] [каталог]\n"
 
 #. type: Plain text
 #: en/git-init.txt:27
@@ -33955,7 +34014,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34114,7 +34173,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "git-interpret-trailers — Добавление или разбор структурированной информации в сообщениях коммита"
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34955,7 +35014,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35297,7 +35356,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Вывод информации о файлах в индексе и в рабочем каталоге"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35974,14 +36033,17 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
 "'git ls-remote' [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "\t      [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
 "\t      [--symref] [<repository> [<patterns>...]]\n"
-msgstr "git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<запуск>]\n\t      [-q | --quiet] [--exit-code] [--get-url] [--sort=<ключ>]\n\t      [--symref] [<репозиторий> [<шаблоны>…]]\n"
+msgstr ""
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<запуск>]\n"
+"\t      [-q | --quiet] [--exit-code] [--get-url] [--sort=<ключ>]\n"
+"\t      [--symref] [<репозиторий> [<шаблоны>…]]\n"
 
 #. type: Plain text
 #: en/git-ls-remote.txt:20
@@ -36184,7 +36246,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36409,7 +36471,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Извлекает патч и авторство из одного сообщения электронной почты"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36604,7 +36666,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36726,7 +36788,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Поиск подходящих общих предков для возможного слияния"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37078,7 +37140,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37266,7 +37328,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37320,7 +37382,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37373,7 +37435,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr "git-merge-one-file - Стандартная программа-помощник для использования совместно с git-merge-index"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37397,7 +37459,7 @@ msgstr "git-mergetool{litdd}lib(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37499,7 +37561,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "git-mergetool - Запуск инструментов разрешения конфликтов слияния"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37649,7 +37711,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "Отображение трёхстороннего слияния без изменения индекса."
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38157,7 +38219,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge - Объединение одной или нескольких историй разработки вместе"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38686,7 +38748,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "git-mktag — Создание объектов-меток с дополнительной проверкой."
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38782,7 +38844,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-mktree - Построение объекта дерева из текста в формате ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38830,7 +38892,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - Перемещение или переименование файла, каталога или символической ссылки"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git annotate' [<options>] <file> [<revision>]\n"
@@ -38912,7 +38974,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39081,7 +39143,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39624,7 +39686,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Импорт и отправка в репозитории Perforce"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41168,7 +41230,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41776,7 +41838,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41854,7 +41916,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "git-pack-refs — Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41963,7 +42025,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42077,7 +42139,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42137,7 +42199,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-prune — Очистка всех недостижимых объектов из базы данных объектов"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42245,7 +42307,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull - Получение и слияние изменений из другого репозитория или локальной ветки"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42411,7 +42473,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42423,7 +42485,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42587,7 +42649,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push - Обновление внешних ссылок и связанных объектов"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -42839,9 +42901,11 @@ msgstr ""
 msgid "--push-option=<option>"
 msgstr "--server-option=<опция>"
 
+# ERROR: `--push-option= not found in translation
+# ERROR: `--push-option= not found in translation
 #. type: Plain text
 #: en/git-push.txt:227
-#, placeholders:'`--push-option=':'`--push-option=':'push.pushOption', priority:220
+#, fuzzy, placeholders:'`--push-option=':'`--push-option=':'push.pushOption', priority:220
 msgid "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple `--push-option=<option>` are given, they are all sent to the other side in the order listed on the command line. When no `--push-option=<option>` is given from the command line, the values of configuration variable `push.pushOption` are used instead."
 msgstr "Передать данную строку на сервер при обмене данными по протоколу версии 2. Данная строка не должна содержать символы NUL или LF. Если параметр `--server-option=<параметры>` указан несколько раз, то все эти строки будут отправлены другой стороне в том порядке, в котором они указанном в командной строке. Если в командной строке параметр `--server-option=<параметры>` не задан ни разу, то вместо этого будет использовано значения переменной конфигурации `push.pushOption`."
 
@@ -43544,7 +43608,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43636,7 +43700,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44056,7 +44120,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44666,7 +44730,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase — Повторное применение коммитов над верхушкой другой ветки"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44701,25 +44765,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46608,7 +46672,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -47043,7 +47107,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47237,7 +47301,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47561,7 +47625,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr "git-remote - Управление отслеживаемыми репозиториями"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47962,7 +48026,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48250,7 +48314,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Создание, вывод списка, удаление ссылок для замены объектов"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48521,7 +48585,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48653,7 +48717,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Повторное использование записанных разрешений конфликтов при слияниях"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48671,7 +48735,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48942,7 +49006,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset - Сброс текущего состояния HEAD на указанное состояние"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49694,7 +49758,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "Переключение веток или восстановление файлов в рабочем каталоге"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49953,7 +50017,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50087,7 +50151,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Вывод списка объектов коммита в обратном хронологическом порядке"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50248,7 +50312,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 #| msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -51270,7 +51334,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - Удаление файлов из рабочего каталога и индекса"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51508,7 +51572,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr "git-send-email - Отправить набор патчей по почте"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52509,7 +52573,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Отправка объектов в другой репозиторий с помощью протокола Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52658,7 +52722,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52812,7 +52876,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52854,7 +52918,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, fuzzy, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52902,7 +52966,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53096,7 +53160,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53401,7 +53465,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, fuzzy, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53461,7 +53525,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53785,7 +53849,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53923,7 +53987,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, fuzzy, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54097,7 +54161,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - Добавление содержимого файлов в индекс"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54122,7 +54186,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - Спрятать изменения в изменённом рабочем каталоге"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54656,7 +54720,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 #| msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
@@ -54914,7 +54978,9 @@ msgstr "При использовании короткого формата ст
 msgid ""
 "\tXY PATH\n"
 "\tXY ORIG_PATH -> PATH\n"
-msgstr "\tXY ПУТЬ\n\tXY ОРИГ_ПУТЬ -> ПУТЬ\n"
+msgstr ""
+"\tXY ПУТЬ\n"
+"\tXY ОРИГ_ПУТЬ -> ПУТЬ\n"
 
 #. type: Plain text
 #: en/git-status.txt:182
@@ -55477,7 +55543,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55631,7 +55697,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr "git-submodule - Инициализация, обновление или проверка подмодулей"
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56298,7 +56364,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Двухсторонние операции между репозиториями Subversion и Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56527,7 +56593,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56569,31 +56635,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56629,7 +56695,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56641,7 +56707,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56653,7 +56719,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56665,7 +56731,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56677,7 +56743,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56689,31 +56755,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56725,25 +56791,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56755,13 +56821,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56769,13 +56835,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56787,31 +56853,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56823,7 +56889,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56835,7 +56901,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56847,7 +56913,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56865,19 +56931,19 @@ msgstr "-o <опция>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56889,7 +56955,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56901,13 +56967,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56919,7 +56985,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56931,7 +56997,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56943,13 +57009,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56967,13 +57033,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56985,19 +57051,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57009,7 +57075,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57021,19 +57087,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57045,7 +57111,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57057,7 +57123,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57069,7 +57135,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57087,7 +57153,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57099,7 +57165,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57111,7 +57177,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57123,7 +57189,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57135,7 +57201,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57147,7 +57213,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57159,19 +57225,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57189,7 +57255,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57201,7 +57267,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57213,7 +57279,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57225,7 +57291,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57237,7 +57303,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57336,7 +57402,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57359,7 +57425,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57446,7 +57512,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57458,19 +57524,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57488,13 +57554,13 @@ msgstr "-C[<число>]"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57514,7 +57580,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57532,7 +57598,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57544,25 +57610,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57574,37 +57640,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57616,13 +57682,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57634,13 +57700,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57701,7 +57767,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58256,7 +58322,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58557,7 +58623,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58656,7 +58722,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag — Создание, отображение, удаление или верификация метки, подписанной с помощью GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59208,7 +59274,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -59218,7 +59284,13 @@ msgid ""
 "    [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
 "    [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]\n"
 "    <command> [<args>]\n"
-msgstr "git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n    [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n    [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n    [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<путь>]\n    [--work-tree=<путь>] [--namespace=<имя>] [--config-env=<имя>=<переменная_среды>]\n    <команда> [<аргументы>]\n"
+msgstr ""
+"git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n"
+"    [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n"
+"    [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n"
+"    [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<путь>]\n"
+"    [--work-tree=<путь>] [--namespace=<имя>] [--config-env=<имя>=<переменная_среды>]\n"
+"    <команда> [<аргументы>]\n"
 
 #. type: Plain text
 #: en/git.txt:24
@@ -61198,7 +61270,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61231,7 +61303,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61291,7 +61363,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62208,7 +62280,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62528,7 +62600,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62576,7 +62648,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -62648,7 +62720,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62758,7 +62830,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62952,7 +63024,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62994,7 +63066,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63084,7 +63156,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63126,7 +63198,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63401,7 +63473,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Вывод журнала изменений, внесённых каждым из коммитов."
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63461,7 +63533,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64170,7 +64242,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr "git-write-tree - Создать объект-дерево, начиная с текущего индекса"
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -64281,7 +64353,7 @@ msgstr "[[def_branch]]ветка, ветвь (branch)"
 
 #. type: Plain text
 #: en/glossary-content.txt:30
-#, ', ':'<<def_HEAD, ':'<<def_head, ':'<<def_ref, ':'<<def_repository, ':'<<def_working_tree, placeholders:'<<def_commit, priority:310
+#, placeholders:'<<def_commit,':'<<def_ref,':'<<def_head,':'<<def_repository,':'<<def_working_tree,':'<<def_HEAD,', priority:310
 msgid "A \"branch\" is a line of development. The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is <<def_ref,referenced>> by a branch <<def_head,head>>, which moves forward as additional development is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
 msgstr "Ветка — это линия развития или разработки. Самый последний <<def_commit,коммит>> ветви называется верхушкой этой ветви. На верхушку ветки <<def_ref,ссылается>> её <<def_head,голова>>, которая продвигается вперёд по мере того, как в ветке ведётся разработка. Один <<def_repository,репозиторий>> Git может отслеживать произвольное количество ветвей, но ваша <<def_working_tree,рабочая копия>> связана только с одной из них («текущей» или «извлечённой» («checked out») веткой), и <<def_HEAD,HEAD>> указывает на эту ветвь."
 
@@ -64344,7 +64416,7 @@ msgstr "[[def_cherry-picking]]копирование коммитов, черр
 # ERROR: <<def_branch, not found in translation
 #. type: Plain text
 #: en/glossary-content.txt:59
-#, ', ':'<<def_branch, ':'git cherry-pick':'<<def_commit, placeholders:'<<def_SCM, priority:310
+#, placeholders:'<<def_SCM,':'git cherry-pick':'<<def_commit,':'<<def_branch,', priority:310
 msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
 msgstr "На жаргоне людей работающих с <<def_SCM,СКВ>>, «черри-пикинг» (cherry-picking) означает выбор подмножества изменений из списка изменений (обычно коммитов) и применения их к другой кодовой базе. Само название «черри-пикинг», «снятие вишенки» уподобляет это тому как вы бы взяли вишенку с одного куска торта и перенесли бы её на свой (прим. переводчика). В Git данное действие выполняется командой \"git cherry-pick\", которая извлекает изменения, внесённые существующим <<def_commit,коммитом>> и переносит их на верхушку текущей <<def_branch,ветки>> в виде нового коммита."
 
@@ -64734,7 +64806,7 @@ msgstr "Слить: принести содержимое сторонней <<d
 
 #. type: Plain text
 #: en/glossary-content.txt:289
-#, ', ':'<<def_branch, ':'<<def_commit, ':'<<def_parent, placeholders:'<<def_fast_forward, priority:310
+#, placeholders:'<<def_fast_forward,':'<<def_commit,':'<<def_parent,':'<<def_branch,', priority:310
 msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
 msgstr "Слияние: успешное слияние приводит к созданию нового <<def_commit,коммита>> (если не используется процедура <<def_fast_forward,быстрой перемотки>>), который и представляет собой результат слияния, и имеет в качестве <<def_parent,родителей>> верхушки слитых <<def_branch,веток>>. Такой коммит называется «коммитом слияния» («merge commit»), или иногда просто «слиянием» («merge»)."
 
@@ -65191,7 +65263,7 @@ msgstr "[[def_reachable]]достижимость"
 
 #. type: Plain text
 #: en/glossary-content.txt:538
-#, ', ':'<<def_blob_object, ':'<<def_chain, ':'<<def_commit_object, ':'<<def_object, ':'<<def_tag, ':'<<def_tree_object, placeholders:'<<def_commit, priority:310
+#, placeholders:'<<def_commit,':'<<def_object,':'<<def_chain,':'<<def_tag,':'<<def_commit_object,':'<<def_tree_object,':'<<def_blob_object,', priority:310
 msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
 msgstr "Говорят, что все предки данного <<def_commit,коммита>> «достижимы» из этого коммита. В более общем смысле, один <<def_object,объект>> достижим из другого, если мы можем добраться из одного до другого по <<def_chain,цепочке>> переходов от <<def_tag,метки>> к тому на что эта метка ссылается, от <<def_commit_object,коммитов>> к их родителям или деревьям, и от <<def_tree_object,деревьев>> к содержащимся в них поддеревьям или <<def_blob_object,blob-объектам>>."
 
@@ -65347,7 +65419,7 @@ msgstr "[[def_repository]]репозиторий"
 
 #. type: Plain text
 #: en/glossary-content.txt:619
-#, ', ':'<<def_alternate_object_database, ':'<<def_object_database, ':'<<def_porcelain, ':'<<def_reachable, placeholders:'<<def_ref, priority:310
+#, placeholders:'<<def_ref,':'<<def_object_database,':'<<def_reachable,':'<<def_porcelain,':'<<def_alternate_object_database,', priority:310
 msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
 msgstr "Коллекция <<def_ref,ссылок>> вместе с <<def_object_database,базой данных объектов>> содержащей все объекты, <<def_reachable,достижимые>> из ссылок, возможно, вместе с данными одной или нескольких программ, использующих <<def_porcelain,высокоуровневый программный интерфейс Git>>. Репозиторий может использовать свою базу данных объектов совместно с другими репозиториями через механизм <<def_alternate_object_database,дополнения базы данных>>."
 
@@ -65491,7 +65563,7 @@ msgstr "[[def_tag]]метка (tag)"
 
 #. type: Plain text
 #: en/glossary-content.txt:685
-#, ', ':'<<def_chain, ':'<<def_commit_object, ':'<<def_head, ':'<<def_object_type, ':'<<def_tag_object, placeholders:'<<def_ref, priority:310
+#, placeholders:'<<def_ref,':'<<def_tag_object,':'<<def_commit_object,':'<<def_head,':'<<def_object_type,':'<<def_chain,', priority:310
 msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
 msgstr "<<def_ref,Ссылка>> в пространстве имён `refs/tags/`, которая указывает на объект произвольного типа (как правило, метка указывает либо на <<def_tag_object,объект-метку>>, либо на <<def_commit_object,объект-коммит>>). В отличие от <<def_head,головы ветки>>, метка не обновляется командой `commit`. Метки в Git не имеют ничего общего с тегами Lisp (который назывались бы <<def_object_type,типами объектов>> в контексте Git). Метка, как правило, используется для того, чтобы пометить определённую точку в <<def_chain,цепочке>> наследования."
 
@@ -66792,7 +66864,10 @@ msgid ""
 "commit <hash>\n"
 "Author: <author>\n"
 "Date:   <author-date>\n"
-msgstr "commit <хеш>\nAuthor: <автор>\nDate:   <дата-создания>\n"
+msgstr ""
+"commit <хеш>\n"
+"Author: <автор>\n"
+"Date:   <дата-создания>\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
@@ -66833,7 +66908,12 @@ msgid ""
 "AuthorDate: <author-date>\n"
 "Commit:     <committer>\n"
 "CommitDate: <committer-date>\n"
-msgstr "commit <хеш>\nAuthor:     <автор>\nAuthorDate: <дата-создания>\nCommit:     <коммиттер>\nCommitDate: <дата-комита>\n"
+msgstr ""
+"commit <хеш>\n"
+"Author:     <автор>\n"
+"AuthorDate: <дата-создания>\n"
+"Commit:     <коммиттер>\n"
+"CommitDate: <дата-комита>\n"
 
 #. type: Plain text
 #: en/pretty-formats.txt:67
@@ -68290,13 +68370,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71474,7 +71554,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71482,7 +71562,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71509,7 +71589,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.sk.po b/po/documentation.sk.po
index 7e272c5d..2c3bff89 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2021-03-02 13:09+0100\n"
 "Last-Translator: Jean-Noël AVILA <jn.avila@free.fr>\n"
 "Language-Team: Slovak\n"
@@ -4764,49 +4764,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4818,7 +4829,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4915,91 +4926,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7760,7 +7775,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8511,7 +8526,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9139,7 +9154,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9169,7 +9184,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9652,7 +9667,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9816,7 +9831,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10266,7 +10281,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11053,7 +11068,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11460,7 +11475,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11490,7 +11505,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12218,7 +12233,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12383,7 +12398,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12926,7 +12941,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13664,7 +13679,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13923,7 +13938,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14111,7 +14126,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14178,7 +14193,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14466,7 +14481,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15392,7 +15407,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15590,7 +15605,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16000,7 +16015,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16213,7 +16228,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16243,7 +16258,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16451,7 +16466,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17086,7 +17101,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17245,7 +17260,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17416,7 +17431,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18247,7 +18262,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19532,7 +19547,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19629,7 +19644,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20354,7 +20369,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20537,7 +20552,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20964,7 +20979,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20972,25 +20987,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21701,7 +21716,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22273,7 +22288,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22568,7 +22583,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22640,7 +22655,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22829,7 +22844,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23075,7 +23090,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23234,10 +23249,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23660,7 +23681,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24061,7 +24082,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26421,7 +26442,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26617,7 +26638,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27098,7 +27119,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27957,7 +27978,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28088,7 +28109,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29011,7 +29032,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30324,7 +30345,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30348,7 +30369,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30646,7 +30667,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30874,7 +30895,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30904,7 +30925,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31633,7 +31654,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31849,7 +31870,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31942,7 +31963,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32365,7 +32386,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32816,7 +32837,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32936,7 +32957,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33086,7 +33107,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33197,13 +33218,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33220,31 +33241,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33289,7 +33310,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33520,7 +33541,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33544,7 +33565,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33863,7 +33884,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34022,7 +34043,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34864,7 +34885,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35206,7 +35227,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35889,7 +35910,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36098,7 +36119,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36323,7 +36344,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36518,7 +36539,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36640,7 +36661,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36992,7 +37013,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37180,7 +37201,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37234,7 +37255,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37287,7 +37308,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37311,7 +37332,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37413,7 +37434,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37563,7 +37584,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38073,7 +38094,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38599,7 +38620,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38695,7 +38716,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38743,7 +38764,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38823,7 +38844,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38992,7 +39013,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39535,7 +39556,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41078,7 +41099,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41686,7 +41707,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41764,7 +41785,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41873,7 +41894,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41987,7 +42008,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42047,7 +42068,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42155,7 +42176,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42313,7 +42334,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42325,7 +42346,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42485,7 +42506,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43442,7 +43463,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43534,7 +43555,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43954,7 +43975,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44564,7 +44585,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44599,25 +44620,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46506,7 +46527,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46941,7 +46962,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47135,7 +47156,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47459,7 +47480,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47860,7 +47881,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48150,7 +48171,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48421,7 +48442,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48553,7 +48574,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48571,7 +48592,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48842,7 +48863,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49594,7 +49615,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49853,7 +49874,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49987,7 +50008,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50148,7 +50169,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51168,7 +51189,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51405,7 +51426,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52406,7 +52427,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52555,7 +52576,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52709,7 +52730,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52751,7 +52772,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52799,7 +52820,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -52993,7 +53014,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53294,7 +53315,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53354,7 +53375,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53678,7 +53699,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53816,7 +53837,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -53990,7 +54011,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54014,7 +54035,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54548,7 +54569,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55366,7 +55387,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55520,7 +55541,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56186,7 +56207,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56415,7 +56436,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56457,31 +56478,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56517,7 +56538,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56529,7 +56550,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56541,7 +56562,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56553,7 +56574,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56565,7 +56586,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56577,31 +56598,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56613,25 +56634,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56643,13 +56664,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56657,13 +56678,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56675,31 +56696,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56711,7 +56732,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56723,7 +56744,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56735,7 +56756,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56753,19 +56774,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56777,7 +56798,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56789,13 +56810,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56807,7 +56828,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56819,7 +56840,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56831,13 +56852,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56855,13 +56876,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56873,19 +56894,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56897,7 +56918,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56909,19 +56930,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56933,7 +56954,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56945,7 +56966,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56957,7 +56978,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56975,7 +56996,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56987,7 +57008,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -56999,7 +57020,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57011,7 +57032,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57023,7 +57044,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57035,7 +57056,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57047,19 +57068,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57077,7 +57098,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57089,7 +57110,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57101,7 +57122,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57113,7 +57134,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57125,7 +57146,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57224,7 +57245,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57247,7 +57268,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57335,7 +57356,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57347,19 +57368,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57377,13 +57398,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57403,7 +57424,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57421,7 +57442,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57433,25 +57454,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57463,37 +57484,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57505,13 +57526,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57523,13 +57544,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57590,7 +57611,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58145,7 +58166,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58446,7 +58467,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58545,7 +58566,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59092,7 +59113,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61081,7 +61102,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61114,7 +61135,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61174,7 +61195,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62091,7 +62112,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62411,7 +62432,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "git-update-server-info(1)"
@@ -62460,7 +62481,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62533,7 +62554,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62643,7 +62664,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62837,7 +62858,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62879,7 +62900,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62969,7 +62990,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63011,7 +63032,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63285,7 +63306,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63345,7 +63366,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64048,7 +64069,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68161,13 +68182,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71342,7 +71363,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71350,7 +71371,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71377,7 +71398,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 046a953f..529b14fc 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4764,49 +4764,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4818,7 +4829,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4915,91 +4926,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7765,7 +7780,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Dosya içeriklerini indekse ekle"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8527,7 +8542,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Bir posta kutusundan bir dizi yama uygula."
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9155,7 +9170,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9185,7 +9200,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Dosyalara ve/veya indekse bir yama uygula."
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9668,7 +9683,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9832,7 +9847,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10281,7 +10296,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11068,7 +11083,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11474,7 +11489,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11504,7 +11519,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12232,7 +12247,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12397,7 +12412,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12939,7 +12954,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Depo nesneleri için içerik veya tür ve boyut bilgileri sağla."
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13676,7 +13691,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13935,7 +13950,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14123,7 +14138,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14190,7 +14205,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14479,7 +14494,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15405,7 +15420,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15603,7 +15618,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16012,7 +16027,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16225,7 +16240,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16255,7 +16270,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16463,7 +16478,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17098,7 +17113,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17257,7 +17272,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17428,7 +17443,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18259,7 +18274,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19537,7 +19552,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19633,7 +19648,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20357,7 +20372,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20540,7 +20555,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Verilerinizi, insanların nefret etmeyi sevdiği başka bir kaynak kodu yönetim sisteminden kurtarın."
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20968,7 +20983,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20976,25 +20991,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21705,7 +21720,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Git depoları için gerçekten basit bir sunucu."
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22277,7 +22292,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22572,7 +22587,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22644,7 +22659,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22833,7 +22848,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23079,7 +23094,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23239,10 +23254,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23666,7 +23687,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24067,7 +24088,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26427,7 +26448,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26623,7 +26644,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27104,7 +27125,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27963,7 +27984,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28093,7 +28114,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29018,7 +29039,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30331,7 +30352,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Veri tabanındaki nesnelerin bağlılığını ve geçerliliğini doğrular."
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30355,7 +30376,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Veri tabanındaki nesnelerin bağlılığını ve geçerliliğini doğrular."
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30653,7 +30674,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Gereksiz dosyaları temizle ve yerel depoyu iyileştir."
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30881,7 +30902,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30911,7 +30932,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31640,7 +31661,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Git için taşınabilir bir grafiksel arayüz."
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31856,7 +31877,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31949,7 +31970,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32372,7 +32393,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32823,7 +32844,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32943,7 +32964,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33093,7 +33114,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33204,13 +33225,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33227,31 +33248,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33296,7 +33317,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33527,7 +33548,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33551,7 +33572,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Boş bir Git deposu oluştur veya var olan bir depoyu yeniden başlat."
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33869,7 +33890,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34028,7 +34049,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34870,7 +34891,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35212,7 +35233,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "İndeksteki ve çalışma ağacındaki dosyalar hakkında bilgi göster."
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35888,7 +35909,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36100,7 +36121,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36325,7 +36346,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Tek bir e-posta mesajından yamayı ve yazar bilgisini çıkarır."
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36520,7 +36541,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36642,7 +36663,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36994,7 +37015,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37182,7 +37203,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37236,7 +37257,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37289,7 +37310,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37313,7 +37334,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37415,7 +37436,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37565,7 +37586,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38074,7 +38095,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "İki veya daha fazla geliştirme geçmişini birleştir."
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38600,7 +38621,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Ek doğrulamaya sahip bir etiket nesnesi oluşturur."
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38696,7 +38717,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38744,7 +38765,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Bir dosyayı, dizini ya da simgesel bağlantıyı taşı veya yeniden adlandır."
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38824,7 +38845,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38993,7 +39014,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39536,7 +39557,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41079,7 +41100,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41687,7 +41708,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41765,7 +41786,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41874,7 +41895,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41988,7 +42009,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42048,7 +42069,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42156,7 +42177,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Başka bir depodan veya yerel bir daldan al ve bütünleştir."
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42314,7 +42335,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42326,7 +42347,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42486,7 +42507,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43443,7 +43464,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43535,7 +43556,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43955,7 +43976,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44565,7 +44586,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44600,25 +44621,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46507,7 +46528,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46944,7 +46965,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47138,7 +47159,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47462,7 +47483,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47863,7 +47884,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48151,7 +48172,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48422,7 +48443,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48554,7 +48575,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48572,7 +48593,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48843,7 +48864,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Geçerli HEAD işaretini belirtilen duruma sıfırla."
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49595,7 +49616,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49854,7 +49875,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49988,7 +50009,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50149,7 +50170,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51170,7 +51191,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Dosyaları çalışma ağacından ve indeksten kaldır."
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51408,7 +51429,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52409,7 +52430,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Nesneleri Git protokolü üzerinden başka bir depoya gönder."
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52558,7 +52579,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52712,7 +52733,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52754,7 +52775,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52802,7 +52823,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -52996,7 +53017,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53297,7 +53318,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53357,7 +53378,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53681,7 +53702,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53819,7 +53840,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -53993,7 +54014,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54017,7 +54038,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54551,7 +54572,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55369,7 +55390,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55523,7 +55544,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56189,7 +56210,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Bir Subversion deposu ile Git arasında iki yönlü işlem."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56419,7 +56440,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56461,31 +56482,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56521,7 +56542,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56533,7 +56554,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56545,7 +56566,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56557,7 +56578,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56569,7 +56590,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56581,31 +56602,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56617,25 +56638,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56647,13 +56668,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56661,13 +56682,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56679,31 +56700,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56715,7 +56736,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56727,7 +56748,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56739,7 +56760,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56757,19 +56778,19 @@ msgstr "-o <yol>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56781,7 +56802,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56793,13 +56814,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56811,7 +56832,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56823,7 +56844,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56835,13 +56856,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56859,13 +56880,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56877,19 +56898,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56901,7 +56922,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56913,19 +56934,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56937,7 +56958,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56949,7 +56970,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56961,7 +56982,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56979,7 +57000,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56991,7 +57012,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57003,7 +57024,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57015,7 +57036,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57027,7 +57048,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57039,7 +57060,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57051,19 +57072,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57081,7 +57102,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57093,7 +57114,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57105,7 +57126,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57117,7 +57138,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57129,7 +57150,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57228,7 +57249,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57251,7 +57272,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57338,7 +57359,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57350,19 +57371,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57380,13 +57401,13 @@ msgstr "-M[<sayı>]"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57406,7 +57427,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57424,7 +57445,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57436,25 +57457,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57466,37 +57487,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57508,13 +57529,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57526,13 +57547,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57593,7 +57614,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58148,7 +58169,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58449,7 +58470,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58548,7 +58569,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "GPG ile imzalanmış bir etiket nesnesi oluştur, listele, sil veya doğrula."
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59095,7 +59116,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61084,7 +61105,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61117,7 +61138,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61177,7 +61198,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62095,7 +62116,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62415,7 +62436,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62463,7 +62484,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62536,7 +62557,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62646,7 +62667,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62840,7 +62861,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62882,7 +62903,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62972,7 +62993,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63014,7 +63035,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63288,7 +63309,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63348,7 +63369,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64051,7 +64072,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68162,13 +68183,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71342,7 +71363,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71350,7 +71371,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71377,7 +71398,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.uk.po b/po/documentation.uk.po
index f38b95e6..66433a2a 100644
--- a/po/documentation.uk.po
+++ b/po/documentation.uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-10-04 16:02+0300\n"
 "Last-Translator: Andrij Mizyk <andmiz@proton.me>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -4766,49 +4766,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4820,7 +4831,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4917,91 +4928,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7768,7 +7783,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - Додає вміст файлу до індексування"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8530,7 +8545,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9158,7 +9173,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr "git-annotate - Анотує рядки файлу інформацією про коміт"
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9188,7 +9203,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9671,7 +9686,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9835,7 +9850,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10285,7 +10300,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11072,7 +11087,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11479,7 +11494,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11509,7 +11524,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12237,7 +12252,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12402,7 +12417,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12945,7 +12960,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13683,7 +13698,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13942,7 +13957,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14130,7 +14145,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14197,7 +14212,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14485,7 +14500,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15411,7 +15426,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15609,7 +15624,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16019,7 +16034,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16232,7 +16247,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16262,7 +16277,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16470,7 +16485,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 #| msgid ""
@@ -17124,7 +17139,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17283,7 +17298,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17454,7 +17469,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18285,7 +18300,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19571,7 +19586,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19668,7 +19683,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20393,7 +20408,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20576,7 +20591,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21003,7 +21018,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21011,25 +21026,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21740,7 +21755,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22312,7 +22327,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22607,7 +22622,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22679,7 +22694,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22868,7 +22883,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23114,7 +23129,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23273,10 +23288,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23699,7 +23720,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24100,7 +24121,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26460,7 +26481,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26656,7 +26677,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27137,7 +27158,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27996,7 +28017,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28127,7 +28148,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29050,7 +29071,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30363,7 +30384,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30387,7 +30408,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30685,7 +30706,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30913,7 +30934,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30943,7 +30964,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31672,7 +31693,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31888,7 +31909,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31981,7 +32002,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32404,7 +32425,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32855,7 +32876,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32975,7 +32996,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33125,7 +33146,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33236,13 +33257,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33259,31 +33280,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33328,7 +33349,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33559,7 +33580,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33583,7 +33604,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33902,7 +33923,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34061,7 +34082,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34903,7 +34924,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35245,7 +35266,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35928,7 +35949,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36137,7 +36158,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36362,7 +36383,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36557,7 +36578,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36679,7 +36700,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37031,7 +37052,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37219,7 +37240,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37273,7 +37294,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37326,7 +37347,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37350,7 +37371,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37452,7 +37473,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37602,7 +37623,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38113,7 +38134,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38639,7 +38660,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38735,7 +38756,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38783,7 +38804,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38863,7 +38884,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39032,7 +39053,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39575,7 +39596,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41118,7 +41139,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41726,7 +41747,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41804,7 +41825,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41913,7 +41934,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42027,7 +42048,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42087,7 +42108,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42195,7 +42216,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42353,7 +42374,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42365,7 +42386,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42525,7 +42546,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43482,7 +43503,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43574,7 +43595,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43994,7 +44015,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44604,7 +44625,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44639,25 +44660,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46547,7 +46568,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46982,7 +47003,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47176,7 +47197,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47500,7 +47521,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47901,7 +47922,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48191,7 +48212,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48462,7 +48483,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48594,7 +48615,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48612,7 +48633,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48883,7 +48904,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49635,7 +49656,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49894,7 +49915,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50028,7 +50049,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50189,7 +50210,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51209,7 +51230,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51446,7 +51467,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52447,7 +52468,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52596,7 +52617,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52750,7 +52771,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52792,7 +52813,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52840,7 +52861,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53034,7 +53055,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53335,7 +53356,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53395,7 +53416,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53719,7 +53740,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53857,7 +53878,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54031,7 +54052,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54055,7 +54076,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54589,7 +54610,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55407,7 +55428,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55561,7 +55582,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56227,7 +56248,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56456,7 +56477,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56498,31 +56519,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56558,7 +56579,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56570,7 +56591,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56582,7 +56603,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56594,7 +56615,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56606,7 +56627,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56618,31 +56639,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56654,25 +56675,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56684,13 +56705,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56698,13 +56719,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56716,31 +56737,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56752,7 +56773,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56764,7 +56785,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56776,7 +56797,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56794,19 +56815,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56818,7 +56839,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56830,13 +56851,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56848,7 +56869,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56860,7 +56881,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56872,13 +56893,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56896,13 +56917,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56914,19 +56935,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56938,7 +56959,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56950,19 +56971,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56974,7 +56995,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56986,7 +57007,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56998,7 +57019,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57016,7 +57037,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57028,7 +57049,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57040,7 +57061,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57052,7 +57073,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57064,7 +57085,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57076,7 +57097,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57088,19 +57109,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57118,7 +57139,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57130,7 +57151,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57142,7 +57163,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57154,7 +57175,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57166,7 +57187,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57265,7 +57286,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57288,7 +57309,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57376,7 +57397,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57388,19 +57409,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57418,13 +57439,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57444,7 +57465,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57462,7 +57483,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57474,25 +57495,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57504,37 +57525,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57546,13 +57567,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57564,13 +57585,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57631,7 +57652,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58186,7 +58207,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58487,7 +58508,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58586,7 +58607,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59133,7 +59154,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61122,7 +61143,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61155,7 +61176,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61215,7 +61236,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62132,7 +62153,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62452,7 +62473,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 #| msgid "git-update-server-info(1)"
@@ -62501,7 +62522,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62574,7 +62595,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62684,7 +62705,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62878,7 +62899,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62920,7 +62941,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63010,7 +63031,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63052,7 +63073,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63326,7 +63347,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63386,7 +63407,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64089,7 +64110,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68204,13 +68225,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71386,7 +71407,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71394,7 +71415,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71421,7 +71442,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.vi.po b/po/documentation.vi.po
index 352d2207..cbc2063e 100644
--- a/po/documentation.vi.po
+++ b/po/documentation.vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2023-05-18 17:58+0000\n"
 "Last-Translator: Ky Bui Van <ky.buivan.dev@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4759,49 +4759,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4813,7 +4824,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4910,91 +4921,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7750,7 +7765,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "Thêm nội dung tập tin vào bảng mục lục"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 msgid ""
@@ -8501,7 +8516,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "Áp dụng một chuỗi các miếng và từ một mailbox"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9139,7 +9154,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9169,7 +9184,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "Áp dụng một miếng vá cho các tập tin đã chỉ ra và/hoặc vào bảng mục lục"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9652,7 +9667,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9816,7 +9831,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "Tạo một kho nén các tập tin từ cây làm việc có tên"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10265,7 +10280,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "Tìm kiếm dạng nhị phân để tìm ra lần chuyển giao nào đưa ra lỗi"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11052,7 +11067,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "Hiển thị số hiệu phiên bản và tác giả sửa đổi cuối cho từng dòng của một tập tin"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11458,7 +11473,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11488,7 +11503,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12216,7 +12231,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "Sưu tập thông tin người dùng để báo cáo lỗi"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12381,7 +12396,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -12923,7 +12938,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "Cung cấp nội dung hoặc thông tin về kiểu và cỡ cho các đối tượng kho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13660,7 +13675,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -13919,7 +13934,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14107,7 +14122,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14173,7 +14188,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14461,7 +14476,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "Chuyển các nhánh hoặc phục hồi lại các tập tin cây làm việc"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15387,7 +15402,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15585,7 +15600,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -15994,7 +16009,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "Tìm những lần chuyển giao còn chưa được áp dụng lên thượng nguồn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, fuzzy, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16207,7 +16222,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16237,7 +16252,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "Gỡ bỏ các tập tin không được theo dõi từ cây làm việc"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16445,7 +16460,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "Nhân bản một kho chứa đến một thư mục mới"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17077,7 +17092,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17236,7 +17251,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17407,7 +17422,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18237,7 +18252,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "Lấy và đặt kho hoặc các tùy chọn toàn cục"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19516,7 +19531,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, fuzzy, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19612,7 +19627,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -20336,7 +20351,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20519,7 +20534,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "Xem xét giá trị dữ liệu của bạn khỏi người khác yêu SCM để ghét"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -20946,7 +20961,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -20954,25 +20969,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21683,7 +21698,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "Một máy phục vụ thực sự đơn giản dành cho kho Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22255,7 +22270,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "Đưa ra một đối tượng dựa trên một tên ở dạng con người đọc được trên một tham chiếu sẵn có"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22550,7 +22565,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22622,7 +22637,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22811,7 +22826,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23057,7 +23072,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "So sánh nội dung và chế độ của các blob tìm thấy thông qua hai đối tượng cây"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23216,10 +23231,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Hiển thị các thay đổi giữa những lần chuyển giao, giữa một lần chuyển giao và cây làm việc, v.v.."
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23641,7 +23662,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24042,7 +24063,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26402,7 +26423,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26598,7 +26619,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - Tải xuống các đối tượng và tham chiếu từ một repo khác"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27079,7 +27100,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -27938,7 +27959,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28068,7 +28089,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -28991,7 +29012,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30303,7 +30324,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "Thẩm tra lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ liệu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30327,7 +30348,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "Thẩm tra lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ liệu"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30625,7 +30646,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "Dọn dẹp các tập tin không cần thiết và tối ưu kho nội bộ"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -30853,7 +30874,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, fuzzy, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -30883,7 +30904,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31612,7 +31633,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "Một giao diện đồ họa khả chuyển cho Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -31828,7 +31849,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "Tính toán ID đối tượng và tùy chọn là tạo một blob từ một tập tin"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -31921,7 +31942,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "Hiển thị thông tin trợ giúp về Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32344,7 +32365,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -32795,7 +32816,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -32915,7 +32936,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "Đẩy các đối tượng lên thông qua HTTP/DAV đến kho chứa khác"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33065,7 +33086,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "Gửi một bộ sưu tập các miếng vá từ đầu vào tiêu chuẩn đến một thư mục IMAP"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33176,13 +33197,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33199,31 +33220,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33268,7 +33289,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "Xây dựng tập tin mục lục gói cho một kho nén đã đóng gói sẵn có"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33499,7 +33520,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -33523,7 +33544,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 msgid ""
@@ -33840,7 +33861,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "Duyệt ngay kho làm việc của bạn trong gitweb"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -33999,7 +34020,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -34840,7 +34861,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35182,7 +35203,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "Hiển thị thông tin về các tập tin trong bảng mục lục và cây làm việc"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -35857,7 +35878,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36069,7 +36090,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36294,7 +36315,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "Trích xuất miếng và và nguồn tác giả từ một thư điện tử đơn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36489,7 +36510,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36611,7 +36632,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "Tìm các tổ tiên chung tốt có thể được cho hòa trộn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -36963,7 +36984,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37151,7 +37172,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37205,7 +37226,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37258,7 +37279,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, fuzzy, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37282,7 +37303,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37384,7 +37405,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Chạy công cụ phân giải xung đột hòa trộn để mà giải quyết các xung đột hòa trộn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37534,7 +37555,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38043,7 +38064,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38569,7 +38590,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "Tạo một đối tượng thẻ với kiểm tra mở rộng"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, fuzzy, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -38665,7 +38686,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "Xây dựng một tree-object từ văn bản định dạng ls-tree"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, fuzzy, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -38713,7 +38734,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết mềm"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -38793,7 +38814,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -38962,7 +38983,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 msgid ""
@@ -39505,7 +39526,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "Nhập vào từ và gửi đến các kho cần thiết"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41048,7 +41069,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -41656,7 +41677,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -41734,7 +41755,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "Đóng gói các phần đầu và thẻ để truy cập kho hiệu quả hơn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -41842,7 +41863,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -41956,7 +41977,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, fuzzy, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42016,7 +42037,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "Xén bớt tất các các đối tượng không tiếp cận được từ cơ sở dữ liệu đối tượng"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42124,7 +42145,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "Lấy về và hợp nhất với kho khác hay một nhánh nội bộ"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42282,7 +42303,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42294,7 +42315,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42454,7 +42475,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "Cập nhật th.chiếu máy chủ cùng với các đối tượng liên quan đến nó"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43411,7 +43432,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43503,7 +43524,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "So sánh hai vùng chuyển giao (vd: hai phiên bản của một nhánh)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -43923,7 +43944,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, fuzzy, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44533,7 +44554,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "Thu hoạch các lần chuyển giao trên đỉnh của đầu mút cơ sở khác"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -44568,25 +44589,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46474,7 +46495,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, fuzzy, no-wrap, placeholders:'git receive-pack', priority:90
 #| msgid "git-receive-pack(1)"
@@ -46909,7 +46930,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47103,7 +47124,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47427,7 +47448,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -47828,7 +47849,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48118,7 +48139,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "Tạo, liệt kê, xóa các tham chiếu để thay thế các đối tượng"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48389,7 +48410,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -48521,7 +48542,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "Dùng lại các giải pháp đã ghi lại của các hòa trộn bị xung đột"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -48539,7 +48560,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -48810,7 +48831,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "Đặt lại HEAD hiện hành thành trạng thái đã cho"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -49562,7 +49583,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -49821,7 +49842,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -49955,7 +49976,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50116,7 +50137,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 msgid "'git rev-parse' [<options>] <arg>...\n"
@@ -51136,7 +51157,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51373,7 +51394,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52374,7 +52395,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "Đẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -52523,7 +52544,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "Hệ vỏ đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -52677,7 +52698,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -52719,7 +52740,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -52767,7 +52788,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -52961,7 +52982,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53262,7 +53283,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53322,7 +53343,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -53646,7 +53667,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -53784,7 +53805,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -53958,7 +53979,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -53982,7 +54003,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -54516,7 +54537,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55333,7 +55354,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -55487,7 +55508,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56153,7 +56174,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "Thao tác hai hướng giữ hai kho Subversion và Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56382,7 +56403,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56424,31 +56445,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -56484,7 +56505,7 @@ msgstr ""
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -56496,7 +56517,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -56508,7 +56529,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -56520,7 +56541,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -56532,7 +56553,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -56544,31 +56565,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -56580,25 +56601,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -56610,13 +56631,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -56624,13 +56645,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -56642,31 +56663,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -56678,7 +56699,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -56690,7 +56711,7 @@ msgstr ""
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -56702,7 +56723,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -56720,19 +56741,19 @@ msgstr "<đường-dẫn>"
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -56744,7 +56765,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -56756,13 +56777,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -56774,7 +56795,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -56786,7 +56807,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -56798,13 +56819,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -56822,13 +56843,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -56840,19 +56861,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -56864,7 +56885,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -56876,19 +56897,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -56900,7 +56921,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -56912,7 +56933,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -56924,7 +56945,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -56942,7 +56963,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -56954,7 +56975,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -56966,7 +56987,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -56978,7 +56999,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -56990,7 +57011,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57002,7 +57023,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57014,19 +57035,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57044,7 +57065,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57056,7 +57077,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57068,7 +57089,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57080,7 +57101,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57092,7 +57113,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57191,7 +57212,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57214,7 +57235,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57301,7 +57322,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57313,19 +57334,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57343,13 +57364,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57369,7 +57390,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57387,7 +57408,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57399,25 +57420,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57429,37 +57450,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr "--strategy"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -57471,13 +57492,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -57489,13 +57510,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -57556,7 +57577,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58111,7 +58132,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58412,7 +58433,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -58511,7 +58532,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59058,7 +59079,7 @@ msgstr ""
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61053,7 +61074,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61086,7 +61107,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61146,7 +61167,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62063,7 +62084,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62383,7 +62404,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, fuzzy, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -62431,7 +62452,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -62504,7 +62525,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -62614,7 +62635,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -62808,7 +62829,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -62850,7 +62871,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -62940,7 +62961,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -62982,7 +63003,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63256,7 +63277,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63316,7 +63337,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64019,7 +64040,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, fuzzy, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68130,13 +68151,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71310,7 +71331,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -71318,7 +71339,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -71345,7 +71366,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index f3247590..c3649a49 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,7 +3,19 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-12-17 15:04+0100\nPO-Revision-Date: 2024-12-23 19:00+0000\nLast-Translator: Koishi0425 <1141181669@qq.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.10-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
+"PO-Revision-Date: 2024-12-23 19:00+0000\n"
+"Last-Translator: Koishi0425 <1141181669@qq.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_HANS-CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/git-instaweb.txt:45 en/git-ls-remote.txt:24 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31
@@ -4872,9 +4884,9 @@ msgstr "当涉及重命名/复制时，`file1` 和 `file2` 分别显示重命名
 msgid "It is followed by one or more extended header lines:"
 msgstr "它的后面是一个或多个扩展头信息行："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4887,7 +4899,18 @@ msgstr "它的后面是一个或多个扩展头信息行："
 #| "similarity index <number>\n"
 #| "dissimilarity index <number>\n"
 #| "index <hash>..<hash> <mode>\n"
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 "old mode <模式>\n"
 "new mode <模式>\n"
@@ -4901,45 +4924,45 @@ msgstr ""
 "dissimilarity index <数字>\n"
 "index <哈希>..<哈希> <模式>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, fuzzy, priority:280
 #| msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr "文件模式被打印为 6 位八进制数字，包括文件类型和文件权限位。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr "扩展头信息中的路径名称不包括 `a/` 和 `b/` 前缀。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr "相似性指数是未改变的行占比，而不相似性指数是改变的行占比。它是四舍五入的整数，后有百分号。因此，100%的相似度指数指为两个文件相等，而 100% 的不相似度意味着入新文件中没有旧文件中的行。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, fuzzy, priority:280
 #| msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr "索引行包括改变前和改变后的 blob 对象名称。如果文件模式没有变化，则包含 <模式>；否则，分别显示新旧模式。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr "含有 \"不常见\" 字符的路径名会被引用，这一点在配置变量` core.quotePath` 中有所解释（见 linkgit:git-config[1]）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr "输出中所有的 `file1` 文件都是指提交前的文件，而所有的 `file2` 文件都是指提交后的文件。按顺序对每个文件进行修改是不正确的。例如，这个补丁将交换文件 a 和 b："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4957,7 +4980,7 @@ msgstr ""
 "rename from b\n"
 "rename to a\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -5080,101 +5103,105 @@ msgstr "       diff --cc file\n"
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr "它的后面是一个或多个扩展头信息行（本例显示的是与两个父提交的合并）："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "index <hash>,<hash>..<hash>\n"
 #| "mode <mode>,<mode>..<mode>\n"
 #| "new file mode <mode>\n"
 #| "deleted file mode <mode>,<mode>\n"
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 "index <哈希>,<哈希>..<哈希>\n"
 "mode <模式>,<模式>..<模式>\n"
 "new file mode <模式>\n"
 "deleted file mode <模式>,<模式>\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, fuzzy, priority:280
 #| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format."
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr "`mode<模式>，<模式>..<模式>` 行仅在 <模式> 中至少有一个与其余的不同时才会出现。包含有关检测到的内容移动的信息 (重命名和复制检测) 的扩展标头设计为使用两个 <目录树对象> 的 diff，不能用于组合的 diff 格式。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr "它的后面是两行源文件/目标文件的头信息："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr "a/file"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr "b/file"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "与传统 ‘统一’ diff 格式的双行标题类似，`/dev/null` 用于表示已创建或已删除的文件。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr "但是，如果提供了 --combined-all-paths 选项，你就会得到一个 N+1 行的源文件/目标文件头，其中 N 是合并提交中的父提交数量："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr "如果重命名或复制检测处于活动状态，这种扩展格式可能很有用，可以让你在不同的父提交中看到文件的原始名称。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr "修改了文件块头信息的格式，以防止不小心将其送入 `patch -p1`。合并的差异格式是为审查合并提交的修改而创建的，并不是为了应用。这个变化类似于扩展的 \"索引\" 头信息的变化："
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr "块中有（父提交数量+1）`@` 字符，用于合并的差异格式。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 "与传统的 \"统一\" 差异格式不同，这种格式显示两个文件 A 和 B 的列，其中有 `-`（减号 -- 在 A 中出现，但在 B 中删除），`+`（加号 -- 在 A 中缺少，但在 B 中增加），或 `\" \"`（空格 -- 不变）前缀，这种格式比较两个或多个文件与一个文件 X，并显示 X 与其中每个文件的差异。文件中的每一个都有一列被前置在输出行中，以指出 X 的行与它的不同之处。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr "第 N 列中的 `-` 字符意味着该行出现在文件 N 中，但它没有出现在结果文件中。第 N 列中的 `+` 字符意味着该行出现在结果文件中，而文件 N 中没有该行（换句话说，从该父提交的角度来看，该行是被添加的）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "在上面的输出示例中，两个文件中的函数签名都被改变了（因此从文件 1 和文件 2 中都有表示删除的 `-`，而 `++` 表示被添加的一行没有出现在文件 1 或文件 2 中）。另外还有 8 行与文件 1 中的相同，但没有出现在文件 2 中（因此前缀为 `+`）。"
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -8105,7 +8132,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - 添加文件内容到索引"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8929,7 +8956,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr "git-am - 从邮箱应用一系列修补程序"
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 #| msgid ""
@@ -9582,7 +9609,7 @@ msgid "git-annotate - Annotate file lines with commit information"
 msgstr "git-annotate - 用提交信息注释文件行"
 
 # ERROR: --] not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9612,7 +9639,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr "git-apply - 将补丁应用于文件和/或索引"
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 #| msgid ""
@@ -10114,7 +10141,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr "git-archimport - 将 GNU Arch 仓库导入 Git 中"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -10280,7 +10307,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr "git-archive - 从命名的目录树中创建一个归档文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10734,7 +10761,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr "git-bisect - 使用二进制搜索查找引入错误的提交"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11608,7 +11635,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr "git-blame - 显示文件每一行的最后修改版本和作者"
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -12034,7 +12061,7 @@ msgstr "\"filename\" <空白引号-片名-到此为止>\n"
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr "因此，对于一些面向行和字的解析器来说，它确实很容易解析（这对于大多数脚本语言来说应该是很自然的）。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -12064,7 +12091,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr "git-branch - 列出、创建或删除分支"
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12826,7 +12853,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr "git-bugreport - 收集用户提交错误报告的信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, fuzzy, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 #| msgid ""
@@ -12998,7 +13025,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr "git-bundle - 通过存档移动对象和引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13573,7 +13600,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr "git-cat-file - 提供仓库对象的内容或详细信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -14360,7 +14387,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr "git-check-attr - 显示 gitattributes 信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14638,7 +14665,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr "git-check-ignore - 调试 gitignore / 排除文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14828,7 +14855,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr "git-check-mailmap - 显示联系人的规范名称和电子邮件地址"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14897,7 +14924,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr "git-checkout-index - 将文件从索引复制到工作目录树"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -15191,7 +15218,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - 切换分支或恢复工作目录树文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -16201,7 +16228,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr "git-check-ref-format - 确保引用名称的格式正确"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -16407,7 +16434,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr "git-cherry-pick - 应用某些现有提交引入的更改"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16826,7 +16853,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr "git-cherry - 查找尚未应用于上游的提交内容"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -17078,7 +17105,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr "git-citool —— 替代 git-commit 的图形化工具"
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -17108,7 +17135,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - 删除工作目录树中未跟踪的文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -17321,7 +17348,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - 克隆一个仓库到新目录"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, fuzzy, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 #| msgid ""
@@ -18020,7 +18047,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr "git-column - 以列展示数据"
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -18195,7 +18222,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr "git-commit-tree -创建一个新的提交对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -18372,7 +18399,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - 记录仓库的修改"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 #| msgid ""
@@ -19250,7 +19277,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config - 获取和设置仓库或全局选项"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, fuzzy, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 #| msgid ""
@@ -20632,7 +20659,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr "git-count-objects - 统计未打包对象的数量及其磁盘消耗量"
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -20728,7 +20755,7 @@ msgstr "git-credential-cache{litdd}daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr "git-credential-cache--daemon - 在内存中临时存储用户证书"
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
@@ -21476,7 +21503,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr "git-cvsexportcommit - 将单个提交导出为 CVS 检出"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -21668,7 +21695,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr "git-cvsimport - 从另一个让人由爱生恨的 SCM 中获取数据"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -22102,7 +22129,7 @@ msgstr "git-cvsserver - Git 的 CVS 服务器模拟器"
 msgid "SSH:"
 msgstr "SSH:"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -22112,25 +22139,25 @@ msgstr ""
 "export CVS_SERVER=\"git cvsserver\"\n"
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD 名称>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr "pserver (/etc/inetd.conf):"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr "无人值守的 cvspserver tcp 流服务器 /usr/bin/git-cvsserver git-cvsserver pserver\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr "用法："
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -22856,7 +22883,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr "git-daemon - 一个非常简单的git存储库服务器"
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -23460,7 +23487,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr "git-describe - 根据一个可用的引用，给一个对象起一个人类可读的名字"
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -23769,7 +23796,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr "git-diff-files - 对比工作区和索引中的文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -23841,7 +23868,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr "git-diff-index - 比较树和工作树或索引"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -24039,7 +24066,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr "git-difftool - 使用常见的差异工具显示变化"
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -24289,7 +24316,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr "git-diff-tree - 比较通过两个树对象找到的 Blob 的内容和模式"
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -24452,9 +24479,9 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - 显示提交和工作区等变化"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, fuzzy, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
 #| msgid ""
 #| "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 #| "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
@@ -24462,7 +24489,13 @@ msgstr "git-diff - 显示提交和工作区等变化"
 #| "'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 #| "'git diff' [<options>] <blob> <blob>\n"
 #| "'git diff' [<options>] --no-index [--] <path> <path>\n"
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]。\n"
 "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]。\n"
@@ -24930,7 +24963,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr "git-fast-export - Git 数据导出器"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -25343,7 +25376,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr "git-fast-import - 快速 Git 数据导入的后端"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -27798,7 +27831,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr "git-fetch-pack - 从另一个仓库接收丢失的对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -28000,7 +28033,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - 从另一个仓库下载对象和引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -28500,7 +28533,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr "git-filter-branch - 重写分支"
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -29421,7 +29454,7 @@ msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr "git-fmt-merge-msg - 生成合并提交信息"
 
 # ERROR: --into-name not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -29556,7 +29589,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr "git-for-each-ref - 输出每个引用的信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 #| msgid ""
@@ -30558,7 +30591,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr "git-format-patch - 为提交电子邮件准备补丁"
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, fuzzy, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 #| msgid ""
@@ -31965,7 +31998,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck-objects - 验证数据库中对象的连接性和有效性"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -31989,7 +32022,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr "git-fsck - 验证数据库中对象的连接性和有效性"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -32291,7 +32324,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr "git-gc - 清理不必要的文件并优化本地仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, fuzzy, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 #| msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -32520,7 +32553,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr "git-get-tar-commit-id - 从使用 git-archive 创建的归档中提取提交 ID"
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -32550,7 +32583,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr "git-grep - 打印与模式匹配的行"
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 #| msgid ""
@@ -33327,7 +33360,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr "git-gui - 一个可移植的git图形界面"
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -33544,7 +33577,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr "git-hash-object - 计算对象 ID 并选择性地从文件创建对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -33640,7 +33673,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "git-help - 显示有关 Git 的帮助信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -34080,7 +34113,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr "git-http-backend - Git 在 HTTP 上的服务器端实现"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -34617,7 +34650,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr "git-http-fetch - 通过 HTTP 从远程 Git 仓库下载"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -34738,7 +34771,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr "git-http-push - 通过http/DAV将对象推送到另一个存储库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -34888,7 +34921,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr "git-imap-send - 从标准输入流中向 IMAP 文件夹发送补丁集"
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -35014,13 +35047,13 @@ msgstr ""
 "    port = 123\n"
 "    ; sslVerify = false\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr "在排除故障时，如果你怀疑连接有问题的原因是你在试图建立（或已经建立）的私人服务器 `example.com`上使用的证书可能没有被正确验证，你可能想使用 `sslVerify=false`。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -35042,31 +35075,31 @@ msgstr ""
 "\tuser = user@gmail.com\n"
 "\tport = 993\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr "如果你得到一个错误，即 “文件夹不存在”，你可能需要改用： `folder = \"[Google Mail]/Drafts\"` 。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr "如果你的 Gmail 账户被设置为英语以外的其他语言，\"Drafts\" 文件夹的名称将被本地化。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr "一旦准备好发送提交，请运行以下命令："
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -35114,7 +35147,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr "git-index-pack - 为现有打包存档建立打包索引文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -35349,7 +35382,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - 创建一个空的 Git 仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n"
@@ -35373,7 +35406,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - 创建一个空的 Git 仓库或是重新初始化一个已经存在的仓库"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -35725,7 +35758,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr "git-instaweb - 立即在 gitweb 中浏览您的工作仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -35893,7 +35926,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr "git-interpret-trailers - 添加或解析提交消息中的结构化信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 #| msgid ""
@@ -36829,7 +36862,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr "git-log - 显示提交日志"
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -37173,7 +37206,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr "git-ls-files - 显示索引和工作目录树中的文件信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -37873,7 +37906,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr "git-ls-remote - 列出远程仓库中的引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 #| msgid ""
@@ -38105,7 +38138,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr "git-ls-tree - 列出树对象的内容"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -38333,7 +38366,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr "git-mailinfo - 从单个电子邮件信息中提取补丁和作者"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -38531,7 +38564,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr "git-mailsplit - 简单的UNIX mbox分割程序"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -38655,7 +38688,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr "git-merge-base - 为合并找到尽可能好的共同祖先"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -39057,7 +39090,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr "git-merge-file - 运行三方文件合并"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -39253,7 +39286,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr "git-merge-index - 对需要合并的文件进行合并"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -39307,7 +39340,7 @@ msgstr "发行版中包含一个名为 'git merge-one-file' 的示例脚本。"
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr "警报 警报Git 的 “合并对象顺序” 与 RCS 的 'merge' 程序合并对象顺序不同。在上述顺序中，原始文件在前。但三方合并程序 'merge' 的参数顺序是把原始文件放在中间。别问我为什么。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -39371,7 +39404,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr "git-merge-one-file - 与 git-merge-index 一起使用的标准辅助程序"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -39395,7 +39428,7 @@ msgstr "git-mergetool{litdd}lib(1)"
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr "git-mergetool--lib - 常见的 Git 合并工具壳 shell 脚本程序"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -39498,7 +39531,7 @@ msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conf
 msgstr "git-mergetool - 运行合并冲突解决工具以解决合并冲突"
 
 # ERROR: --[no-]prompt] not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -39650,7 +39683,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr "git-merge-tree - 显示三向合并，不触及索引"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -40190,7 +40223,7 @@ msgstr "git-merge - 将两个或多个开发历史合并在一起"
 # ERROR: --quit not found in translation
 # ERROR: --stat] not found in translation
 # ERROR: --[no-]rerere-autoupdate] not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -40773,7 +40806,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr "git-mktag - 创建带有额外验证的标记对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -40875,7 +40908,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr "git-mktree - 从 ls-tree 格式化文本构建树对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -40923,7 +40956,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - 移动或重命名一个文件、一个目录或一个符号链接"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -41006,7 +41039,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr "git-name-rev - 为给定的 rev 查找符号名称"
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -41190,7 +41223,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr "git-notes - 添加或查看对象注释"
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 #| msgid ""
@@ -41771,7 +41804,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-p4 - 从 Perforce 仓库导入和提交"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -43345,7 +43378,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr "git-pack-objects - 创建打包的对象档案"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -43968,7 +44001,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr "git-pack-redundant - 查找多余的软件包文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -44046,7 +44079,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr "git-pack-refs - 打包头和标签，以便有效地访问仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, fuzzy, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 #| msgid "'git pack-refs' [--all] [--no-prune] [--include <pattern>] [--exclude <pattern>]\n"
@@ -44155,7 +44188,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr "git-patch-id - 计算补丁的唯一 ID"
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -44269,7 +44302,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr "git-prune-packed - 删除软件包文件中已有的额外对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -44329,7 +44362,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr "git-prune - 从对象数据库中删除所有无法访问的对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -44437,7 +44470,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr "git-pull - 从另一个仓库或本地分支撷取并与之集成"
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -44603,7 +44636,7 @@ msgstr "当设置为 `interactive` 时，启用变基的交互模式。"
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr "如果你想让 `git pull` 总是使用 `--rebase` 而不是合并，请参见 linkgit:git-config[1] 中的 `pull.rebase`, `branch.< 分支名 >.rebase` 和 `branch.autoSetupRebase`。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -44615,7 +44648,7 @@ msgstr "这是一种潜在的「危险的」操作模式。 它重写了历史
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -44779,7 +44812,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr "git-push - 与相关对象一起更新远程分支引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -45766,7 +45799,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr "git-quiltimport - 在当前分支上应用被子补丁集"
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -45860,7 +45893,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "git-range-diff - 比较两个提交范围（例如一个分支的两个版本）"
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -46322,7 +46355,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr "git-read-tree - 将树信息读入索引"
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -46978,7 +47011,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr "git-rebase - 在另一个基础提示之上重新应用提交内容"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, fuzzy, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 #| msgid ""
@@ -47024,25 +47057,25 @@ msgstr "当前分支中的所有提交所做的改动，但不在 `<upstream>` 
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr "如果提供了 `--onto` 选项，当前分支会重置为 `<upstream>` 或 `<newbase>`。 这与 `git reset --hard <upstream>`（或 `<newbase>`）的效果完全相同。`ORIG_HEAD` 设置为指向重置前分支的顶端。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr "如果在重置过程中使用了其他写入伪引用的命令（例如 `git reset`），就不能保证 `ORIG_HEAD` 在重置结束时仍然指向前一个分支的分支提示。不过，使用当前分支的 引用日志（即 `@{1}`，参见 linkgit:gitrevisions[7]）可以访问前一个分支的分支提示。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr "然后，先前保存在临时区域的提交将按顺序逐一重新应用到当前分支。请注意，`HEAD` 中任何与 `HEAD...<upstream>` 中的提交有相同文字改动的提交都会被省略（也就是说，上游已经接受的补丁，如果提交信息或时间戳不同，就会被跳过）。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr "合并失败有可能导致该过程无法完全自动进行。 您必须解决合并失败问题，然后运行 `git rebase --continue`。 另一种方法是使用 `git rebase --skip` 绕过导致合并失败的提交。 要检查原始的 `<branch>` 并移除 `.git/rebase-apply` 工作文件，请使用 `git rebase --abort` 命令。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -49052,7 +49085,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr "git-receive-pack - 接收推送到仓库的内容"
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -49512,7 +49545,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr "git-reflog - 管理重引用日志信息"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 #| msgid ""
@@ -49721,7 +49754,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr "git-remote-ext - 桥接智能传输与外部命令。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -50045,7 +50078,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr "git-remote - 管理一组追踪的仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -50488,7 +50521,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr "git-repack - 在仓库中打包未打包对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -50776,7 +50809,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "git-replace - 创建、列出、删除用于替换对象的引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -51052,7 +51085,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr "git-request-pull - 生成待处理更改的摘要"
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -51184,7 +51217,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr "git-rerere - 重复使用已记录的冲突合并解决方法"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -51202,7 +51235,7 @@ msgstr "在采用相对较长的特性分支的工作流程中，开发人员有
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr "在此过程中，该命令通过记录冲突的自动合并结果和初始手动合并的相应手工解析结果，并将先前记录的手工解析结果应用于相应的自动合并结果，来帮助开发人员。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -51504,7 +51537,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr "git-reset - 重置当前HEAD到指定的状态"
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -52382,7 +52415,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "git-restore - 恢复工作树文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -52655,7 +52688,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr "git-revert - 还原某些现有提交"
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -52791,7 +52824,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr "git-rev-list 按照时间倒序列出提交对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -52970,7 +53003,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr "git-rev-parse - 挑选并调整参数"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 #| msgid "'git rev-parse' [<options>] <args>...\n"
@@ -54032,7 +54065,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - 从工作树和索引中删除文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -54272,7 +54305,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr "git-send-email - 以电子邮件形式发送补丁集"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 #| msgid ""
@@ -55310,7 +55343,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr "git-send-pack - 通过 Git 协议将对象推送到另一个仓库"
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -55464,7 +55497,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr "git-shell - 仅限 Git SSH 访问的受限登录 shell"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -55638,7 +55671,7 @@ msgstr "git-sh-i18n{litdd}envsubst(1)"
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr "git-sh-i18n--envsubst - Git 自带的 envsubst(1) i18n 回退功能"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -55686,7 +55719,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr "git-sh-i18n - 用于 shell 脚本的 Git i18n 设置代码"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -55734,7 +55767,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr "git-shortlog - 汇总 'git log' 输出"
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -55933,7 +55966,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr "git-show-branch - 显示分支及其提交情况"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -56260,7 +56293,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr "git-show-index - 显示打包的档案索引"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -56320,7 +56353,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr "git-show-ref - 列出本地仓库中的引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 #| msgid ""
@@ -56686,7 +56719,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr "git-show - 显示各种类型的对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -56825,7 +56858,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr "git-sh-setup - 常见 Git shell 脚本设置代码"
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -56999,7 +57032,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr "git-stage - 将文件内容添加到暂存区"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -57023,7 +57056,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr "git-stash - 将变化藏在一个脏工作区中"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -57621,7 +57654,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr "git-status - 显示工作树状态"
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -58525,7 +58558,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr "git-stripspace - 去除不必要的空白"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -58708,7 +58741,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr "git-submodule - 初始化、更新或检查子模块"
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -59388,7 +59421,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr "git-svn - Subversion 仓库和 Git 之间的双向操作"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -59618,7 +59651,7 @@ msgstr "'fetch'"
 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 "从我们正在跟踪的 Subversion 远程仓库中获取未抓取的版本。 $GIT_DIR/config 文件中 [svn-remote \"...\"] 部分的名称可作为命令行参数指定。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -59661,13 +59694,13 @@ msgstr "仅从当前 HEAD 的 SVN 父节点获取。"
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr "忽略与 Perl 正则表达式匹配的分支或标记的引用。^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$`之类的 \"否定前瞻断言 \" 可用于只允许某些引用。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr "config key: svn-remote.<名称>.ignore-refs\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -59675,19 +59708,19 @@ msgstr "如果设置了 ignore-refs 配置键，并且还给出了命令行选
 
 # ERROR: --ignore-paths not found in translation
 # ERROR: --ignore-paths not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr "该选项允许指定一个 Perl 正则表达式，从而跳过所有与之匹配的 SVN 签出路径。 `--ignore-paths` 选项应与指定仓库的每次 'fetch'（包括 'clone'、'commit'、'rebase' 等导致的自动获取）操作相匹配。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr "config key: svn-remote.<名称>.ignore-paths\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -59723,7 +59756,7 @@ msgstr "--ignore-paths=\"^[^/]+/(?:branches|tags)\"\n"
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr "该选项允许指定一个 Perl 正则表达式，使 SVN 在检出时只包含匹配的路径。 `-include-paths` 选项应与指定版本库的每次 “取回”（包括 “克隆”、\"dcommit\"、“变基” 等引起的自动取回）相匹配。`--ignore-paths` 优先于 `--include-paths`。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -59735,7 +59768,7 @@ msgstr "config key: svn-remote.<名称>.include-paths\n"
 msgid "--log-window-size=<n>"
 msgstr "--log-window-size=<n>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -59747,7 +59780,7 @@ msgstr "扫描 Subversion 历史记录时，每次请求获取 <n> 个日志条
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -59759,7 +59792,7 @@ msgstr "运行 'init' 和 'fetch'。 它会根据传递给它的 URL 的基名
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -59771,7 +59804,7 @@ msgstr "在本地 Git 仓库中为每个从 Subversion 获取的空目录创建
 msgid "--placeholder-filename=<filename>"
 msgstr "--placeholder-filename=<文件名>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -59783,31 +59816,31 @@ msgstr "设置由 --preserve-empty-dirs 创建的占位符文件的名称。 默
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr "这将从当前 HEAD 的 SVN 父版本中获取修订版本，并将当前（未提交至 SVN）工作与之相对应。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr "除了用 'git rebase' 而不是 'git merge' 保留线性历史记录以便于用 'git svn' 提交外，它的工作原理与 `svn update` 或 'git pull' 类似。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr "它接受所有 'git svn fetch' 和 'git rebase' 接受的选项。 不过，`--fetch-all` 只从当前 [svn-remote] 获取，而不是所有 [svn-remote] 定义。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr "和 'git rebase' 一样，它要求工作区是干净的，没有未提交的更改。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -59819,25 +59852,25 @@ msgstr "不要远程获取；只针对从上游 SVN 获取的最后一次提交
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr "将当前分支的每个差异直接提交到 SVN 仓库，然后重置或重置（取决于 SVN 和 head 之间是否有差异）。 这样，Git 中的每次提交都会在 SVN 中创建一个修订版本。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr "当参数中指定了一个可选的 Git 分支名称（或 Git 提交对象名称）时，该子命令将在指定的分支而非当前分支上运行。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr "使用 'dcommit' 比使用 'set-tree'（下文）更可取。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -59849,13 +59882,13 @@ msgstr "提交后，请勿变基或重置。"
 msgid "--commit-url <URL>"
 msgstr "--commit-url <地址>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr "提交到此 SVN URL（完整路径）。 这样做的目的是，如果用户后来获得了使用另一种传输方式（如 `svn+ssh://` 或 `https://`）提交的权限，那么使用一种传输方式（如匿名读取的 `svn://` 或 `http://`）创建的现有 'git svn' 仓库就可以重复使用。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -59865,13 +59898,13 @@ msgstr ""
 "config key: svn-remote.<名称>.commiturl\n"
 "config key: svn.commiturl (覆盖所有的 svn-remote.<名称>.commiturl 选项)\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr "请注意，commiturl 配置键的 SVN URL 包括 SVN 分支。 如果你想为整个 SVN 仓库设置提交 URL，请使用 svn-remote.<名称>.pushurl。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -59883,31 +59916,31 @@ msgstr "我们强烈反对将此选项用于任何其他目的（不要问）。
 msgid "--mergeinfo=<mergeinfo>"
 msgstr "--mergeinfo=<合并信息>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr "在 dcommit 时添加给定的合并信息（例如 `--mergeinfo=\"/branches/foo:1-10\"`）。所有版本的 svn 服务器都可以存储此信息（作为属性），而从 1.5 版开始的 svn 客户端也可以使用它。要指定多个分支的合并信息，请在分支之间使用一个空格字符（`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr "config key: svn.pushmergeinfo\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr "此选项将使 git-svn 在可能的情况下尝试自动填充 SVN 仓库中的 svn:mergeinfo 属性。目前，只有在提交非快进合并时才能这样做，即除了第一个合并之外的所有父合并都已推送到 SVN。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr "要求用户确认是否应将补丁集发送到 SVN。 对于每个补丁，用户可以回答 \"yes\"（接受此补丁）、\"no\"（放弃此补丁）、\"all\"（接受所有补丁）或 \"quit\"。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -59919,7 +59952,7 @@ msgstr "如果答案是 \"no\" 或 \"quit\"，'git svn dcommit' 会立即返回
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -59931,7 +59964,7 @@ msgstr "在 SVN 代码库中创建一个分支。"
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -59943,7 +59976,7 @@ msgstr "允许指定提交信息。"
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -59961,19 +59994,19 @@ msgstr "-d<路径>"
 msgid "--destination=<path>"
 msgstr "--destination=<l路径>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr "如果在 'init' 或 'clone' 命令中给出了一个以上的 --branches（或 --tags）选项，则必须提供你希望在 SVN 仓库中创建的分支（或标签）的位置。 <路径> 指定了创建分支或标签所要使用的路径，并应与某个已配置的分支或标签引用规范左侧的模式相匹配。 你可以使用以下命令查看这些引用规范"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr "git config --get-all svn-remote.<名称>.branches git config --get-all svn-remote.<名称>.tags"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -59985,7 +60018,7 @@ msgstr "其中 <名称> 是 'init'（默认为 'svn'）的 -R 选项指定的 SV
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -59997,13 +60030,13 @@ msgstr "指定执行提交的 SVN 用户名。 此选项覆盖 'username'（用
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr "使用指定的 URL 连接到目标 Subversion 仓库。 这在源 SVN 仓库为只读的情况下非常有用。 此选项覆盖配置属性 'commiturl'。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -60015,7 +60048,7 @@ msgstr "git config --get-all svn-remote.<名称>.commiturl"
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -60027,7 +60060,7 @@ msgstr "创建父文件夹。该参数等同于 svn cp 命令中的 --parents 
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -60040,13 +60073,13 @@ msgid "'log'"
 msgstr "'log'"
 
 # ERROR: --revision not found in translation
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr "这样，当 svn 用户引用 -r/--revision 时，就可以很容易地查找 svn 日志信息了。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -60064,13 +60097,13 @@ msgstr "-r <n>[:<n>]"
 msgid "--revision=<n>[:<n>]"
 msgstr "--revision=<n>[:<n>]"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr "支持，但不支持非数字参数： HEAD、NEXT、BASE、PREV 等..."
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -60082,19 +60115,19 @@ msgstr "它与 svn 日志中的 --verbose 输出不完全兼容，但相当接
 msgid "--limit=<n>"
 msgstr "--limit=<n>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr "与 --max-count 不同，不计算合并/排除的提交次数"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr "支持"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -60106,7 +60139,7 @@ msgstr "新功能："
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -60118,19 +60151,19 @@ msgstr "显示 Git 提交的 sha1，以及"
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr "我们的 --pretty=oneline 版本"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr "SVN 本身只存储 UTC 时间，不存储其他时间。常规的 svn 客户端会将 UTC 时间转换为本地时间（或基于 TZ= 环境）。该命令具有相同的行为。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -60142,7 +60175,7 @@ msgstr "其他参数将直接传递给 'git log'"
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -60154,7 +60187,7 @@ msgstr "显示文件每一行的最后修改版本和作者。该模式的输出
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -60166,7 +60199,7 @@ msgstr "输出格式与 'git blame' 相同，但使用 SVN 版本号而非 Git 
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -60184,7 +60217,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -60196,7 +60229,7 @@ msgstr "如果给定 SVN 修订版本，则不要求精确匹配，而是查找
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -60208,7 +60241,7 @@ msgstr "如果给定的是 SVN 修订版本，则不要求完全匹配；如果
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -60220,7 +60253,7 @@ msgstr "您应该考虑使用 'dcommit' 而不是此命令。 将指定的提交
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, fuzzy, placeholders:'.gitignore':'--revision', priority:100
 #| msgid "Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -60233,7 +60266,7 @@ msgstr "递归查找目录上的 svn:ignore 属性，并创建匹配的 .gitigno
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, fuzzy, placeholders:'$GIT_DIR/info/exclude', priority:100
 #| msgid "Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -60246,7 +60279,7 @@ msgstr "递归查找并列出目录的 svn:ignore 属性。 输出结果适合
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -60258,19 +60291,19 @@ msgstr "根据 $GIT_DIR/svn/<引用名>/unhandled.log 文件中的信息，尝
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr "从命令行提交两个树状参数的差异。 此命令并不依赖于在 `git svn init ` 版本库中。 该命令需要三个参数，(a) 要进行差异的原始树，(b) 新目录树的结果，(c) 目标 Subversion 仓库的 URL。 如果使用的是 'git svn' 感知的仓库（已用 'git svn' `init `过），则最后一个参数（URL）可以省略。 为此需要使用 -r<版本> 选项。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr "提交信息可以通过 `-m` 或 `-F` 选项直接提供，也可以在第二个树对象表示提交对象时通过标记或提交间接提供，还可以通过调用编辑器（见下文的 `--edit` 选项）请求提供。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -60288,7 +60321,7 @@ msgstr "-F <文件名>"
 msgid "--file=<filename>"
 msgstr "--file=<文件名>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -60300,7 +60333,7 @@ msgstr "从给定文件中获取提交信息。此选项禁用 `--edit` 选项
 msgid "'info'"
 msgstr "'info'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -60312,7 +60345,7 @@ msgstr "显示文件或目录的信息，类似于 `svn info` 提供的信息。
 msgid "'proplist'"
 msgstr "'proplist'（属性列表）"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -60324,7 +60357,7 @@ msgstr "列出 Subversion 仓库中存储的指定文件或目录的属性。 
 msgid "'propget'"
 msgstr "'propget'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -60336,7 +60369,7 @@ msgstr "获取作为第一个参数给定的文件的 Subversion 属性。 可
 msgid "'propset'"
 msgstr "'propset'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -60438,7 +60471,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr "修复导致 \"r2 \"不完整的忽略路径或 SVN 权限问题。 然后："
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -60466,7 +60499,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr "然后用 'git rebase' 修复 'master'。 切勿使用 'git merge'，否则您的历史记录将无法与未来的 'dcommit' 兼容！"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -60556,7 +60589,7 @@ msgstr "从标准输入流读取提交列表，并按相反顺序提交。 每
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -60568,19 +60601,19 @@ msgstr "仅与 'dcommit'、'set-tree' 和 'commit-diff' 命令一起使用。"
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr "如果 SVN 目录树中没有文件，则删除目录。 SVN 可以对空目录进行版本控制，如果其中没有文件，默认情况下也不会删除。 Git 不能对空目录进行版本控制。 启用此标记后，提交到 SVN 的操作将与 Git 类似。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr "配置键：svn.rmdir\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr "在提交到 SVN 之前编辑提交信息。 对于提交对象，默认情况下是关闭的，而在提交树对象时则强制开启。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -60598,13 +60631,13 @@ msgstr "-l<数量>"
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr "它们都会直接传递给 'git diff-tree'；更多信息请参见 linkgit:git-diff-tree[1] 。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -60626,7 +60659,7 @@ msgstr "-A<文件名>"
 msgid "--authors-file=<filename>"
 msgstr "--authors-file=<文件名>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -60644,7 +60677,7 @@ msgstr "\tloginname =Stackzcryp<jcs.pattystackzz@gmail.com>\n"
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr "如果指定此选项，'git svn' 遇到作者文件中不存在的 SVN 提交人名称，'git svn' 将中止操作。然后，用户必须添加适当的条目。 修改作者文件后重新运行以前的 'git svn' 命令应继续操作。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -60656,25 +60689,25 @@ msgstr "配置键：svn.authorsfile\n"
 msgid "--authors-prog=<filename>"
 msgstr "--authors-prog=<文件名>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr "如果指定了该选项，对于作者文件中不存在的每个 SVN 提交者名称，都会以提交者名称为第一个参数执行给定文件。 程序将返回一行 \"Name <邮件地址>\" 或 \"Name <>\"，并将其视为作者文件中的内容。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr "由于历史原因，对于 'init' 和 'clone'，相对 'filename（文件名）' 首先会在当前目录下搜索，而对于 'fetch'，则会在工作树的根目录下搜索。如果未找到 'filename'，则会像 '$PATH' 中的其他命令一样进行搜索。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr "配置键：svn.authorsProg\n"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -60686,37 +60719,37 @@ msgstr "使 'git svn'不那么啰嗦。再指定一次，使其更不啰嗦。"
 msgid "-s<strategy>"
 msgstr "-s<策略>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr "这些命令只与 'dcommit' 和 'rebase' 命令一起使用。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr "如果无法使用 'git reset'（参见 'dcommit'），则在使用 'dcommit' 时直接传递给 'git rebase'。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr "可与 'dcommit'、'rebase'、'branch' 和 'tag' 命令一起使用。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr "对于 'dcommit'，打印出一系列 Git 参数，显示哪些差异将提交到 SVN。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr "对于 'rebase'，显示与当前分支关联的上游 svn 仓库相关联的本地分支，以及将从中获取的 svn 仓库的 URL。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -60728,13 +60761,13 @@ msgstr "对于 'branch'（分支） 和 'tag'（标记），显示创建分支
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr "在 Git 中检索 svn 提交（作为 'fetch'、'rebase' 或 'dcommit' 操作的一部分）时，查找日志信息中的第一行 `From:` 或 `Signed-off-by` 尾注，并将其作为作者字符串。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -60746,13 +60779,13 @@ msgstr "配置键：svn.useLogAuthor\n"
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr "从 Git 提交到 svn 时（作为 'set-tree' 或 'dcommit' 操作的一部分），如果现有日志信息中还没有 `From:` 或 `Signed-off-by` 尾注，则根据 Git 提交的作者字符串添加一行 `From:`。如果这样做，`--use-log-author` 将为所有提交获取有效的作者字符串。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -60812,7 +60845,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr "只有在跟踪分支的情况下（使用仓库布局选项之一 --trunk、--tags、--branches、--stdlayout），该选项才有意义。对于每个被跟踪的分支，我们会尝试找出它的修订版本是从哪里复制的，并在该分支的第一次 Git 提交中设置一个合适的父分支。 当我们跟踪的目录在版本库中被移动过时，这一点尤其有用。 如果禁用此功能，'git svn' 创建的分支将全部是线性的，不会共享任何历史记录，这意味着不会有任何关于分支被分支或合并的信息。 不过，追踪冗长/复杂的历史可能需要很长时间，所以禁用该功能可能会加快克隆过程。该功能默认为启用，使用 --no-follow-parent 可以禁用它。"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -61453,7 +61486,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr "git-switch - 切换分支"
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -61773,7 +61806,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr "git-symbolic-ref - 读取、修改和删除符号引用"
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -61876,7 +61909,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr "git-tag - 创建、列出、删除或验证使用GPG签名的tag对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 #| msgid ""
@@ -62455,7 +62488,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr "git - 简单的内容追踪系统"
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, fuzzy, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 #| msgid ""
@@ -64473,7 +64506,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr "git-unpack-file - 创建一个包含 blob 内容的临时文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -64509,7 +64542,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr "git-unpack-objects - 从打包的压缩包中解压对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -64569,7 +64602,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr "git-update-index - 将工作区中的文件内容注册到索引中"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 #| msgid ""
@@ -65550,7 +65583,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr "git-update-ref - 安全地更新存储在引用中的对象名称"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, fuzzy, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 #| msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
@@ -65929,7 +65962,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr "git-update-server-info - 更新辅助信息文件以帮助哑服务器"
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -65977,7 +66010,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr "git-upload-archive - 将存档发回 git-archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, no-wrap, placeholders:'git upload-archive', priority:100
 msgid "'git upload-archive' <repository>\n"
@@ -66049,7 +66082,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr "git-upload-pack - 将打包的对象发送回 git-fetch-pack"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -66161,7 +66194,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr "git-var - 显示 Git 逻辑变量"
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -66357,7 +66390,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr "git-verify-commit - 检查提交的 GPG 签名"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -66399,7 +66432,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr "git-verify-pack - 验证打包的 Git 压缩文件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -66489,7 +66522,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr "git-verify-tag - 检查标签的 GPG 签名"
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -66531,7 +66564,7 @@ msgstr "git-web{litdd}browse(1)"
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr "git-web--browse - 启动网络浏览器的 Git 辅助脚本"
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -66810,7 +66843,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr "git-whatchanged - 显示每次提交引入的差异日志"
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -66870,7 +66903,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr "git-worktree - 管理多个工作区"
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -67630,7 +67663,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr "git-write-tree - 从当前索引创建目录树对象"
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -71790,13 +71823,13 @@ msgstr "与使用 linkgit:git-push[1] 推送时不同，没有任何配置可以
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr "就像用 linkgit:git-push[1] 推送一样，上面描述的所有关于不允许更新的规则都可以通过在引用规范中添加一个可选的前导词 `+` 来覆盖（或者使用 `--force` 命令行选项）。唯一的例外是，无论如何强制都不能使 `refs/heads/*` 命名空间接受一个非提交对象。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr "当你想获取的远程分支已知会被定期回溯和重定向时，预计它的新提示不会是其先前提示的后代（如你上次获取时存储在远程跟踪分支中的提示）。 你应该使用 `+` 号来表示对这类分支需要进行非快速合并式更新。 没有办法确定或声明一个分支将以这种行为在仓库中提供；拉取的用户只是必须知道这是一个分支的预期使用模式。"
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -75180,7 +75213,7 @@ msgstr "其中，<地址> 可以是路径，服务器与路径，也可以是可
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr "如果存在大量类似名称的远程仓库，并且您要为其使用不同的格式（这样，您使用的地址将被重写为有效的地址），则可以创建以下形式的配置："
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
@@ -75193,7 +75226,7 @@ msgstr ""
 "\t[url \"<实际基础网址>\"]\n"
 "\t\tinsteadOf = <其他基础网址>\n"
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -75223,7 +75256,7 @@ msgstr "诸如 \"work:repo.git\" 或 \"host.xz:/path/to/repo.git\" 的地址会
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr "如果要重写仅用于推送的地址，可以创建表单的配置部分："
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index d3a77846..7b4f4786 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2024-12-17 15:04+0100\n"
+"POT-Creation-Date: 2024-12-25 19:35+0100\n"
 "PO-Revision-Date: 2024-05-04 07:07+0000\n"
 "Last-Translator: KiralFox <kiralfox@icloud.com>\n"
 "Language-Team: French\n"
@@ -4786,49 +4786,60 @@ msgstr ""
 msgid "It is followed by one or more extended header lines:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:46
-#, priority:280
-msgid "old mode <mode> new mode <mode> deleted file mode <mode> new file mode <mode> copy from <path> copy to <path> rename from <path> rename to <path> similarity index <number> dissimilarity index <number> index <hash>..<hash> <mode>"
+#, no-wrap, priority:280
+msgid ""
+"old mode <mode>\n"
+"new mode <mode>\n"
+"deleted file mode <mode>\n"
+"new file mode <mode>\n"
+"copy from <path>\n"
+"copy to <path>\n"
+"rename from <path>\n"
+"rename to <path>\n"
+"similarity index <number>\n"
+"dissimilarity index <number>\n"
+"index <hash>..<hash> <mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "File modes _<mode>_ are printed as 6-digit octal numbers including the file type and file permission bits."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:51
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:58
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:62
 #, priority:280
 msgid "The index line includes the blob object names before and after the change. The _<mode>_ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:66
 #, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:71
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:78
 #, no-wrap, placeholders:'--git':'--git', priority:280
 msgid ""
@@ -4840,7 +4851,7 @@ msgid ""
 "rename to a\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:83
 #, placeholders:'linkgit:gitattributes[5]', priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
@@ -4937,91 +4948,95 @@ msgstr ""
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:144
-#, priority:280
-msgid "index <hash>,<hash>..<hash> mode <mode>,<mode>`..`<mode> new file mode <mode> deleted file mode <mode>,<mode>"
+#, no-wrap, priority:280
+msgid ""
+"index <hash>,<hash>..<hash>\n"
+"mode <mode>,<mode>`..`<mode>\n"
+"new file mode <mode>\n"
+"deleted file mode <mode>,<mode>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:150
 #, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two _<tree-ish>_ and are not used by combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:152
 #, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:154 en/diff-generate-patch.txt:165 en/diff-generate-patch.txt:166 en/diff-generate-patch.txt:167
 #, priority:280
 msgid "a/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:155 en/diff-generate-patch.txt:168
 #, priority:280
 msgid "b/file"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:159
 #, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:163
 #, placeholders:'--combined-all-paths', priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:172
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:178
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:180
 #, no-wrap, priority:280
 msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:183
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:192
 #, ignore-ellipsis, priority:280
 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 ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:198
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:204
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr ""
 
-#. type: Plain text
+#. type: synopsis
 #: en/diff-generate-patch.txt:210
 #, placeholders:'git diff-tree':'git diff-files', priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
@@ -7792,7 +7807,7 @@ msgstr "git-add(1)"
 msgid "git-add - Add file contents to the index"
 msgstr "git-add - 在索引中加入檔案"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-add.txt:16
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--verbose':'[--dry-run':'[--force':'[--interactive':'[--patch':'[--edit':'[--update':'[--sparse]':'[--intent-to-add':'[--refresh]':'[--ignore-errors]':'[--ignore-missing]':'[--renormalize]':'[--chmod=(+|-)x]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:300
 #| msgid ""
@@ -8557,7 +8572,7 @@ msgstr "git-am(1)"
 msgid "git-am - Apply a series of patches from a mailbox"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-am.txt:22
 #, ignore-ellipsis, no-wrap, placeholders:'[--signoff]':'[--keep]':'[--no-verify]':'[--interactive]':'[--committer-date-is-author-date]':'[--ignore-date]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=':'[--directory=':'[--exclude=':'[--include=':'[--reject]':'--quiet]':'[--patch-format=':'[--quoted-cr=':'[--empty=(stop|drop|keep)]':'--continue':'--skip':'--abort':'--quit':'--retry':'--show-current-patch[=(diff|raw)]':'--allow-empty', priority:100
 msgid ""
@@ -9185,7 +9200,7 @@ msgstr "git-annotate(1)"
 msgid "git-annotate - Annotate file lines with commit information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-annotate.txt:12
 #, no-wrap, priority:100
 msgid "'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>\n"
@@ -9215,7 +9230,7 @@ msgstr "git-apply(1)"
 msgid "git-apply - Apply a patch to files and/or to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-apply.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--numstat]':'[--summary]':'[--check]':'[--index':'--intent-to-add]':'[--3way]':'[--ours':'--theirs':'--union]':'[--apply]':'[--no-add]':'[--build-fake-ancestor=':'--reverse]':'[--allow-binary-replacement':'--binary]':'[--reject]':'[--inaccurate-eof]':'[--recount]':'[--cached]':'[--ignore-space-change':'--ignore-whitespace]':'[--whitespace=(nowarn|warn|fix|error|error-all)]':'[--exclude=':'[--include=':'[--directory=':'[--verbose':'--quiet]':'[--unsafe-paths]':'[--allow-empty]', priority:100
 msgid ""
@@ -9698,7 +9713,7 @@ msgstr "git-archimport(1)"
 msgid "git-archimport - Import a GNU Arch repository into Git"
 msgstr "git-archimport - 將一個 GNU Arch 儲存庫匯入到 Git"
 
-#. type: Plain text
+#. type: verse
 #: en/git-archimport.txt:14
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
@@ -9863,7 +9878,7 @@ msgstr "git-archive(1)"
 msgid "git-archive - Create an archive of files from a named tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-archive.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--format=':'[--list]':'[--prefix=':'--output=':'[--worktree-attributes]':'[--remote=':'[--exec=', priority:100
 msgid ""
@@ -10314,7 +10329,7 @@ msgstr "git-bisect(1)"
 msgid "git-bisect - Use binary search to find the commit that introduced a bug"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bisect.txt:13
 #, no-wrap, priority:100
 msgid "'git bisect' <subcommand> <options>\n"
@@ -11108,7 +11123,7 @@ msgstr "git-blame(1)"
 msgid "git-blame - Show what revision and author last modified each line of a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-blame.txt:16
 #, no-wrap, placeholders:'[--root]':'[--incremental]':'[--since=':'[--ignore-rev':'[--ignore-revs-file':'[--color-lines]':'[--color-by-age]':'[--progress]':'[--abbrev=':'--contents':'--reverse', priority:100
 msgid ""
@@ -11521,7 +11536,7 @@ msgstr ""
 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-blame.txt:237
 #, priority:100
 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
@@ -11552,7 +11567,7 @@ msgstr "git-branch(1)"
 msgid "git-branch - List, create, or delete branches"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-branch.txt:27
 #, ignore-ellipsis, no-wrap, placeholders:'[--color':'--no-color]':'[--show-current]':'[--abbrev=':'--no-abbrev]':'[--column':'--no-column]':'[--sort=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--points-at':'[--format=':'--remotes':'--all':'[--list]':'[--track[=(direct|inherit)]':'--no-track]':'[--recurse-submodules]':'--set-upstream-to=':'--unset-upstream':'--edit-description', priority:260
 msgid ""
@@ -12280,7 +12295,7 @@ msgstr "git-bugreport(1)"
 msgid "git-bugreport - Collect information for user to file a bug report"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bugreport.txt:14
 #, no-wrap, placeholders:'--output-directory':'--suffix':'--no-suffix]':'[--diagnose', priority:100
 msgid ""
@@ -12449,7 +12464,7 @@ msgstr "git-bundle(1)"
 msgid "git-bundle - Move objects and refs by archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-bundle.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--quiet':'--progress]':'[--version=':'--quiet]':'[--progress]', priority:100
 msgid ""
@@ -13010,7 +13025,7 @@ msgstr "git-cat-file(1)"
 msgid "git-cat-file - Provide contents or details of repository objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cat-file.txt:19
 #, no-wrap, placeholders:'git cat-file':'git cat-file':'git cat-file':'[--allow-unknown-type]':'git cat-file':'--textconv':'--filters':'--path=':'git cat-file':'--batch':'--batch-check':'--batch-command':'[--batch-all-objects]':'[--buffer]':'[--follow-symlinks]':'[--unordered]':'[--textconv':'--filters]', priority:80
 msgid ""
@@ -13749,7 +13764,7 @@ msgstr "git-check-attr(1)"
 msgid "git-check-attr - Display gitattributes information"
 msgstr "git-check-attr - 顯示 gitattributes 資訊"
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-attr.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-attr':'[--source':'--all':'git check-attr':'--stdin':'[--source':'--all', priority:100
 msgid ""
@@ -14008,7 +14023,7 @@ msgstr "git-check-ignore(1)"
 msgid "git-check-ignore - Debug gitignore / exclude files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ignore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git check-ignore':'git check-ignore':'--stdin', priority:80
 msgid ""
@@ -14196,7 +14211,7 @@ msgstr "git-check-mailmap(1)"
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-mailmap.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git check-mailmap', priority:100
 msgid "'git check-mailmap' [<options>] <contact>...\n"
@@ -14263,7 +14278,7 @@ msgstr "git-checkout-index(1)"
 msgid "git-checkout-index - Copy files from the index to the working tree"
 msgstr "git-checkout-index - 將檔案從索引複製到工作樹"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout-index.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git checkout-index':'[--prefix=':'[--stage=':'[--temp]':'[--ignore-skip-worktree-bits]':'[--stdin]', priority:80
 msgid ""
@@ -14552,7 +14567,7 @@ msgstr "git-checkout(1)"
 msgid "git-checkout - Switch branches or restore working tree files"
 msgstr "git-checkout - 切換分支或還原工作樹檔案"
 
-#. type: Plain text
+#. type: verse
 #: en/git-checkout.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'--detach':'[--detach]':'--orphan]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--ours':'--theirs':'--conflict=':'--ours':'--theirs':'--conflict=':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch', priority:240
 msgid ""
@@ -15485,7 +15500,7 @@ msgstr "git-check-ref-format(1)"
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-check-ref-format.txt:15
 #, no-wrap, placeholders:'git check-ref-format':'[--normalize]':'[--refspec-pattern]':'git check-ref-format':'--branch', priority:100
 msgid ""
@@ -15683,7 +15698,7 @@ msgstr "git-cherry-pick(1)"
 msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry-pick.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git cherry-pick':'[--edit]':'[--ff]':'git cherry-pick':'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -16093,7 +16108,7 @@ msgstr "git-cherry(1)"
 msgid "git-cherry - Find commits yet to be applied to upstream"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cherry.txt:12
 #, no-wrap, priority:100
 msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n"
@@ -16306,7 +16321,7 @@ msgstr "git-citool(1)"
 msgid "git-citool - Graphical alternative to git-commit"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-citool.txt:12
 #, no-wrap, priority:100
 msgid "'git citool'\n"
@@ -16336,7 +16351,7 @@ msgstr "git-clean(1)"
 msgid "git-clean - Remove untracked files from the working tree"
 msgstr "git-clean - 從工作樹中移除未追蹤的檔案"
 
-#. type: Plain text
+#. type: verse
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]\n"
@@ -16544,7 +16559,7 @@ msgstr "git-clone(1)"
 msgid "git-clone - Clone a repository into a new directory"
 msgstr "git-clone - 拓製一個儲存庫到新的目錄"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-clone.txt:21
 #, no-wrap, placeholders:'[--template=':'[--no-hardlinks]':'[--bare]':'[--mirror]':'[--reference':'[--dissociate]':'[--depth':'[--no-tags]':'[--recurse-submodules':'[--jobs':'[--sparse]':'[--filter=':'[--also-filter-submodules]', priority:300
 msgid ""
@@ -17188,7 +17203,7 @@ msgstr "git-column(1)"
 msgid "git-column - Display data in columns"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-column.txt:13
 #, no-wrap, placeholders:'[--command=':'[--width=':'[--indent=':'[--nl=':'[--padding=', priority:100
 msgid ""
@@ -17360,7 +17375,7 @@ msgstr "git-commit-tree(1)"
 msgid "git-commit-tree - Create a new commit object"
 msgstr "git-commit-tree - 建立一個新的送交物件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git commit-tree':'git commit-tree', priority:80
 msgid ""
@@ -17531,7 +17546,7 @@ msgstr "git-commit(1)"
 msgid "git-commit - Record changes to the repository"
 msgstr "git-commit - 記錄儲存庫的變更"
 
-#. type: Plain text
+#. type: verse
 #: en/git-commit.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'--interactive':'--patch]':'[--amend]':'[--dry-run]':'--squash':'--fixup':'[--reset-author]':'[--allow-empty]':'[--allow-empty-message]':'[--no-verify]':'[--author=':'[--date=':'[--cleanup=':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--trailer', priority:280
 msgid ""
@@ -18385,7 +18400,7 @@ msgstr "git-config(1)"
 msgid "git-config - Get and set repository or global options"
 msgstr "git-config - 獲取和設定儲存庫或全域選項"
 
-#. type: Plain text
+#. type: verse
 #: en/git-config.txt:20
 #, no-wrap, placeholders:'[--includes]':'[--includes]':'[--all]':'[--regexp]':'[--value=':'[--fixed-value]':'[--default=':'[--type=':'[--all]':'[--value=':'[--fixed-value]':'[--all]':'[--value=':'[--fixed-value]':'--get-colorbool', priority:100
 msgid ""
@@ -19680,7 +19695,7 @@ msgstr "git-count-objects(1)"
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-count-objects.txt:12
 #, no-wrap, placeholders:'git count-objects':'--human-readable]', priority:80
 msgid "'git count-objects' [-v] [-H | --human-readable]\n"
@@ -19777,7 +19792,7 @@ msgstr "git-credential-cache--daemon(1)"
 msgid "git-credential-cache--daemon - Temporarily store user credentials in memory"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-credential-cache--daemon.txt:12
 #, fuzzy, no-wrap, placeholders:'git credential-cache':'{litdd}':'[--debug]', priority:90
 #| msgid "git-credential-cache--daemon(1)"
@@ -20503,7 +20518,7 @@ msgstr "git-cvsexportcommit(1)"
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsexportcommit.txt:14
 #, no-wrap, priority:90
 msgid ""
@@ -20693,7 +20708,7 @@ msgstr "git-cvsimport(1)"
 msgid "git-cvsimport - Salvage your data out of another SCM people love to hate"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsimport.txt:17
 #, no-wrap, priority:90
 msgid ""
@@ -21120,7 +21135,7 @@ msgstr ""
 msgid "SSH:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:16
 #, no-wrap, placeholders:'CVS_SERVER', priority:90
 msgid ""
@@ -21128,25 +21143,25 @@ msgid ""
 "'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:18
 #, placeholders:'inetd.conf', priority:90
 msgid "pserver (/etc/inetd.conf):"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:21
 #, no-wrap, placeholders:'git-cvsserver':'git-cvsserver', priority:90
 msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:23
 #, priority:90
 msgid "Usage:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-cvsserver.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'git-cvsserver', priority:90
 msgid "'git-cvsserver' [<options>] [pserver|server] [<directory> ...]\n"
@@ -21868,7 +21883,7 @@ msgstr "git-daemon(1)"
 msgid "git-daemon - A really simple server for Git repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-daemon.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'[--verbose]':'[--syslog]':'[--export-all]':'[--timeout=':'[--init-timeout=':'[--max-connections=':'[--strict-paths]':'[--base-path=':'[--base-path-relaxed]':'[--user-path':'--user-path=':'[--interpolated-path=':'[--reuseaddr]':'[--detach]':'[--pid-file=':'[--enable=':'[--disable=':'[--allow-override=':'[--forbid-override=':'[--access-hook=':'[--inetd':'[--listen=':'[--port=':'[--user=':'[--group=':'[--log-destination=(stderr|syslog|none)]', priority:100
 msgid ""
@@ -22440,7 +22455,7 @@ msgstr "git-describe(1)"
 msgid "git-describe - Give an object a human readable name based on an available ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-describe.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'[--all]':'[--tags]':'[--contains]':'[--abbrev=':'--dirty', priority:260
 msgid ""
@@ -22735,7 +22750,7 @@ msgstr "git-diff-files(1)"
 msgid "git-diff-files - Compares files in the working tree and the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-files':'--cc]', priority:100
 msgid "'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]\n"
@@ -22807,7 +22822,7 @@ msgstr "git-diff-index(1)"
 msgid "git-diff-index - Compare a tree to the working tree or index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-index':'[--cached]':'[--merge-base]', priority:80
 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n"
@@ -22996,7 +23011,7 @@ msgstr "git-difftool(1)"
 msgid "git-difftool - Show changes using common diff tools"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-difftool.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n"
@@ -23244,7 +23259,7 @@ msgstr "git-diff-tree(1)"
 msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-diff-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git diff-tree':'[--stdin]':'[--no-commit-id]':'[--pretty]':'--cc]':'[--combined-all-paths]':'[--root]':'[--merge-base]', priority:80
 msgid ""
@@ -23404,10 +23419,16 @@ msgstr "git-diff(1)"
 msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - 顯示送交之間的變更、送交與工作樹枝間的變更...等等"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-diff.txt:18
-#, ignore-ellipsis, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
-msgid "git diff [<options>] [<commit>] [--] [<path>...] git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...] git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...] git diff [<options>] <commit>...<commit> [--] [<path>...] git diff [<options>] <blob> <blob> git diff [<options>] --no-index [--] <path> <path>"
+#, ignore-ellipsis, no-wrap, placeholders:'--cached':'[--merge-base]':'[--merge-base]':'--no-index', priority:280
+msgid ""
+"git diff [<options>] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"git diff [<options>] <blob> <blob>\n"
+"git diff [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
@@ -23847,7 +23868,7 @@ msgstr "git-fast-export(1)"
 msgid "git-fast-export - Git data exporter"
 msgstr "git-fast-export - Git 資料匯出器"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-export.txt:13
 #, no-wrap, placeholders:'git fast-export':'git fast-import', priority:90
 msgid "'git fast-export' [<options>] | 'git fast-import'\n"
@@ -24259,7 +24280,7 @@ msgstr "git-fast-import(1)"
 msgid "git-fast-import - Backend for fast Git data importers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fast-import.txt:13
 #, no-wrap, placeholders:'git fast-import', priority:90
 msgid "frontend | 'git fast-import' [<options>]\n"
@@ -26619,7 +26640,7 @@ msgstr "git-fetch-pack(1)"
 msgid "git-fetch-pack - Receive missing objects from another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch-pack.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git fetch-pack':'[--all]':'[--quiet':'[--keep':'[--thin]':'[--include-tag]':'[--upload-pack=':'git-upload-pack':'[--depth=':'[--no-progress]', priority:90
 msgid ""
@@ -26815,7 +26836,7 @@ msgstr "git-fetch(1)"
 msgid "git-fetch - Download objects and refs from another repository"
 msgstr "git-fetch - 從另一個儲存庫下載物件和參照"
 
-#. type: Plain text
+#. type: verse
 #: en/git-fetch.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'--multiple':'--all', priority:220
 msgid ""
@@ -27309,7 +27330,7 @@ msgstr "git-filter-branch(1)"
 msgid "git-filter-branch - Rewrite branches"
 msgstr "git-filter-branch - 重寫分支"
 
-#. type: Plain text
+#. type: verse
 #: en/git-filter-branch.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git filter-branch':'[--setup':'[--subdirectory-filter':'[--env-filter':'[--tree-filter':'[--index-filter':'[--parent-filter':'[--msg-filter':'[--commit-filter':'[--tag-name-filter':'[--prune-empty]':'[--original':'--force]':'[--state-branch', priority:90
 msgid ""
@@ -28212,7 +28233,7 @@ msgstr "git-fmt-merge-msg(1)"
 msgid "git-fmt-merge-msg - Produce a merge commit message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fmt-merge-msg.txt:14
 #, no-wrap, placeholders:'git fmt-merge-msg':'[--into-name':'[--log':'--no-log]':'git fmt-merge-msg':'[--log':'--no-log]', priority:100
 msgid ""
@@ -28343,7 +28364,7 @@ msgstr "git-for-each-ref(1)"
 msgid "git-for-each-ref - Output information on each ref"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-for-each-ref.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'git for-each-ref':'[--count=':'[--shell':'--perl':'--python':'--tcl]':'--sort=':'[--format=':'[--include-root-refs]':'--stdin':'[--points-at=':'[--merged':'[--no-merged':'[--contains':'[--no-contains':'[--exclude=', priority:80
 msgid ""
@@ -29271,7 +29292,7 @@ msgstr "git-format-patch(1)"
 msgid "git-format-patch - Prepare patches for e-mail submission"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-format-patch.txt:35
 #, no-wrap, placeholders:'git format-patch':'--output-directory':'--stdout]':'[--no-thread':'--thread':'--attach':'--inline':'--no-attach]':'--signoff]':'[--signature=':'--no-signature]':'[--signature-file=':'--numbered':'--no-numbered]':'[--start-number':'[--numbered-files]':'[--in-reply-to=':'[--suffix=':'[--ignore-if-in-upstream]':'[--always]':'[--cover-from-description=':'[--rfc':'[--subject-prefix=':'--reroll-count':'[--to=':'[--cc=':'[--quiet]':'[--no-notes':'--notes':'[--interdiff=':'[--range-diff=':'[--creation-factor=':'[--filename-max-length=':'[--progress]', priority:100
 msgid ""
@@ -30589,7 +30610,7 @@ msgstr "git-fsck-objects(1)"
 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck-objects.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git fsck-objects', priority:100
 msgid "'git fsck-objects' ...\n"
@@ -30613,7 +30634,7 @@ msgstr "git-fsck(1)"
 msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-fsck.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'[--tags]':'[--root]':'[--unreachable]':'[--cache]':'[--no-reflogs]':'[--strict]':'[--verbose]':'[--lost-found]':'[--connectivity-only]', priority:100
 msgid ""
@@ -30911,7 +30932,7 @@ msgstr "git-gc(1)"
 msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gc.txt:13
 #, no-wrap, placeholders:'[--aggressive]':'[--auto]':'[--quiet]':'[--prune=':'--no-prune]':'[--force]':'[--keep-largest-pack]', priority:100
 msgid "'git gc' [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
@@ -31140,7 +31161,7 @@ msgstr "git-get-tar-commit-id(1)"
 msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-get-tar-commit-id.txt:13
 #, no-wrap, placeholders:'git get-tar-commit-id', priority:100
 msgid "'git get-tar-commit-id'\n"
@@ -31170,7 +31191,7 @@ msgstr "git-grep(1)"
 msgid "git-grep - Print lines matching a pattern"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-grep.txt:33
 #, ignore-ellipsis, no-wrap, placeholders:'--text]':'[--textconv]':'--ignore-case]':'--word-regexp]':'--invert-match]':'[--full-name]':'--extended-regexp]':'--basic-regexp]':'--perl-regexp]':'--fixed-strings]':'--line-number]':'[--column]':'--files-with-matches]':'--files-without-match]':'--open-files-in-pager':'--null]':'--only-matching':'--count]':'[--all-match]':'--quiet]':'[--max-depth':'[--color':'--no-color]':'[--break]':'[--heading]':'--show-function]':'--function-context]':'--max-count':'[--threads':'[--and':'--or':'--not':'[--recurse-submodules]':'[--parent-basename':'[--cached':'--untracked':'--no-index]', priority:100
 msgid ""
@@ -31899,7 +31920,7 @@ msgstr "git-gui(1)"
 msgid "git-gui - A portable graphical interface to Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-gui.txt:12
 #, no-wrap, priority:100
 msgid "'git gui' [<command>] [<arguments>]\n"
@@ -32116,7 +32137,7 @@ msgstr "git-hash-object(1)"
 msgid "git-hash-object - Compute object ID and optionally create an object from a file"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-hash-object.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git hash-object':'[--path=':'--no-filters]':'[--stdin':'[--literally]':'git hash-object':'--stdin-paths':'[--no-filters]', priority:80
 msgid ""
@@ -32209,7 +32230,7 @@ msgstr "git-help(1)"
 msgid "git-help - Display help information about Git"
 msgstr "git-help - 顯示關於 Git 的幫助資訊"
 
-#. type: Plain text
+#. type: verse
 #: en/git-help.txt:17
 #, fuzzy, no-wrap, placeholders:'--all]':'[[-i|--info] [-m|--man] [-w|--web]]':'--guides]':'--config]':'[--user-interfaces]':'[--developer-interfaces]', priority:100
 msgid ""
@@ -32640,7 +32661,7 @@ msgstr "git-http-backend(1)"
 msgid "git-http-backend - Server side implementation of Git over HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-backend.txt:12
 #, no-wrap, placeholders:'git http-backend', priority:100
 msgid "'git http-backend'\n"
@@ -33091,7 +33112,7 @@ msgstr "git-http-fetch(1)"
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-fetch.txt:13
 #, no-wrap, placeholders:'git http-fetch':'[--recover]':'[--stdin':'--packfile=', priority:100
 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
@@ -33211,7 +33232,7 @@ msgstr "git-http-push(1)"
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git http-push':'[--all]':'[--dry-run]':'[--force]':'[--verbose]', priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
@@ -33361,7 +33382,7 @@ msgstr "git-imap-send(1)"
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-imap-send.txt:13
 #, no-wrap, placeholders:'git imap-send', priority:100
 msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
@@ -33472,13 +33493,13 @@ msgid ""
 "    ; sslVerify = false\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:102
 #, priority:100
 msgid "Using Gmail's IMAP interface:"
@@ -33495,31 +33516,31 @@ msgid ""
 "\tport = 993\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:118
 #, priority:100
 msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:122
 #, no-wrap, placeholders:'git format-patch':'--cover-letter':'--stdout':'git imap-send', priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-imap-send.txt:126
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
@@ -33564,7 +33585,7 @@ msgstr "git-index-pack(1)"
 msgid "git-index-pack - Build pack index file for an existing packed archive"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-index-pack.txt:15
 #, no-wrap, placeholders:'git index-pack':'git index-pack':'--stdin':'[--fix-thin]':'[--keep]', priority:100
 msgid ""
@@ -33796,7 +33817,7 @@ msgstr "git-init-db(1)"
 msgid "git-init-db - Creates an empty Git repository"
 msgstr "git-init-db - 建立一個空白的 Git 儲存庫"
 
-#. type: Plain text
+#. type: verse
 #: en/git-init-db.txt:13
 #, fuzzy, no-wrap, placeholders:'git init-db':'--quiet]':'[--bare]':'[--template=':'[--shared', priority:100
 #| msgid ""
@@ -33829,7 +33850,7 @@ msgstr "git-init(1)"
 msgid "git-init - Create an empty Git repository or reinitialize an existing one"
 msgstr "git-init - 建立一個空的 Git 儲存庫或是重新初始化現有的儲存庫"
 
-#. type: Plain text
+#. type: synopsis
 #: en/git-init.txt:17
 #, fuzzy, no-wrap, placeholders:'--quiet]':'[--bare]':'[--template=':'[--object-format=':'[--ref-format=':'--initial-branch=':'[--shared', priority:300
 #| msgid ""
@@ -34181,7 +34202,7 @@ msgstr "git-instaweb(1)"
 msgid "git-instaweb - Instantly browse your working repository in gitweb"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-instaweb.txt:14
 #, no-wrap, placeholders:'[--local]':'[--httpd=':'[--port=':'[--browser=':'[--start]':'[--stop]':'[--restart]', priority:100
 msgid ""
@@ -34340,7 +34361,7 @@ msgstr "git-interpret-trailers(1)"
 msgid "git-interpret-trailers - Add or parse structured information in commit messages"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-interpret-trailers.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git interpret-trailers':'[--in-place]':'[--trim-empty]':'--trailer':'[--parse]', priority:100
 msgid ""
@@ -35185,7 +35206,7 @@ msgstr "git-log(1)"
 msgid "git-log - Show commit logs"
 msgstr "git-log - 顯示送交日誌"
 
-#. type: Plain text
+#. type: verse
 #: en/git-log.txt:13
 #, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
@@ -35527,7 +35548,7 @@ msgstr "git-ls-files(1)"
 msgid "git-ls-files - Show information about files in the index and the working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-files.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-files':'--cached]':'--deleted]':'--others]':'--ignored]':'--stage]':'--unmerged]':'--killed]':'--modified]':'[--resolve-undo]':'[--directory':'[--no-empty-directory]':'[--eol]':'[--deduplicate]':'--exclude=':'--exclude-from=':'[--exclude-per-directory=':'[--exclude-standard]':'[--error-unmatch]':'[--with-tree=':'[--full-name]':'[--recurse-submodules]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36211,7 +36232,7 @@ msgstr "git-ls-remote(1)"
 msgid "git-ls-remote - List references in a remote repository"
 msgstr "git-ls-remote - 列出一個遠端儲存庫中的參照"
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-remote.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-remote':'[--branches]':'[--tags]':'[--refs]':'[--upload-pack=':'--quiet]':'[--exit-code]':'[--get-url]':'[--sort=':'[--symref]', priority:100
 msgid ""
@@ -36421,7 +36442,7 @@ msgstr "git-ls-tree(1)"
 msgid "git-ls-tree - List the contents of a tree object"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-ls-tree.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'git ls-tree':'[--name-only]':'[--name-status]':'[--object-only]':'[--full-name]':'[--full-tree]':'[--abbrev':'[--format=', priority:80
 msgid ""
@@ -36646,7 +36667,7 @@ msgstr "git-mailinfo(1)"
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailinfo.txt:15
 #, no-wrap, placeholders:'--encoding=':'[--quoted-cr=', priority:100
 msgid ""
@@ -36841,7 +36862,7 @@ msgstr "git-mailsplit(1)"
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mailsplit.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--keep-cr]':'[--mboxrd]', priority:100
 msgid ""
@@ -36963,7 +36984,7 @@ msgstr "git-merge-base(1)"
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-base.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-base':'--all]':'git merge-base':'--all]':'--octopus':'git merge-base':'--is-ancestor':'git merge-base':'--independent':'git merge-base':'--fork-point', priority:80
 msgid ""
@@ -37315,7 +37336,7 @@ msgstr "git-merge-file(1)"
 msgid "git-merge-file - Run a three-way file merge"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-file.txt:15
 #, no-wrap, placeholders:'git merge-file':'[--ours':'--theirs':'--union]':'--stdout]':'--quiet]':'[--marker-size=':'[--object-id]', priority:90
 msgid ""
@@ -37504,7 +37525,7 @@ msgstr "git-merge-index(1)"
 msgid "git-merge-index - Run a merge for files needing merging"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git merge-index', priority:90
 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n"
@@ -37558,7 +37579,7 @@ msgstr ""
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
 #, priority:100
 msgid "Examples:"
@@ -37611,7 +37632,7 @@ msgstr "git-merge-one-file(1)"
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-one-file.txt:13
 #, no-wrap, placeholders:'git merge-one-file', priority:100
 msgid "'git merge-one-file'\n"
@@ -37635,7 +37656,7 @@ msgstr ""
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, placeholders:'TOOL_MODE':'--exec-path':'git-mergetool':'{litdd}', priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
@@ -37737,7 +37758,7 @@ msgstr "git-mergetool(1)"
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'[--tool=', priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
@@ -37887,7 +37908,7 @@ msgstr "git-merge-tree(1)"
 msgid "git-merge-tree - Perform merge without touching index or working tree"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge-tree.txt:14
 #, no-wrap, placeholders:'git merge-tree':'[--write-tree]':'git merge-tree':'[--trivial-merge]', priority:100
 msgid ""
@@ -38398,7 +38419,7 @@ msgstr "git-merge(1)"
 msgid "git-merge - Join two or more development histories together"
 msgstr "git-merge - 將兩個或多個開發歷史合併在一起"
 
-#. type: Plain text
+#. type: verse
 #: en/git-merge.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--stat]':'[--no-commit]':'[--squash]':'[--no-verify]':'[--into-name':'--continue':'--abort':'--quit', priority:240
 msgid ""
@@ -38933,7 +38954,7 @@ msgstr "git-mktag(1)"
 msgid "git-mktag - Creates a tag object with extra validation"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktag.txt:13
 #, no-wrap, priority:100
 msgid "'git mktag'\n"
@@ -39029,7 +39050,7 @@ msgstr "git-mktree(1)"
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-mktree.txt:13
 #, no-wrap, placeholders:'[--missing]':'[--batch]', priority:100
 msgid "'git mktree' [-z] [--missing] [--batch]\n"
@@ -39077,7 +39098,7 @@ msgstr "git-mv(1)"
 msgid "git-mv - Move or rename a file, a directory, or a symlink"
 msgstr "git-mv - 移動或重新命名檔案、目錄或符號連結"
 
-#. type: Plain text
+#. type: verse
 #: en/git-mv.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
@@ -39158,7 +39179,7 @@ msgstr "git-name-rev(1)"
 msgid "git-name-rev - Find symbolic names for given revs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-name-rev.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'git name-rev':'[--tags]':'[--refs=':'--all':'--annotate-stdin', priority:100
 msgid ""
@@ -39327,7 +39348,7 @@ msgstr "git-notes(1)"
 msgid "git-notes - Add or inspect object notes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-notes.txt:23
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
 #| msgid ""
@@ -39898,7 +39919,7 @@ msgstr "git-p4(1)"
 msgid "git-p4 - Import from and submit to Perforce repositories"
 msgstr "git-p4 - 從 Perforce 儲存庫匯入和提交到 Perforce 儲存庫"
 
-#. type: Plain text
+#. type: verse
 #: en/git-p4.txt:16
 #, ignore-ellipsis, no-wrap, priority:90
 msgid ""
@@ -41461,7 +41482,7 @@ msgstr "git-pack-objects(1)"
 msgid "git-pack-objects - Create a packed archive of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-objects.txt:19
 #, no-wrap, placeholders:'git pack-objects':'--progress':'--all-progress]':'[--all-progress-implied]':'[--no-reuse-delta]':'[--delta-base-offset]':'[--non-empty]':'[--local]':'[--incremental]':'[--window=':'[--depth=':'[--revs':'[--unpacked':'--all]':'[--keep-pack=':'[--cruft]':'[--cruft-expiration=':'[--stdout':'[--filter=':'[--shallow]':'[--keep-true-parents]', priority:80
 msgid ""
@@ -42076,7 +42097,7 @@ msgstr "git-pack-redundant(1)"
 msgid "git-pack-redundant - Find redundant pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git pack-redundant':'[--verbose]':'[--alt-odb]':'--all', priority:80
 msgid "'git pack-redundant' [--verbose] [--alt-odb] (--all | <pack-filename>...)\n"
@@ -42154,7 +42175,7 @@ msgstr "git-pack-refs(1)"
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pack-refs.txt:12
 #, no-wrap, placeholders:'git pack-refs':'[--all]':'[--no-prune]':'[--auto]':'[--include':'[--exclude', priority:80
 msgid "'git pack-refs' [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude <pattern>]\n"
@@ -42263,7 +42284,7 @@ msgstr "git-patch-id(1)"
 msgid "git-patch-id - Compute unique ID for a patch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-patch-id.txt:12
 #, no-wrap, placeholders:'git patch-id':'[--stable':'--unstable':'--verbatim]', priority:80
 msgid "'git patch-id' [--stable | --unstable | --verbatim]\n"
@@ -42377,7 +42398,7 @@ msgstr "git-prune-packed(1)"
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune-packed.txt:13
 #, no-wrap, placeholders:'git prune-packed':'--dry-run]':'--quiet]', priority:100
 msgid "'git prune-packed' [-n | --dry-run] [-q | --quiet]\n"
@@ -42437,7 +42458,7 @@ msgstr "git-prune(1)"
 msgid "git-prune - Prune all unreachable objects from the object database"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-prune.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'[--progress]':'[--expire', priority:100
 msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
@@ -42545,7 +42566,7 @@ msgstr "git-pull(1)"
 msgid "git-pull - Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-pull.txt:13
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n"
@@ -42706,7 +42727,7 @@ msgstr ""
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:132
 #, placeholders:'linkgit:git-rebase[1]', priority:220
 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
@@ -42718,7 +42739,7 @@ msgstr ""
 msgid "--no-rebase"
 msgstr "--no-rebase"
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-pull.txt:135
 #, placeholders:'--rebase=false', priority:220
 msgid "This is shorthand for --rebase=false."
@@ -42882,7 +42903,7 @@ msgstr "git-push(1)"
 msgid "git-push - Update remote refs along with associated objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-push.txt:18
 #, ignore-ellipsis, no-wrap, placeholders:'[--all':'--branches':'--mirror':'--tags]':'[--follow-tags]':'[--atomic]':'--dry-run]':'[--receive-pack=':'git-receive-pack':'[--repo=':'--force]':'--delete]':'[--prune]':'--quiet]':'--verbose]':'--set-upstream]':'--push-option=':'--signed=(true|false|if-asked)]':'[--force-with-lease':'[--force-if-includes]':'[--no-verify]', priority:220
 msgid ""
@@ -43853,7 +43874,7 @@ msgstr "git-quiltimport(1)"
 msgid "git-quiltimport - Applies a quilt patchset onto the current branch"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-quiltimport.txt:14
 #, no-wrap, placeholders:'[--dry-run':'[--author':'[--patches':'[--series':'[--keep-non-patch]', priority:90
 msgid ""
@@ -43945,7 +43966,7 @@ msgstr "git-range-diff(1)"
 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-range-diff.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git range-diff':'[--color=[':'[--no-color]':'[--no-dual-color]':'[--creation-factor=':'[--left-only':'--right-only]', priority:100
 msgid ""
@@ -44388,7 +44409,7 @@ msgstr "git-read-tree(1)"
 msgid "git-read-tree - Reads tree information into the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-read-tree.txt:15
 #, no-wrap, placeholders:'git read-tree':'[--trivial]':'[--aggressive]':'--reset':'--prefix=':'[--index-output=':'[--no-sparse-checkout]':'--empty', priority:80
 msgid ""
@@ -44998,7 +45019,7 @@ msgstr "git-rebase(1)"
 msgid "git-rebase - Reapply commits on top of another base tip"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rebase.txt:16
 #, no-wrap, placeholders:'--interactive]':'[--exec':'[--onto':'--keep-base]':'--interactive]':'[--exec':'[--onto':'--root':'--continue':'--skip':'--abort':'--quit':'--edit-todo':'--show-current-patch', priority:100
 msgid ""
@@ -45033,25 +45054,25 @@ msgstr ""
 msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:47
 #, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100
 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:53
 #, placeholders:'`HEAD`', priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:60
 #, placeholders:'--continue`':'--skip`':'--abort`', priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rebase.txt:62
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
@@ -46967,7 +46988,7 @@ msgstr "git-receive-pack(1)"
 msgid "git-receive-pack - Receive what is pushed into the repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-receive-pack.txt:13
 #, no-wrap, placeholders:'git receive-pack', priority:90
 msgid "'git receive-pack' <git-dir>\n"
@@ -47402,7 +47423,7 @@ msgstr "git-reflog(1)"
 msgid "git-reflog - Manage reflog information"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reflog.txt:20
 #, ignore-ellipsis, no-wrap, placeholders:'[--expire=':'[--expire-unreachable=':'[--rewrite]':'[--updateref]':'[--stale-fix]':'[--dry-run':'[--verbose]':'[--all':'[--single-worktree]':'[--rewrite]':'[--updateref]':'[--dry-run':'[--verbose]', priority:100
 msgid ""
@@ -47596,7 +47617,7 @@ msgstr "git-remote-ext(1)"
 msgid "git-remote-ext - Bridge smart transport to external command."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote-ext.txt:12
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "git remote add <nick> \"ext::<command>[ <arguments>...]\"\n"
@@ -47920,7 +47941,7 @@ msgstr "git-remote(1)"
 msgid "git-remote - Manage set of tracked repositories"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-remote.txt:25
 #, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'[--mirror=(fetch|push)]':'--auto':'--delete':'[--add]':'[--push]':'[--all]':'[--push]':'--add':'[--push]':'--delete':'[--push]':'--verbose]':'--dry-run]':'--verbose]':'--prune]', priority:220
 msgid ""
@@ -48321,7 +48342,7 @@ msgstr "git-repack(1)"
 msgid "git-repack - Pack unpacked objects in a repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-repack.txt:13
 #, no-wrap, placeholders:'[--window=':'[--depth=':'[--threads=':'[--keep-pack=':'[--write-midx]', priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]\n"
@@ -48611,7 +48632,7 @@ msgstr "git-replace(1)"
 msgid "git-replace - Create, list, delete refs to replace objects"
 msgstr "git-replace - 建立、列出、刪除用於取代物件的參照"
 
-#. type: Plain text
+#. type: verse
 #: en/git-replace.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'--edit':'--graft':'--convert-graft-file':'[--format=', priority:100
 msgid ""
@@ -48883,7 +48904,7 @@ msgstr "git-request-pull(1)"
 msgid "git-request-pull - Generates a summary of pending changes"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-request-pull.txt:12
 #, no-wrap, placeholders:'git request-pull', priority:100
 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n"
@@ -49015,7 +49036,7 @@ msgstr "git-rerere(1)"
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rerere.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git rerere' [clear | forget <pathspec>... | diff | status | remaining | gc]\n"
@@ -49033,7 +49054,7 @@ msgstr ""
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/git-rerere.txt:29
 #, placeholders:'rerere.enabled', priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
@@ -49304,7 +49325,7 @@ msgstr "git-reset(1)"
 msgid "git-reset - Reset current HEAD to the specified state"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-reset.txt:15
 #, ignore-ellipsis, no-wrap, placeholders:'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--soft':'--mixed':'--hard':'--merge':'--keep]', priority:280
 msgid ""
@@ -50088,7 +50109,7 @@ msgstr "git-restore(1)"
 msgid "git-restore - Restore working tree files"
 msgstr "git-restore - 還原工作樹檔案"
 
-#. type: Plain text
+#. type: verse
 #: en/git-restore.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 msgid ""
@@ -50353,7 +50374,7 @@ msgstr "git-revert(1)"
 msgid "git-revert - Revert some existing commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-revert.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--continue':'--skip':'--abort':'--quit', priority:100
 msgid ""
@@ -50487,7 +50508,7 @@ msgstr "git-rev-list(1)"
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-list.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git rev-list', priority:80
 msgid "'git rev-list' [<options>] <commit>... [--] [<path>...]\n"
@@ -50649,7 +50670,7 @@ msgstr "git-rev-parse(1)"
 msgid "git-rev-parse - Pick out and massage parameters"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-rev-parse.txt:13
 #, fuzzy, ignore-ellipsis, no-wrap, placeholders:'git rev-parse', priority:80
 #| msgid "git reset --option target\n"
@@ -51672,7 +51693,7 @@ msgstr "git-rm(1)"
 msgid "git-rm - Remove files from the working tree and from the index"
 msgstr "git-rm - 從工作樹和索引中移除檔案"
 
-#. type: Plain text
+#. type: verse
 #: en/git-rm.txt:14
 #, ignore-ellipsis, no-wrap, placeholders:'--force]':'[--cached]':'[--ignore-unmatch]':'[--quiet]':'[--pathspec-from-file=':'[--pathspec-file-nul]', priority:280
 msgid ""
@@ -51909,7 +51930,7 @@ msgstr "git-send-email(1)"
 msgid "git-send-email - Send a collection of patches as emails"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-email.txt:16
 #, ignore-ellipsis, no-wrap, placeholders:'git send-email':'git send-email':'git send-email':'--dump-aliases':'git send-email':'--translate-aliases', priority:100
 msgid ""
@@ -52910,7 +52931,7 @@ msgstr "git-send-pack(1)"
 msgid "git-send-pack - Push objects over Git protocol to another repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-send-pack.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git send-pack':'[--mirror]':'[--dry-run]':'[--force]':'[--receive-pack=':'git-receive-pack':'[--verbose]':'[--thin]':'[--atomic]':'--signed=(true|false|if-asked)]':'--all', priority:90
 msgid ""
@@ -53059,7 +53080,7 @@ msgstr "git-shell(1)"
 msgid "git-shell - Restricted login shell for Git-only SSH access"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shell.txt:15
 #, no-wrap, placeholders:'git-shell', priority:100
 msgid ""
@@ -53213,7 +53234,7 @@ msgstr ""
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n--envsubst.txt:17
 #, no-wrap, placeholders:'eval_gettext':'git sh-i':'{litdd}':'--variables':'git sh-i':'{litdd}', priority:90
 msgid ""
@@ -53261,7 +53282,7 @@ msgstr "git-sh-i18n(1)"
 msgid "git-sh-i18n - Git's i18n setup code for shell scripts"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-i18n.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-i', priority:90
 msgid "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
@@ -53309,7 +53330,7 @@ msgstr "git-shortlog(1)"
 msgid "git-shortlog - Summarize 'git log' output"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-shortlog.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'--pretty=short', priority:260
 msgid ""
@@ -53504,7 +53525,7 @@ msgstr "git-show-branch(1)"
 msgid "git-show-branch - Show branches and their commits"
 msgstr "git-show-branch - 顯示分支和它們的送交"
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-branch.txt:17
 #, ignore-ellipsis, no-wrap, placeholders:'git show-branch':'--all]':'--remotes]':'[--topo-order':'--date-order]':'[--current]':'[--color':'--no-color]':'[--sparse]':'[--more=':'--list':'--independent':'--merge-base]':'[--no-name':'--sha1-name]':'[--topics]':'git show-branch':'--reflog':'[--list]', priority:100
 msgid ""
@@ -53805,7 +53826,7 @@ msgstr "git-show-index(1)"
 msgid "git-show-index - Show packed archive index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-index.txt:13
 #, no-wrap, placeholders:'git show-index':'[--object-format=', priority:100
 msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
@@ -53866,7 +53887,7 @@ msgstr "git-show-ref(1)"
 msgid "git-show-ref - List references in a local repository"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show-ref.txt:19
 #, ignore-ellipsis, no-wrap, placeholders:'git show-ref':'[--head]':'--dereference]':'--hash':'[--abbrev':'[--branches]':'[--tags]':'git show-ref':'--verify':'--quiet]':'--dereference]':'--hash':'[--abbrev':'git show-ref':'--exclude-existing':'git show-ref':'--exists', priority:80
 msgid ""
@@ -54190,7 +54211,7 @@ msgstr "git-show(1)"
 msgid "git-show - Show various types of objects"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-show.txt:13
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git show' [<options>] [<object>...]\n"
@@ -54328,7 +54349,7 @@ msgstr "git-sh-setup(1)"
 msgid "git-sh-setup - Common Git shell script setup code"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-sh-setup.txt:12
 #, no-wrap, placeholders:'--exec-path':'git-sh-setup', priority:100
 msgid "'. \"$(git --exec-path)/git-sh-setup\"'\n"
@@ -54502,7 +54523,7 @@ msgstr "git-stage(1)"
 msgid "git-stage - Add file contents to the staging area"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stage.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git stage' <arg>...\n"
@@ -54526,7 +54547,7 @@ msgstr "git-stash(1)"
 msgid "git-stash - Stash the changes in a dirty working directory away"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-stash.txt:26
 #, ignore-ellipsis, no-wrap, placeholders:'--include-untracked':'--only-untracked]':'--quiet]':'[--index]':'--quiet]':'[--index]':'--quiet]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'[--pathspec-from-file=':'[--pathspec-file-nul]':'--patch]':'--staged]':'--quiet]':'--include-untracked]':'--all]':'--message':'--quiet]', priority:240
 msgid ""
@@ -55063,7 +55084,7 @@ msgstr "git-status(1)"
 msgid "git-status - Show the working tree status"
 msgstr "git-status - 顯示工作樹狀態"
 
-#. type: Plain text
+#. type: verse
 #: en/git-status.txt:13
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git status' [<options>] [--] [<pathspec>...]\n"
@@ -55883,7 +55904,7 @@ msgstr "git-stripspace(1)"
 msgid "git-stripspace - Remove unnecessary whitespace"
 msgstr "git-stripspace - 移除不必要的空白"
 
-#. type: Plain text
+#. type: verse
 #: en/git-stripspace.txt:14
 #, no-wrap, placeholders:'--strip-comments]':'--comment-lines]', priority:100
 msgid ""
@@ -56039,7 +56060,7 @@ msgstr "git-submodule(1)"
 msgid "git-submodule - Initialize, update or inspect submodules"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-submodule.txt:24
 #, ignore-ellipsis, no-wrap, placeholders:'[--quiet]':'[--cached]':'[--quiet]':'[--quiet]':'[--cached]':'[--recursive]':'[--quiet]':'[--quiet]':'--force]':'--all':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--quiet]':'[--recursive]':'[--quiet]':'[--recursive]':'[--quiet]', priority:220
 msgid ""
@@ -56706,7 +56727,7 @@ msgstr "git-svn(1)"
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:12
 #, no-wrap, priority:100
 msgid "'git svn' <command> [<options>] [<arguments>]\n"
@@ -56940,7 +56961,7 @@ msgstr "'fetch'"
 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 ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, placeholders:'rev_map':'$GIT_DIR/svn/':'rev_map', priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
@@ -56982,31 +57003,31 @@ msgstr ""
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:153
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-refs\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:163
 #, placeholders:'`--ignore-paths`', priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN. The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:166
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.ignore-paths\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
@@ -57042,7 +57063,7 @@ msgstr "--ignore-paths=\"^[^/]+/(?:branches|tags)\"\n"
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN. The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:196
 #, no-wrap, priority:100
 msgid "config key: svn-remote.<name>.include-paths\n"
@@ -57054,7 +57075,7 @@ msgstr ""
 msgid "--log-window-size=<n>"
 msgstr "--log-window-size=<n>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history. The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
@@ -57066,7 +57087,7 @@ msgstr ""
 msgid "'clone'"
 msgstr "'clone'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:214
 #, placeholders:'`--fetch-all`':'`--parent`', priority:100
 msgid "Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that. It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`. After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
@@ -57078,7 +57099,7 @@ msgstr ""
 msgid "--preserve-empty-dirs"
 msgstr "--preserve-empty-dirs"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself). The placeholder files are also tracked and removed when no longer necessary."
@@ -57090,7 +57111,7 @@ msgstr ""
 msgid "--placeholder-filename=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:225
 #, placeholders:'--preserve-empty-dirs':'.gitignore', priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs. Default: \".gitignore\""
@@ -57102,31 +57123,31 @@ msgstr ""
 msgid "'rebase'"
 msgstr "'rebase'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:237
 #, placeholders:'`--fetch-all`', priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept. However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
@@ -57138,25 +57159,25 @@ msgstr ""
 msgid "'dcommit'"
 msgstr "'dcommit'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create a revision in SVN for each commit in Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:260
 #, priority:100
 msgid "Use of 'dcommit' is preferred to 'set-tree' (below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:263
 #, priority:100
 msgid "After committing, do not rebase or reset."
@@ -57168,13 +57189,13 @@ msgstr ""
 msgid "--commit-url <URL>"
 msgstr "--commit-url <URL>"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path). This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:273
 #, no-wrap, placeholders:'svn.commiturl', priority:100
 msgid ""
@@ -57182,13 +57203,13 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch. If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
@@ -57200,31 +57221,31 @@ msgstr ""
 msgid "--mergeinfo=<mergeinfo>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:288
 #, placeholders:'`--mergeinfo=':'`--mergeinfo=', priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:291
 #, no-wrap, placeholders:'svn.pushmergeinfo', priority:100
 msgid "config key: svn.pushmergeinfo\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:296
 #, placeholders:'git-svn', priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
@@ -57236,7 +57257,7 @@ msgstr ""
 msgid "'branch'"
 msgstr "'branch'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:307
 #, priority:100
 msgid "Create a branch in the SVN repository."
@@ -57248,7 +57269,7 @@ msgstr "在 SVN 儲存庫中建立一個分支。"
 msgid "--message"
 msgstr "--message"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:311
 #, priority:100
 msgid "Allows to specify the commit message."
@@ -57260,7 +57281,7 @@ msgstr ""
 msgid "--tag"
 msgstr "--tag"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:316
 #, placeholders:'tags_subdir':'branches_subdir', priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
@@ -57278,19 +57299,19 @@ msgstr ""
 msgid "--destination=<path>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:326
 #, placeholders:'--branches':'--tags', priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository. <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs. You can see these refspecs with the commands"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:329
 #, placeholders:'--get-all':'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
@@ -57302,7 +57323,7 @@ msgstr ""
 msgid "--username"
 msgstr "--username"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as. This option overrides the 'username' configuration property."
@@ -57314,13 +57335,13 @@ msgstr ""
 msgid "--commit-url"
 msgstr "--commit-url"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository. This is useful in cases where the source SVN repository is read-only. This option overrides configuration property 'commiturl'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:344
 #, placeholders:'--get-all', priority:100
 msgid "git config --get-all svn-remote.<name>.commiturl"
@@ -57332,7 +57353,7 @@ msgstr ""
 msgid "--parents"
 msgstr "--parents"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:350
 #, placeholders:'--parents', priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
@@ -57344,7 +57365,7 @@ msgstr ""
 msgid "'tag'"
 msgstr "'tag'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
@@ -57356,13 +57377,13 @@ msgstr ""
 msgid "'log'"
 msgstr "'log'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:358
 #, placeholders:'--revision', priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:360
 #, priority:100
 msgid "The following features from `svn log' are supported:"
@@ -57380,13 +57401,13 @@ msgstr ""
 msgid "--revision=<n>[:<n>]"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:370
 #, placeholders:'--verbose', priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
@@ -57398,19 +57419,19 @@ msgstr ""
 msgid "--limit=<n>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:373
 #, placeholders:'--max-count', priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:375
 #, priority:100
 msgid "supported"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:378
 #, priority:100
 msgid "New features:"
@@ -57422,7 +57443,7 @@ msgstr ""
 msgid "--show-commit"
 msgstr "--show-commit"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:382
 #, priority:100
 msgid "shows the Git commit sha1, as well"
@@ -57434,19 +57455,19 @@ msgstr ""
 msgid "--oneline"
 msgstr "--oneline"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:384
 #, placeholders:'--pretty=oneline', priority:100
 msgid "our version of --pretty=oneline"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
@@ -57458,7 +57479,7 @@ msgstr ""
 msgid "'blame'"
 msgstr "'blame'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:399
 #, priority:100
 msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
@@ -57470,7 +57491,7 @@ msgstr ""
 msgid "--git-format"
 msgstr "--git-format"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
@@ -57482,7 +57503,7 @@ msgstr ""
 msgid "'find-rev'"
 msgstr "'find-rev'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number."
@@ -57500,7 +57521,7 @@ msgstr "-B"
 msgid "--before"
 msgstr "--before"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
@@ -57512,7 +57533,7 @@ msgstr ""
 msgid "--after"
 msgstr "--after"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
@@ -57524,7 +57545,7 @@ msgstr ""
 msgid "'set-tree'"
 msgstr "'set-tree'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up to date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of 'git svn' functions."
@@ -57536,7 +57557,7 @@ msgstr ""
 msgid "'create-ignore'"
 msgstr "'create-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:438
 #, placeholders:'.gitignore':'--revision', priority:100
 msgid "Recursively finds the svn:ignore and svn:global-ignores properties on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
@@ -57548,7 +57569,7 @@ msgstr ""
 msgid "'show-ignore'"
 msgstr "'show-ignore'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:443
 #, placeholders:'$GIT_DIR/info/exclude', priority:100
 msgid "Recursively finds and lists the svn:ignore and svn:global-ignores properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file."
@@ -57560,7 +57581,7 @@ msgstr ""
 msgid "'mkdirs'"
 msgstr "'mkdirs'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:452
 #, placeholders:'$GIT_DIR/svn/':'unhandled.log', priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\". (See the svn-remote.<name>.automkdirs config file option for more information.)"
@@ -57572,19 +57593,19 @@ msgstr ""
 msgid "'commit-diff'"
 msgstr "'commit-diff'"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside a `git svn init`-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:467
 #, placeholders:'`-m`':'`-F`':'`--edit`', priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:472
 #, placeholders:'`--edit`', priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
@@ -57602,7 +57623,7 @@ msgstr ""
 msgid "--file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:477
 #, placeholders:'`--edit`', priority:100
 msgid "Take the commit message from the given file. This option disables the `--edit` option."
@@ -57614,7 +57635,7 @@ msgstr ""
 msgid "'info'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:483
 #, placeholders:'--revision':'--url', priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides. Does not currently support a -r/--revision argument. Use the --url option to output only the value of the 'URL:' field."
@@ -57626,7 +57647,7 @@ msgstr ""
 msgid "'proplist'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:488
 #, placeholders:'--revision', priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory. Use -r/--revision to refer to a specific Subversion revision."
@@ -57638,7 +57659,7 @@ msgstr ""
 msgid "'propget'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:492
 #, placeholders:'--revision', priority:100
 msgid "Gets the Subversion property given as the first argument, for a file. A specific revision can be specified with -r/--revision."
@@ -57650,7 +57671,7 @@ msgstr ""
 msgid "'propset'"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
@@ -57749,7 +57770,7 @@ msgstr ""
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place. Then:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:554
 #, no-wrap, priority:100
 msgid ""
@@ -57772,7 +57793,7 @@ msgstr ""
 msgid "Then fixup \"master\" with 'git rebase'. Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:567
 #, no-wrap, placeholders:'--onto':'git-svn', priority:100
 msgid "git rebase --onto remotes/git-svn A^ master\n"
@@ -57860,7 +57881,7 @@ msgstr ""
 msgid "--rmdir"
 msgstr "--rmdir"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:604 en/git-svn.txt:617 en/git-svn.txt:628
 #, priority:100
 msgid "Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands."
@@ -57872,19 +57893,19 @@ msgstr ""
 msgid "Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make the commit to SVN act like Git."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:613
 #, no-wrap, placeholders:'svn.rmdir', priority:100
 msgid "config key: svn.rmdir\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:624
 #, no-wrap, placeholders:'svn.edit', priority:100
 msgid "config key: svn.edit\n"
@@ -57902,13 +57923,13 @@ msgstr ""
 msgid "--find-copies-harder"
 msgstr "--find-copies-harder"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:631
 #, placeholders:'git diff-tree':'linkgit:git-diff-tree[1]', priority:100
 msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:635
 #, no-wrap, placeholders:'svn.findcopiesharder', priority:100
 msgid ""
@@ -57928,7 +57949,7 @@ msgstr ""
 msgid "--authors-file=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
@@ -57946,7 +57967,7 @@ msgstr ""
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry. Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:653
 #, no-wrap, placeholders:'svn.authorsfile', priority:100
 msgid "config key: svn.authorsfile\n"
@@ -57958,25 +57979,25 @@ msgstr ""
 msgid "--authors-prog=<filename>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:666
 #, placeholders:'$PATH', priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:669
 #, no-wrap, placeholders:'svn.authorsProg', priority:100
 msgid "config key: svn.authorsProg\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
@@ -57988,37 +58009,37 @@ msgstr ""
 msgid "-s<strategy>"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:682
 #, priority:100
 msgid "These are only used with the 'dcommit' and 'rebase' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:685
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:690
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:693
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:697
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:700
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
@@ -58030,13 +58051,13 @@ msgstr ""
 msgid "--use-log-author"
 msgstr "--use-log-author"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:705
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer in the log message and use that as the author string."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:708
 #, no-wrap, placeholders:'svn.useLogAuthor', priority:100
 msgid "config key: svn.useLogAuthor\n"
@@ -58048,13 +58069,13 @@ msgstr ""
 msgid "--add-author-from"
 msgstr "--add-author-from"
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:715
 #, placeholders:'`--use-log-author`', priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by` trailer, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:718
 #, no-wrap, placeholders:'svn.addAuthorFrom', priority:100
 msgid "config key: svn.addAuthorFrom\n"
@@ -58115,7 +58136,7 @@ msgstr "--follow-parent"
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged. However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-svn.txt:753
 #, no-wrap, placeholders:'svn.followparent', priority:100
 msgid "config key: svn.followparent\n"
@@ -58670,7 +58691,7 @@ msgstr "git-switch(1)"
 msgid "git-switch - Switch branches"
 msgstr "git-switch - 切換分支"
 
-#. type: Plain text
+#. type: verse
 #: en/git-switch.txt:15
 #, no-wrap, placeholders:'[--no-guess]':'--detach':'--orphan', priority:100
 msgid ""
@@ -58975,7 +58996,7 @@ msgstr "git-symbolic-ref(1)"
 msgid "git-symbolic-ref - Read, modify and delete symbolic refs"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-symbolic-ref.txt:14
 #, no-wrap, placeholders:'git symbolic-ref':'git symbolic-ref':'[--short]':'[--no-recurse]':'git symbolic-ref':'--delete', priority:80
 msgid ""
@@ -59074,7 +59095,7 @@ msgstr "git-tag(1)"
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-tag.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'--trailer':'[--contains':'[--no-contains':'[--points-at':'[--column':'--no-column]':'[--create-reflog]':'[--sort=':'[--format=':'[--merged':'[--no-merged':'[--format=', priority:240
 msgid ""
@@ -59622,7 +59643,7 @@ msgstr "git(1)"
 msgid "git - the stupid content tracker"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git.txt:18
 #, no-wrap, placeholders:'--version]':'--help]':'[--exec-path':'[--html-path]':'[--man-path]':'[--info-path]':'--paginate':'--no-pager]':'[--no-replace-objects]':'[--no-lazy-fetch]':'[--no-optional-locks]':'[--no-advice]':'[--bare]':'[--work-tree=':'[--namespace=':'[--config-env=', priority:100
 msgid ""
@@ -61614,7 +61635,7 @@ msgstr "git-unpack-file(1)"
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-file.txt:14
 #, no-wrap, placeholders:'git unpack-file', priority:90
 msgid "'git unpack-file' <blob>\n"
@@ -61647,7 +61668,7 @@ msgstr "git-unpack-objects(1)"
 msgid "git-unpack-objects - Unpack objects from a packed archive"
 msgstr "git-unpack-objects - 從打包的封存檔中解包物件"
 
-#. type: Plain text
+#. type: verse
 #: en/git-unpack-objects.txt:13
 #, no-wrap, placeholders:'git unpack-objects':'[--strict]', priority:90
 msgid "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
@@ -61707,7 +61728,7 @@ msgstr "git-update-index(1)"
 msgid "git-update-index - Register file contents in the working tree to the index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-index.txt:31
 #, ignore-ellipsis, no-wrap, placeholders:'git update-index':'[--add]':'[--remove':'--force-remove]':'[--replace]':'[--refresh]':'[--unmerged]':'[--ignore-missing]':'--cacheinfo':'[--chmod=(+|-)x]':'[--ignore-submodules]':'[--really-refresh]':'[--unresolve]':'[--again':'[--info-only]':'[--index-info]':'[--stdin]':'[--index-version':'[--show-index-version]':'[--verbose]', priority:80
 msgid ""
@@ -62637,7 +62658,7 @@ msgstr "git-update-ref(1)"
 msgid "git-update-ref - Update the object name stored in a ref safely"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-ref.txt:12
 #, no-wrap, placeholders:'git update-ref':'[--no-deref]':'[--create-reflog]':'--stdin', priority:80
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])\n"
@@ -62977,7 +62998,7 @@ msgstr "git-update-server-info(1)"
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-update-server-info.txt:13
 #, no-wrap, placeholders:'git update-server-info':'--force]', priority:90
 msgid "'git update-server-info' [-f | --force]\n"
@@ -63026,7 +63047,7 @@ msgstr "git-upload-archive(1)"
 msgid "git-upload-archive - Send archive back to git-archive"
 msgstr "git-upload-archive - 將封存檔傳送回 git-archive"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-archive.txt:13
 #, fuzzy, no-wrap, placeholders:'git upload-archive', priority:100
 #| msgid "git-upload-archive(1)"
@@ -63099,7 +63120,7 @@ msgstr "git-upload-pack(1)"
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
 msgstr "git-upload-pack - 將打包的物件傳送回 git-fetch-pack"
 
-#. type: Plain text
+#. type: verse
 #: en/git-upload-pack.txt:14
 #, no-wrap, placeholders:'git-upload-pack':'[--timeout=':'[--stateless-rpc]':'[--advertise-refs]', priority:100
 msgid ""
@@ -63209,7 +63230,7 @@ msgstr "git-var(1)"
 msgid "git-var - Show a Git logical variable"
 msgstr "git-var - 顯示一個 Git 邏輯變數"
 
-#. type: Plain text
+#. type: verse
 #: en/git-var.txt:13
 #, no-wrap, priority:100
 msgid "'git var' (-l | <variable>)\n"
@@ -63405,7 +63426,7 @@ msgstr "git-verify-commit(1)"
 msgid "git-verify-commit - Check the GPG signature of commits"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-commit.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-commit':'--verbose]':'[--raw]', priority:100
 msgid "'git verify-commit' [-v | --verbose] [--raw] <commit>...\n"
@@ -63447,7 +63468,7 @@ msgstr "git-verify-pack(1)"
 msgid "git-verify-pack - Validate packed Git archive files"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-pack':'--verbose]':'--stat-only]', priority:80
 msgid "'git verify-pack' [-v | --verbose] [-s | --stat-only] [--] <pack>.idx...\n"
@@ -63537,7 +63558,7 @@ msgstr "git-verify-tag(1)"
 msgid "git-verify-tag - Check the GPG signature of tags"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-verify-tag.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'git verify-tag':'--verbose]':'[--format=':'[--raw]', priority:100
 msgid "'git verify-tag' [-v | --verbose] [--format=<format>] [--raw] <tag>...\n"
@@ -63579,7 +63600,7 @@ msgstr ""
 msgid "git-web--browse - Git helper script to launch a web browser"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-web--browse.txt:12
 #, ignore-ellipsis, no-wrap, placeholders:'{litdd}', priority:100
 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n"
@@ -63853,7 +63874,7 @@ msgstr "git-whatchanged(1)"
 msgid "git-whatchanged - Show logs with differences each commit introduces"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
@@ -63913,7 +63934,7 @@ msgstr "git-worktree(1)"
 msgid "git-worktree - Manage multiple working trees"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-worktree.txt:21
 #, ignore-ellipsis, no-wrap, placeholders:'[--detach]':'[--checkout]':'[--lock':'[--reason':'[--orphan]':'--porcelain':'[--reason':'[--expire', priority:240
 msgid ""
@@ -64644,7 +64665,7 @@ msgstr "git-write-tree(1)"
 msgid "git-write-tree - Create a tree object from the current index"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/git-write-tree.txt:13
 #, no-wrap, placeholders:'git write-tree':'[--missing-ok]':'[--prefix=', priority:80
 msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
@@ -68781,13 +68802,13 @@ msgstr ""
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:100
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
 msgstr ""
 
-#. type: Plain text
+#. type: NOTE
 #: en/pull-fetch-param.txt:120
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
@@ -71992,7 +72013,7 @@ msgstr ""
 msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:79
 #, no-wrap, priority:300
 msgid ""
@@ -72000,7 +72021,7 @@ msgid ""
 "\t\tinsteadOf = _<other-url-base>_\n"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:82 en/urls.txt:102
 #, priority:300
 msgid "For example, with this:"
@@ -72027,7 +72048,7 @@ msgstr ""
 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
 msgstr ""
 
-#. type: Plain text
+#. type: verse
 #: en/urls.txt:99
 #, no-wrap, priority:300
 msgid ""