Skip to content

Commit 6caaf2d

Browse files
committed
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 <spearce@spearce.org>
1 parent ed76cb7 commit 6caaf2d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

po/glossary/fr.po

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ msgstr "branche"
3434

3535
#. ""
3636
msgid "branch [verb]"
37-
msgstr "créer une branche"
37+
msgstr "créer une branche"
3838

3939
#. ""
4040
msgid "checkout [noun]"
@@ -58,7 +58,7 @@ msgstr "commiter"
5858

5959
#. ""
6060
msgid "diff [noun]"
61-
msgstr "différence"
61+
msgstr "différence"
6262

6363
#. ""
6464
msgid "diff [verb]"
@@ -70,11 +70,11 @@ msgstr "fusion par avance rapide"
7070

7171
#. "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."
7272
msgid "fetch"
73-
msgstr "récupérer"
73+
msgstr "récupérer"
7474

7575
#. "A collection of files. The index is a stored version of your working tree."
7676
msgid "index (in git-gui: staging area)"
77-
msgstr "pré-commit"
77+
msgstr "pré-commit"
7878

7979
#. "A successful merge results in the creation of a new commit representing the result of the merge."
8080
msgid "merge [noun]"
@@ -106,35 +106,35 @@ msgstr "refaire"
106106

107107
#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
108108
msgid "remote"
109-
msgstr "référentiel distant"
109+
msgstr "référentiel distant"
110110

111111
#. "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?)"
112112
msgid "repository"
113-
msgstr "référentiel"
113+
msgstr "référentiel"
114114

115115
#. ""
116116
msgid "reset"
117-
msgstr "réinitialiser"
117+
msgstr "réinitialiser"
118118

119119
#. ""
120120
msgid "revert"
121121
msgstr "inverser"
122122

123123
#. "A particular state of files and directories which was stored in the object database."
124124
msgid "revision"
125-
msgstr "révision"
125+
msgstr "révision"
126126

127127
#. ""
128128
msgid "sign off"
129129
msgstr "signer"
130130

131131
#. ""
132132
msgid "staging area"
133-
msgstr "pré-commit"
133+
msgstr "pré-commit"
134134

135135
#. ""
136136
msgid "status"
137-
msgstr "état"
137+
msgstr "état"
138138

139139
#. "A ref pointing to a tag or commit object"
140140
msgid "tag [noun]"
@@ -150,15 +150,15 @@ msgstr "branche de suivi"
150150

151151
#. ""
152152
msgid "undo"
153-
msgstr "défaire"
153+
msgstr "défaire"
154154

155155
#. ""
156156
msgid "update"
157-
msgstr "mise à jour"
157+
msgstr "mise à jour"
158158

159159
#. ""
160160
msgid "verify"
161-
msgstr "vérifier"
161+
msgstr "vérifier"
162162

163163
#. "The tree of actual checked out files."
164164
msgid "working copy, working tree"

0 commit comments

Comments
 (0)