add groups to user list, change some field sizes, add pattern for audio import

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index a75748c5847843d4f6a04a801f437f493aa3f467..ad62bc1a540473d1b128a849628412570ecae882 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1112,12 +1112,30 @@ a.image-link {
 #id_title {
     width: 500px;
 }
+#id_alt_title {
+    width: 500px;
+}
+#id_collector {
+    width: 500px;
+}
+#id_cultural_area {
+    width: 500px;
+}
+#id_location_comment {
+    width: 500px;
+}
 #id_old_code {
     width: 300px;
 }
 #id_code {
     width: 300px;
 }
+#id_author {
+    width: 300px;
+}
+#id_collector_selection {
+    width: 300px;
+}
 
 /*focus on elements*/
 a:focus,div:focus{

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index b08a8e4040e671061ca7692512223eb5b1ba6185..f02e9761d185f348df280526cccb0c41b849a9ee 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 3050e43a498df33dc4bd9efaf0c62d5ab63e4d3e..8ac00cd7764ad94ea3b8f7598affb84910d297af 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: 2011-05-12 00:01+0200\n"
+"POT-Creation-Date: 2011-05-24 11:14+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"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: models/core.py:143
+#: models/core.py:145
 msgid "Duration"
 msgstr ""
 
-#: models/core.py:148
+#: models/core.py:150
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr ""
 
@@ -30,31 +30,31 @@ msgstr ""
 msgid "value"
 msgstr ""
 
-#: models/enum.py:57 models/media.py:95
+#: models/enum.py:57 models/media.py:144
 msgid "archive format"
 msgstr ""
 
-#: models/enum.py:64 models/media.py:99
+#: models/enum.py:64 models/media.py:128
 msgid "secondary edition"
 msgstr ""
 
-#: models/enum.py:71 models/media.py:114
+#: models/enum.py:71 models/media.py:122
 msgid "mode of acquisition"
 msgstr ""
 
-#: models/enum.py:78 models/media.py:117
+#: models/enum.py:78 models/media.py:125
 msgid "record author"
 msgstr ""
 
-#: models/enum.py:85 models/media.py:119
+#: models/enum.py:85 models/media.py:132
 msgid "record writer"
 msgstr ""
 
-#: models/enum.py:92 models/media.py:121
+#: models/enum.py:92 models/media.py:118
 msgid "legal rights"
 msgstr ""
 
-#: models/enum.py:99 models/media.py:126
+#: models/enum.py:99 models/media.py:97
 msgid "recording context"
 msgstr ""
 
@@ -62,19 +62,19 @@ msgstr ""
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:233
+#: models/enum.py:113 models/media.py:246
 msgid "vernacular style"
 msgstr ""
 
-#: models/enum.py:120 models/media.py:241
+#: models/enum.py:120 models/media.py:248
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:308
+#: models/enum.py:127 models/media.py:333
 msgid "keyword"
 msgstr ""
 
-#: models/enum.py:134 models/media.py:106
+#: models/enum.py:134 models/media.py:108
 msgid "publisher / status"
 msgstr ""
 
@@ -82,135 +82,115 @@ msgstr ""
 msgid "publisher"
 msgstr ""
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:229
+#: models/enum.py:152 models/enum.py:156 models/media.py:240
 msgid "population / social group"
 msgstr ""
 
-#: models/enum.py:157 models/instrument.py:41 models/instrument.py:51
-#: models/location.py:50 models/location.py:148
+#: models/enum.py:157 models/instrument.py:43 models/instrument.py:53
+#: models/location.py:51 models/location.py:149
 msgid "name"
 msgstr ""
 
-#: models/instrument.py:62 models/instrument.py:75
+#: models/instrument.py:64 models/instrument.py:81
 msgid "instrument"
 msgstr ""
 
-#: models/instrument.py:64
+#: models/instrument.py:66
 msgid "parent instrument"
 msgstr ""
 
-#: models/instrument.py:73 models/location.py:156
+#: models/instrument.py:79 models/location.py:160
 msgid "alias"
 msgstr ""
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "country"
 msgstr ""
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "continent"
 msgstr ""
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "other"
 msgstr ""
 
-#: models/location.py:51
+#: models/location.py:52
 msgid "type"
 msgstr ""
 
-#: models/location.py:52
+#: models/location.py:53
 msgid "complete type"
 msgstr ""
 
-#: models/location.py:54
+#: models/location.py:55
 msgid "current location"
 msgstr ""
 
-#: models/location.py:57 models/location.py:157 models/location.py:171
+#: models/location.py:58 models/location.py:161 models/location.py:175
 msgid "authoritative"
 msgstr ""
 
-#: models/location.py:111 models/location.py:155 models/location.py:168
-#: models/media.py:226
+#: models/location.py:112 models/location.py:159 models/location.py:172
+#: models/media.py:236
 msgid "location"
 msgstr ""
 
-#: models/location.py:147
+#: models/location.py:148
 msgid "identifier"
 msgstr ""
 
-#: models/location.py:169
+#: models/location.py:173
 msgid "ancestor location"
 msgstr ""
 
-#: models/media.py:55
+#: models/media.py:57
 msgid "Metadata only"
 msgstr ""
 
-#: models/media.py:57
+#: models/media.py:59
 msgid "Sound and metadata"
 msgstr ""
 
-#: models/media.py:59
+#: models/media.py:61
 msgid "Private data"
 msgstr ""
 
-#: models/media.py:60 models/media.py:136 models/media.py:247
+#: models/media.py:62 models/media.py:115 models/media.py:263
 msgid "public access"
 msgstr ""
 
-#: models/media.py:89 models/media.py:222
-msgid "code"
-msgstr ""
-
-#: models/media.py:90 models/media.py:221
-msgid "old code"
-msgstr ""
-
-#: models/media.py:91 models/media.py:243
+#: models/media.py:92 models/media.py:260
 msgid "reference"
 msgstr ""
 
-#: models/media.py:92 models/media.py:219 models/media.py:340
-#: models/media.py:355 models/media.py:389
+#: models/media.py:93 models/media.py:227 models/media.py:365
+#: models/media.py:380 models/media.py:414
 msgid "title"
 msgstr ""
 
-#: models/media.py:93 models/media.py:230
+#: models/media.py:94 models/media.py:228
 msgid "original title / translation"
 msgstr ""
 
-#: models/media.py:97
-msgid "number of components (medium / piece)"
-msgstr ""
-
-#: models/media.py:100
+#: models/media.py:95
 msgid "depositor / contributor"
 msgstr ""
 
-#: models/media.py:101
-msgid "author of published notice"
-msgstr ""
-
-#: models/media.py:102
-msgid "related documentation"
-msgstr ""
-
-#: models/media.py:103 models/media.py:237
-msgid "recordist"
+#: models/media.py:98
+msgid "recording year (from)"
 msgstr ""
 
-#: models/media.py:104
-msgid "recordist identical to depositor"
+#: models/media.py:99
+msgid "recording year (until)"
 msgstr ""
 
-#: models/media.py:107
-msgid "published"
+#: models/media.py:100
+msgid "year published"
 msgstr ""
 
-#: models/media.py:108
-msgid "year published"
+#: models/media.py:106 models/media.py:229
+msgid "recordist"
 msgstr ""
 
 #: models/media.py:110
@@ -222,234 +202,278 @@ msgid "publisher serial number"
 msgstr ""
 
 #: models/media.py:112
-msgid "bibliographic references"
+msgid "author of published notice"
 msgstr ""
 
-#: models/media.py:115
-msgid "comment"
+#: models/media.py:113
+msgid "bibliographic references"
 msgstr ""
 
-#: models/media.py:122
-msgid "copies"
+#: models/media.py:114
+msgid "document type"
 msgstr ""
 
 #: models/media.py:123
-msgid "recording year (from)"
+msgid "CNRS depositor"
 msgstr ""
 
-#: models/media.py:124
-msgid "recording year (until)"
+#: models/media.py:126
+msgid "related documentation"
 msgstr ""
 
-#: models/media.py:127 models/media.py:223
-msgid "approximative duration"
+#: models/media.py:129
+msgid "copies"
 msgstr ""
 
-#: models/media.py:128
-msgid "document type"
+#: models/media.py:130
+msgid "comment"
 msgstr ""
 
-#: models/media.py:129
+#: models/media.py:133
 msgid "archiver notes"
 msgstr ""
 
-#: models/media.py:130
-msgid "status"
+#: models/media.py:134
+msgid "items finished"
 msgstr ""
 
-#: models/media.py:131
-msgid "CNRS depositor"
+#: models/media.py:135
+msgid "recordist identical to depositor"
 msgstr ""
 
-#: models/media.py:132
-msgid "items finished"
+#: models/media.py:136
+msgid "published"
 msgstr ""
 
-#: models/media.py:133
-msgid "a_informer_07_03"
+#: models/media.py:139 models/media.py:257
+msgid "code"
 msgstr ""
 
-#: models/media.py:135
+#: models/media.py:140 models/media.py:258
+msgid "old code"
+msgstr ""
+
+#: models/media.py:141 models/media.py:267
+msgid "approximative duration"
+msgstr ""
+
+#: models/media.py:142
+msgid "number of components (medium / piece)"
+msgstr ""
+
+#: models/media.py:146
 msgid "digitization"
 msgstr ""
 
-#: models/media.py:173
+#: models/media.py:147
+msgid "status"
+msgstr ""
+
+#: models/media.py:148
+msgid "a_informer_07_03"
+msgstr ""
+
+#: models/media.py:182
 msgid "states / nations"
 msgstr ""
 
-#: models/media.py:187
+#: models/media.py:196
 msgid "populations / social groups"
 msgstr ""
 
-#: models/media.py:195 models/media.py:288
+#: models/media.py:204 models/media.py:309
 msgid "computed duration"
 msgstr ""
 
-#: models/media.py:218
+#: models/media.py:231
 msgid "collection"
 msgstr ""
 
-#: models/media.py:220
-msgid "item number"
-msgstr ""
-
-#: models/media.py:224
+#: models/media.py:232
 msgid "recording date (from)"
 msgstr ""
 
-#: models/media.py:225
+#: models/media.py:233
 msgid "recording date (until)"
 msgstr ""
 
-#: models/media.py:227
+#: models/media.py:237
 msgid "location details"
 msgstr ""
 
-#: models/media.py:231
-msgid "author / compositor"
+#: models/media.py:238
+msgid "cultural area"
 msgstr ""
 
-#: models/media.py:234
-msgid "published reference"
+#: models/media.py:241
+msgid "comments"
 msgstr ""
 
-#: models/media.py:235
+#: models/media.py:242
 msgid "moda_execut"
 msgstr ""
 
-#: models/media.py:236
-msgid "copy of"
+#: models/media.py:249
+msgid "author / compositor"
 msgstr ""
 
-#: models/media.py:238
-msgid "recordist as in collection"
+#: models/media.py:252
+msgid "remarks"
 msgstr ""
 
-#: models/media.py:239
-msgid "cultural area"
+#: models/media.py:253
+msgid "recordist selection"
 msgstr ""
 
-#: models/media.py:242
-msgid "recordist selection"
+#: models/media.py:254
+msgid "recordist as in collection"
 msgstr ""
 
-#: models/media.py:244
-msgid "comments"
+#: models/media.py:259
+msgid "item number"
 msgstr ""
 
-#: models/media.py:245
-msgid "remarks"
+#: models/media.py:261
+msgid "published reference"
+msgstr ""
+
+#: models/media.py:262
+msgid "copy of"
 msgstr ""
 
-#: models/media.py:246
+#: models/media.py:264
 msgid "file"
 msgstr ""
 
-#: models/media.py:253 models/media.py:409
-#: templates/telemeta_default/mediaitem_detail.html:239
+#: models/media.py:274 models/media.py:434
+#: templates/telemeta_default/mediaitem_detail.html:207
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:307 models/media.py:321 models/media.py:339
-#: models/media.py:386
+#: models/media.py:332 models/media.py:346 models/media.py:364
+#: models/media.py:411
 msgid "item"
 msgstr ""
 
-#: models/media.py:323
+#: models/media.py:348
 msgid "composition"
 msgstr ""
 
-#: models/media.py:325
+#: models/media.py:350
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:326
+#: models/media.py:351
 msgid "number"
 msgstr ""
 
-#: models/media.py:327
+#: models/media.py:352
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:341
+#: models/media.py:366
 msgid "start"
 msgstr ""
 
-#: models/media.py:342
+#: models/media.py:367
 msgid "end"
 msgstr ""
 
-#: models/media.py:353 models/media.py:372 models/media.py:387
+#: models/media.py:378 models/media.py:397 models/media.py:412
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:356 models/media.py:391
+#: models/media.py:381 models/media.py:416
 msgid "description"
 msgstr ""
 
-#: models/media.py:373
+#: models/media.py:398
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:374
+#: models/media.py:399
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:375
+#: models/media.py:400
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:388 models/system.py:52
+#: models/media.py:413 models/system.py:54
 msgid "time"
 msgstr ""
 
-#: models/media.py:390 models/media.py:410
+#: models/media.py:415 models/media.py:435
 msgid "date"
 msgstr ""
 
-#: models/media.py:392
+#: models/media.py:417
 msgid "author"
 msgstr ""
 
-#: models/system.py:49
+#: models/system.py:51
 msgid "element type"
 msgstr ""
 
-#: models/system.py:50
+#: models/system.py:52
 msgid "element identifier"
 msgstr ""
 
-#: models/system.py:51
+#: models/system.py:53
 msgid "modification type"
 msgstr ""
 
-#: models/system.py:53
+#: models/system.py:55
 msgid "user"
 msgstr ""
 
-#: models/system.py:79 templates/telemeta_default/profile_detail.html:36
+#: models/system.py:81
+msgid "username"
+msgstr ""
+
+#: models/system.py:82
+msgid "level"
+msgstr ""
+
+#: models/system.py:83
+msgid "first name"
+msgstr ""
+
+#: models/system.py:84
+msgid "last name"
+msgstr ""
+
+#: models/system.py:85
+msgid "phone"
+msgstr ""
+
+#: models/system.py:86
+msgid "email"
+msgstr ""
+
+#: models/system.py:99 templates/telemeta_default/profile_detail.html:36
 msgid "Institution"
 msgstr ""
 
-#: models/system.py:80 templates/telemeta_default/profile_detail.html:37
+#: models/system.py:100 templates/telemeta_default/profile_detail.html:37
 msgid "Function"
 msgstr ""
 
-#: models/system.py:81 templates/telemeta_default/profile_detail.html:38
+#: models/system.py:101 templates/telemeta_default/profile_detail.html:38
 msgid "Address"
 msgstr ""
 
-#: models/system.py:82 templates/telemeta_default/profile_detail.html:39
+#: models/system.py:102 templates/telemeta_default/profile_detail.html:39
 msgid "Telephone"
 msgstr ""
 
-#: models/system.py:83
+#: models/system.py:103
 msgid "Expiration_date"
 msgstr ""
 
 #: templates/admin/base.html:21
 #: templates/telemeta/registration/logged_out.html:4
-#: templates/telemeta_default/base.html:78
+#: templates/telemeta_default/base.html:80
 #: templates/telemeta_default/registration/logged_out.html:4
 #: templates/telemeta_default/registration/password_change_done.html:5
 #: templates/telemeta_default/registration/password_change_form.html:5
@@ -506,7 +530,7 @@ msgid "Instruments"
 msgstr ""
 
 #: templates/telemeta_default/admin_enumerations.html:12
-#: templates/telemeta_default/home.html:49
+#: templates/telemeta_default/home.html:46
 #: templates/telemeta_default/mediaitem_copy.html:32
 #: templates/telemeta_default/mediaitem_edit.html:27
 #: templates/telemeta_default/search_criteria.html:78
@@ -522,7 +546,7 @@ msgid "No enumerations"
 msgstr ""
 
 #: templates/telemeta_default/admin_instruments.html:15
-#: templates/telemeta_default/admin_users.html:30
+#: templates/telemeta_default/admin_users.html:32
 msgid "No users"
 msgstr ""
 
@@ -545,71 +569,74 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: templates/telemeta_default/base.html:50
+#: templates/telemeta_default/admin_users.html:16
+msgid "Groups"
+msgstr ""
+
+#: templates/telemeta_default/base.html:52
 msgid "Welcome"
 msgstr ""
 
-#: templates/telemeta_default/base.html:56
+#: templates/telemeta_default/base.html:58
 msgid "Account"
 msgstr ""
 
-#: templates/telemeta_default/base.html:57
-#: templates/telemeta_default/base.html:61
+#: templates/telemeta_default/base.html:59
+#: templates/telemeta_default/base.html:63
 msgid "Help"
 msgstr ""
 
-#: templates/telemeta_default/base.html:58
+#: templates/telemeta_default/base.html:60
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta_default/base.html:62
-#: templates/telemeta_default/login.html:24
+#: templates/telemeta_default/base.html:64
+#: templates/telemeta_default/login.html:20
 msgid "Sign in"
 msgstr ""
 
-#: templates/telemeta_default/base.html:70
+#: templates/telemeta_default/base.html:72
 #: templates/telemeta_default/search_criteria.html:134
 msgid "Search"
 msgstr ""
 
-#: templates/telemeta_default/base.html:79
+#: templates/telemeta_default/base.html:81
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta_default/base.html:80
+#: templates/telemeta_default/base.html:82
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta_default/base.html:81
-#: templates/telemeta_default/index.html:13
+#: templates/telemeta_default/base.html:83
+#: templates/telemeta_default/index.html:12
 msgid "Geo Navigator"
 msgstr ""
 
-#: templates/telemeta_default/base.html:82
+#: templates/telemeta_default/base.html:84
 msgid "Advanced search"
 msgstr ""
 
-#: templates/telemeta_default/base.html:84
+#: templates/telemeta_default/base.html:86
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta_default/base.html:110
+#: templates/telemeta_default/base.html:112
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta_default/base.html:111
+#: templates/telemeta_default/base.html:113
 msgid "By"
 msgstr ""
 
-#: templates/telemeta_default/base.html:116
+#: templates/telemeta_default/base.html:118
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
 "communities."
 msgstr ""
 
-#: templates/telemeta_default/base.html:122
-#: templates/telemeta_default/collection_detail.html:114
-#: templates/telemeta_default/collection_detail_new.html:116
+#: templates/telemeta_default/base.html:124
+#: templates/telemeta_default/collection_detail.html:115
 msgid "Legal notices"
 msgstr ""
 
@@ -618,115 +645,103 @@ msgstr ""
 #: templates/telemeta_default/collection_edit.html:9
 #: templates/telemeta_default/collection_edit.html:27
 #: templates/telemeta_default/enumeration_edit_value.html:22
-#: templates/telemeta_default/instrument_edit_value.html:22
+#: templates/telemeta_default/instrument_edit_value.html:21
 #: templates/telemeta_default/mediaitem_add.html:15
 #: templates/telemeta_default/mediaitem_add.html:36
 #: templates/telemeta_default/mediaitem_copy.html:16
-#: templates/telemeta_default/mediaitem_copy.html:41
+#: templates/telemeta_default/mediaitem_copy.html:43
 #: templates/telemeta_default/mediaitem_edit.html:10
-#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_edit.html:42
 #: templates/telemeta_default/mediaitem_keywords_edit.html:12
 #: templates/telemeta_default/mediaitem_keywords_edit.html:43
 #: templates/telemeta_default/mediaitem_performances_edit.html:12
 #: templates/telemeta_default/mediaitem_performances_edit.html:42
 #: templates/telemeta_default/profile_edit.html:6
-#: templates/telemeta_default/profile_edit.html:30
+#: templates/telemeta_default/profile_edit.html:29
 msgid "Cancel"
 msgstr ""
 
 #: templates/telemeta_default/collection_add.html:30
 #: templates/telemeta_default/collection_edit.html:29
 #: templates/telemeta_default/enumeration_edit_value.html:20
-#: templates/telemeta_default/instrument_edit_value.html:20
+#: templates/telemeta_default/instrument_edit_value.html:19
 #: templates/telemeta_default/mediaitem_add.html:38
-#: templates/telemeta_default/mediaitem_copy.html:43
-#: templates/telemeta_default/mediaitem_edit.html:42
+#: templates/telemeta_default/mediaitem_copy.html:45
+#: templates/telemeta_default/mediaitem_edit.html:44
 #: templates/telemeta_default/mediaitem_keywords_edit.html:45
 #: templates/telemeta_default/mediaitem_performances_edit.html:44
-#: templates/telemeta_default/profile_edit.html:32
+#: templates/telemeta_default/profile_edit.html:31
 msgid "Save"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:5
 #: templates/telemeta_default/collection_detail_dc.html:5
-#: templates/telemeta_default/collection_detail_new.html:5
 msgid "Collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:43
-#: templates/telemeta_default/collection_detail_new.html:43
-#: templates/telemeta_default/mediaitem_detail.html:95
-#: templates/telemeta_default/mediaitem_detail.html:239
-#: templates/telemeta_default/mediaitem_detail.html:278
+#: templates/telemeta_default/collection_detail.html:44
+#: templates/telemeta_default/mediaitem_detail.html:109
+#: templates/telemeta_default/mediaitem_detail.html:207
+#: templates/telemeta_default/mediaitem_detail.html:246
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:44
-#: templates/telemeta_default/collection_detail_new.html:44
-#: templates/telemeta_default/mediaitem_detail.html:96
+#: templates/telemeta_default/collection_detail.html:45
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Copy"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:45
+#: templates/telemeta_default/collection_detail.html:46
 msgid "Add item"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:48
-#: templates/telemeta_default/collection_detail_new.html:47
-#: templates/telemeta_default/mediaitem_detail.html:99
+#: templates/telemeta_default/collection_detail.html:49
+#: templates/telemeta_default/mediaitem_detail.html:113
 msgid "Add to playlist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:60
+#: templates/telemeta_default/collection_detail.html:61
 msgid "Listen to this collection"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:92
-#: templates/telemeta_default/collection_detail_new.html:93
+#: templates/telemeta_default/collection_detail.html:93
 msgid "Recording year"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:101
-#: templates/telemeta_default/collection_detail_new.html:103
-#: templates/telemeta_default/mediaitem_detail.html:225
+#: templates/telemeta_default/collection_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:193
 msgid "Geographic and cultural informations"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:119
-#: templates/telemeta_default/collection_detail_new.html:121
-#: templates/telemeta_default/home.html:52
+#: templates/telemeta_default/collection_detail.html:120
+#: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:140
-#: templates/telemeta_default/collection_detail_new.html:142
-#: templates/telemeta_default/mediaitem_detail.html:294
+#: templates/telemeta_default/collection_detail.html:141
+#: templates/telemeta_default/mediaitem_detail.html:262
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:163
-#: templates/telemeta_default/collection_detail_new.html:165
-#: templates/telemeta_default/mediaitem_detail.html:309
+#: templates/telemeta_default/collection_detail.html:162
+#: templates/telemeta_default/mediaitem_detail.html:277
 msgid "Technical data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:168
-#: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:312
+#: templates/telemeta_default/collection_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:280
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:168
-#: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:312
+#: templates/telemeta_default/collection_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:280
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:173
-#: templates/telemeta_default/collection_detail_new.html:175
+#: templates/telemeta_default/collection_detail.html:172
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -759,8 +774,8 @@ msgstr ""
 
 #: templates/telemeta_default/collection_list.html:16
 #: templates/telemeta_default/enumeration_edit.html:20
-#: templates/telemeta_default/home.html:29
-#: templates/telemeta_default/instrument_edit.html:20
+#: templates/telemeta_default/home.html:27
+#: templates/telemeta_default/instrument_edit.html:19
 #: templates/telemeta_default/mediaitem_list.html:13
 msgid "Add"
 msgstr ""
@@ -781,19 +796,19 @@ msgid "Enumeration"
 msgstr ""
 
 #: templates/telemeta_default/enumeration_edit.html:12
-#: templates/telemeta_default/instrument_edit.html:12
+#: templates/telemeta_default/instrument_edit.html:11
 msgid "Add entry"
 msgstr ""
 
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:172
+#: templates/telemeta_default/mediaitem_detail.html:153
 msgid "Value"
 msgstr ""
 
 #: templates/telemeta_default/enumeration_edit.html:44
-#: templates/telemeta_default/instrument_edit.html:42
+#: templates/telemeta_default/instrument_edit.html:41
 msgid "Remove selected items"
 msgstr ""
 
@@ -802,7 +817,7 @@ msgid "This enumeration is empty"
 msgstr ""
 
 #: templates/telemeta_default/enumeration_edit_value.html:12
-#: templates/telemeta_default/instrument_edit_value.html:12
+#: templates/telemeta_default/instrument_edit_value.html:11
 msgid "Modify an entry"
 msgstr ""
 
@@ -850,27 +865,29 @@ msgid_plural "%(counter)s items "
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/telemeta_default/home.html:27
+#: templates/telemeta_default/home.html:25
 #: templates/telemeta_default/profile_detail.html:16
 msgid "Playlists"
 msgstr ""
 
-#: templates/telemeta_default/home.html:37
+#: templates/telemeta_default/home.html:35
 msgid "Delete"
 msgstr ""
 
-#: templates/telemeta_default/home.html:50
+#: templates/telemeta_default/home.html:47
 #: templates/telemeta_default/inc/module_revisions.html:13
 msgid "Type"
 msgstr ""
 
-#: templates/telemeta_default/home.html:51
+#: templates/telemeta_default/home.html:48
+#: templates/telemeta_default/mediaitem_copy.html:33
+#: templates/telemeta_default/mediaitem_edit.html:28
 #: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:15
 msgid "Code"
 msgstr ""
 
-#: templates/telemeta_default/home.html:53
+#: templates/telemeta_default/home.html:50
 #: templates/telemeta_default/search_criteria.html:94
 #: templates/telemeta_default/search_results.html:33
 #: templates/telemeta_default/inc/collection_list.html:17
@@ -878,40 +895,36 @@ msgstr ""
 msgid "Year of recording"
 msgstr ""
 
-#: templates/telemeta_default/home.html:54
+#: templates/telemeta_default/home.html:51
 #: templates/telemeta_default/inc/collection_list.html:18
 #: templates/telemeta_default/inc/mediaitem_list.html:23
 msgid "Sound"
 msgstr ""
 
-#: templates/telemeta_default/home.html:55
+#: templates/telemeta_default/home.html:52
 msgid "Action"
 msgstr ""
 
-#: templates/telemeta_default/home.html:70
+#: templates/telemeta_default/home.html:66
 #: templates/telemeta_default/inc/module_revisions.html:32
 msgid "deleted"
 msgstr ""
 
-#: templates/telemeta_default/index.html:15
+#: templates/telemeta_default/index.html:14
 msgid "Open the geographic navigator"
 msgstr ""
 
-#: templates/telemeta_default/index.html:20
+#: templates/telemeta_default/index.html:19
 msgid "Musical selection"
 msgstr ""
 
-#: templates/telemeta_default/index.html:38
-msgid "Partenaires"
-msgstr ""
-
-#: templates/telemeta_default/instrument_edit.html:14
-#: templates/telemeta_default/instrument_edit.html:28
-#: templates/telemeta_default/instrument_edit_value.html:14
+#: templates/telemeta_default/instrument_edit.html:13
+#: templates/telemeta_default/instrument_edit.html:27
+#: templates/telemeta_default/instrument_edit_value.html:13
 msgid "Name"
 msgstr ""
 
-#: templates/telemeta_default/instrument_edit.html:46
+#: templates/telemeta_default/instrument_edit.html:45
 msgid "This instrument list is empty"
 msgstr ""
 
@@ -919,11 +932,11 @@ msgstr ""
 msgid "User authentication"
 msgstr ""
 
-#: templates/telemeta_default/login.html:11
+#: templates/telemeta_default/login.html:10
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 
-#: templates/telemeta_default/login.html:26
+#: templates/telemeta_default/login.html:22
 msgid "Password forgotten"
 msgstr ""
 
@@ -933,54 +946,54 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:101
+#: templates/telemeta_default/mediaitem_detail.html:115
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:116
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:161
+#: templates/telemeta_default/mediaitem_detail.html:142
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:163
+#: templates/telemeta_default/mediaitem_detail.html:144
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:152
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:173
+#: templates/telemeta_default/mediaitem_detail.html:154
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:194
+#: templates/telemeta_default/mediaitem_detail.html:162
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:215
+#: templates/telemeta_default/mediaitem_detail.html:183
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/mediaitem_detail.html:195
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:244
+#: templates/telemeta_default/mediaitem_detail.html:212
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:278
+#: templates/telemeta_default/mediaitem_detail.html:246
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:283
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "General informations"
 msgstr ""
 
@@ -1026,8 +1039,10 @@ msgid "Is superuser"
 msgstr ""
 
 #: templates/telemeta_default/profile_detail.html:44
-msgid "Groups"
-msgstr ""
+msgid "Group"
+msgid_plural "Groups"
+msgstr[0] ""
+msgstr[1] ""
 
 #: templates/telemeta_default/profile_detail.html:45
 msgid "Last login"
@@ -1099,7 +1114,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1084
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1086
 msgid "Last changes"
 msgstr ""
 
@@ -1157,7 +1172,7 @@ msgid "Password (again)"
 msgstr ""
 
 #: templates/telemeta_default/registration/password_change_form.html:45
-#: templates/telemeta_default/registration/password_reset_confirm.html:19
+#: templates/telemeta_default/registration/password_reset_confirm.html:17
 msgid "Change my password"
 msgstr ""
 
@@ -1173,11 +1188,11 @@ msgstr ""
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_complete.html:10
+#: templates/telemeta_default/registration/password_reset_complete.html:9
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_complete.html:12
+#: templates/telemeta_default/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr ""
 
@@ -1185,25 +1200,25 @@ msgstr ""
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:12
+#: templates/telemeta_default/registration/password_reset_confirm.html:10
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:16
+#: templates/telemeta_default/registration/password_reset_confirm.html:14
 msgid "New password:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:18
+#: templates/telemeta_default/registration/password_reset_confirm.html:16
 msgid "Confirm password:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:24
+#: templates/telemeta_default/registration/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:26
+#: templates/telemeta_default/registration/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -1213,7 +1228,7 @@ msgstr ""
 msgid "Password reset successful"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_done.html:10
+#: templates/telemeta_default/registration/password_reset_done.html:9
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
@@ -1245,17 +1260,17 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:10
+#: templates/telemeta_default/registration/password_reset_form.html:9
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:14
+#: templates/telemeta_default/registration/password_reset_form.html:13
 msgid "E-mail address:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:14
+#: templates/telemeta_default/registration/password_reset_form.html:13
 msgid "Reset my password"
 msgstr ""
 
@@ -1273,11 +1288,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1095
+#: web/base.py:1097
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1097
+#: web/base.py:1099
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 203c40ad0ec036dc94ce8762626adaf012348f71..7d58fba261084cdda16c71743abb0d4eb567fed5 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 13ad45e52e72c7d11d8f3f35aefa033d18ecc01a..cc42006c24905fe1142560f200a6f1349b0dcac1 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: 2011-05-12 00:01+0200\n"
+"POT-Creation-Date: 2011-05-24 11:14+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"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: models/core.py:143
+#: models/core.py:145
 msgid "Duration"
 msgstr "Durée"
 
-#: models/core.py:148
+#: models/core.py:150
 msgid "Enter a valid duration in HH:MM[:ss] format."
 msgstr "Entrez une durée valide au format HH:MM[:ss]"
 
@@ -29,31 +29,31 @@ msgstr "Entrez une durée valide au format HH:MM[:ss]"
 msgid "value"
 msgstr "valeur"
 
-#: models/enum.py:57 models/media.py:95
+#: models/enum.py:57 models/media.py:144
 msgid "archive format"
 msgstr "format d'archivage"
 
-#: models/enum.py:64 models/media.py:99
+#: models/enum.py:64 models/media.py:128
 msgid "secondary edition"
 msgstr "réédition"
 
-#: models/enum.py:71 models/media.py:114
+#: models/enum.py:71 models/media.py:122
 msgid "mode of acquisition"
 msgstr "mode d'acquisition"
 
-#: models/enum.py:78 models/media.py:117
+#: models/enum.py:78 models/media.py:125
 msgid "record author"
 msgstr "rédacteur fiche"
 
-#: models/enum.py:85 models/media.py:119
+#: models/enum.py:85 models/media.py:132
 msgid "record writer"
 msgstr "saisie fiche"
 
-#: models/enum.py:92 models/media.py:121
+#: models/enum.py:92 models/media.py:118
 msgid "legal rights"
 msgstr "droit d'utilisation"
 
-#: models/enum.py:99 models/media.py:126
+#: models/enum.py:99 models/media.py:97
 msgid "recording context"
 msgstr "contexte d'enregistrement"
 
@@ -61,20 +61,20 @@ msgstr "contexte d'enregistrement"
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:233
+#: models/enum.py:113 models/media.py:246
 msgid "vernacular style"
 msgstr "style vernaculaire"
 
-#: models/enum.py:120 models/media.py:241
+#: models/enum.py:120 models/media.py:248
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:308
+#: models/enum.py:127 models/media.py:333
 #, fuzzy
 msgid "keyword"
 msgstr "Mot-clé"
 
-#: models/enum.py:134 models/media.py:106
+#: models/enum.py:134 models/media.py:108
 msgid "publisher / status"
 msgstr "éditeur / statut"
 
@@ -82,137 +82,117 @@ msgstr "éditeur / statut"
 msgid "publisher"
 msgstr "éditeur"
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:229
+#: models/enum.py:152 models/enum.py:156 models/media.py:240
 msgid "population / social group"
 msgstr "population / groupe social"
 
-#: models/enum.py:157 models/instrument.py:41 models/instrument.py:51
-#: models/location.py:50 models/location.py:148
+#: models/enum.py:157 models/instrument.py:43 models/instrument.py:53
+#: models/location.py:51 models/location.py:149
 msgid "name"
 msgstr "nom"
 
-#: models/instrument.py:62 models/instrument.py:75
+#: models/instrument.py:64 models/instrument.py:81
 msgid "instrument"
 msgstr "instrument"
 
-#: models/instrument.py:64
+#: models/instrument.py:66
 msgid "parent instrument"
 msgstr "instrument parent"
 
-#: models/instrument.py:73 models/location.py:156
+#: models/instrument.py:79 models/location.py:160
 msgid "alias"
 msgstr "alias"
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "country"
 msgstr "état/nation"
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "continent"
 msgstr "continent"
 
-#: models/location.py:48
+#: models/location.py:49
 msgid "other"
 msgstr "autre"
 
-#: models/location.py:51
+#: models/location.py:52
 msgid "type"
 msgstr "type"
 
-#: models/location.py:52
+#: models/location.py:53
 msgid "complete type"
 msgstr "type complet"
 
-#: models/location.py:54
+#: models/location.py:55
 msgid "current location"
 msgstr "lieu actuel"
 
-#: models/location.py:57 models/location.py:157 models/location.py:171
+#: models/location.py:58 models/location.py:161 models/location.py:175
 msgid "authoritative"
 msgstr "officiel"
 
-#: models/location.py:111 models/location.py:155 models/location.py:168
-#: models/media.py:226
+#: models/location.py:112 models/location.py:159 models/location.py:172
+#: models/media.py:236
 msgid "location"
 msgstr "lieu"
 
-#: models/location.py:147
+#: models/location.py:148
 msgid "identifier"
 msgstr "identifiant"
 
-#: models/location.py:169
+#: models/location.py:173
 msgid "ancestor location"
 msgstr "lieu ancêtre"
 
-#: models/media.py:55
+#: models/media.py:57
 msgid "Metadata only"
 msgstr "Métadonnées uniquement"
 
-#: models/media.py:57
+#: models/media.py:59
 msgid "Sound and metadata"
 msgstr "Son et métadonnées"
 
-#: models/media.py:59
+#: models/media.py:61
 msgid "Private data"
 msgstr "Données privées"
 
-#: models/media.py:60 models/media.py:136 models/media.py:247
+#: models/media.py:62 models/media.py:115 models/media.py:263
 msgid "public access"
 msgstr "accès public"
 
-#: models/media.py:89 models/media.py:222
-msgid "code"
-msgstr "cote"
-
-#: models/media.py:90 models/media.py:221
-msgid "old code"
-msgstr "ancienne cote"
-
-#: models/media.py:91 models/media.py:243
+#: models/media.py:92 models/media.py:260
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:92 models/media.py:219 models/media.py:340
-#: models/media.py:355 models/media.py:389
+#: models/media.py:93 models/media.py:227 models/media.py:365
+#: models/media.py:380 models/media.py:414
 msgid "title"
 msgstr "titre"
 
-#: models/media.py:93 models/media.py:230
+#: models/media.py:94 models/media.py:228
 msgid "original title / translation"
 msgstr "titre original / traduction"
 
-#: models/media.py:97
-msgid "number of components (medium / piece)"
-msgstr "nb de composants (support / pièce)"
-
-#: models/media.py:100
+#: models/media.py:95
 msgid "depositor / contributor"
 msgstr "déposant / contributeur"
 
-#: models/media.py:101
-msgid "author of published notice"
-msgstr "auteur de la notice éditée"
-
-#: models/media.py:102
-msgid "related documentation"
-msgstr "documentation associée"
-
-#: models/media.py:103 models/media.py:237
-msgid "recordist"
-msgstr "collecteur"
-
-#: models/media.py:104
-msgid "recordist identical to depositor"
-msgstr "collecteur identique au déposant"
+#: models/media.py:98
+msgid "recording year (from)"
+msgstr "année d'enregistrement (depuis)"
 
-#: models/media.py:107
-msgid "published"
-msgstr "édité"
+#: models/media.py:99
+msgid "recording year (until)"
+msgstr "année d'enregistrement (jusqu'à)"
 
-#: models/media.py:108
+#: models/media.py:100
 msgid "year published"
 msgstr "année de parution"
 
+#: models/media.py:106 models/media.py:229
+msgid "recordist"
+msgstr "collecteur"
+
 #: models/media.py:110
 msgid "publisher collection"
 msgstr "collection éditeur"
@@ -222,239 +202,284 @@ msgid "publisher serial number"
 msgstr "numéro dans la série"
 
 #: models/media.py:112
+msgid "author of published notice"
+msgstr "auteur de la notice éditée"
+
+#: models/media.py:113
 msgid "bibliographic references"
 msgstr "références bibliographiques"
 
-#: models/media.py:115
-msgid "comment"
-msgstr "commentaire"
+#: models/media.py:114
+msgid "document type"
+msgstr "type de document"
+
+#: models/media.py:123
+msgid "CNRS depositor"
+msgstr "déposant CNRS"
+
+#: models/media.py:126
+msgid "related documentation"
+msgstr "documentation associée"
 
-#: models/media.py:122
+#: models/media.py:129
 msgid "copies"
 msgstr "autres exemplaires"
 
-#: models/media.py:123
-msgid "recording year (from)"
-msgstr "année d'enregistrement (depuis)"
+#: models/media.py:130
+msgid "comment"
+msgstr "commentaire"
 
-#: models/media.py:124
-msgid "recording year (until)"
-msgstr "année d'enregistrement (jusqu'à)"
+#: models/media.py:133
+msgid "archiver notes"
+msgstr "notes de l'archiviste"
+
+#: models/media.py:134
+msgid "items finished"
+msgstr "fiches items faîtes"
+
+#: models/media.py:135
+msgid "recordist identical to depositor"
+msgstr "collecteur identique au déposant"
+
+#: models/media.py:136
+msgid "published"
+msgstr "édité"
+
+#: models/media.py:139 models/media.py:257
+msgid "code"
+msgstr "cote"
 
-#: models/media.py:127 models/media.py:223
+#: models/media.py:140 models/media.py:258
+msgid "old code"
+msgstr "ancienne cote"
+
+#: models/media.py:141 models/media.py:267
 msgid "approximative duration"
 msgstr "durée approximative"
 
-#: models/media.py:128
-msgid "document type"
-msgstr "type de document"
+#: models/media.py:142
+msgid "number of components (medium / piece)"
+msgstr "nb de composants (support / pièce)"
 
-#: models/media.py:129
-msgid "archiver notes"
-msgstr "notes de l'archiviste"
+#: models/media.py:146
+msgid "digitization"
+msgstr "numérisation"
 
-#: models/media.py:130
+#: models/media.py:147
 msgid "status"
 msgstr "etat"
 
-#: models/media.py:131
-msgid "CNRS depositor"
-msgstr "déposant CNRS"
-
-#: models/media.py:132
-msgid "items finished"
-msgstr "fiches items faîtes"
-
-#: models/media.py:133
+#: models/media.py:148
 msgid "a_informer_07_03"
 msgstr "a_informer_07_03"
 
-#: models/media.py:135
-msgid "digitization"
-msgstr "numérisation"
-
-#: models/media.py:173
+#: models/media.py:182
 msgid "states / nations"
 msgstr "états / nations"
 
-#: models/media.py:187
+#: models/media.py:196
 msgid "populations / social groups"
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:195 models/media.py:288
+#: models/media.py:204 models/media.py:309
 msgid "computed duration"
 msgstr "durée calculée"
 
-#: models/media.py:218
+#: models/media.py:231
 msgid "collection"
 msgstr "collection"
 
-#: models/media.py:220
-msgid "item number"
-msgstr "n° de l'item"
-
-#: models/media.py:224
+#: models/media.py:232
 msgid "recording date (from)"
 msgstr "date d'enregistrement (depuis)"
 
-#: models/media.py:225
+#: models/media.py:233
 msgid "recording date (until)"
 msgstr "date d'enregistrement (jusqu'à)"
 
-#: models/media.py:227
+#: models/media.py:237
 msgid "location details"
 msgstr "précisions lieu"
 
-#: models/media.py:231
-msgid "author / compositor"
-msgstr "auteur / compositeur"
+#: models/media.py:238
+msgid "cultural area"
+msgstr "aire culturelle"
 
-#: models/media.py:234
-msgid "published reference"
-msgstr "référence éditée"
+#: models/media.py:241
+msgid "comments"
+msgstr "commentaires"
 
-#: models/media.py:235
+#: models/media.py:242
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:236
-msgid "copy of"
-msgstr "copie de"
-
-#: models/media.py:238
-msgid "recordist as in collection"
-msgstr "collecteur identique à la collection"
+#: models/media.py:249
+msgid "author / compositor"
+msgstr "auteur / compositeur"
 
-#: models/media.py:239
-msgid "cultural area"
-msgstr "aire culturelle"
+#: models/media.py:252
+msgid "remarks"
+msgstr "remarques"
 
-#: models/media.py:242
+#: models/media.py:253
 msgid "recordist selection"
 msgstr "sélection collecteur"
 
-#: models/media.py:244
-msgid "comments"
-msgstr "commentaires"
+#: models/media.py:254
+msgid "recordist as in collection"
+msgstr "collecteur identique à la collection"
 
-#: models/media.py:245
-msgid "remarks"
-msgstr "remarques"
+#: models/media.py:259
+msgid "item number"
+msgstr "n° de l'item"
+
+#: models/media.py:261
+msgid "published reference"
+msgstr "référence éditée"
 
-#: models/media.py:246
+#: models/media.py:262
+msgid "copy of"
+msgstr "copie de"
+
+#: models/media.py:264
 msgid "file"
 msgstr "fichier"
 
-#: models/media.py:253 models/media.py:409
-#: templates/telemeta_default/mediaitem_detail.html:239
+#: models/media.py:274 models/media.py:434
+#: templates/telemeta_default/mediaitem_detail.html:207
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:307 models/media.py:321 models/media.py:339
-#: models/media.py:386
+#: models/media.py:332 models/media.py:346 models/media.py:364
+#: models/media.py:411
 msgid "item"
 msgstr "item"
 
-#: models/media.py:323
+#: models/media.py:348
 msgid "composition"
 msgstr "formation"
 
-#: models/media.py:325
+#: models/media.py:350
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:326
+#: models/media.py:351
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:327
+#: models/media.py:352
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:341
+#: models/media.py:366
 msgid "start"
 msgstr "début"
 
-#: models/media.py:342
+#: models/media.py:367
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:353 models/media.py:372 models/media.py:387
+#: models/media.py:378 models/media.py:397 models/media.py:412
 #, fuzzy
 msgid "public_id"
 msgstr "édité"
 
-#: models/media.py:356 models/media.py:391
+#: models/media.py:381 models/media.py:416
 msgid "description"
 msgstr ""
 
-#: models/media.py:373
+#: models/media.py:398
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:374
+#: models/media.py:399
 #, fuzzy
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:375
+#: models/media.py:400
 #, fuzzy
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:388 models/system.py:52
+#: models/media.py:413 models/system.py:54
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:390 models/media.py:410
+#: models/media.py:415 models/media.py:435
 msgid "date"
 msgstr ""
 
-#: models/media.py:392
+#: models/media.py:417
 #, fuzzy
 msgid "author"
 msgstr "rédacteur fiche"
 
-#: models/system.py:49
+#: models/system.py:51
 msgid "element type"
 msgstr "type d'élément"
 
-#: models/system.py:50
+#: models/system.py:52
 msgid "element identifier"
 msgstr "identifiant de l'élément"
 
-#: models/system.py:51
+#: models/system.py:53
 msgid "modification type"
 msgstr "type de modification"
 
-#: models/system.py:53
+#: models/system.py:55
 msgid "user"
 msgstr "utilisateur"
 
-#: models/system.py:79 templates/telemeta_default/profile_detail.html:36
+#: models/system.py:81
+msgid "username"
+msgstr "nom d'utilisateur"
+
+#: models/system.py:82
+msgid "level"
+msgstr "niveau"
+
+#: models/system.py:83
+msgid "first name"
+msgstr "prénom"
+
+#: models/system.py:84
+msgid "last name"
+msgstr "nom de famille"
+
+#: models/system.py:85
+msgid "phone"
+msgstr "téléphone"
+
+#: models/system.py:86
+#, fuzzy
+msgid "email"
+msgstr "Courriel"
+
+#: models/system.py:99 templates/telemeta_default/profile_detail.html:36
 msgid "Institution"
 msgstr "Institution"
 
-#: models/system.py:80 templates/telemeta_default/profile_detail.html:37
+#: models/system.py:100 templates/telemeta_default/profile_detail.html:37
 msgid "Function"
 msgstr "Fonction"
 
-#: models/system.py:81 templates/telemeta_default/profile_detail.html:38
+#: models/system.py:101 templates/telemeta_default/profile_detail.html:38
 msgid "Address"
 msgstr "Adresse"
 
-#: models/system.py:82 templates/telemeta_default/profile_detail.html:39
+#: models/system.py:102 templates/telemeta_default/profile_detail.html:39
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models/system.py:83
+#: models/system.py:103
 #, fuzzy
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
 #: templates/admin/base.html:21
 #: templates/telemeta/registration/logged_out.html:4
-#: templates/telemeta_default/base.html:78
+#: templates/telemeta_default/base.html:80
 #: templates/telemeta_default/registration/logged_out.html:4
 #: templates/telemeta_default/registration/password_change_done.html:5
 #: templates/telemeta_default/registration/password_change_form.html:5
@@ -511,7 +536,7 @@ msgid "Instruments"
 msgstr "Instruments"
 
 #: templates/telemeta_default/admin_enumerations.html:12
-#: templates/telemeta_default/home.html:49
+#: templates/telemeta_default/home.html:46
 #: templates/telemeta_default/mediaitem_copy.html:32
 #: templates/telemeta_default/mediaitem_edit.html:27
 #: templates/telemeta_default/search_criteria.html:78
@@ -527,7 +552,7 @@ msgid "No enumerations"
 msgstr "Pas d'énumérations"
 
 #: templates/telemeta_default/admin_instruments.html:15
-#: templates/telemeta_default/admin_users.html:30
+#: templates/telemeta_default/admin_users.html:32
 msgid "No users"
 msgstr "Pas d'utilisateurs"
 
@@ -550,63 +575,67 @@ msgstr "Nom"
 msgid "E-mail"
 msgstr "Courriel"
 
-#: templates/telemeta_default/base.html:50
+#: templates/telemeta_default/admin_users.html:16
+msgid "Groups"
+msgstr "Groupes"
+
+#: templates/telemeta_default/base.html:52
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: templates/telemeta_default/base.html:56
+#: templates/telemeta_default/base.html:58
 msgid "Account"
 msgstr "Compte"
 
-#: templates/telemeta_default/base.html:57
-#: templates/telemeta_default/base.html:61
+#: templates/telemeta_default/base.html:59
+#: templates/telemeta_default/base.html:63
 msgid "Help"
 msgstr "Aide"
 
-#: templates/telemeta_default/base.html:58
+#: templates/telemeta_default/base.html:60
 msgid "Sign out"
 msgstr "Déconnexion"
 
-#: templates/telemeta_default/base.html:62
-#: templates/telemeta_default/login.html:24
+#: templates/telemeta_default/base.html:64
+#: templates/telemeta_default/login.html:20
 msgid "Sign in"
 msgstr "Connexion"
 
-#: templates/telemeta_default/base.html:70
+#: templates/telemeta_default/base.html:72
 #: templates/telemeta_default/search_criteria.html:134
 msgid "Search"
 msgstr "Recherche"
 
-#: templates/telemeta_default/base.html:79
+#: templates/telemeta_default/base.html:81
 msgid "Collections"
 msgstr "Collections"
 
-#: templates/telemeta_default/base.html:80
+#: templates/telemeta_default/base.html:82
 msgid "Items"
 msgstr "Items"
 
-#: templates/telemeta_default/base.html:81
-#: templates/telemeta_default/index.html:13
+#: templates/telemeta_default/base.html:83
+#: templates/telemeta_default/index.html:12
 msgid "Geo Navigator"
 msgstr "Géo-Navigateur"
 
-#: templates/telemeta_default/base.html:82
+#: templates/telemeta_default/base.html:84
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: templates/telemeta_default/base.html:84
+#: templates/telemeta_default/base.html:86
 msgid "Admin"
 msgstr "Admin"
 
-#: templates/telemeta_default/base.html:110
+#: templates/telemeta_default/base.html:112
 msgid "Powered by"
 msgstr "Propulsé par"
 
-#: templates/telemeta_default/base.html:111
+#: templates/telemeta_default/base.html:113
 msgid "By"
 msgstr "Par"
 
-#: templates/telemeta_default/base.html:116
+#: templates/telemeta_default/base.html:118
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
 "communities."
@@ -614,9 +643,8 @@ msgstr ""
 "Usage des archives réservé dans le respect du patrimoine culturel des "
 "communautés d'origine."
 
-#: templates/telemeta_default/base.html:122
-#: templates/telemeta_default/collection_detail.html:114
-#: templates/telemeta_default/collection_detail_new.html:116
+#: templates/telemeta_default/base.html:124
+#: templates/telemeta_default/collection_detail.html:115
 msgid "Legal notices"
 msgstr "Mentions légales"
 
@@ -625,115 +653,103 @@ msgstr "Mentions légales"
 #: templates/telemeta_default/collection_edit.html:9
 #: templates/telemeta_default/collection_edit.html:27
 #: templates/telemeta_default/enumeration_edit_value.html:22
-#: templates/telemeta_default/instrument_edit_value.html:22
+#: templates/telemeta_default/instrument_edit_value.html:21
 #: templates/telemeta_default/mediaitem_add.html:15
 #: templates/telemeta_default/mediaitem_add.html:36
 #: templates/telemeta_default/mediaitem_copy.html:16
-#: templates/telemeta_default/mediaitem_copy.html:41
+#: templates/telemeta_default/mediaitem_copy.html:43
 #: templates/telemeta_default/mediaitem_edit.html:10
-#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_edit.html:42
 #: templates/telemeta_default/mediaitem_keywords_edit.html:12
 #: templates/telemeta_default/mediaitem_keywords_edit.html:43
 #: templates/telemeta_default/mediaitem_performances_edit.html:12
 #: templates/telemeta_default/mediaitem_performances_edit.html:42
 #: templates/telemeta_default/profile_edit.html:6
-#: templates/telemeta_default/profile_edit.html:30
+#: templates/telemeta_default/profile_edit.html:29
 msgid "Cancel"
 msgstr "Annuler"
 
 #: templates/telemeta_default/collection_add.html:30
 #: templates/telemeta_default/collection_edit.html:29
 #: templates/telemeta_default/enumeration_edit_value.html:20
-#: templates/telemeta_default/instrument_edit_value.html:20
+#: templates/telemeta_default/instrument_edit_value.html:19
 #: templates/telemeta_default/mediaitem_add.html:38
-#: templates/telemeta_default/mediaitem_copy.html:43
-#: templates/telemeta_default/mediaitem_edit.html:42
+#: templates/telemeta_default/mediaitem_copy.html:45
+#: templates/telemeta_default/mediaitem_edit.html:44
 #: templates/telemeta_default/mediaitem_keywords_edit.html:45
 #: templates/telemeta_default/mediaitem_performances_edit.html:44
-#: templates/telemeta_default/profile_edit.html:32
+#: templates/telemeta_default/profile_edit.html:31
 msgid "Save"
 msgstr "Enregistrer"
 
 #: templates/telemeta_default/collection_detail.html:5
 #: templates/telemeta_default/collection_detail_dc.html:5
-#: templates/telemeta_default/collection_detail_new.html:5
 msgid "Collection"
 msgstr "Collection"
 
-#: templates/telemeta_default/collection_detail.html:43
-#: templates/telemeta_default/collection_detail_new.html:43
-#: templates/telemeta_default/mediaitem_detail.html:95
-#: templates/telemeta_default/mediaitem_detail.html:239
-#: templates/telemeta_default/mediaitem_detail.html:278
+#: templates/telemeta_default/collection_detail.html:44
+#: templates/telemeta_default/mediaitem_detail.html:109
+#: templates/telemeta_default/mediaitem_detail.html:207
+#: templates/telemeta_default/mediaitem_detail.html:246
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr "Editer"
 
-#: templates/telemeta_default/collection_detail.html:44
-#: templates/telemeta_default/collection_detail_new.html:44
-#: templates/telemeta_default/mediaitem_detail.html:96
+#: templates/telemeta_default/collection_detail.html:45
+#: templates/telemeta_default/mediaitem_detail.html:110
 msgid "Copy"
 msgstr "Copier"
 
-#: templates/telemeta_default/collection_detail.html:45
+#: templates/telemeta_default/collection_detail.html:46
 msgid "Add item"
 msgstr "Ajouter item"
 
-#: templates/telemeta_default/collection_detail.html:48
-#: templates/telemeta_default/collection_detail_new.html:47
-#: templates/telemeta_default/mediaitem_detail.html:99
+#: templates/telemeta_default/collection_detail.html:49
+#: templates/telemeta_default/mediaitem_detail.html:113
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
-#: templates/telemeta_default/collection_detail.html:60
+#: templates/telemeta_default/collection_detail.html:61
 msgid "Listen to this collection"
 msgstr "Écouter la collection"
 
-#: templates/telemeta_default/collection_detail.html:92
-#: templates/telemeta_default/collection_detail_new.html:93
+#: templates/telemeta_default/collection_detail.html:93
 msgid "Recording year"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/collection_detail.html:101
-#: templates/telemeta_default/collection_detail_new.html:103
-#: templates/telemeta_default/mediaitem_detail.html:225
+#: templates/telemeta_default/collection_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:193
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta_default/collection_detail.html:119
-#: templates/telemeta_default/collection_detail_new.html:121
-#: templates/telemeta_default/home.html:52
+#: templates/telemeta_default/collection_detail.html:120
+#: templates/telemeta_default/home.html:49
 #: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta_default/collection_detail.html:140
-#: templates/telemeta_default/collection_detail_new.html:142
-#: templates/telemeta_default/mediaitem_detail.html:294
+#: templates/telemeta_default/collection_detail.html:141
+#: templates/telemeta_default/mediaitem_detail.html:262
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:163
-#: templates/telemeta_default/collection_detail_new.html:165
-#: templates/telemeta_default/mediaitem_detail.html:309
+#: templates/telemeta_default/collection_detail.html:162
+#: templates/telemeta_default/mediaitem_detail.html:277
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:168
-#: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:312
+#: templates/telemeta_default/collection_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:280
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:168
-#: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:312
+#: templates/telemeta_default/collection_detail.html:167
+#: templates/telemeta_default/mediaitem_detail.html:280
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:173
-#: templates/telemeta_default/collection_detail_new.html:175
+#: templates/telemeta_default/collection_detail.html:172
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -766,8 +782,8 @@ msgstr "Éditées"
 
 #: templates/telemeta_default/collection_list.html:16
 #: templates/telemeta_default/enumeration_edit.html:20
-#: templates/telemeta_default/home.html:29
-#: templates/telemeta_default/instrument_edit.html:20
+#: templates/telemeta_default/home.html:27
+#: templates/telemeta_default/instrument_edit.html:19
 #: templates/telemeta_default/mediaitem_list.html:13
 msgid "Add"
 msgstr "Ajouter"
@@ -788,19 +804,19 @@ msgid "Enumeration"
 msgstr "Enumération"
 
 #: templates/telemeta_default/enumeration_edit.html:12
-#: templates/telemeta_default/instrument_edit.html:12
+#: templates/telemeta_default/instrument_edit.html:11
 msgid "Add entry"
 msgstr "Ajouter une entrée"
 
 #: templates/telemeta_default/enumeration_edit.html:14
 #: templates/telemeta_default/enumeration_edit.html:28
 #: templates/telemeta_default/enumeration_edit_value.html:14
-#: templates/telemeta_default/mediaitem_detail.html:172
+#: templates/telemeta_default/mediaitem_detail.html:153
 msgid "Value"
 msgstr "Valeur"
 
 #: templates/telemeta_default/enumeration_edit.html:44
-#: templates/telemeta_default/instrument_edit.html:42
+#: templates/telemeta_default/instrument_edit.html:41
 msgid "Remove selected items"
 msgstr "Supprimer les éléments sélectionnés"
 
@@ -809,7 +825,7 @@ msgid "This enumeration is empty"
 msgstr "Cette énumération est vide"
 
 #: templates/telemeta_default/enumeration_edit_value.html:12
-#: templates/telemeta_default/instrument_edit_value.html:12
+#: templates/telemeta_default/instrument_edit_value.html:11
 msgid "Modify an entry"
 msgstr "Modification d'une entrée"
 
@@ -857,27 +873,29 @@ msgid_plural "%(counter)s items "
 msgstr[0] "1 item"
 msgstr[1] "%(counter)s items "
 
-#: templates/telemeta_default/home.html:27
+#: templates/telemeta_default/home.html:25
 #: templates/telemeta_default/profile_detail.html:16
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#: templates/telemeta_default/home.html:37
+#: templates/telemeta_default/home.html:35
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/telemeta_default/home.html:50
+#: templates/telemeta_default/home.html:47
 #: templates/telemeta_default/inc/module_revisions.html:13
 msgid "Type"
 msgstr ""
 
-#: templates/telemeta_default/home.html:51
+#: templates/telemeta_default/home.html:48
+#: templates/telemeta_default/mediaitem_copy.html:33
+#: templates/telemeta_default/mediaitem_edit.html:28
 #: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:15
 msgid "Code"
 msgstr "Cote"
 
-#: templates/telemeta_default/home.html:53
+#: templates/telemeta_default/home.html:50
 #: templates/telemeta_default/search_criteria.html:94
 #: templates/telemeta_default/search_results.html:33
 #: templates/telemeta_default/inc/collection_list.html:17
@@ -885,40 +903,36 @@ msgstr "Cote"
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/home.html:54
+#: templates/telemeta_default/home.html:51
 #: templates/telemeta_default/inc/collection_list.html:18
 #: templates/telemeta_default/inc/mediaitem_list.html:23
 msgid "Sound"
 msgstr "Son"
 
-#: templates/telemeta_default/home.html:55
+#: templates/telemeta_default/home.html:52
 msgid "Action"
 msgstr "Action"
 
-#: templates/telemeta_default/home.html:70
+#: templates/telemeta_default/home.html:66
 #: templates/telemeta_default/inc/module_revisions.html:32
 msgid "deleted"
 msgstr "supprimé"
 
-#: templates/telemeta_default/index.html:15
+#: templates/telemeta_default/index.html:14
 msgid "Open the geographic navigator"
 msgstr "Accéder au navigateur géographique"
 
-#: templates/telemeta_default/index.html:20
+#: templates/telemeta_default/index.html:19
 msgid "Musical selection"
 msgstr "Sélection musicale"
 
-#: templates/telemeta_default/index.html:38
-msgid "Partenaires"
-msgstr ""
-
-#: templates/telemeta_default/instrument_edit.html:14
-#: templates/telemeta_default/instrument_edit.html:28
-#: templates/telemeta_default/instrument_edit_value.html:14
+#: templates/telemeta_default/instrument_edit.html:13
+#: templates/telemeta_default/instrument_edit.html:27
+#: templates/telemeta_default/instrument_edit_value.html:13
 msgid "Name"
 msgstr "Nom"
 
-#: templates/telemeta_default/instrument_edit.html:46
+#: templates/telemeta_default/instrument_edit.html:45
 msgid "This instrument list is empty"
 msgstr "Cette énumération est vide"
 
@@ -926,12 +940,12 @@ msgstr "Cette énumération est vide"
 msgid "User authentication"
 msgstr "Identification"
 
-#: templates/telemeta_default/login.html:11
+#: templates/telemeta_default/login.html:10
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 "Vos nom d'utilisateur et/ou mot de passe sont incorrects. Essayez à nouveau."
 
-#: templates/telemeta_default/login.html:26
+#: templates/telemeta_default/login.html:22
 msgid "Password forgotten"
 msgstr "Mot de passe oublié"
 
@@ -941,54 +955,54 @@ msgstr "Mot de passe oublié"
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta_default/mediaitem_detail.html:101
+#: templates/telemeta_default/mediaitem_detail.html:115
 #: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/telemeta_default/mediaitem_detail.html:102
+#: templates/telemeta_default/mediaitem_detail.html:116
 #: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/telemeta_default/mediaitem_detail.html:161
+#: templates/telemeta_default/mediaitem_detail.html:142
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta_default/mediaitem_detail.html:163
+#: templates/telemeta_default/mediaitem_detail.html:144
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta_default/mediaitem_detail.html:171
+#: templates/telemeta_default/mediaitem_detail.html:152
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta_default/mediaitem_detail.html:173
+#: templates/telemeta_default/mediaitem_detail.html:154
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta_default/mediaitem_detail.html:194
+#: templates/telemeta_default/mediaitem_detail.html:162
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta_default/mediaitem_detail.html:215
+#: templates/telemeta_default/mediaitem_detail.html:183
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/mediaitem_detail.html:195
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:244
+#: templates/telemeta_default/mediaitem_detail.html:212
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:278
+#: templates/telemeta_default/mediaitem_detail.html:246
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta_default/mediaitem_detail.html:283
+#: templates/telemeta_default/mediaitem_detail.html:251
 msgid "General informations"
 msgstr "Informations générales"
 
@@ -1034,8 +1048,10 @@ msgid "Is superuser"
 msgstr "Statut super-utilisateur"
 
 #: templates/telemeta_default/profile_detail.html:44
-msgid "Groups"
-msgstr ""
+msgid "Group"
+msgid_plural "Groups"
+msgstr[0] "Groupe"
+msgstr[1] "Groupes"
 
 #: templates/telemeta_default/profile_detail.html:45
 msgid "Last login"
@@ -1107,7 +1123,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1084
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1086
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1169,7 +1185,7 @@ msgid "Password (again)"
 msgstr "Mot de passe (encore)"
 
 #: templates/telemeta_default/registration/password_change_form.html:45
-#: templates/telemeta_default/registration/password_reset_confirm.html:19
+#: templates/telemeta_default/registration/password_reset_confirm.html:17
 msgid "Change my password"
 msgstr ""
 
@@ -1187,11 +1203,11 @@ msgstr "Mot de passe oublié"
 msgid "Password reset complete"
 msgstr "Mise à jour du mot de passe effectuée"
 
-#: templates/telemeta_default/registration/password_reset_complete.html:10
+#: templates/telemeta_default/registration/password_reset_complete.html:9
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_complete.html:12
+#: templates/telemeta_default/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr ""
 
@@ -1199,25 +1215,25 @@ msgstr ""
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:12
+#: templates/telemeta_default/registration/password_reset_confirm.html:10
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:16
+#: templates/telemeta_default/registration/password_reset_confirm.html:14
 msgid "New password:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:18
+#: templates/telemeta_default/registration/password_reset_confirm.html:16
 msgid "Confirm password:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:24
+#: templates/telemeta_default/registration/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_confirm.html:26
+#: templates/telemeta_default/registration/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -1227,7 +1243,7 @@ msgstr ""
 msgid "Password reset successful"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_done.html:10
+#: templates/telemeta_default/registration/password_reset_done.html:9
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
@@ -1259,17 +1275,17 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:10
+#: templates/telemeta_default/registration/password_reset_form.html:9
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:14
+#: templates/telemeta_default/registration/password_reset_form.html:13
 msgid "E-mail address:"
 msgstr ""
 
-#: templates/telemeta_default/registration/password_reset_form.html:14
+#: templates/telemeta_default/registration/password_reset_form.html:13
 msgid "Reset my password"
 msgstr ""
 
@@ -1287,11 +1303,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1095
+#: web/base.py:1097
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1097
+#: web/base.py:1099
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."
@@ -1308,21 +1324,6 @@ msgstr ""
 #~ msgid "resource"
 #~ msgstr "ressource"
 
-#~ msgid "username"
-#~ msgstr "nom d'utilisateur"
-
-#~ msgid "level"
-#~ msgstr "niveau"
-
-#~ msgid "first name"
-#~ msgstr "prénom"
-
-#~ msgid "last name"
-#~ msgstr "nom de famille"
-
-#~ msgid "phone"
-#~ msgstr "téléphone"
-
 #~ msgid "Visit the Telemeta open source project at"
 #~ msgstr "Visitez le projet libre Telemeta"
 

diff --git a/telemeta/templates/telemeta_default/admin_users.html b/telemeta/templates/telemeta_default/admin_users.html
index c4a0aa78eac52a07eab98570216aea70b360c80b..31edf7845f52af549c164b024773560dc1df783f 100644 (file)
--- a/telemeta/templates/telemeta_default/admin_users.html
+++ b/telemeta/templates/telemeta_default/admin_users.html
@@ -13,6 +13,7 @@
     <th>{% trans "First Name"%}</th>
     <th>{% trans "Last Name"%}</th>
     <th>{% trans "E-mail"%}</th>
+    <th>{% trans "Groups"%}</th>
     </tr>
    </thead><tbody>
     {% for user in users %}
@@ -21,6 +22,7 @@
      <td>{{ user.first_name }}</td>
      <td>{{ user.last_name }}</td>
      <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td>
+     <td>{% for group in user.groups.all %}{{ group }} {% endfor %}</td>
     </tr>
     {% endfor %}
     </tbody>

diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html
index b3b6863b9d193e03cb1281a598a2e39d2e0ca2ec..b24b08604b4d00e372c0ad7c894d783304b11d78 100644 (file)
--- a/telemeta/templates/telemeta_default/profile_detail.html
+++ b/telemeta/templates/telemeta_default/profile_detail.html
@@ -41,7 +41,7 @@
       
       <dt>{% trans "Is staff" %}</dt><dd>{{ usr.is_staff }}</dd>
       <dt>{% trans "Is superuser" %}</dt><dd>{{ usr.is_superuser }}</dd>
-      <dt>{% trans "Groups" %}</dt><dd>{% for group in usr.groups.all %}{{ group }}, {% endfor %}</dd>
+      <dt>{% blocktrans count user.groups.all.count as counter %}Group{% plural %}Groups{% endblocktrans %}</dt><dd>{% for group in usr.groups.all %}{{ group }} {% endfor %}</dd>
       <dt>{% trans "Last login" %}</dt><dd>{{ usr.last_login }}</dd>
       {% if user.is_authenticated and user.username == usr.username %}
       <dt>{% trans "Language" %}</dt><dd><form id="setlang" action="/i18n/setlang/" method="post">{% csrf_token %}

diff --git a/tools/scripts/telemeta-crem-import.py b/tools/scripts/telemeta-crem-import.py
index 9ec85d0c5e78dee6863f35d4697a5d46e366a5f9..88c24b82d0c3bd84b50eb30e8e99630b3bb62fad 100755 (executable)
--- a/tools/scripts/telemeta-crem-import.py
+++ b/tools/scripts/telemeta-crem-import.py
@@ -38,17 +38,18 @@ class Logger:
 
 class TelemetaWavImport:
 
-    def __init__(self, source_dir, log_file):
+    def __init__(self, source_dir, log_file, pattern):
         self.logger = Logger(log_file)
         self.source_dir = source_dir
         self.collections = os.listdir(self.source_dir)
         self.buffer_size = 0x1000
+        self.pattern = pattern
 
     def wav_import(self):
         from telemeta.models import MediaItem
         for collection in self.collections:
             collection_dir = self.source_dir + os.sep + collection
-            if not '/.' in collection_dir:
+            if not '/.' in collection_dir and self.pattern in collection_dir:
                 self.collection_name = collection.split(os.sep)[-1]
                 msg = '************************ ' + collection + ' ******************************'
                 self.logger.write_info(collection, msg[:70])
@@ -87,17 +88,20 @@ class TelemetaWavImport:
 
 
 def print_usage(tool_name):
-    print "Usage: "+tool_name+" <project_dir> <source_dir> <log_file>"
+    print "Usage: "+tool_name+" <project_dir> <source_dir> <pattern> <log_file>"
     print "  project_dir: the directory of the Django project which hosts Telemeta"
     print "  source_dir: the directory containing the wav files to include"
+    print "  pattern: a pattern to match the collection names"
+    print "  log_file: a log file to write logs"
 
 def run():
     if len(sys.argv) < 3:
         print_usage(os.path.basename(sys.argv[0]))
         sys.exit(1)
     else:
-        project_dir = sys.argv[-3]
-        source_dir = sys.argv[-2]
+        project_dir = sys.argv[-4]
+        source_dir = sys.argv[-3]
+        pattern = sys.argv[-2]
         log_file = sys.argv[-1]
         sys.path.append(project_dir)
         import settings