From 794b1d2ee1068799fdbfe72e0927d8bd9e1bfa6f Mon Sep 17 00:00:00 2001 From: Vasco Almeida <vascomalmeida@sapo.pt> Date: Sun, 13 Mar 2016 11:56:03 -0100 Subject: [PATCH 1/4] l10n: fr: fix transcation of "dir" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "dir" was translated to the same string at builtin/log.c:1236, but, also at that code line, "<dir>" was translate to "<répertoire>". Before this commit, git format-patch -h would output "-o, --output-directory <dir>" and <répertoire> in its description. Use <répertoire> in both the parameter and description. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 88b0b8a78ad..71738feaac5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6197,7 +6197,7 @@ msgstr "convertir en un dépôt complet" #: builtin/fetch.c:122 builtin/log.c:1236 msgid "dir" -msgstr "dir" +msgstr "répertoire" #: builtin/fetch.c:123 msgid "prepend this to submodule path output" From a0f3d92b528063956959e0b4a20b83df8c8aad23 Mon Sep 17 00:00:00 2001 From: Vasco Almeida <vascomalmeida@sapo.pt> Date: Sun, 13 Mar 2016 11:56:03 -0100 Subject: [PATCH 2/4] l10n: fr: fix wrongly translated option name In the original source, tags and heads refer to that options (--head and --tags) for git show-ref. Don't translate that terms, since they refer to actual option names. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 71738feaac5..b8fe1f016bd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10809,11 +10809,11 @@ msgstr "git show-ref --exclude-existing[=<motif>]" #: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" -msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)" +msgstr "afficher seulement les étiquettes (peut être combiné avec heads)" #: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" -msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)" +msgstr "afficher seulement les têtes (peut être combiné avec tags)" #: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" From abf579559252af1da773b5b70dbe24a84cc73de4 Mon Sep 17 00:00:00 2001 From: Vasco Almeida <vascomalmeida@sapo.pt> Date: Mon, 14 Mar 2016 23:34:22 -0100 Subject: [PATCH 3/4] =?UTF-8?q?l10n:=20fr:=20change=20"id=20de=20cl=C3=A9"?= =?UTF-8?q?=20to=20match=20"id-cl=C3=A9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At builtin/tag.c:23 French message translation, "<key-id>" was translated to "<id-clé>", but at builtin/tag.c:355 "key-id" was translated to "id de clé", hence an inconsistency in git tag -h output. Translate "key-id" to "id-clé". Alternatively, both places could use "id de clé" instead of "id-clé". Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index b8fe1f016bd..868514e924e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2945,7 +2945,7 @@ msgstr "utiliser l'horodatage actuel pour la date d'auteur" #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" -msgstr "id de clé" +msgstr "id-clé" #: builtin/am.c:2322 msgid "GPG-sign commits" From bb310722467d0adda499cb70429d86fbaa755dac Mon Sep 17 00:00:00 2001 From: Vasco Almeida <vascomalmeida@sapo.pt> Date: Mon, 14 Mar 2016 23:34:22 -0100 Subject: [PATCH 4/4] l10n: fr: don't translate "merge" as a parameter At builtin/checkout.c:1154, merge is a parameter to --conflict=<style> (git checkout --conflict=merge). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 868514e924e..55ca387ba4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4545,7 +4545,7 @@ msgstr "style" #: builtin/checkout.c:1154 msgid "conflict style (merge or diff3)" -msgstr "style de conflit (fusion ou diff3)" +msgstr "style de conflit (merge (fusion) ou diff3)" #: builtin/checkout.c:1157 msgid "do not limit pathspecs to sparse entries only"