Skip to content

Commit

Permalink
git-gui: Correct encoding of glossary/fr.po to UTF-8
Browse files Browse the repository at this point in the history
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 <spearce@spearce.org>
  • Loading branch information
Shawn O. Pearce committed Jan 21, 2008
1 parent ed76cb7 commit 6caaf2d
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions po/glossary/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ msgstr "branche"

#. ""
msgid "branch [verb]"
msgstr "créer une branche"
msgstr "créer une branche"

#. ""
msgid "checkout [noun]"
Expand All @@ -58,7 +58,7 @@ msgstr "commiter"

#. ""
msgid "diff [noun]"
msgstr "différence"
msgstr "différence"

#. ""
msgid "diff [verb]"
Expand All @@ -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]"
Expand Down Expand Up @@ -106,35 +106,35 @@ 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"
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"
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]"
Expand All @@ -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"
Expand Down

0 comments on commit 6caaf2d

Please sign in to comment.