From: yomguy <yomguy@parisson.com>
Date: Thu, 7 Jun 2012 08:06:04 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Tag: 1.4.4-lam~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5856547c4d2f77b6a5e84d82eb71974026ab4244;p=telemeta.git

Merge branch 'dev' into lam

Conflicts:
	telemeta/locale/de/LC_MESSAGES/django.mo
	telemeta/locale/de/LC_MESSAGES/django.po
	telemeta/locale/de/LC_MESSAGES/djangojs.mo
	telemeta/locale/de/LC_MESSAGES/djangojs.po
	telemeta/locale/fr/LC_MESSAGES/django.mo
	telemeta/locale/fr/LC_MESSAGES/django.po
	telemeta/locale/fr/LC_MESSAGES/djangojs.mo
	telemeta/locale/fr/LC_MESSAGES/djangojs.po
---

5856547c4d2f77b6a5e84d82eb71974026ab4244
diff --cc telemeta/locale/de/LC_MESSAGES/django.po
index a81266c5,daeff561..ccbfd83a
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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 telemeta/locale/de/LC_MESSAGES/djangojs.po
index dce25902,31389267..4f4d6b5b
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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 telemeta/locale/fr/LC_MESSAGES/django.po
index 1148f51c,3efcef83..07ec5358
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@@ -8,7 -8,7 +8,11 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2012-05-31 15:31+0200\n"
++=======
+ "POT-Creation-Date: 2012-06-07 10:02+0200\n"
++>>>>>>> dev
  "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"
@@@ -1923,17 -1925,12 +1926,26 @@@ msgstr "
  msgid "Last changes"
  msgstr "Dernières modifications"
  
++<<<<<<< HEAD
 +#~ msgid "Language ISO"
 +#~ msgstr "Langue ISO"
 +
 +#~ msgid "Ethnographic context"
 +#~ msgstr "Contexte ethnographique"
 +
 +#~ msgid "Musical informations"
 +#~ msgstr "Informations sur la musique"
 +
 +#~ msgid "General informations"
 +#~ msgstr "Informations générales"
++=======
+ #, fuzzy
+ #~ msgid "lieux types"
+ #~ msgstr "lieux types"
+ 
+ #~ msgid "subject"
+ #~ msgstr "discipline"
++>>>>>>> dev
  
  #~ msgid "domain"
  #~ msgstr "discipline"