Merge branch 'dev' of http://vcs.parisson.com/git/telemeta-locales

Conflicts:
	fr/LC_MESSAGES/django.mo

diff --cc de/LC_MESSAGES/django.mo
index fe36b8b6dfecc489a4eb912bd9fcb456f871b541,f91671cd11cfb9f167c3a24e5e6fc14f7ee5cd16..d39f041fde1534d7893ae047dfd00e6143f08c2d
Binary files differ

diff --cc de/LC_MESSAGES/django.po
index ab00c1cee95c62edad8e97a2ad7bbfc2a27bfe2e,9ddc1f023be276040f7af913b9a1d4701df1ff70..66c2704d879b500088115ad8835339ec8c782b03
--- 1/de/LC_MESSAGES/django.po
--- 2/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 <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"

diff --cc de/LC_MESSAGES/djangojs.mo
index fe36b8b6dfecc489a4eb912bd9fcb456f871b541,2455fb16e9c33931230f4ec28348d8b1d6bc3ec8..d39f041fde1534d7893ae047dfd00e6143f08c2d
Binary files differ

diff --cc de/LC_MESSAGES/djangojs.po
index 8b3ff4c43f9409b66d9e5cc117ca05771ee65359,f3036564a291c42afaaf9b57b5833ed48b94bf62..00bdcc2938544f7505e85bc05e2eb3a3471b3064
--- 1/de/LC_MESSAGES/djangojs.po
--- 2/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 <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"

diff --cc fr/LC_MESSAGES/django.mo
index cbc2162ecad28e481e7dec7a96b9b9b6aa6683ea,40fa4a2bd9e7bba8774405081caa16ffffcd4c62..086a066d92510625f6c8d6087c35024f32ce33b0
Binary files differ

diff --cc fr/LC_MESSAGES/django.po
index ef80a0846a6a6074f244fcd10a86e8dda13ed35e,d1e1d393fed4767c3a733e510ca84326c241c462..0c9ab0f1ee37cbed8ed0212c90650ed29713ee9d
--- 1/fr/LC_MESSAGES/django.po
--- 2/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 <olivier samalyse com>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
+ "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
+ "Language-Team: LANGUAGE <dev@parisson.com>\n"
  "Language: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"

diff --cc fr/LC_MESSAGES/djangojs.mo
index d8370f69308bec46fba2eb83f17903dc8068be2a,36032721cb4e67430935312fef69590f179849e3..771e4a0f270f58470d9d52cbf6d754a1d1f17076
Binary files differ

diff --cc fr/LC_MESSAGES/djangojs.po
index 674295ce609822754e2ca468a88874aecdf0f60f,045b5dcc1d58720f63add7a767346e8931f3e336..2f207a17cfa9199c2a611572924105a049c88251
--- 1/fr/LC_MESSAGES/djangojs.po
--- 2/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 <yomguy@parisson.com>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"