Compile error due to po/fr.po on old gettext in v2.21.0

Compile error due to po/fr.po on old gettext in v2.21.0

[Ævar Arnfjörð Bjarmason]

On a NetBSD test box I have with msgfmt 0.14.4 v2.21.0 fails to compile.

I didn't spot this in rc2 because b3225a4183 ("l10n: fr.po v2.21.0 rnd
2", 2019-02-13) along with the rest of i18n updates gets pulled in after
all the RCs.

The error s:

    $ msgfmt --version; msgfmt -o fr.mo po/fr.po
    msgfmt (GNU gettext-tools) 0.14.4
    Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
    This is free software; see the source for copying conditions.  There is NO
    warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
    Written by Ulrich Drepper.
    po/fr.po:22482:4: parse error
    po/fr.po:22482: missing `msgstr' section
    po/fr.po:22487:4: parse error
    po/fr.po:22487: missing `msgstr' section
    po/fr.po:22492:4: parse error
    po/fr.po:22492: missing `msgstr' section
    po/fr.po:22497:4: parse error
    po/fr.po:22497: missing `msgstr' section
    po/fr.po:22502:4: parse error
    po/fr.po:22502: missing `msgstr' section
    po/fr.po:22507:4: parse error
    po/fr.po:22507: missing `msgstr' section
    po/fr.po:22512:4: parse error
    po/fr.po:22512: missing `msgstr' section
    po/fr.po:22517:4: parse error
    po/fr.po:22517: missing `msgstr' section
    po/fr.po:22522:4: parse error
    po/fr.po:22522: missing `msgstr' section
    po/fr.po:22527:4: parse error
    po/fr.po:22527: missing `msgstr' section
    msgfmt: too many errors, aborting

It's "fixed" by:

    perl -pi -e 's/^#~\|.*\n//' po/fr.po

I.e. this is because of the comments being parsed (fuzzy comments).

The 0.14.4 gettext release was back in 2005, so presumably this is due
to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
released a couple of years ago.

Re: Compile error due to po/fr.po on old gettext in v2.21.0

[Jean-Noël AVILA]

On Monday, 25 February 2019 21:19:53 CET Ævar Arnfjörð Bjarmason wrote:
> On a NetBSD test box I have with msgfmt 0.14.4 v2.21.0 fails to compile.
> 
> I didn't spot this in rc2 because b3225a4183 ("l10n: fr.po v2.21.0 rnd
> 2", 2019-02-13) along with the rest of i18n updates gets pulled in after
> all the RCs.
> 
> I.e. this is because of the comments being parsed (fuzzy comments).
> 
> The 0.14.4 gettext release was back in 2005, so presumably this is due
> to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
> released a couple of years ago.
> 

I kept the commented entries as a translation memory, even when they are 
fuzzy.

Would unfuzzying these entries resolve the issue?

Re: Compile error due to po/fr.po on old gettext in v2.21.0

[Ævar Arnfjörð Bjarmason]

On Mon, Feb 25 2019, Jean-Noël AVILA wrote:

> On Monday, 25 February 2019 21:19:53 CET Ævar Arnfjörð Bjarmason wrote:
>> On a NetBSD test box I have with msgfmt 0.14.4 v2.21.0 fails to compile.
>>
>> I didn't spot this in rc2 because b3225a4183 ("l10n: fr.po v2.21.0 rnd
>> 2", 2019-02-13) along with the rest of i18n updates gets pulled in after
>> all the RCs.
>>
>> I.e. this is because of the comments being parsed (fuzzy comments).
>>
>> The 0.14.4 gettext release was back in 2005, so presumably this is due
>> to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
>> released a couple of years ago.
>>
>
> I kept the commented entries as a translation memory, even when they are
> fuzzy.
>
> Would unfuzzying these entries resolve the issue?

Yeah it seems so. I think specifically it's complaining that even for
comments there needs to be a msgid/msgstr pair, whereas in those fuzzy
comments there's 2/1 instead of 1/1.

[PATCH] l10n: fr.po unfuzzy commented entries

[Jean-Noël Avila]

The 0.14.4 gettext release was back in 2005, so presumably this is due
to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
released a couple of years ago.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 po/fr.po | 190 +++++++++++++++++++++++++++----------------------------
 1 file changed, 95 insertions(+), 95 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 7b15b76374..47a4210570 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22478,185 +22478,185 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ msgid "--reschedule-failed-exec requires an interactive rebase"
 #~ msgstr "--reschedule-failed-exec requiert un rebasage interactif"
 
-#, fuzzy
+#
 #~| msgid "git archive [<options>] <tree-ish> [<path>...]"
 #~ msgid "git diff --no-index [<options>] <path> <path>"
 #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
 
-#, fuzzy
+#
 #~| msgid "invalid sparse value '%s'"
 #~ msgid "invalid --stat value: %s"
 #~ msgstr "valeur invalide de 'sparse' '%s'"
 
-#, fuzzy
+#
 #~| msgid "unable to create '%s'"
 #~ msgid "unable to resolve '%s'"
 #~ msgstr "impossible de créer '%s'"
 
-#, fuzzy
+#
 #~| msgid "expected wanted-ref, got '%s'"
 #~ msgid "%s expects a character, got '%s'"
 #~ msgstr "wanted-ref attendu, '%s' trouvé"
 
-#, fuzzy
+#
 #~| msgid "invalid color '%s' in color.blame.repeatedLines"
 #~ msgid "invalid mode '%s' in --color-moved-ws"
 #~ msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
 
-#, fuzzy
+#
 #~| msgid "invalid value for %s"
 #~ msgid "invalid argument to %s"
 #~ msgstr "Valeur invalide pour %s"
 
-#, fuzzy
+#
 #~| msgid "bad number of arguments"
 #~ msgid "bad --word-diff argument: %s"
 #~ msgstr "mauvais nombre d'arguments"
 
-#, fuzzy
+#
 #~| msgid "Generating patches"
 #~ msgid "generate patch"
 #~ msgstr "Génération des patchs"
 
-#, fuzzy
+#
 #~| msgid "ensure at least <n> lines of context match"
 #~ msgid "generate diffs with <n> lines context"
 #~ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#, fuzzy
+#
 #~| msgid "(synonym to --stat)"
 #~ msgid "synonym for '-p --raw'"
 #~ msgstr "(synonyme de --stat)"
 
-#, fuzzy
+#
 #~| msgid "(synonym to --stat)"
 #~ msgid "synonym for '-p --stat'"
 #~ msgstr "(synonyme de --stat)"
 
-#, fuzzy
+#
 #~| msgid "machine-readable output"
 #~ msgid "machine friendly --stat"
 #~ msgstr "sortie pour traitement automatique"
 
-#, fuzzy
+#
 #~| msgid "output only the trailers"
 #~ msgid "output only the last line of --stat"
 #~ msgstr "éliminer les lignes terminales vides"
 
-#, fuzzy
+#
 #~| msgid "synonym for --files-with-matches"
 #~ msgid "synonym for --dirstat=cumulative"
 #~ msgstr "synonyme pour --files-with-matches"
 
-#, fuzzy
+#
 #~| msgid "show only filenames instead of matching lines"
 #~ msgid "show only names of changed files"
 #~ msgstr ""
 #~ "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#, fuzzy
+#
 #~| msgid "show only filenames instead of matching lines"
 #~ msgid "show only names and status of changed files"
 #~ msgstr ""
 #~ "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#, fuzzy
+#
 #~| msgid "failed to generate diff"
 #~ msgid "generate diffstat"
 #~ msgstr "échec de la génération de diff"
 
-#, fuzzy
+#
 #~| msgid "show ignored files"
 #~ msgid "show colored diff"
 #~ msgstr "afficher les fichiers ignorés"
 
-#, fuzzy
+#
 #~| msgid "<prefix>/"
 #~ msgid "<prefix>"
 #~ msgstr "<préfixe>/"
 
-#, fuzzy
+#
 #~| msgid "prepend parent project's basename to output"
 #~ msgid "prepend an additional prefix to every line of output"
 #~ msgstr "préfixer le nom de base du projet parent à la sortie"
 
-#, fuzzy
+#
 #~| msgid ""
 #~| "Create a shallow clone truncated to the specified number of revisions"
 #~ msgid "show context between diff hunks up to the specified number of lines"
 #~ msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
 
