aboutsummaryrefslogtreecommitdiff
path: root/git-gui/po
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-16 20:06:55 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-16 20:06:55 -0700
commitfb7dfaa710da6f9ebb854f70ffc1c78668a1e70c (patch)
treee09f2a46099de99a00e1a256b5dfad02927c7ad9 /git-gui/po
parent0dbd81251dbc516bb3bf07862c369fc582a4e5e0 (diff)
parent8a383db4b28059becc3ebfd1b402299e34c3151f (diff)
downloadgit-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.gz
git-fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c.tar.xz
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
git-gui 0.18.0 * tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui: git-gui 0.18 git-gui: avoid an error message when removing the last remote git-gui: fix file name handling with non-empty prefix git-gui: bring wish process to front on Mac git-gui: change dialog button positions for Windows to suit platform. git-gui: allow "\ No newline at end of file" for linewise staging git-gui: fix the mergetool launcher for the Beyond Compare tool. Makefile: replace "echo 1>..." with "echo >..." French translation: copy -> copie. git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
Diffstat (limited to 'git-gui/po')
-rw-r--r--git-gui/po/fr.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 40441dbb0..0aff18691 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -1139,7 +1139,7 @@ msgstr "Standard (rapide, semi-redondant, liens durs)"
#: lib/choose_repository.tcl:514
msgid "Full Copy (Slower, Redundant Backup)"
-msgstr "Copy complète (plus lent, sauvegarde redondante)"
+msgstr "Copie complète (plus lent, sauvegarde redondante)"
#: lib/choose_repository.tcl:520
msgid "Shared (Fastest, Not Recommended, No Backup)"