fix logo & trans

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 32da2ab7d9395cedc1f8ae655109d672092af9c1..7a60a1dddeab4f69127acbf450c3e39e5f284f0f 100644 (file)
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index 45b659feb191dfd1e2ed64bb5b34396495569b17..1da18d81615d69a2c318d43dfb6ee0cea4816c68 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 13:14+0200\n"
+"POT-Creation-Date: 2012-05-30 18:09+0200\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"
@@ -802,7 +802,7 @@ msgstr ""
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
 #: templates/telemeta/collection_detail.html:217
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:346
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:102
 msgid "Delete"
 msgstr ""
@@ -1054,6 +1054,7 @@ msgstr ""
 #: templates/telemeta/base.html:117 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
 #: templates/telemeta/instrument_edit_value.html:5
+#: templates/telemeta/mediaitem_detail.html:193
 msgid "Instruments"
 msgstr ""
 
@@ -1169,13 +1170,12 @@ msgid "Recording period"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/mediaitem_detail.html:204
+#: templates/telemeta/mediaitem_detail.html:230
 #: templates/telemeta/resource_detail.html:73
 msgid "Last modification"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:112
-#: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr ""
 
@@ -1191,7 +1191,7 @@ msgid "Bibliographic references"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:152
-#: templates/telemeta/mediaitem_detail.html:284
+#: templates/telemeta/mediaitem_detail.html:260
 msgid "Archiving data"
 msgstr ""
 
@@ -1200,17 +1200,17 @@ msgid "Related documentation"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:162
-#: templates/telemeta/mediaitem_detail.html:315
+#: templates/telemeta/mediaitem_detail.html:298
 msgid "Comments"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:176
-#: templates/telemeta/mediaitem_detail.html:300
+#: templates/telemeta/mediaitem_detail.html:286
 msgid "Technical data"
 msgstr ""
 
 #: templates/telemeta/collection_detail.html:181
-#: templates/telemeta/mediaitem_detail.html:303
+#: templates/telemeta/mediaitem_detail.html:226
 msgid "Media type"
 msgstr ""
 
@@ -1463,36 +1463,36 @@ msgstr ""
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:196
-msgid "Recording date"
-msgstr ""
-
 #: templates/telemeta/mediaitem_detail.html:200
-msgid "Remarks"
+msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:216
+#: templates/telemeta/mediaitem_detail.html:208
 #: templates/telemeta/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:222
-msgid "Language ISO"
+#: templates/telemeta/mediaitem_detail.html:215
+msgid "Interprets"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:226
-msgid "Ethnographic context"
+#: templates/telemeta/mediaitem_detail.html:223
+msgid "Remarks"
+msgstr ""
+
+#: templates/telemeta/mediaitem_detail.html:241
+msgid "Legal mentions"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:237
-msgid "Musical informations"
+#: templates/telemeta/mediaitem_detail.html:243
+msgid "Organization"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:274
-msgid "General informations"
+#: templates/telemeta/mediaitem_detail.html:247
+msgid "Rights"
 msgstr ""
 
-#: templates/telemeta/mediaitem_detail.html:290
+#: templates/telemeta/mediaitem_detail.html:273
 msgid "Published references"
 msgstr ""
 

diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo
index 32da2ab7d9395cedc1f8ae655109d672092af9c1..7a60a1dddeab4f69127acbf450c3e39e5f284f0f 100644 (file)
Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ

diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po
index dafcf43b86f21787828a3847e913b51e438cdecf..dcbaa3973b83384ee9d9e209573499f84226e1cd 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 13:14+0200\n"
+"POT-Creation-Date: 2012-05-30 18:09+0200\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 --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index f160bb36bcf3f1c571105686beffc1c358c9a074..bac214fa0b138c3e8539b7fcf9bffd21795bffc9 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index c0669f4f0e4c485520efac28be396e4c781b9a23..5606fa30a920d993809c4a3257fcceb2e39af36a 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 13:14+0200\n"
+"POT-Creation-Date: 2012-05-30 18:09+0200\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"
@@ -803,7 +803,7 @@ msgstr ""
 #: templates/postman/base_folder.html:49 templates/postman/view.html:25
 #: templates/telemeta/collection_detail.html:217
 #: templates/telemeta/lists.html:58
-#: templates/telemeta/mediaitem_detail.html:346
+#: templates/telemeta/mediaitem_detail.html:327
 #: templates/telemeta/resource_detail.html:102
 msgid "Delete"
 msgstr "Supprimer"
@@ -1057,6 +1057,7 @@ msgstr "Admin"
 #: templates/telemeta/base.html:117 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
 #: templates/telemeta/instrument_edit_value.html:5
+#: templates/telemeta/mediaitem_detail.html:193
 msgid "Instruments"
 msgstr "Instruments"
 
@@ -1174,13 +1175,12 @@ msgid "Recording period"
 msgstr "Période d'enregistrement"
 
 #: templates/telemeta/collection_detail.html:103
-#: templates/telemeta/mediaitem_detail.html:204
+#: templates/telemeta/mediaitem_detail.html:230
 #: templates/telemeta/resource_detail.html:73
 msgid "Last modification"
 msgstr "Dernière modification"
 
 #: templates/telemeta/collection_detail.html:112