-#, fuzzy
+#
 #~| msgid "Generic options"
 #~ msgid "Diff rename options"
 #~ msgstr "Options génériques"
 
-#, fuzzy
+#
 #~| msgid "<n>[,<base>]"
 #~ msgid "<n>[/<m>]"
 #~ msgstr "<n>[,<base>]"
 
-#, fuzzy
+#
 #~| msgid "do not detect renames"
 #~ msgid "detect renames"
 #~ msgstr "ne pas détecter les renommages"
 
-#, fuzzy
+#
 #~| msgid "Updated preimage for '%s'"
 #~ msgid "omit the preimage for deletes"
 #~ msgstr "Pré-image mise à jour pour '%s'"
 
-#, fuzzy
+#
 #~| msgid "Performing inexact rename detection"
 #~ msgid "disable rename detection"
 #~ msgstr "Détection de renommage inexact en cours"
 
-#, fuzzy
+#
 #~| msgid "invalid option: %s"
 #~ msgid "Diff algorithm options"
 #~ msgstr "option invalide : %s"
 
-#, fuzzy
+#
 #~| msgid "ignore changes in whitespace when finding context"
 #~ msgid "ignore whitespace when comparing lines"
 #~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#, fuzzy
+#
 #~| msgid "ignore changes in whitespace when finding context"
 #~ msgid "ignore changes in amount of whitespace"
 #~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#, fuzzy
+#
 #~| msgid "ignore changes in whitespace when finding context"
 #~ msgid "ignore changes in whitespace at EOL"
 #~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#, fuzzy
+#
 #~| msgid "text"
 #~ msgid "<text>"
 #~ msgstr "texte"
 
-#, fuzzy
+#
 #~| msgid "mode"
 #~ msgid "<mode>"
 #~ msgstr "mode"
 
-#, fuzzy
+#
 #~| msgid "decorate options"
 #~ msgid "Diff other options"
 #~ msgstr "décorer les options"
 
-#, fuzzy
+#
 #~| msgid "process binary files as text"
 #~ msgid "treat all files as text"
 #~ msgstr "traiter les fichiers binaires comme texte"
 
-#, fuzzy
+#
 #~| msgid "when"
 #~ msgid "<when>"
 #~ msgstr "quand"
 
-#, fuzzy
+#
 #~| msgid ""
 #~| "ignore changes to submodules, optional when: all, dirty, untracked. "
 #~| "(Default: all)"
@@ -22665,72 +22665,72 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "ignorer les modifications dans les sous-modules, \"quand\" facultatif : "
 #~ "all (tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#, fuzzy
+#
 #~| msgid "format"
 #~ msgid "<format>"
 #~ msgstr "format"
 
-#, fuzzy
+#
 #~| msgid "use .gitattributes only from the index"
 #~ msgid "hide 'git add -N' entries from the index"
 #~ msgstr "utiliser .gitattributes seulement depuis l'index"
 
-#, fuzzy
+#
 #~| msgid "string"
 #~ msgid "<string>"
 #~ msgstr "chaîne"
 
-#, fuzzy
+#
 #~| msgid "show matching files in the pager"
 #~ msgid "show all changes in the changeset with -S or -G"
 #~ msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#, fuzzy
+#
 #~| msgid "use extended POSIX regular expressions"
 #~ msgid "treat <string> in -S as extended POSIX regular expression"
 #~ msgstr "utiliser des expressions régulières étendues POSIX"
 
-#, fuzzy
+#
 #~| msgid "print all configuration variable names"
 #~ msgid "override diff.orderFile configuration variable"
 #~ msgstr "afficher tous les noms de variables de configuration"
 
-#, fuzzy
+#
 #~| msgid "object"
 #~ msgid "<object-id>"
 #~ msgstr "objet"
 
-#, fuzzy
+#
 #~| msgid "file"
 #~ msgid "<file>"
 #~ msgstr "fichier"
 
-#, fuzzy
+#
 #~| msgid "commit only specified files"
 #~ msgid "Output to a specific file"
 #~ msgstr "valider seulement les fichiers spécifiés"
 
-#, fuzzy
+#
 #~| msgid "Could not spawn pack-objects"
 #~ msgid "could not start pack-objects"
 #~ msgstr "Impossible de créer des objets groupés"
 
-#, fuzzy
+#
 #~| msgid "Could not spawn pack-objects"
 #~ msgid "could not finish pack-objects"
 #~ msgstr "Impossible de créer des objets groupés"
 
-#, fuzzy
+#
 #~| msgid "unrecognized position:%s"
 #~ msgid "Unrecognized protocol version"
 #~ msgstr "position non reconnue : %s"
 
-#, fuzzy
+#
 #~| msgid "unrecognized position:%s"
 #~ msgid "Unrecognized protocol_version"
 #~ msgstr "position non reconnue : %s"
 
-#, fuzzy
+#
 #~| msgid "could not write '%s'"
 #~ msgid "could not write '%s'."
 #~ msgstr "impossible d'écrire '%s'"
@@ -22744,52 +22744,52 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ msgid "cannot read sha1_file for %s"
 #~ msgstr "impossible de lire le fichier sha1 pour %s"
 
-#, fuzzy
+#
 #~| msgid "bad revision '%s'"
 #~ msgid "Can't find revision '%s' to ignore"
 #~ msgstr "mauvaise révision '%s'"
 
-#, fuzzy
+#
 #~| msgid "ignore index when checking"
 #~ msgid "Ignore <rev> when blaming"
 #~ msgstr "ignorer l'index pendant la vérification"
 
-#, fuzzy
+#
 #~| msgid "read message from file"
 #~ msgid "Ignore revisions from <file>"
 #~ msgstr "lire le message depuis un fichier"
 
-#, fuzzy
+#
 #~| msgid "could not resolve HEAD commit"
 #~ msgid "could not resolve HEAD"
 #~ msgstr "impossible de résoudre le commit HEAD"
 
-#, fuzzy
+#
 #~| msgid "HEAD not found below refs/heads!"
 #~ msgid "HEAD (%s) points outside of refs/heads/"
 #~ msgstr "HEAD non trouvée sous refs/heads !"
 
-#, fuzzy
+#
 #~| msgid "No current branch."
 #~ msgid "show current branch name"
 #~ msgstr "Pas de branche courante."
 
-#, fuzzy
+#
 #~| msgid "prune loose refs (default)"
 #~ msgid "use overlay mode (default)"
 #~ msgstr "éliminer les références perdues (défaut)"
 
-#, fuzzy
+#
 #~| msgid "-n and -k are mutually exclusive"
 #~ msgid "-p and --overlay are mutually exclusive"
 #~ msgstr "-n et -k sont mutuellement exclusifs"
 
-#, fuzzy
+#
 #~| msgid "unable to read config file '%s'"
 #~ msgid "move a variable to a different config file"
 #~ msgstr "lecture du fichier de configuration '%s' impossible"
 
-#, fuzzy
+#
 #~| msgid "Unknown commit %s"
 #~ msgid "unknown config source"
 #~ msgstr "Commit inconnu %s"
@@ -22803,161 +22803,161 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) "
 #~ "avec les options am (%s)"
 
-#, fuzzy
+#
 #~| msgid "git remote set-url --delete <name> <url>"
 #~ msgid "git remote set-url --save-to-push <name> <url>"
 #~ msgstr "git remote set-url --delete <nom> <URL>"
 
-#, fuzzy
+#
 #~| msgid "The --cached option cannot be used with the --files option"
 #~ msgid "--save-to-push cannot be used with other options"
 #~ msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
 
-#, fuzzy
+#
 #~| msgid "--format cannot be used when not listing"
 #~ msgid "--save-to-push can only be used when only one url is defined"
 #~ msgstr "--format ne peut pas être utilisé sans lister"
 
-#, fuzzy
+#
 #~| msgid "git worktree list [<options>]"
 #~ msgid "git stash list [<options>]"
 #~ msgstr "git worktree list [<options>]"
 
-#, fuzzy
+#
 #~| msgid "git remote show [<options>] <name>"
 #~ msgid "git stash show [<options>] [<stash>]"
 #~ msgstr "git remote show [<options>] <nom>"
 
