git v2.49: update po files with fixed synopsis entries

The po4a tool used to extract the strings from the
documentation files was not able to handle the synopsis
entries. This caused the translation entries to be
on a single line instead of being formatted as verbatim.

Note that this version cannot be processed correctly with
the latest official po4a version. The po4a tool has been
patched locally, and the patch will be submitted to the
upstream repository.

Signed-off-by: Jean-Noël Avila <[email protected]>

Author: jnavila

po/documentation.de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-03-01 16:40+0100\n"
+"POT-Creation-Date: 2025-03-06 18:29+0100\n"
 "PO-Revision-Date: 2024-10-01 11:16+0000\n"
 "Last-Translator: Ettore Atalan <[email protected]>\n"
 "Language-Team: Matthias Aßhauer <[email protected]>\n"
@@ -4896,8 +4896,19 @@ msgstr ""
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc: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: synopsis
@@ -5047,8 +5058,12 @@ msgstr ""
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc: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: synopsis
@@ -24017,8 +24032,14 @@ msgstr "git-diff – Zeigt die Unterschiede zwischen Commits, Commit und Arbeits
 
 #. type: synopsis
 #: en/git-diff.adoc: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"
@@ -39666,8 +39687,20 @@ msgstr ""
 
 #. type: synopsis
 #: en/git-notes.adoc:23
-#, ignore-ellipsis, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
-msgid "git notes [list [<object>]] git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes copy [-f] ( --stdin | <from-object> [<to-object>] ) git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes edit [--allow-empty] [<object>] [--[no-]stripspace] git notes show [<object>] git notes merge [-v | -q] [-s <strategy> ] <notes-ref> git notes merge --commit [-v | -q] git notes merge --abort [-v | -q] git notes remove [--ignore-missing] [--stdin] [<object>...] git notes prune [-n] [-v] git notes get-ref"
+#, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
+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"
 msgstr ""
 
 #. type: Plain text
@@ -50363,12 +50396,15 @@ msgstr "git-restore - Dateien im Arbeitsbereich wiederherstellen"
 
 #. type: synopsis
 #: en/git-restore.adoc:14
-#, fuzzy, ignore-ellipsis, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
+#, fuzzy, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
 #| 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"
-msgid "git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>... git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]"
+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"
 msgstr ""
 "'git restore' [<Optionen>] [--source=<Tree>] [--staged] [--worktree] [--] <Pfadspezifikation>...\n"
 "'git restore' [<Optionen>] [--source=<Tree>] [--staged] [--worktree] --pathspec-from-file=<Datei> [--pathspec-file-nul]\n"

po/documentation.es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-03-01 16:40+0100\n"
+"POT-Creation-Date: 2025-03-06 18:29+0100\n"
 "PO-Revision-Date: 2025-02-23 22:59+0000\n"
 "Last-Translator: Salvador Peña <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -4770,7 +4770,7 @@ msgstr "Es seguido por una o mas líneas de encabezado extendido:"
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc:46
-#, fuzzy, priority:280
+#, fuzzy, no-wrap, priority:280
 #| msgid ""
 #| "old mode <mode>\n"
 #| "new mode <mode>\n"
@@ -4783,7 +4783,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"
@@ -4975,13 +4986,17 @@ msgstr "Es seguido por uno o mas líneas de encabezado extendido (este ejemplo m
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc: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"
@@ -23589,8 +23604,14 @@ msgstr "git-diff - Muestra los cambios entre confirmaciones, confirmación y ár
 
 #. type: synopsis
 #: en/git-diff.adoc: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
@@ -39116,8 +39137,20 @@ msgstr ""
 
 #. type: synopsis
 #: en/git-notes.adoc:23
-#, ignore-ellipsis, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
-msgid "git notes [list [<object>]] git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes copy [-f] ( --stdin | <from-object> [<to-object>] ) git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes edit [--allow-empty] [<object>] [--[no-]stripspace] git notes show [<object>] git notes merge [-v | -q] [-s <strategy> ] <notes-ref> git notes merge --commit [-v | -q] git notes merge --abort [-v | -q] git notes remove [--ignore-missing] [--stdin] [<object>...] git notes prune [-n] [-v] git notes get-ref"
+#, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
+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"
 msgstr ""
 
 #. type: Plain text
@@ -49795,8 +49828,11 @@ msgstr ""
 
 #. type: synopsis
 #: en/git-restore.adoc:14
-#, ignore-ellipsis, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
-msgid "git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>... git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]"
+#, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
+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"
 msgstr ""
 
 #. type: Plain text

po/documentation.es_MX.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2025-03-01 16:40+0100\n"
+"POT-Creation-Date: 2025-03-06 18:29+0100\n"
 "PO-Revision-Date: 2019-10-05 21:56+0000\n"
 "Last-Translator: Farándula <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -4784,8 +4784,19 @@ msgstr ""
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc: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: synopsis
@@ -4935,8 +4946,12 @@ msgstr ""
 
 #. type: synopsis
 #: en/diff-generate-patch.adoc: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: synopsis
@@ -23449,8 +23464,14 @@ msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 
 #. type: synopsis
 #: en/git-diff.adoc: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
@@ -38995,8 +39016,20 @@ msgstr ""
 
 #. type: synopsis
 #: en/git-notes.adoc:23
-#, ignore-ellipsis, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
-msgid "git notes [list [<object>]] git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes copy [-f] ( --stdin | <from-object> [<to-object>] ) git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>] git notes edit [--allow-empty] [<object>] [--[no-]stripspace] git notes show [<object>] git notes merge [-v | -q] [-s <strategy> ] <notes-ref> git notes merge --commit [-v | -q] git notes merge --abort [-v | -q] git notes remove [--ignore-missing] [--stdin] [<object>...] git notes prune [-n] [-v] git notes get-ref"
+#, ignore-ellipsis, no-wrap, placeholders:'[--allow-empty]':'--separator=':'--stdin':'[--allow-empty]':'--separator=':'[--allow-empty]':'--commit':'--abort':'[--ignore-missing]':'[--stdin]', priority:280
+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"
 msgstr ""
 
 #. type: Plain text
@@ -49678,8 +49711,11 @@ msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
 
 #. type: synopsis
 #: en/git-restore.adoc:14
-#, ignore-ellipsis, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
-msgid "git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>... git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]"
+#, ignore-ellipsis, no-wrap, placeholders:'[--source=':'[--staged]':'[--worktree]':'[--source=':'[--staged]':'[--worktree]':'--pathspec-from-file=':'[--pathspec-file-nul]':'--patch':'[--source=':'[--staged]':'[--worktree]', priority:280
+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"
 msgstr ""
 
 #. type: Plain text