mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2013-06-16 20:06:55 -07:00
parent 0dbd81251d 8a383db4b2
commit fb7dfaa710
8 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui/po/fr.po
View File

@ -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)"