-#, fuzzy
+#
 #~| msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 #~ msgid "git stash branch <branchname> [<stash>]"
 #~ msgstr ""
 #~ "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
 
-#, fuzzy
+#
 #~| msgid "'$args' is not a stash-like commit"
 #~ msgid "'%s' is not a stash-like commit"
 #~ msgstr "'$args' n'est pas une validation de type remisage"
 
-#, fuzzy
+#
 #~| msgid "Too many revisions specified: $REV"
 #~ msgid "Too many revisions specified:%s"
 #~ msgstr "Trop de révisions spécifiées : $REV"
 
-#, fuzzy
+#
 #~| msgid "'%s' is not a valid ref name"
 #~ msgid "%s is not a valid reference"
 #~ msgstr "'%s' n'est pas un nom valide de référence"
 
-#, fuzzy
+#
 #~| msgid "Cannot apply a stash in the middle of a merge"
 #~ msgid "cannot apply a stash in the middle of a merge"
 #~ msgstr "Impossible d'appliquer un remisage en cours de fusion"
 
-#, fuzzy
+#
 #~| msgid "could not generate todo list"
 #~ msgid "could not generate diff %s^!."
 #~ msgstr "impossible de générer la liste à-faire"
 
-#, fuzzy
+#
 #~| msgid "Conflicts in index. Try without --index."
 #~ msgid "conflicts in index.Try without --index."
 #~ msgstr "Conflits dans l'index. Essayez sans --index."
 
-#, fuzzy
+#
 #~| msgid "Could not save index tree"
 #~ msgid "could not save index tree"
 #~ msgstr "Impossible de sauvegarder l'arbre d'index"
 
-#, fuzzy
+#
 #~| msgid "Could not restore untracked files from stash entry"
 #~ msgid "could not restore untracked files from stash"
 #~ msgstr ""
 #~ "Impossible de restaurer les fichiers non-suivis depuis l'entrée de "
 #~ "remisage"
 
-#, fuzzy
+#
 #~| msgid "Merging %s with %s\n"
 #~ msgid "Merging %s with %s"
 #~ msgstr "Fusion de %s avec %s\n"
 
-#, fuzzy
+#
 #~| msgid "failed to read the index"
 #~ msgid "attempt to recreate the index"
 #~ msgstr "échec à la lecture de l'index"
 
-#, fuzzy
+#
 #~| msgid "Dropped ${REV} ($s)"
 #~ msgid "Dropped %s (%s)"
 #~ msgstr "${REV} supprimé ($s)"
 
-#, fuzzy
+#
 #~| msgid "${REV}: Could not drop stash entry"
 #~ msgid "%s: Could not drop stash entry"
 #~ msgstr "${REV}: Impossible de supprimer l'élément de stash"
 
-#, fuzzy
+#
 #~| msgid "'$args' is not a stash reference"
 #~ msgid "'%s' is not a stash reference"
 #~ msgstr "'$args' n'est pas une référence de remisage"
 
-#, fuzzy
+#
 #~| msgid "Cannot update $ref_stash with $w_commit"
 #~ msgid "Cannot update %s with %s"
 #~ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
 
-#, fuzzy
+#
 #~| msgid "tag message"
 #~ msgid "stash message"
 #~ msgstr "message pour l'étiquette"
 
-#, fuzzy
+#
 #~| msgid "--bisect-clean-state requires no arguments"
 #~ msgid "\"git stash store\" requires one <commit> argument"
 #~ msgstr "--bisect-clean-state ne supporte aucun argument"
 
-#, fuzzy
+#
 #~| msgid "Maybe you wanted to say 'git add .'?\n"
 #~ msgid "Did you forget to 'git add'?"
 #~ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
 
-#, fuzzy
+#
 #~| msgid "Saved working directory and index state $stash_msg"
 #~ msgid "Saved working directory and index state %s"
 #~ msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
 
-#, fuzzy
+#
 #~| msgid "Refresh index"
 #~ msgid "keep index"
 #~ msgstr "Rafraîchir l'index"
 
-#, fuzzy
+#
 #~| msgid "quiet"
 #~ msgid "quiet mode"
 #~ msgstr "quiet"
 
-#, fuzzy
+#
 #~| msgid "list untracked files in columns"
 #~ msgid "include untracked files in stash"
 #~ msgstr "afficher les fichiers non suivis en colonnes"
 
-#, fuzzy
+#
 #~| msgid "show ignored files"
 #~ msgid "include ignore files"
 #~ msgstr "afficher les fichiers ignorés"
 
-#, fuzzy
+#
 #~| msgid "expiry-date"
 #~ msgid "expiry date"
 #~ msgstr "date-d'expiration"
 
-#, fuzzy
+#
 #~| msgid "Use binary search to find the commit that introduced a bug"
 #~ msgid "Find by binary search the change that introduced a bug"
 #~ msgstr ""
 #~ "Trouver par recherche binaire la modification qui a introduit un bogue"
 
-#, fuzzy
+#
 #~| msgid "path into the working tree"
 #~ msgid "Checkout a branch or paths to the working tree"
 #~ msgstr "chemin dans la copie de travail"
@@ -22967,22 +22967,22 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
 #~ "amont"
 
-#, fuzzy
+#
 #~| msgid "invalid ident line: %s"
 #~ msgid "invalid hunk line '%d'\n"
 #~ msgstr "ligne d'identification invalide : %s"
 
-#, fuzzy
+#
 #~| msgid "invalid ident line: %s"
 #~ msgid "invalid hunk line '%s'\n"
 #~ msgstr "ligne d'identification invalide : %s"
 
-#, fuzzy
+#
 #~| msgid "select mainline parent"
 #~ msgid "select lines? "
 #~ msgstr "sélectionner le parent principal"
 
-#, fuzzy
+#
 #~| msgid "cannot store index file"
 #~ msgid "Cannot select line by line\n"
 #~ msgstr "impossible de stocker le fichier d'index"
-- 
2.21.0

Re: [PATCH] l10n: fr.po unfuzzy commented entries

[Ævar Arnfjörð Bjarmason]

On Mon, Feb 25 2019, Jean-Noël Avila wrote:

> The 0.14.4 gettext release was back in 2005, so presumably this is due
> to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
> released a couple of years ago.

So this one pargaraph of commit message is just a paragraph from my
E-Mail upthread, but out of context it's just confusing.

> -#, fuzzy
> +#
>  #~| msgid "git archive [<options>] <tree-ish> [<path>...]"
>  #~ msgid "git diff --no-index [<options>] <path> <path>"
>  #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

This still results in the same issue. Sorry, by "unfuzzying" I thought
you meant change these translations so they'd no longer be commented out
and would actually have a translation.

The problem is that there's two msgid lines, so e.g. this on top of
yours "fixes" it:

     #
    -#~| msgid "git archive [<options>] <tree-ish> [<path>...]"
     #~ msgid "git diff --no-index [<options>] <path> <path>"
     #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

But isn't a better fix on top of master just:

    sed -i '22477,$ d' po/fr.po

That results in 1500 lines removed from the end. I.e. what's the point
of keeping those old now-unused translations around?

Re: Compile error due to po/fr.po on old gettext in v2.21.0

[Jiang Xin]

Jean-Noël AVILA <jn.avila@free.fr> 于2019年2月26日周二 上午4:54写道：
>
> On Monday, 25 February 2019 21:19:53 CET Ævar Arnfjörð Bjarmason wrote:
> > On a NetBSD test box I have with msgfmt 0.14.4 v2.21.0 fails to compile.
> >
> > I didn't spot this in rc2 because b3225a4183 ("l10n: fr.po v2.21.0 rnd
> > 2", 2019-02-13) along with the rest of i18n updates gets pulled in after
> > all the RCs.
> >
> > I.e. this is because of the comments being parsed (fuzzy comments).
> >
> > The 0.14.4 gettext release was back in 2005, so presumably this is due
> > to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
> > released a couple of years ago.
> >

gettext (version below 0.16) doesn't work well with the special format
in `po/fr.po`. I will update the validation script to check for this
issue for future l10n updates.

    $ LC_ALL=C PATH=/opt/gettext/0.15/bin/:$PATH po-helper.sh check
    ------------------------------------------------------------
    bg.po     : 4363 translated messages.
    ca.po     : 3450 translated messages, 417 fuzzy translations, 318
