diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 10:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 10:27:59 -0800 |
| commit | ffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2 (patch) | |
| tree | 27746141c96717f27093602d720673a83199ccb7 /gitk-git/po/fr.po | |
| parent | RelNotes: drop merge-later comments for maint (diff) | |
| parent | gitk: Remove translated message from comments (diff) | |
| download | tgif-ffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2.tar.xz | |
Merge git://ozlabs.org/~paulus/gitk
* 'master' of git://ozlabs.org/~paulus/gitk:
gitk: Remove translated message from comments
gitk: ru.po: Update Russian translation
gitk: Update copyright notice to 2016
gitk: Clear array 'commitinfo' on reload
gitk: Remove closed file descriptors from $blobdifffd
gitk: Turn off undo manager in the text widget
gitk: Fix Japanese translation for "marked commit"
gitk: Fix missing commits when using -S or -G
gitk: Use explicit RGB green instead of "lime"
gitk: Add Portuguese translation
gitk: Makefile: create install bin directory
gitk: Include commit title in branch dialog
gitk: Allow checking out a remote branch
gitk: Add a 'rename' option to the branch context menu
Diffstat (limited to 'gitk-git/po/fr.po')
| -rw-r--r-- | gitk-git/po/fr.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po index c44f994fa5..e4fac932e5 100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@ -372,14 +372,14 @@ msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2014 Paul Mackerras\n" +"Copyright © 2005-2016 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - visualisateur de commit pour git\n" "\n" -"Copyright \\u00a9 2005-2014 Paul Mackerras\n" +"Copyright \\u00a9 2005-2016 Paul Mackerras\n" "\n" "Utilisation et redistribution soumises aux termes de la GNU General Public License" |