From 6caaf2daf0ea50ff99009b94f24252b8fa747e64 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sun, 20 Jan 2008 23:03:23 -0500 Subject: [PATCH] git-gui: Correct encoding of glossary/fr.po to UTF-8 Junio noticed this was incorrectly added in ISO-8859-1 but it should be in UTF-8 (as the headers claim UTF-8, and our convention is to use only UTF-8). Signed-off-by: Shawn O. Pearce --- po/glossary/fr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/glossary/fr.po b/po/glossary/fr.po index bb2feaf13..27c006abb 100644 --- a/po/glossary/fr.po +++ b/po/glossary/fr.po @@ -34,7 +34,7 @@ msgstr "branche" #. "" msgid "branch [verb]" -msgstr "créer une branche" +msgstr "créer une branche" #. "" msgid "checkout [noun]" @@ -58,7 +58,7 @@ msgstr "commiter" #. "" msgid "diff [noun]" -msgstr "différence" +msgstr "différence" #. "" msgid "diff [verb]" @@ -70,11 +70,11 @@ msgstr "fusion par avance rapide" #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." msgid "fetch" -msgstr "récupérer" +msgstr "récupérer" #. "A collection of files. The index is a stored version of your working tree." msgid "index (in git-gui: staging area)" -msgstr "pré-commit" +msgstr "pré-commit" #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" @@ -106,15 +106,15 @@ msgstr "refaire" #. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." msgid "remote" -msgstr "référentiel distant" +msgstr "référentiel distant" #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" msgid "repository" -msgstr "référentiel" +msgstr "référentiel" #. "" msgid "reset" -msgstr "réinitialiser" +msgstr "réinitialiser" #. "" msgid "revert" @@ -122,7 +122,7 @@ msgstr "inverser" #. "A particular state of files and directories which was stored in the object database." msgid "revision" -msgstr "révision" +msgstr "révision" #. "" msgid "sign off" @@ -130,11 +130,11 @@ msgstr "signer" #. "" msgid "staging area" -msgstr "pré-commit" +msgstr "pré-commit" #. "" msgid "status" -msgstr "état" +msgstr "état" #. "A ref pointing to a tag or commit object" msgid "tag [noun]" @@ -150,15 +150,15 @@ msgstr "branche de suivi" #. "" msgid "undo" -msgstr "défaire" +msgstr "défaire" #. "" msgid "update" -msgstr "mise à jour" +msgstr "mise à jour" #. "" msgid "verify" -msgstr "vérifier" +msgstr "vérifier" #. "The tree of actual checked out files." msgid "working copy, working tree" -- 2.30.2