untranslated messages.
    de.po     : 4363 translated messages.
    el.po     : 1038 translated messages, 3325 untranslated messages.
    es.po     : 4363 translated messages.
    fr.po     : po/fr.po:22482:4: parse error
    po/fr.po:22482: missing `msgstr' section
    po/fr.po:22487:4: parse error
    po/fr.po:22487: missing `msgstr' section
    po/fr.po:22492:4: parse error
    po/fr.po:22492: missing `msgstr' section
    po/fr.po:22497:4: parse error
    po/fr.po:22497: missing `msgstr' section
    po/fr.po:22502:4: parse error
    po/fr.po:22502: missing `msgstr' section
    po/fr.po:22507:4: parse error
    po/fr.po:22507: missing `msgstr' section
    po/fr.po:22512:4: parse error
    po/fr.po:22512: missing `msgstr' section
    po/fr.po:22517:4: parse error
    po/fr.po:22517: missing `msgstr' section
    po/fr.po:22522:4: parse error
    po/fr.po:22522: missing `msgstr' section
    po/fr.po:22527:4: parse error
    po/fr.po:22527: missing `msgstr' section
    msgfmt: too many errors, aborting
    is.po     : 14 translated messages.
    it.po     : 2347 translated messages, 583 fuzzy translations, 1433
untranslated messages.
    ko.po     : 3608 translated messages.
    pt_PT.po  : 3198 translated messages.
    ru.po     : 3366 translated messages, 594 untranslated messages.
    sv.po     : 4363 translated messages.
    vi.po     : 4187 translated messages.
    zh_CN.po  : 4363 translated messages.
    ------------------------------------------------------------

>
> I kept the commented entries as a translation memory, even when they are
> fuzzy.
>
> Would unfuzzying these entries resolve the issue?
>
It's not caused by the fuzzy directions in comments (e.g. line 22481),
but because of the duplicated msgid in line 22482. Removing line 22482
will fix this issue.

    22481 #, fuzzy
    22482 #~| msgid "git archive [<options>] <tree-ish> [<path>...]"
    22483 #~ msgid "git diff --no-index [<options>] <path> <path>"
    22484 #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

Re: [PATCH] l10n: fr.po unfuzzy commented entries

[Jean-Noël AVILA]

On Monday, 25 February 2019 23:42:11 CET Ævar Arnfjörð Bjarmason wrote:
> 
> On Mon, Feb 25 2019, Jean-Noël Avila wrote:
> 
> > The 0.14.4 gettext release was back in 2005, so presumably this is due
> > to some GPLv3 allergy of NetBSD's. The OS version itself is 7.1,
> > released a couple of years ago.
> 
> So this one pargaraph of commit message is just a paragraph from my
> E-Mail upthread, but out of context it's just confusing.
> 

Yes. More explanation.

> > -#, fuzzy
> > +#
> >  #~| msgid "git archive [<options>] <tree-ish> [<path>...]"
> >  #~ msgid "git diff --no-index [<options>] <path> <path>"
> >  #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
> 
> This still results in the same issue. Sorry, by "unfuzzying" I thought
> you meant change these translations so they'd no longer be commented out
> and would actually have a translation.
> 

The thing is that there isn't two msgid lines, the first one being the previous value.

> The problem is that there's two msgid lines, so e.g. this on top of
> yours "fixes" it:
> 
>      #
>     -#~| msgid "git archive [<options>] <tree-ish> [<path>...]"
>      #~ msgid "git diff --no-index [<options>] <path> <path>"
>      #~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
> 
> But isn't a better fix on top of master just:
> 
>     sed -i '22477,$ d' po/fr.po
> 
> That results in 1500 lines removed from the end. I.e. what's the point
> of keeping those old now-unused translations around?

They can still be used as a translation memory for future approximate translations.

But, I guess it's safer to keep the translation memory out of this repo.

Will do.

[PATCH v2] l10n: fr.po remove obsolete entries

[Jean-Noël Avila]

On NetBSD, the version of msgfmt is still 0.14.4. There's no hope for
an upgrade due to some GPLv3 allergy of NetBSD's. This version chokes
on heavily decorated commented entries in po files. It's safer to get
rid of all these obsolete entries.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 po/fr.po | 1500 ------------------------------------------------------
 1 file changed, 1500 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 7b15b76374..0e084f5a49 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22474,1503 +22474,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
