From: yomguy Date: Tue, 25 Sep 2012 12:46:02 +0000 (+0200) Subject: Merge branch 'dev' into lam X-Git-Tag: 1.4.4-lam~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f68c7b8004dad66451e036fba4ad2ab77791e14f;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 --- f68c7b8004dad66451e036fba4ad2ab77791e14f diff --cc telemeta/locale/de/LC_MESSAGES/django.mo index 10d55ef4,fe36b8b6..60607a89 Binary files differ diff --cc telemeta/locale/de/LC_MESSAGES/django.po index 5a9c5236,ab00c1ce..e9d3606f --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/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:22+0200\n" -"POT-Creation-Date: 2012-09-25 14:16+0200\n" ++"POT-Creation-Date: 2012-09-25 14:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -806,7 -806,7 +806,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:330 -#: templates/telemeta/mediaitem_detail.html:339 ++#: templates/telemeta/mediaitem_detail.html:332 #: templates/telemeta/resource_detail.html:102 msgid "Delete" msgstr "" @@@ -1079,7 -1078,6 +1079,7 @@@ msgstr " #: templates/telemeta/base.html:165 #: templates/telemeta/collection_detail.html:125 - #: templates/telemeta/mediaitem_detail.html:244 ++#: templates/telemeta/mediaitem_detail.html:246 msgid "Legal notices" msgstr "" @@@ -1176,7 -1174,7 +1176,7 @@@ msgid "Recording period msgstr "" #: templates/telemeta/collection_detail.html:103 - #: templates/telemeta/mediaitem_detail.html:233 -#: templates/telemeta/mediaitem_detail.html:207 ++#: templates/telemeta/mediaitem_detail.html:235 #: templates/telemeta/resource_detail.html:73 msgid "Last modification" msgstr "" @@@ -1197,7 -1196,7 +1197,7 @@@ msgid "Bibliographic references msgstr "" #: templates/telemeta/collection_detail.html:152 - #: templates/telemeta/mediaitem_detail.html:263 -#: templates/telemeta/mediaitem_detail.html:277 ++#: templates/telemeta/mediaitem_detail.html:265 msgid "Archiving data" msgstr "" @@@ -1206,17 -1205,17 +1206,17 @@@ msgid "Related documentation msgstr "" #: templates/telemeta/collection_detail.html:162 - #: templates/telemeta/mediaitem_detail.html:301 -#: templates/telemeta/mediaitem_detail.html:308 ++#: templates/telemeta/mediaitem_detail.html:303 msgid "Comments" msgstr "" #: templates/telemeta/collection_detail.html:176 - #: templates/telemeta/mediaitem_detail.html:289 -#: templates/telemeta/mediaitem_detail.html:293 ++#: templates/telemeta/mediaitem_detail.html:291 msgid "Technical data" msgstr "" #: templates/telemeta/collection_detail.html:181 - #: templates/telemeta/mediaitem_detail.html:229 -#: templates/telemeta/mediaitem_detail.html:296 ++#: templates/telemeta/mediaitem_detail.html:231 msgid "Media type" msgstr "" @@@ -1478,23 -1481,19 +1478,23 @@@ msgstr " msgid "Location" msgstr "" -#: templates/telemeta/mediaitem_detail.html:225 -msgid "Language ISO" +#: templates/telemeta/mediaitem_detail.html:218 +msgid "Interprets" +msgstr "" + +#: templates/telemeta/mediaitem_detail.html:226 +msgid "Remarks" msgstr "" - #: templates/telemeta/mediaitem_detail.html:246 -#: templates/telemeta/mediaitem_detail.html:229 -msgid "Ethnographic context" ++#: templates/telemeta/mediaitem_detail.html:248 +msgid "Organization" msgstr "" - #: templates/telemeta/mediaitem_detail.html:250 -#: templates/telemeta/mediaitem_detail.html:240 -msgid "Musical informations" ++#: templates/telemeta/mediaitem_detail.html:252 +msgid "Rights" msgstr "" - #: templates/telemeta/mediaitem_detail.html:276 -#: templates/telemeta/mediaitem_detail.html:283 ++#: templates/telemeta/mediaitem_detail.html:278 msgid "Published references" msgstr "" diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.mo index 10d55ef4,fe36b8b6..60607a89 Binary files differ diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.po index 7a6b130f,8b3ff4c4..809c172a --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/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:22+0200\n" -"POT-Creation-Date: 2012-09-25 14:16+0200\n" ++"POT-Creation-Date: 2012-09-25 14:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc telemeta/locale/fr/LC_MESSAGES/django.mo index e4b05800,cbc2162e..d6b76335 Binary files differ diff --cc telemeta/locale/fr/LC_MESSAGES/django.po index 2eab0b03,ef80a084..93966e1c --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/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:22+0200\n" -"POT-Creation-Date: 2012-09-25 14:16+0200\n" ++"POT-Creation-Date: 2012-09-25 14:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@@ -806,7 -806,7 +806,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:330 -#: templates/telemeta/mediaitem_detail.html:339 ++#: templates/telemeta/mediaitem_detail.html:332 #: templates/telemeta/resource_detail.html:102 msgid "Delete" msgstr "Supprimer" @@@ -1083,7 -1082,6 +1083,7 @@@ msgstr " #: templates/telemeta/base.html:165 #: templates/telemeta/collection_detail.html:125 - #: templates/telemeta/mediaitem_detail.html:244 ++#: templates/telemeta/mediaitem_detail.html:246 msgid "Legal notices" msgstr "Mentions légales" @@@ -1180,7 -1178,7 +1180,7 @@@ msgid "Recording period msgstr "Période d'enregistrement" #: templates/telemeta/collection_detail.html:103 - #: templates/telemeta/mediaitem_detail.html:233 -#: templates/telemeta/mediaitem_detail.html:207 ++#: templates/telemeta/mediaitem_detail.html:235 #: templates/telemeta/resource_detail.html:73 msgid "Last modification" msgstr "Dernière modification" @@@ -1201,7 -1200,7 +1201,7 @@@ msgid "Bibliographic references msgstr "Références bibliographiques" #: templates/telemeta/collection_detail.html:152 - #: templates/telemeta/mediaitem_detail.html:263 -#: templates/telemeta/mediaitem_detail.html:277 ++#: templates/telemeta/mediaitem_detail.html:265 msgid "Archiving data" msgstr "Données d'archivage" @@@ -1210,17 -1209,17 +1210,17 @@@ msgid "Related documentation msgstr "Documentation associée" #: templates/telemeta/collection_detail.html:162 - #: templates/telemeta/mediaitem_detail.html:301 -#: templates/telemeta/mediaitem_detail.html:308 ++#: templates/telemeta/mediaitem_detail.html:303 msgid "Comments" msgstr "Commentaires" #: templates/telemeta/collection_detail.html:176 - #: templates/telemeta/mediaitem_detail.html:289 -#: templates/telemeta/mediaitem_detail.html:293 ++#: templates/telemeta/mediaitem_detail.html:291 msgid "Technical data" msgstr "Données techniques" #: templates/telemeta/collection_detail.html:181 - #: templates/telemeta/mediaitem_detail.html:229 -#: templates/telemeta/mediaitem_detail.html:296 ++#: templates/telemeta/mediaitem_detail.html:231 msgid "Media type" msgstr "Type de media" @@@ -1483,23 -1486,19 +1483,23 @@@ msgstr "Date d'enregistrement msgid "Location" msgstr "Lieu" -#: templates/telemeta/mediaitem_detail.html:225 -msgid "Language ISO" -msgstr "Langue ISO" +#: templates/telemeta/mediaitem_detail.html:218 +msgid "Interprets" +msgstr "Interprètes" -#: templates/telemeta/mediaitem_detail.html:229 -msgid "Ethnographic context" -msgstr "Contexte ethnographique" +#: templates/telemeta/mediaitem_detail.html:226 +msgid "Remarks" +msgstr "Remarques" + - #: templates/telemeta/mediaitem_detail.html:246 ++#: templates/telemeta/mediaitem_detail.html:248 +msgid "Organization" +msgstr "Organisation" - #: templates/telemeta/mediaitem_detail.html:250 -#: templates/telemeta/mediaitem_detail.html:240 -msgid "Musical informations" -msgstr "Informations sur la musique" ++#: templates/telemeta/mediaitem_detail.html:252 +msgid "Rights" +msgstr "Droits" - #: templates/telemeta/mediaitem_detail.html:276 -#: templates/telemeta/mediaitem_detail.html:283 ++#: templates/telemeta/mediaitem_detail.html:278 msgid "Published references" msgstr "Références éditées" diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.mo index 7eadc04a,d8370f69..eeaa8bc2 Binary files differ diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.po index 90a98b90,674295ce..4a43ea92 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/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:22+0200\n" -"POT-Creation-Date: 2012-09-25 14:16+0200\n" ++"POT-Creation-Date: 2012-09-25 14:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n"