[Pkg-privacy-commits] [torbrowser-launcher] 231/476: Merge branch 'french-translation' of https://github.com/tbbler/torbrowser-launcher into tbbler-french-translation

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 064ae5591c86c122f5286f92c2ac7e26239786a2
Merge: a71e3be da6bb8e
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Jul 7 18:13:23 2014 -0700

    Merge branch 'french-translation' of https://github.com/tbbler/torbrowser-launcher into tbbler-french-translation
    
    Conflicts:
    	locale/en/messages.pot

 locale/en/messages.pot | 294 +++++++++++++++++++++++++++++++-------
 locale/fr/messages.pot | 381 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 626 insertions(+), 49 deletions(-)

diff --cc locale/en/messages.pot
index 732a829,7ea5b25..f42add6
--- a/locale/en/messages.pot
+++ b/locale/en/messages.pot
@@@ -1,10 -1,14 +1,12 @@@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 -# This file is distributed under the same license as the PACKAGE package.
 -# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 +# Tor Browser Launcher
 +# Copyright (C) 2013-2014 Micah Lee <micah at micahflee.com>
  #
+ #, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: 0.1\n"
- "POT-Creation-Date: 2013-04-03 10:49+PDT\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2014-06-26 16:27+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git