-
-#~ msgid "--reschedule-failed-exec requires an interactive rebase"
-#~ msgstr "--reschedule-failed-exec requiert un rebasage interactif"
-
-#, fuzzy
-#~| msgid "git archive [<options>] <tree-ish> [<path>...]"
-#~ msgid "git diff --no-index [<options>] <path> <path>"
-#~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
-
-#, fuzzy
-#~| msgid "invalid sparse value '%s'"
-#~ msgid "invalid --stat value: %s"
-#~ msgstr "valeur invalide de 'sparse' '%s'"
-
-#, fuzzy
-#~| msgid "unable to create '%s'"
-#~ msgid "unable to resolve '%s'"
-#~ msgstr "impossible de créer '%s'"
-
-#, fuzzy
-#~| msgid "expected wanted-ref, got '%s'"
-#~ msgid "%s expects a character, got '%s'"
-#~ msgstr "wanted-ref attendu, '%s' trouvé"
-
-#, fuzzy
-#~| msgid "invalid color '%s' in color.blame.repeatedLines"
-#~ msgid "invalid mode '%s' in --color-moved-ws"
-#~ msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
-
-#, fuzzy
-#~| msgid "invalid value for %s"
-#~ msgid "invalid argument to %s"
-#~ msgstr "Valeur invalide pour %s"
-
-#, fuzzy
-#~| msgid "bad number of arguments"
-#~ msgid "bad --word-diff argument: %s"
-#~ msgstr "mauvais nombre d'arguments"
-
-#, fuzzy
-#~| msgid "Generating patches"
-#~ msgid "generate patch"
-#~ msgstr "Génération des patchs"
-
-#, fuzzy
-#~| msgid "ensure at least <n> lines of context match"
-#~ msgid "generate diffs with <n> lines context"
-#~ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-
-#, fuzzy
-#~| msgid "(synonym to --stat)"
-#~ msgid "synonym for '-p --raw'"
-#~ msgstr "(synonyme de --stat)"
-
-#, fuzzy
-#~| msgid "(synonym to --stat)"
-#~ msgid "synonym for '-p --stat'"
-#~ msgstr "(synonyme de --stat)"
-
-#, fuzzy
-#~| msgid "machine-readable output"
-#~ msgid "machine friendly --stat"
-#~ msgstr "sortie pour traitement automatique"
-
-#, fuzzy
-#~| msgid "output only the trailers"
-#~ msgid "output only the last line of --stat"
-#~ msgstr "éliminer les lignes terminales vides"
-
-#, fuzzy
-#~| msgid "synonym for --files-with-matches"
-#~ msgid "synonym for --dirstat=cumulative"
-#~ msgstr "synonyme pour --files-with-matches"
-
-#, fuzzy
-#~| msgid "show only filenames instead of matching lines"
-#~ msgid "show only names of changed files"
-#~ msgstr ""
-#~ "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-
-#, fuzzy
-#~| msgid "show only filenames instead of matching lines"
-#~ msgid "show only names and status of changed files"
-#~ msgstr ""
-#~ "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-
-#, fuzzy
-#~| msgid "failed to generate diff"
-#~ msgid "generate diffstat"
-#~ msgstr "échec de la génération de diff"
-
-#, fuzzy
-#~| msgid "show ignored files"
-#~ msgid "show colored diff"
-#~ msgstr "afficher les fichiers ignorés"
-
-#, fuzzy
-#~| msgid "<prefix>/"
-#~ msgid "<prefix>"
-#~ msgstr "<préfixe>/"
-
-#, fuzzy
-#~| msgid "prepend parent project's basename to output"
-#~ msgid "prepend an additional prefix to every line of output"
-#~ msgstr "préfixer le nom de base du projet parent à la sortie"
-
-#, fuzzy
-#~| msgid ""
-#~| "Create a shallow clone truncated to the specified number of revisions"
-#~ msgid "show context between diff hunks up to the specified number of lines"
-#~ msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-
-#, fuzzy
-#~| msgid "Generic options"
-#~ msgid "Diff rename options"
-#~ msgstr "Options génériques"
-
-#, fuzzy
-#~| msgid "<n>[,<base>]"
-#~ msgid "<n>[/<m>]"
-#~ msgstr "<n>[,<base>]"
-
-#, fuzzy
-#~| msgid "do not detect renames"
-#~ msgid "detect renames"
-#~ msgstr "ne pas détecter les renommages"
-
-#, fuzzy
-#~| msgid "Updated preimage for '%s'"
-#~ msgid "omit the preimage for deletes"
-#~ msgstr "Pré-image mise à jour pour '%s'"
-
-#, fuzzy
-#~| msgid "Performing inexact rename detection"
-#~ msgid "disable rename detection"
-#~ msgstr "Détection de renommage inexact en cours"
-
-#, fuzzy
-#~| msgid "invalid option: %s"
-#~ msgid "Diff algorithm options"
-#~ msgstr "option invalide : %s"
-
-#, fuzzy
-#~| msgid "ignore changes in whitespace when finding context"
-#~ msgid "ignore whitespace when comparing lines"
-#~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-
-#, fuzzy
-#~| msgid "ignore changes in whitespace when finding context"
-#~ msgid "ignore changes in amount of whitespace"
-#~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-
-#, fuzzy
-#~| msgid "ignore changes in whitespace when finding context"
-#~ msgid "ignore changes in whitespace at EOL"
-#~ msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-
-#, fuzzy
-#~| msgid "text"
-#~ msgid "<text>"
-#~ msgstr "texte"
-
-#, fuzzy
-#~| msgid "mode"
-#~ msgid "<mode>"
-#~ msgstr "mode"
-
-#, fuzzy
-#~| msgid "decorate options"
-#~ msgid "Diff other options"
-#~ msgstr "décorer les options"
-
-#, fuzzy
-#~| msgid "process binary files as text"
-#~ msgid "treat all files as text"
-#~ msgstr "traiter les fichiers binaires comme texte"
-
-#, fuzzy
-#~| msgid "when"
-#~ msgid "<when>"
-#~ msgstr "quand"
-
-#, fuzzy
-#~| msgid ""
-#~| "ignore changes to submodules, optional when: all, dirty, untracked. "
-#~| "(Default: all)"
-#~ msgid "ignore changes to submodules in the diff generation"
-#~ msgstr ""
-#~ "ignorer les modifications dans les sous-modules, \"quand\" facultatif : "
-#~ "all (tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-
-#, fuzzy
-#~| msgid "format"
-#~ msgid "<format>"
-#~ msgstr "format"
-
-#, fuzzy
-#~| msgid "use .gitattributes only from the index"
-#~ msgid "hide 'git add -N' entries from the index"
-#~ msgstr "utiliser .gitattributes seulement depuis l'index"
-
-#, fuzzy
-#~| msgid "string"
-#~ msgid "<string>"
-#~ msgstr "chaîne"
-
-#, fuzzy
-#~| msgid "show matching files in the pager"
-#~ msgid "show all changes in the changeset with -S or -G"
-#~ msgstr "afficher les fichiers correspondant dans le pagineur"
-
-#, fuzzy
-#~| msgid "use extended POSIX regular expressions"
-#~ msgid "treat <string> in -S as extended POSIX regular expression"
-#~ msgstr "utiliser des expressions régulières étendues POSIX"
-
-#, fuzzy
-#~| msgid "print all configuration variable names"
-#~ msgid "override diff.orderFile configuration variable"
-#~ msgstr "afficher tous les noms de variables de configuration"
-
-#, fuzzy
-#~| msgid "object"
-#~ msgid "<object-id>"
-#~ msgstr "objet"
-
-#, fuzzy
-#~| msgid "file"
-#~ msgid "<file>"
-#~ msgstr "fichier"
-
-#, fuzzy
-#~| msgid "commit only specified files"
-#~ msgid "Output to a specific file"
-#~ msgstr "valider seulement les fichiers spécifiés"
-
-#, fuzzy
-#~| msgid "Could not spawn pack-objects"
-#~ msgid "could not start pack-objects"
-#~ msgstr "Impossible de créer des objets groupés"
-
-#, fuzzy
-#~| msgid "Could not spawn pack-objects"
-#~ msgid "could not finish pack-objects"
-#~ msgstr "Impossible de créer des objets groupés"
-
-#, fuzzy
-#~| msgid "unrecognized position:%s"
-#~ msgid "Unrecognized protocol version"
-#~ msgstr "position non reconnue : %s"
-
-#, fuzzy
-#~| msgid "unrecognized position:%s"
-#~ msgid "Unrecognized protocol_version"
-#~ msgstr "position non reconnue : %s"
-
-#, fuzzy
-#~| msgid "could not write '%s'"
-#~ msgid "could not write '%s'."
-#~ msgstr "impossible d'écrire '%s'"
-
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "impossible d'écrire le fichier sha1 %s"
-
-#~ msgid "unable to write sha1 file"
-#~ msgstr "impossible d'écrire le fichier sha1"
-
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "impossible de lire le fichier sha1 pour %s"
-
-#, fuzzy
-#~| msgid "bad revision '%s'"
-#~ msgid "Can't find revision '%s' to ignore"
-#~ msgstr "mauvaise révision '%s'"
-
-#, fuzzy
-#~| msgid "ignore index when checking"
-#~ msgid "Ignore <rev> when blaming"
-#~ msgstr "ignorer l'index pendant la vérification"
-
-#, fuzzy
-#~| msgid "read message from file"
-#~ msgid "Ignore revisions from <file>"
-#~ msgstr "lire le message depuis un fichier"
-
-#, fuzzy
-#~| msgid "could not resolve HEAD commit"
-#~ msgid "could not resolve HEAD"
-#~ msgstr "impossible de résoudre le commit HEAD"
-
-#, fuzzy
-#~| msgid "HEAD not found below refs/heads!"
-#~ msgid "HEAD (%s) points outside of refs/heads/"
-#~ msgstr "HEAD non trouvée sous refs/heads !"
-
-#, fuzzy
-#~| msgid "No current branch."
-#~ msgid "show current branch name"
-#~ msgstr "Pas de branche courante."
-
-#, fuzzy
-#~| msgid "prune loose refs (default)"
-#~ msgid "use overlay mode (default)"
-#~ msgstr "éliminer les références perdues (défaut)"
-
-#, fuzzy
-#~| msgid "-n and -k are mutually exclusive"
-#~ msgid "-p and --overlay are mutually exclusive"
-#~ msgstr "-n et -k sont mutuellement exclusifs"
-
-#, fuzzy
-#~| msgid "unable to read config file '%s'"
-#~ msgid "move a variable to a different config file"
-#~ msgstr "lecture du fichier de configuration '%s' impossible"
-
-#, fuzzy
-#~| msgid "Unknown commit %s"
-#~ msgid "unknown config source"
-#~ msgstr "Commit inconnu %s"
-
-#~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
-#~ msgstr ""
-#~ "erreur: impossible de combiner des options interactives (--interactive, --"
-#~ "exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) "
-#~ "avec les options am (%s)"
-
-#, fuzzy
-#~| msgid "git remote set-url --delete <name> <url>"
-#~ msgid "git remote set-url --save-to-push <name> <url>"
-#~ msgstr "git remote set-url --delete <nom> <URL>"
-
-#, fuzzy
-#~| msgid "The --cached option cannot be used with the --files option"
-#~ msgid "--save-to-push cannot be used with other options"
-#~ msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-
-#, fuzzy
-#~| msgid "--format cannot be used when not listing"
-#~ msgid "--save-to-push can only be used when only one url is defined"
-#~ msgstr "--format ne peut pas être utilisé sans lister"
-
-#, fuzzy
-#~| msgid "git worktree list [<options>]"
-#~ msgid "git stash list [<options>]"
-#~ msgstr "git worktree list [<options>]"
-
-#, fuzzy
-#~| msgid "git remote show [<options>] <name>"
-#~ msgid "git stash show [<options>] [<stash>]"
-#~ msgstr "git remote show [<options>] <nom>"
-
-#, fuzzy
-#~| msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-#~ msgid "git stash branch <branchname> [<stash>]"
-#~ msgstr ""
-#~ "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
-
-#, fuzzy
-#~| msgid "'$args' is not a stash-like commit"
-#~ msgid "'%s' is not a stash-like commit"
-#~ msgstr "'$args' n'est pas une validation de type remisage"
-
-#, fuzzy
-#~| msgid "Too many revisions specified: $REV"
-#~ msgid "Too many revisions specified:%s"
-#~ msgstr "Trop de révisions spécifiées : $REV"
-
-#, fuzzy
-#~| msgid "'%s' is not a valid ref name"
-#~ msgid "%s is not a valid reference"
-#~ msgstr "'%s' n'est pas un nom valide de référence"
-
-#, fuzzy
-#~| msgid "Cannot apply a stash in the middle of a merge"
-#~ msgid "cannot apply a stash in the middle of a merge"
-#~ msgstr "Impossible d'appliquer un remisage en cours de fusion"
-
-#, fuzzy
-#~| msgid "could not generate todo list"
-#~ msgid "could not generate diff %s^!."
-#~ msgstr "impossible de générer la liste à-faire"
-
-#, fuzzy
-#~| msgid "Conflicts in index. Try without --index."
-#~ msgid "conflicts in index.Try without --index."
-#~ msgstr "Conflits dans l'index. Essayez sans --index."
-
-#, fuzzy
-#~| msgid "Could not save index tree"
-#~ msgid "could not save index tree"
-#~ msgstr "Impossible de sauvegarder l'arbre d'index"
-
-#, fuzzy
-#~| msgid "Could not restore untracked files from stash entry"
-#~ msgid "could not restore untracked files from stash"
-#~ msgstr ""
-#~ "Impossible de restaurer les fichiers non-suivis depuis l'entrée de "
-#~ "remisage"
-
-#, fuzzy
-#~| msgid "Merging %s with %s\n"
-#~ msgid "Merging %s with %s"
-#~ msgstr "Fusion de %s avec %s\n"
-
-#, fuzzy
-#~| msgid "failed to read the index"
-#~ msgid "attempt to recreate the index"
-#~ msgstr "échec à la lecture de l'index"
-
-#, fuzzy
-#~| msgid "Dropped ${REV} ($s)"
-#~ msgid "Dropped %s (%s)"
-#~ msgstr "${REV} supprimé ($s)"
-
-#, fuzzy
-#~| msgid "${REV}: Could not drop stash entry"
-#~ msgid "%s: Could not drop stash entry"
-#~ msgstr "${REV}: Impossible de supprimer l'élément de stash"
-
-#, fuzzy
-#~| msgid "'$args' is not a stash reference"
-#~ msgid "'%s' is not a stash reference"
-#~ msgstr "'$args' n'est pas une référence de remisage"
-
-#, fuzzy
-#~| msgid "Cannot update $ref_stash with $w_commit"
-#~ msgid "Cannot update %s with %s"
-#~ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
-
-#, fuzzy
-#~| msgid "tag message"
-#~ msgid "stash message"
-#~ msgstr "message pour l'étiquette"
-
-#, fuzzy
-#~| msgid "--bisect-clean-state requires no arguments"
-#~ msgid "\"git stash store\" requires one <commit> argument"
-#~ msgstr "--bisect-clean-state ne supporte aucun argument"
-
-#, fuzzy
-#~| msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgid "Did you forget to 'git add'?"
-#~ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-
-#, fuzzy
-#~| msgid "Saved working directory and index state $stash_msg"
-#~ msgid "Saved working directory and index state %s"
-#~ msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-
-#, fuzzy
-#~| msgid "Refresh index"
-#~ msgid "keep index"
-#~ msgstr "Rafraîchir l'index"
-
-#, fuzzy
-#~| msgid "quiet"
-#~ msgid "quiet mode"
-#~ msgstr "quiet"
-
-#, fuzzy
-#~| msgid "list untracked files in columns"
-#~ msgid "include untracked files in stash"
-#~ msgstr "afficher les fichiers non suivis en colonnes"
-
-#, fuzzy
-#~| msgid "show ignored files"
-#~ msgid "include ignore files"
-#~ msgstr "afficher les fichiers ignorés"
-
-#, fuzzy
-#~| msgid "expiry-date"
-#~ msgid "expiry date"
-#~ msgstr "date-d'expiration"
-
-#, fuzzy
-#~| msgid "Use binary search to find the commit that introduced a bug"
-#~ msgid "Find by binary search the change that introduced a bug"
-#~ msgstr ""
-#~ "Trouver par recherche binaire la modification qui a introduit un bogue"
-
-#, fuzzy
-#~| msgid "path into the working tree"
-#~ msgid "Checkout a branch or paths to the working tree"
-#~ msgstr "chemin dans la copie de travail"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr ""
-#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
-#~ "amont"
-
-#, fuzzy
-#~| msgid "invalid ident line: %s"
-#~ msgid "invalid hunk line '%d'\n"
-#~ msgstr "ligne d'identification invalide : %s"
-
-#, fuzzy
-#~| msgid "invalid ident line: %s"
-#~ msgid "invalid hunk line '%s'\n"
-#~ msgstr "ligne d'identification invalide : %s"
-
-#, fuzzy
-#~| msgid "select mainline parent"
-#~ msgid "select lines? "
-#~ msgstr "sélectionner le parent principal"
-
-#, fuzzy
-#~| msgid "cannot store index file"
-#~ msgid "Cannot select line by line\n"
-#~ msgstr "impossible de stocker le fichier d'index"
-
-#~ msgid "ignoring unknown color-moved-ws mode '%s'"
-#~ msgstr "mode color-moved-ws inconnu '%s' ignoré"
-
-#~ msgid "only 'tree:0' is supported"
-#~ msgstr "seul 'tree:0' est supporté"
-
-#~ msgid "Renaming %s to %s and %s to %s instead"
-#~ msgstr "Renommage de %s en %s et de %s en %s à la place"
-
-#~ msgid "Adding merged %s"
-#~ msgstr "Ajout de %s fusionné"
-
-#~ msgid "Internal error"
-#~ msgstr "Erreur interne"
-
-#~ msgid "mainline was specified but commit %s is not a merge."
-#~ msgstr ""
-#~ "une branche principale a été spécifiée mais le commit %s n'est pas une "
-#~ "fusion."
-
-#~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
-#~ msgstr ""
-#~ "erreur : impossible de combiner les options de fusion (--merge, --"
-#~ "strategy, --strategy-option) avec les options am (%s)"
-
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "option inconnue : '$arg'"
-
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "'$invalid' n'est pas une validation valide"
-
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
-
-#~ msgid "bad quoting on %s value in '%s'"
-#~ msgstr "Mauvaise citation sur la valeur %s dans '%s'"
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "synonyme déconseillé de --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "impossible de faire un stat de %s"
-
-#~ msgid "abort rebase"
-#~ msgstr "abandonner le rebasage"
-
-#~ msgid "make rebase script"
-#~ msgstr "créer les script de rebasage"
-
-#~ msgid "No such remote: %s"
-#~ msgstr "Distante inconnue : %s"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "impossible de déplacer un arbre de travail verrouillé"
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "impossible de supprimer un arbre de travail verrouillé"
-
-#~ msgid "Applied autostash."
-#~ msgstr "Autoremisage appliqué."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Impossible de stocker $stash_sha1"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
-#~ "\n"
-#~ "\t"
-
-#~ msgid "could not parse '%s' (looking for '%s'"
-#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
-
-#~ msgid "color both diff and diff-between-diffs"
-#~ msgstr "colorer à la fois les diffs et le diff-between-diffs"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Index sale : fusion impossible (sales : %s)"
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#~ msgid "<command>"
-#~ msgstr "<commande>"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Entrée dans '$displaypath'"
-
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Git de tous les jours avec à peu près 20 commandes"
-
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "première ligne de message de compression inattendue :\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "première ligne de message de compression invalide :\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
-
-#~ msgid "Error in object"
-#~ msgstr "Erreur dans l'objet"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "expression de filtre invalide : '%s'"
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "La copie du patch qui a échoué se trouve dans : %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "un spécificateur de chemin et --all sont incompatibles"
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
-#~ "'$displaypath'"
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr ""
-#~ "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "les chaines de caractères vides comme spécificateurs de chemin seront "
-#~ "invalides dans les prochaines versions. Veuillez utiliser . à la place "
-#~ "pour correspondre à tous le chemins"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "impossible de tronquer '%s'"
-
-#~ msgid "could not close %s"
-#~ msgstr "impossible de fermer %s"
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Copie d'une branche mal nommée '%s'"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "créer manuellement 'HEAD' n'a pas de sens"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "Je ne sais pas cloner %s"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Je ne sais pas récupérer depuis %s"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "'$term' n'est pas un terme valide"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ "       To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "erreur: option inconnue pour 'stash save': $option\n"
-#~ "        Pour fournir un message, utilisez git stash save -- '$option'"
-
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) n'accepte pas d'argument"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module "
-#~ "'%s'"
-
-#~ msgid "change upstream info"
-#~ msgstr "modifier l'information amont"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n"
-#~ "\n"
-
-#~ msgid "basename"
-#~ msgstr "nom de base"
-
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne "
-#~ "suivante :\n"
-#~ " - $line"
-
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
-#~ " - $line"
-
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr ""
-#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "dans %0.1f secondes automatiquement..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "échec de dup2(%d,%d)"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Validation initiale sur "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Le patch est vide. Le découpage était-il bon ?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Vous avez toujours des chemins non fusionnés dans votre index\n"
-#~ "Auriez-vous oublié de faire 'git add' ?"
-
-#~ msgid ""
-#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
-#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
-#~ msgstr ""
-#~ "Impossible de mettre à jour les chemins et de basculer sur la branche "
-#~ "'%s' en même temps.\n"
-#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "mode par défaut pour la récursion"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr ""
-#~ "la sous-commande submodule--helper doit être appelée avec une sous-"
-#~ "commande"
-
-#~ msgid "could not stat '%s"
-#~ msgstr "stat impossible de '%s'"
-
-#~ msgid "tag: tagging "
-#~ msgstr "étiquette: étiquetage de "
-
-#~ msgid "commit object"
-#~ msgstr "objet commit"
-
-#~ msgid "tree object"
-#~ msgstr "objet arbre"
-
-#~ msgid "blob object"
-#~ msgstr "objet blob"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
-#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "format non reconnu %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requiert un argument entier positif"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "la réf '%s' n'a pas %ld composants à :strip"
-
-# féminin pour une branche
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: disparue]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: en retard de %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s : en avance de %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s : en avance de %d, en retard de %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** référence invalide ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "objet répertoire démentiellement long %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<options>] <message> HEAD <commit>"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "nom d'étiquette trop long : %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "en-tête d'étiquette trop gros."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Si le patch s'applique proprement, la section éditée sera\n"
-#~ "immediatement marquée comme éliminée"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
-#~ "améliorer le diffs"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Malin... correction du dernier avec un index sale."
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] ""
-#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n"
-#~ "utilise un répertoire .git :"
-#~ msgstr[1] ""
-#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n"
-#~ "utilisent un répertoire .git :"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
-#~ "son historique)"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Erreur lors de l'emballage de %s."
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr "Impossible de picorer pendant un autre picorage."
-
-#~ msgid "Could not parse line %d."
-#~ msgstr "Impossible d'analyser la ligne %d."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Impossible d'ouvrir %s"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Impossible de formater %s."
-
-#~ msgid "%s: %s"
-#~ msgstr "%s : %s"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Vous devez d'abord définir vos informations de validateur"
-
-#~ msgid "This is the 2nd commit message:"
-#~ msgstr "Ceci est le deuxième message de validation :"
-
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "Ceci est le troisième message de validation :"
-
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "Ceci est le quatrième message de validation :"
-
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "Ceci est le cinquième message de validation :"
-
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "Ceci est le sixième message de validation :"
-
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "Ceci est le septième message de validation :"
-
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "Ceci est le huitième message de validation :"
-
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "Ceci est le neuvième message de validation :"
-
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "Ceci est le dixième message de validation :"
-
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "Ceci est le ${n}ième message de validation :"
-
-#~ msgid "The 1st commit message will be skipped:"
-#~ msgstr "Le premier message de validation sera ignoré :"
-
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "Le deuxième message de validation sera ignoré :"
-
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "Le troisième message de validation sera ignoré :"
-
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "Le quatrième message de validation sera ignoré :"
-
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "Le cinquième message de validation sera ignoré :"
-
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "Le sixième message de validation sera ignoré :"
-
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "Le septième message de validation sera ignoré :"
-
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "Le huitième message de validation sera ignoré :"
-
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "Le neuvième message de validation sera ignoré :"
-
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "Le dixième message de validation sera ignoré :"
-
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "le ${n}ième message de validation sera ignoré :"
-
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "Le message de validation ${n} sera ignoré :"
-
-#~ msgid "could not run gpg."
-#~ msgstr "impossible de lancer gpg."
-
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg n'a pas accepté les données"
-
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "type d'objet non supporté dans l'arbre"
-
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."
-
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "Chemin non traité ??? %s"
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Impossible de %s pendant un %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Impossible de picorer vers une HEAD vide"
-
-#~ msgid "could not open %s for writing"
-#~ msgstr "Impossible d'ouvrir '%s' en écriture"
-
-#~ msgid "bug: unhandled unmerged status %x"
-#~ msgstr "bogue : état de non-fusion non géré %x"
-
-#~ msgid "bug: unhandled diff status %c"
-#~ msgstr "bogue : état de diff non géré %c"
-
-#~ msgid "could not write branch description template"
-#~ msgstr "impossible d'écrire le modèle de description de branche"
-
-#~ msgid "corrupt index file"
-#~ msgstr "fichier d'index corrompu"
-
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "détacher la HEAD à la validation nommée"
-
-#~ msgid "Checking connectivity... "
-#~ msgstr "Vérification de la connectivité... "
-
-#~ msgid "  (unable to update local ref)"
-#~ msgstr "  (impossible de mettre à jour la référence locale)"
-
-#~ msgid "Reinitialized existing"
-#~ msgstr "existant réinitialisé"
-
-#~ msgid "Initialized empty"
-#~ msgstr "vide initialisé"
-
-#~ msgid " shared"
-#~ msgstr " partagé"
-
-#~ msgid "Verify that the named commit has a valid GPG signature"
-#~ msgstr "Vérifier que la validation a une signature GPG valide"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "Écriture de SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "Finition de SQUASH_MSG"
-
-#~ msgid "   and with remote"
-#~ msgstr "   et avec la distante"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "la suppression de '%s' a échoué"
-
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr ""
-#~ "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à "
-#~ "nouveau depuis"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "utilisez l'option '--force'. Si le répertoire local git n'est pas le "
-#~ "dépôt correct"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom "
-#~ "avec l'option '--name'."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr ""
-#~ "La copie de travail du sous-module '$displaypath' contient un répertoire ."
-#~ "git"
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
-#~ "son historique)"
-
-#~ msgid "'%s': %s"
-#~ msgstr "'%s' : %s"
-
-#~ msgid "unable to access '%s': %s"
-#~ msgstr "impossible d'accéder à '%s' : %s"
-
-#~ msgid "    git branch -d %s\n"
-#~ msgstr "    git branch -d %s\n"
-
-#~ msgid "    git branch --set-upstream-to %s\n"
-#~ msgstr "    git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "impossible d'ouvrir %s : %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour "
-#~ "continuer"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "échec de la suppression de %s"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Chemin de sous-module '$displaypath' non initialisé\n"
-#~ "Peut-être souhaitez-vous utiliser 'update --init' ?"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "format non convenable align:%s"
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "push.default n'est pas défini ; sa valeur implicite a changé dans Git "
-#~ "2.0\n"
-#~ "de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n"
-#~ "le comportement actuel après la modification de la valeur de défaut, "
-#~ "utilisez :\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "Pour supprimer ce message et adopter le nouveau comportement maintenant, "
-#~ "utilisez :\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "Quand push.default vaudra 'matching', git poussera les branches locales\n"
-#~ "sur les branches distantes qui existent déjà avec le même nom.\n"
-#~ "\n"
-#~ "Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif "
-#~ "'simple'\n"
-#~ "qui ne pousse la branche courante que vers la branche distante "
-#~ "correspondante\n"
-#~ "que 'git pull' utilise pour mettre à jour la branche courante.\n"
-#~ " \n"
-#~ "Voir 'git help config' et chercher 'push.default' pour plus "
-#~ "d'information.\n"
-#~ "(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode "
-#~ "similaire\n"
-#~ "'current' au lieu de 'simple' si vous utilisez de temps en temps "
-#~ "d'anciennes versions de Git)"
-
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Impossible d'ajouter '%s'"
-
-#~ msgid "Missing author: %s"
-#~ msgstr "Auteur manquant : %s"
-
-#~ msgid "Testing "
-#~ msgstr "Test en cours "
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr ""
-#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
-#~ "passe : %s"
-
-#~ msgid "no such user"
-#~ msgstr "utilisateur inconnu"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "la branche '%s' ne pointe pas sur un commit"
-
-#~ msgid "print only merged branches"
-#~ msgstr "afficher seulement les branches fusionnées"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "--dissociate est spécifié, mais --reference est absent"
-
-#~ msgid "show usage"
-#~ msgstr "afficher l'usage"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "nom de modèle démentiellement long %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "lien symbolique démentiellement long %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "chemin de modèle %s démentiellement long"
-
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "spécification de tri non supportée '%s'"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "spécification de tri non supportée '%s' dans le variable '%s'"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "le commutateur 'points-at' a besoin d'un objet"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort et -n sont incompatibles"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr ""
-#~ "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-"
-#~ "versa"
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "BUG: réouverture d'un fichier verrou validé"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "l'option %s n'accepte pas de valeur négative"
-
-#~ msgid "unable to parse value '%s' for option %s"
-#~ msgstr "impossible d'analyser la valeur '%s' pour l'option %s"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b et -B sont mutuellement exclusifs"
-
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n"
-#~ "Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n"
-#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
-#~ "\"$cmdline --abort\"."
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "Le format de patch $patch_format n'est pas supporté."
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Décidez-vous. --skip ou --abort ?"
-
-#~ msgid ""
-#~ "Patch is empty.  Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Le patch est vide.  Était-il mal découpé ?\n"
-#~ "Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n"
-#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
-#~ "\"$cmdline --abort\"."
-
-#~ msgid "Patch does not have a valid courriel address."
-#~ msgstr "Le patch n'a pas d'adresse courriel valide."
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Application : $FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Le patch a échoué à $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-#~ "as appropriate to mark resolution and make a commit."
-#~ msgstr ""
-#~ "Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n"
-#~ "Veuillez les corriger dans votre copie de travail, utiliser alors 'git "
-#~ "add/rm <fichier>'\n"
-#~ "si nécessaire pour marquer comme résolu et valider."
-
-#~ msgid "no branch specified"
-#~ msgstr "aucune branche spécifiée"
-
-#~ msgid "prune .git/worktrees"
-#~ msgstr "éliminer .git/worktrees"
-
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "Les commandes git les plus utilisées sont :"
-
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Branche inconnue : '%s'"
-
-#~ msgid "Could not create git link %s"
-#~ msgstr "Impossible de créer le lien git %s"
-
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "gc.pruneexpire invalide : '%s'"
-
-#~ msgid "(detached from %s)"
-#~ msgstr "(détaché de %s)"
-
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Aucun auteur existant trouvé avec '%s'"
-
-#~ msgid "search also in ignored files"
-#~ msgstr "rechercher aussi dans les fichiers ignorés"
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"
-
-#~ msgid "no files added"
-#~ msgstr "aucun fichier ajouté"
-
-#~ msgid "slot"
-#~ msgstr "emplacement"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Échec du verrouillage de la référence pour mise à jour"
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Échec de l'écriture de la référence"
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "impossible de verrouiller la référence HEAD"
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "impossible de mettre à jour la référence HEAD"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s : impossible de verrouiller la référence"
-
-#~ msgid "commit has empty message"
-#~ msgstr "le commit a un message vide"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Échec de chdir: %s"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr "Suivi de branche non paramétré : le nom est trop long : %s"
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "impossible de trouver .gitmodules dans l'index"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "échec de la lecture du .gitmodules mis à jour"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "échec de stat du .gitmodules mis à jour"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "suppression du .gitmodules dans l'index impossible"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "échec de l'ajout du .gitmodules mis à jour"
-
-#~ msgid "bug"
-#~ msgstr "bogue"
-
-#~ msgid ", behind "
-#~ msgstr ", derrière "
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis "
-#~ "un\n"
-#~ "sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être "
-#~ "utilisé.\n"
-#~ "Pour ajouter le contenu de toute l'arborescence, lancez :\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (ou git add %s :/)\n"
-#~ "\n"
-#~ "Pour restreindre la commande au répertoire courant, lancez :\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (ou git add %s .)\n"
-#~ "\n"
-#~ "Avec la version actuelle de Git, la commande est restreinte au répertoire "
-#~ "courant.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ "  ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n"
-#~ "dont le comportement va changer dans Git 2.0 avec le respect des chemins "
-#~ "que vous supprimez.\n"
-#~ "Les chemins tels que '%s' qui ont été\n"
-#~ "retirés de votre copie de travail sont ignorés avec cette version de "
-#~ "Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <chemin>', qui est l'option par défaut "
-#~ "actuelle,\n"
-#~ "  ignore les chemins que vous avez supprimés de votre copie de travail.\n"
-#~ "\n"
-#~ "* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n"
-#~ "\n"
-#~ "Lancez 'git status' pour vérifier les chemins que vous avez supprimés de "
-#~ "votre copie de travail.\n"
-
-#~ msgid "key id"
-#~ msgstr "identifiant de clé"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Compression automatique du dépôt pour une performance optimum. Vous "
-#~ "pouvez aussi\n"
-#~ "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "
-#~ "d'information.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Les mises à jour ont été rejetées car la pointe de la branche poussée est "
-#~ "derrière\n"
-#~ "son homologue distant. Si vous ne vouliez pas pousser cette branche, vous "
-#~ "pourriez\n"
-#~ "vouloir spécifier les branches à pousser ou définir la variable de "
-#~ "configuration\n"
-#~ "'push.default' à 'simple', 'current' ou 'upstream' pour pousser seulement "
-#~ "la branche courante."
-
-#~ msgid "deleted:    %s"
-#~ msgstr "supprimé :  %s"
-
-#~ msgid "modified:   %s"
-#~ msgstr "modifié :   %s"
-
-#~ msgid "renamed:    %s -> %s"
-#~ msgstr "renommé :   %s -> %s"
-
-#~ msgid "unmerged:   %s"
-#~ msgstr "non fus. :  %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "les chemins en entrée sont terminés par le caractère nul"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked."
-- 
2.21.0