-#: templates/telemeta/mediaitem_detail.html:214
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
@@ -1196,7 +1196,7 @@ msgid "Bibliographic references"
 msgstr "Références bibliographiques"
 
 #: templates/telemeta/collection_detail.html:152
-#: templates/telemeta/mediaitem_detail.html:284
+#: templates/telemeta/mediaitem_detail.html:260
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
@@ -1205,17 +1205,17 @@ msgid "Related documentation"
 msgstr "Documentation associée"
 
 #: templates/telemeta/collection_detail.html:162
-#: templates/telemeta/mediaitem_detail.html:315
+#: templates/telemeta/mediaitem_detail.html:298
 msgid "Comments"
 msgstr "Commentaires"
 
 #: templates/telemeta/collection_detail.html:176
-#: templates/telemeta/mediaitem_detail.html:300
+#: templates/telemeta/mediaitem_detail.html:286
 msgid "Technical data"
 msgstr "Données techniques"
 
 #: templates/telemeta/collection_detail.html:181
-#: templates/telemeta/mediaitem_detail.html:303
+#: templates/telemeta/mediaitem_detail.html:226
 msgid "Media type"
 msgstr "Type de media"
 
@@ -1469,36 +1469,40 @@ msgstr "Unité"
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta/mediaitem_detail.html:196
+#: templates/telemeta/mediaitem_detail.html:200
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta/mediaitem_detail.html:200
-msgid "Remarks"
-msgstr "Remarques"
-
-#: templates/telemeta/mediaitem_detail.html:216
+#: templates/telemeta/mediaitem_detail.html:208
 #: templates/telemeta/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta/mediaitem_detail.html:222
-msgid "Language ISO"
-msgstr "Langue ISO"
+#: templates/telemeta/mediaitem_detail.html:215
+#, fuzzy
+msgid "Interprets"
+msgstr "interprètes"
 
-#: templates/telemeta/mediaitem_detail.html:226
-msgid "Ethnographic context"
-msgstr "Contexte ethnographique"
+#: templates/telemeta/mediaitem_detail.html:223
+msgid "Remarks"
+msgstr "Remarques"
 
-#: templates/telemeta/mediaitem_detail.html:237
-msgid "Musical informations"
-msgstr "Informations sur la musique"
+#: templates/telemeta/mediaitem_detail.html:241
+#, fuzzy
+msgid "Legal mentions"
+msgstr "Mentions légales"
 
-#: templates/telemeta/mediaitem_detail.html:274
-msgid "General informations"
-msgstr "Informations générales"
+#: templates/telemeta/mediaitem_detail.html:243
+#, fuzzy
+msgid "Organization"
+msgstr "organisation"
 
-#: templates/telemeta/mediaitem_detail.html:290
+#: templates/telemeta/mediaitem_detail.html:247
+#, fuzzy
+msgid "Rights"
+msgstr "droits"
+
+#: templates/telemeta/mediaitem_detail.html:273
 msgid "Published references"
 msgstr "Références éditées"
 
@@ -1926,6 +1930,18 @@ msgstr ""
 msgid "Last changes"
 msgstr "Dernières modifications"
 
+#~ 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"
+
 #~ msgid "domain"
 #~ msgstr "discipline"
 

diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index bf6582560b85ad95f8f1bae3d8ddabb70f085955..830b2cf367432a2f2502fdf8d34d86e7b8c8e143 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
index 9bd2b3682f87a9443ce68e237d79035bb6756b4f..24b789092f507dd874023635febade554b0a8289 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 13:14+0200\n"
+"POT-Creation-Date: 2012-05-30 18:09+0200\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"

diff --git a/telemeta/static/telemeta/images/logo_lam2.png b/telemeta/static/telemeta/images/logo_lam2.png
index 5fba56a30c9e6a4c999fa5197bcafaa1492ef965..cdb7727836cf76b21413c3c18ff59b9977c97c66 100644 (file)
Binary files a/telemeta/static/telemeta/images/logo_lam2.png and b/telemeta/static/telemeta/images/logo_lam2.png differ

diff --git a/telemeta/static/telemeta/images/logo_lam3.png b/telemeta/static/telemeta/images/logo_lam3.png
new file mode 100644 (file)
index 0000000..be9149f
Binary files /dev/null and b/telemeta/static/telemeta/images/logo_lam3.png differ

diff --git a/telemeta/static/telemeta/images/logo_lam4.png b/telemeta/static/telemeta/images/logo_lam4.png
new file mode 100644 (file)
index 0000000..f5ae77f
Binary files /dev/null and b/telemeta/static/telemeta/images/logo_lam4.png differ

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index b095b651a781dc8c5f02efdc3876192c80845013..1be787dcf99ce21a09480637d71e0eef0fe3ef90 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -45,7 +45,7 @@
 <div id="header">
 <div id="logo">
 {% block logo %}
-<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_lam2.png" alt="Telemeta" /></a>
+<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_lam3.png" alt="Telemeta" /></a>
 {% endblock %}
 </div>