From: yomguy Date: Mon, 19 Nov 2012 16:53:49 +0000 (+0100) Subject: Merge branch 'dev' of http://vcs.parisson.com/git/telemeta-locales X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;p=telemeta-locales.git Merge branch 'dev' of http://vcs.parisson.com/git/telemeta-locales Conflicts: fr/LC_MESSAGES/django.mo --- 66a2d4b513e68700dc188f64baf9ae7f7e51ad5c diff --cc de/LC_MESSAGES/django.mo index fe36b8b,f91671c..d39f041 Binary files differ diff --cc de/LC_MESSAGES/django.po index ab00c1c,9ddc1f0..66c2704 --- a/de/LC_MESSAGES/django.po +++ b/de/LC_MESSAGES/django.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-25 14:16+0200\n" -"POT-Creation-Date: 2012-11-19 12:02+0100\n" ++"POT-Creation-Date: 2012-11-19 17:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc de/LC_MESSAGES/djangojs.mo index fe36b8b,2455fb1..d39f041 Binary files differ diff --cc de/LC_MESSAGES/djangojs.po index 8b3ff4c,f303656..00bdcc2 --- a/de/LC_MESSAGES/djangojs.po +++ b/de/LC_MESSAGES/djangojs.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-25 14:16+0200\n" -"POT-Creation-Date: 2012-11-19 12:03+0100\n" ++"POT-Creation-Date: 2012-11-19 17:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc fr/LC_MESSAGES/django.mo index cbc2162,40fa4a2..086a066 Binary files differ diff --cc fr/LC_MESSAGES/django.po index ef80a08,d1e1d39..0c9ab0f --- a/fr/LC_MESSAGES/django.po +++ b/fr/LC_MESSAGES/django.po @@@ -8,10 -10,10 +10,10 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-25 14:16+0200\n" -"POT-Creation-Date: 2012-11-19 12:03+0100\n" ++"POT-Creation-Date: 2012-11-19 17:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: Olivier Guilyardi \n" - "Language-Team: LANGUAGE \n" + "Last-Translator: Guillaume Pellerin \n" + "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --cc fr/LC_MESSAGES/djangojs.mo index d8370f6,3603272..771e4a0 Binary files differ diff --cc fr/LC_MESSAGES/djangojs.po index 674295c,045b5dc..2f207a1 --- a/fr/LC_MESSAGES/djangojs.po +++ b/fr/LC_MESSAGES/djangojs.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-25 14:16+0200\n" -"POT-Creation-Date: 2012-11-19 12:03+0100\n" ++"POT-Creation-Date: 2012-11-19 17:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n"