Re: [PATCH v2] l10n: fr.po remove obsolete entries

[Jiang Xin]

Jean-Noël Avila <jn.avila@free.fr> 于2019年2月27日周三 上午4:56写道：
>
> On NetBSD, the version of msgfmt is still 0.14.4. There's no hope for
> an upgrade due to some GPLv3 allergy of NetBSD's. This version chokes
> on heavily decorated commented entries in po files. It's safer to get
> rid of all these obsolete entries.
>
> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
> ---
>  po/fr.po | 1500 ------------------------------------------------------
>  1 file changed, 1500 deletions(-)
>
> diff --git a/po/fr.po b/po/fr.po
> index 7b15b76374..0e084f5a49 100644
> --- a/po/fr.po
> +++ b/po/fr.po
> @@ -22474,1503 +22474,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
>  #, perl-format
>  msgid "Do you really want to send %s? [y|N]: "
>  msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
> -
> -#~ msgid "--reschedule-failed-exec requires an interactive rebase"
> -#~ msgstr "--reschedule-failed-exec requiert un rebasage interactif"
> -
> -#, fuzzy
> -#~| msgid "git archive [<options>] <tree-ish> [<path>...]"
> -#~ msgid "git diff --no-index [<options>] <path> <path>"
> -#~ msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

The pull request sent by Tran this morning has the same issue, see:
https://github.com/git-l10n/git-po/pull/357.

@Jean-Noël, you can send pull request to me to the "git-l10n/git-po"
repo on Github, I will send a pull requst to Junio when he is back
last week.