From 2694e17d6b0d8e36d70fce219312e13fcbf5fc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Sun, 28 Jul 2024 15:38:46 +0000 Subject: [PATCH 1/2] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 79.2% (9158 of 11563 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ Signed-off-by: Jean-Noël Avila --- po/documentation.fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 7ad17f9..b9d60cc 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -1,6 +1,6 @@ # msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-07-15 22:01+0200\nPO-Revision-Date: 2024-07-28 15:20+0000\nLast-Translator: Jean-Noël Avila \nLanguage-Team: LANGUAGE \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.7-dev\n" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-07-15 22:01+0200\nPO-Revision-Date: 2024-07-28 20:17+0000\nLast-Translator: Jean-Noël Avila \nLanguage-Team: LANGUAGE \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.7-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:781 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 @@ -8470,7 +8470,7 @@ msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]] [--no-veri #: en/git-am.txt:30 #, placeholders:'linkgit:git-format-patch[1]', priority:100 msgid "Splits mail messages in a mailbox into commit log messages, authorship information, and patches, and applies them to the current branch. You could think of it as a reverse operation of linkgit:git-format-patch[1] run on a branch with a straight history without merges." -msgstr "Découpe des messages courriel dans un boîte aux lettre en message, auteur, information et rustine de commits, et les applique sur la branche en cours. Vous pouvez considérer cela comme une opération inverse de linkgit:git-format-patch[1] exécutée sur une branche avec un historique direct sans fusions." +msgstr "Découpe des messages courriel dans une boîte aux lettres en message, auteur, information et rustine de commits, et les applique sur la branche en cours. Vous pouvez considérer cela comme une opération inverse de linkgit:git-format-patch[1] exécutée sur une branche avec un historique direct sans fusions." #. type: Labeled list #: en/git-am.txt:33 @@ -29944,7 +29944,7 @@ msgstr "" #: en/git-format-patch.txt:461 #, placeholders:'git format-patch', priority:100 msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:" -msgstr "La rustine produite par 'git format-patch' est au format d'une boîte aux lettres UNIX, avec un horodatage \"magique\" fixe pour indiquer que le fichier est produit par format-patch plutôt que par une vraie boîte aux lettres, comme ceci :" +msgstr "La rustine produite par 'git format-patch' est au format d'une boîte aux lettres UNIX, avec un horodatage \"magique\" fixe pour indiquer que le fichier est produit par format-patch plutôt que par une vraie boîte aux lettres, comme ceci :" #. type: delimited block - #: en/git-format-patch.txt:471 From 44c8a87ae9c3ebfb8d4fcb7b64971435473d4496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Pe=C3=B1a?= Date: Sun, 28 Jul 2024 15:40:40 +0000 Subject: [PATCH 2/2] Translated using Weblate (Spanish) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 31.4% (3640 of 11563 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/es/ Signed-off-by: Salvador Peña --- po/documentation.es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/documentation.es.po b/po/documentation.es.po index 9c7f62f..b2d61d6 100644 --- a/po/documentation.es.po +++ b/po/documentation.es.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-07-15 22:01+0200\nPO-Revision-Date: 2024-07-28 15:20+0000\nLast-Translator: Salvador Peña \nLanguage-Team: LANGUAGE \nLanguage: es\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.7-dev\n" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-07-15 22:01+0200\nPO-Revision-Date: 2024-07-28 20:17+0000\nLast-Translator: Salvador Peña \nLanguage-Team: LANGUAGE \nLanguage: es\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.7-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:781 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 @@ -3162,7 +3162,7 @@ msgstr "commit.cleanup" #: en/config/commit.txt:9 #, placeholders:'`--cleanup`':'linkgit:git-commit[1]':'commit.cleanup', priority:280 msgid "This setting overrides the default of the `--cleanup` option in `git commit`. See linkgit:git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with the comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)." -msgstr "" +msgstr "Esta configuración anula el predeterminado de la opción `--cleanup` en `git commit`. Ver linkgit:git-commit[1] para detalles. Cambiar el predeterminado puede ser útil cuando quieres siempre mantener líneas que comiencen con el caracter `#` en tu mensaje de bitácora, en cuyo caso harías `git config commit.cleanup whitespace` (nota que, si haces esto, tendrás que quitar por ti mismo las líneas de ayuda que comienzan con `#` en la plantilla de bitácora de confirmación)." #. type: Labeled list #: en/config/commit.txt:10 @@ -3222,7 +3222,7 @@ msgstr "diff.autoRefreshIndex" #: en/config/diff.txt:10 #, placeholders:'git update-index':'--refresh`':'git diff-files', priority:280 msgid "When using 'git diff' to compare with work tree files, do not consider stat-only changes as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'." -msgstr "" +msgstr "Cuando se usa 'git-diff' para comparar con ficheros del árbol de trabajo, no considera cambios stat-only como changed. En su lugar, ejecuta silenciosamente `git update-index --refresh` para actualizar la información estadística en antememoria para rutas cuyo contenido en el árbol de trabajo coincide con el contenido en el índice. Ésta opción se predetermina a verdadero. Nota que esto afecta sólo a 'git diff' porcelana, y no a comandos 'diff' de mas bajo nivel como 'git diff-files'." #. type: Labeled list #: en/config/diff.txt:11