update fr locale, fix collection edit/add error display, update help, fix DurationFie...

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 2342491ddc35b437e9cdfbb77922cac75c9818a9..02f452c82dcc8058b710314afd286011bda9bb74 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 0eab210b7d4d2893d90357efb441987d9b80512e..03dc755b81cde63610097c8dbc08c5e463826a32 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-04 17:58+0200\n"
+"POT-Creation-Date: 2011-05-11 14:04+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"
@@ -30,31 +30,31 @@ msgstr ""
 msgid "value"
 msgstr ""
 
-#: models/enum.py:57 models/media.py:94
+#: models/enum.py:57 models/media.py:95
 msgid "archive format"
 msgstr ""
 
-#: models/enum.py:64 models/media.py:98
+#: models/enum.py:64 models/media.py:99
 msgid "secondary edition"
 msgstr ""
 
-#: models/enum.py:71 models/media.py:113
+#: models/enum.py:71 models/media.py:114
 msgid "mode of acquisition"
 msgstr ""
 
-#: models/enum.py:78 models/media.py:116
+#: models/enum.py:78 models/media.py:117
 msgid "record author"
 msgstr ""
 
-#: models/enum.py:85 models/media.py:118
+#: models/enum.py:85 models/media.py:119
 msgid "record writer"
 msgstr ""
 
-#: models/enum.py:92 models/media.py:120
+#: models/enum.py:92 models/media.py:121
 msgid "legal rights"
 msgstr ""
 
-#: models/enum.py:99 models/media.py:125
+#: models/enum.py:99 models/media.py:126
 msgid "recording context"
 msgstr ""
 
@@ -62,19 +62,19 @@ msgstr ""
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:232
+#: models/enum.py:113 models/media.py:233
 msgid "vernacular style"
 msgstr ""
 
-#: models/enum.py:120 models/media.py:240
+#: models/enum.py:120 models/media.py:241
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:307
+#: models/enum.py:127 models/media.py:308
 msgid "keyword"
 msgstr ""
 
-#: models/enum.py:134 models/media.py:105
+#: models/enum.py:134 models/media.py:106
 msgid "publisher / status"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "publisher"
 msgstr ""
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:228
+#: models/enum.py:152 models/enum.py:156 models/media.py:229
 msgid "population / social group"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgid "authoritative"
 msgstr ""
 
 #: models/location.py:111 models/location.py:155 models/location.py:168
-#: models/media.py:225
+#: models/media.py:226
 msgid "location"
 msgstr ""
 
@@ -144,269 +144,269 @@ msgstr ""
 msgid "ancestor location"
 msgstr ""
 
-#: models/media.py:54
+#: models/media.py:55
 msgid "Metadata only"
 msgstr ""
 
-#: models/media.py:56
+#: models/media.py:57
 msgid "Sound and metadata"
 msgstr ""
 
-#: models/media.py:58
+#: models/media.py:59
 msgid "Private data"
 msgstr ""
 
-#: models/media.py:59 models/media.py:135 models/media.py:246
+#: models/media.py:60 models/media.py:136 models/media.py:247
 msgid "public access"
 msgstr ""
 
-#: models/media.py:88 models/media.py:221
+#: models/media.py:89 models/media.py:222
 msgid "code"
 msgstr ""
 
-#: models/media.py:89 models/media.py:220
+#: models/media.py:90 models/media.py:221
 msgid "old code"
 msgstr ""
 
-#: models/media.py:90 models/media.py:242
+#: models/media.py:91 models/media.py:243
 msgid "reference"
 msgstr ""
 
-#: models/media.py:91 models/media.py:218 models/media.py:331
-#: models/media.py:346 models/media.py:380
+#: models/media.py:92 models/media.py:219 models/media.py:336
+#: models/media.py:351 models/media.py:385
 msgid "title"
 msgstr ""
 
-#: models/media.py:92 models/media.py:229
+#: models/media.py:93 models/media.py:230
 msgid "original title / translation"
 msgstr ""
 
-#: models/media.py:96
+#: models/media.py:97
 msgid "number of components (medium / piece)"
 msgstr ""
 
-#: models/media.py:99
+#: models/media.py:100
 msgid "depositor / contributor"
 msgstr ""
 
-#: models/media.py:100
+#: models/media.py:101
 msgid "author of published notice"
 msgstr ""
 
-#: models/media.py:101
+#: models/media.py:102
 msgid "related documentation"
 msgstr ""
 
-#: models/media.py:102 models/media.py:236
+#: models/media.py:103 models/media.py:237
 msgid "recordist"
 msgstr ""
 
-#: models/media.py:103
+#: models/media.py:104
 msgid "recordist identical to depositor"
 msgstr ""
 
-#: models/media.py:106
+#: models/media.py:107
 msgid "published"
 msgstr ""
 
-#: models/media.py:107
+#: models/media.py:108
 msgid "year published"
 msgstr ""
 
-#: models/media.py:109
+#: models/media.py:110
 msgid "publisher collection"
 msgstr ""
 
-#: models/media.py:110
+#: models/media.py:111
 msgid "publisher serial number"
 msgstr ""
 
-#: models/media.py:111
+#: models/media.py:112
 msgid "bibliographic references"
 msgstr ""
 
-#: models/media.py:114
+#: models/media.py:115
 msgid "comment"
 msgstr ""
 
-#: models/media.py:121
+#: models/media.py:122
 msgid "copies"
 msgstr ""
 
-#: models/media.py:122
+#: models/media.py:123
 msgid "recording year (from)"
 msgstr ""
 
-#: models/media.py:123
+#: models/media.py:124
 msgid "recording year (until)"
 msgstr ""
 
-#: models/media.py:126 models/media.py:222
+#: models/media.py:127 models/media.py:223
 msgid "approximative duration"
 msgstr ""
 
-#: models/media.py:127
+#: models/media.py:128
 msgid "document type"
 msgstr ""
 
-#: models/media.py:128
+#: models/media.py:129
 msgid "archiver notes"
 msgstr ""
 
-#: models/media.py:129
+#: models/media.py:130
 msgid "status"
 msgstr ""
 
-#: models/media.py:130
+#: models/media.py:131
 msgid "CNRS depositor"
 msgstr ""
 
-#: models/media.py:131
+#: models/media.py:132
 msgid "items finished"
 msgstr ""
 
-#: models/media.py:132
+#: models/media.py:133
 msgid "a_informer_07_03"
 msgstr ""
 
-#: models/media.py:134
+#: models/media.py:135
 msgid "digitization"
 msgstr ""
 
-#: models/media.py:172
+#: models/media.py:173
 msgid "states / nations"
 msgstr ""
 
-#: models/media.py:186
+#: models/media.py:187
 msgid "populations / social groups"
 msgstr ""
 
-#: models/media.py:194 models/media.py:287
+#: models/media.py:195 models/media.py:288
 msgid "computed duration"
 msgstr ""
 
-#: models/media.py:217
+#: models/media.py:218
 msgid "collection"
 msgstr ""
 
-#: models/media.py:219
+#: models/media.py:220
 msgid "item number"
 msgstr ""
 
-#: models/media.py:223
+#: models/media.py:224
 msgid "recording date (from)"
 msgstr ""
 
-#: models/media.py:224
+#: models/media.py:225
 msgid "recording date (until)"
 msgstr ""
 
-#: models/media.py:226
+#: models/media.py:227
 msgid "location details"
 msgstr ""
 
-#: models/media.py:230
+#: models/media.py:231
 msgid "author / compositor"
 msgstr ""
 
-#: models/media.py:233
+#: models/media.py:234
 msgid "published reference"
 msgstr ""
 
-#: models/media.py:234
+#: models/media.py:235
 msgid "moda_execut"
 msgstr ""
 
-#: models/media.py:235
+#: models/media.py:236
 msgid "copy of"
 msgstr ""
 
-#: models/media.py:237
+#: models/media.py:238
 msgid "recordist as in collection"
 msgstr ""
 
-#: models/media.py:238
+#: models/media.py:239
 msgid "cultural area"
 msgstr ""
 
-#: models/media.py:241
+#: models/media.py:242
 msgid "recordist selection"
 msgstr ""
 
-#: models/media.py:243
+#: models/media.py:244
 msgid "comments"
 msgstr ""
 
-#: models/media.py:244
+#: models/media.py:245
 msgid "remarks"
 msgstr ""
 
-#: models/media.py:245
+#: models/media.py:246
 msgid "file"
 msgstr ""
 
-#: models/media.py:252 models/media.py:397
+#: models/media.py:253 models/media.py:405
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:306 models/media.py:316 models/media.py:330
-#: models/media.py:377
+#: models/media.py:307 models/media.py:317 models/media.py:335
+#: models/media.py:382
 msgid "item"
 msgstr ""
 
-#: models/media.py:318
+#: models/media.py:319
 msgid "composition"
 msgstr ""
 
-#: models/media.py:320
+#: models/media.py:321
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:321
+#: models/media.py:322
 msgid "number"
 msgstr ""
 
-#: models/media.py:322
+#: models/media.py:323
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:332
+#: models/media.py:337
 msgid "start"
 msgstr ""
 
-#: models/media.py:333
+#: models/media.py:338
 msgid "end"
 msgstr ""
 
-#: models/media.py:344 models/media.py:363 models/media.py:378
+#: models/media.py:349 models/media.py:368 models/media.py:383
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:347 models/media.py:382
+#: models/media.py:352 models/media.py:387
 msgid "description"
 msgstr ""
 
-#: models/media.py:364
+#: models/media.py:369
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:365
+#: models/media.py:370
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:366
+#: models/media.py:371
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:379 models/system.py:52
+#: models/media.py:384 models/system.py:52
 msgid "time"
 msgstr ""
 
-#: models/media.py:381 models/media.py:398
+#: models/media.py:386 models/media.py:406
 msgid "date"
 msgstr ""
 
-#: models/media.py:383
+#: models/media.py:388
 msgid "author"
 msgstr ""
 
@@ -446,8 +446,9 @@ msgstr ""
 msgid "Expiration_date"
 msgstr ""
 
+#: templates/admin/base.html:21
 #: templates/telemeta/registration/logged_out.html:4
-#: templates/telemeta_default/base.html:74
+#: templates/telemeta_default/base.html:75
 #: templates/telemeta_default/registration/logged_out.html:4
 #: templates/telemeta_default/registration/password_change_done.html:4
 #: templates/telemeta_default/registration/password_change_form.html:5
@@ -458,6 +459,14 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: templates/admin/base_site.html:4
+msgid "Telemta site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Telemeta administration"
+msgstr ""
+
 #: templates/telemeta/registration/logged_out.html:8
 #: templates/telemeta_default/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
@@ -472,22 +481,22 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: templates/telemeta_default/admin.html:15
+#: templates/telemeta_default/admin.html:19
 msgid "General administration"
 msgstr ""
 
-#: templates/telemeta_default/admin.html:16
+#: templates/telemeta_default/admin.html:20
 #: templates/telemeta_default/admin_instruments.html:6
 #: templates/telemeta_default/admin_users.html:6
 msgid "Users"
 msgstr ""
 
-#: templates/telemeta_default/admin.html:17
+#: templates/telemeta_default/admin.html:21
 #: templates/telemeta_default/admin_enumerations.html:6
 msgid "Enumerations"
 msgstr ""
 
-#: templates/telemeta_default/admin.html:18
+#: templates/telemeta_default/admin.html:22
 #: templates/telemeta_default/instrument_edit.html:4
 #: templates/telemeta_default/instrument_edit.html:7
 #: templates/telemeta_default/instrument_edit_value.html:4
@@ -496,12 +505,12 @@ msgid "Instruments"
 msgstr ""
 
 #: templates/telemeta_default/admin_enumerations.html:12
-#: templates/telemeta_default/home.html:31
-#: templates/telemeta_default/home.html:83
-#: templates/telemeta_default/search_criteria.html:76
-#: templates/telemeta_default/search_results.html:28
-#: templates/telemeta_default/inc/collection_list.html:12
+#: templates/telemeta_default/home.html:49
+#: templates/telemeta_default/search_criteria.html:78
+#: templates/telemeta_default/search_results.html:30
+#: templates/telemeta_default/inc/collection_list.html:13
 #: templates/telemeta_default/inc/mediaitem_list.html:13
+#: templates/telemeta_default/inc/module_revisions.html:12
 msgid "Title"
 msgstr ""
 
@@ -515,7 +524,7 @@ msgid "No users"
 msgstr ""
 
 #: templates/telemeta_default/admin_users.html:12
-#: templates/telemeta_default/home.html:33
+#: templates/telemeta_default/inc/module_revisions.html:14
 msgid "User"
 msgstr ""
 
@@ -533,76 +542,76 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: templates/telemeta_default/base.html:46
+#: templates/telemeta_default/base.html:47
 msgid "Welcome"
 msgstr ""
 
-#: templates/telemeta_default/base.html:52
+#: templates/telemeta_default/base.html:53
 msgid "Account"
 msgstr ""
 
-#: templates/telemeta_default/base.html:53
-#: templates/telemeta_default/base.html:57
+#: templates/telemeta_default/base.html:54
+#: templates/telemeta_default/base.html:58
 msgid "Help"
 msgstr ""
 
-#: templates/telemeta_default/base.html:54
+#: templates/telemeta_default/base.html:55
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta_default/base.html:58
-#: templates/telemeta_default/login.html:21
+#: templates/telemeta_default/base.html:59
+#: templates/telemeta_default/login.html:24
 msgid "Sign in"
 msgstr ""
 
-#: templates/telemeta_default/base.html:66
-#: templates/telemeta_default/search_criteria.html:132
+#: templates/telemeta_default/base.html:67
+#: templates/telemeta_default/search_criteria.html:134
 msgid "Search"
 msgstr ""
 
-#: templates/telemeta_default/base.html:75
+#: templates/telemeta_default/base.html:76
 msgid "Collections"
 msgstr ""
 
-#: templates/telemeta_default/base.html:76
+#: templates/telemeta_default/base.html:77
 msgid "Items"
 msgstr ""
 
-#: templates/telemeta_default/base.html:77
+#: templates/telemeta_default/base.html:78
 #: templates/telemeta_default/index.html:13
 msgid "Geo Navigator"
 msgstr ""
 
-#: templates/telemeta_default/base.html:78
+#: templates/telemeta_default/base.html:79
 msgid "Advanced search"
 msgstr ""
 
-#: templates/telemeta_default/base.html:80
+#: templates/telemeta_default/base.html:81
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta_default/base.html:105
+#: templates/telemeta_default/base.html:106
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta_default/base.html:106
+#: templates/telemeta_default/base.html:107
 msgid "By"
 msgstr ""
 
-#: templates/telemeta_default/base.html:111
+#: templates/telemeta_default/base.html:112
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
 "communities."
 msgstr ""
 
-#: templates/telemeta_default/base.html:117
+#: templates/telemeta_default/base.html:118
 #: templates/telemeta_default/collection_detail.html:111
 #: templates/telemeta_default/collection_detail_new.html:116
 msgid "Legal notices"
 msgstr ""
 
-#: templates/telemeta_default/collection_add.html:7
-#: templates/telemeta_default/collection_add.html:26
+#: templates/telemeta_default/collection_add.html:10
+#: templates/telemeta_default/collection_add.html:28
 #: templates/telemeta_default/collection_edit.html:9
 #: templates/telemeta_default/collection_edit.html:27
 #: templates/telemeta_default/enumeration_edit_value.html:22
@@ -611,20 +620,23 @@ msgstr ""
 #: templates/telemeta_default/mediaitem_add.html:36
 #: templates/telemeta_default/mediaitem_copy.html:15
 #: templates/telemeta_default/mediaitem_copy.html:40
-#: templates/telemeta_default/mediaitem_edit.html:9
-#: templates/telemeta_default/mediaitem_edit.html:38
+#: templates/telemeta_default/mediaitem_edit.html:10
+#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_performances_edit.html:12
+#: templates/telemeta_default/mediaitem_performances_edit.html:43
 #: templates/telemeta_default/profile_edit.html:5
 #: templates/telemeta_default/profile_edit.html:29
 msgid "Cancel"
 msgstr ""
 
-#: templates/telemeta_default/collection_add.html:28
+#: 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/mediaitem_add.html:38
 #: templates/telemeta_default/mediaitem_copy.html:42
-#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_edit.html:42
+#: templates/telemeta_default/mediaitem_performances_edit.html:45
 #: templates/telemeta_default/profile_edit.html:31
 msgid "Save"
 msgstr ""
@@ -637,20 +649,21 @@ msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:43
 #: templates/telemeta_default/collection_detail_new.html:43
-#: templates/telemeta_default/mediaitem_detail.html:99
+#: templates/telemeta_default/mediaitem_detail.html:97
+#: templates/telemeta_default/mediaitem_detail.html:278
 #: templates/telemeta_default/profile_detail.html:60
 msgid "Edit"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:44
 #: templates/telemeta_default/collection_detail_new.html:44
-#: templates/telemeta_default/mediaitem_detail.html:100
+#: templates/telemeta_default/mediaitem_detail.html:98
 msgid "Copy"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:47
 #: templates/telemeta_default/collection_detail_new.html:47
-#: templates/telemeta_default/mediaitem_detail.html:103
+#: templates/telemeta_default/mediaitem_detail.html:101
 msgid "Add to playlist"
 msgstr ""
 
@@ -665,45 +678,45 @@ msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:98
 #: templates/telemeta_default/collection_detail_new.html:103
-#: templates/telemeta_default/mediaitem_detail.html:230
+#: templates/telemeta_default/mediaitem_detail.html:228
 msgid "Geographic and cultural informations"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:116
 #: templates/telemeta_default/collection_detail_new.html:121
-#: templates/telemeta_default/home.html:86
-#: templates/telemeta_default/inc/collection_list.html:15
+#: templates/telemeta_default/home.html:52
+#: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:15
 msgid "Recordist"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:137
 #: templates/telemeta_default/collection_detail_new.html:142
-#: templates/telemeta_default/mediaitem_detail.html:293
+#: templates/telemeta_default/mediaitem_detail.html:294
 msgid "Archiving data"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:160
 #: templates/telemeta_default/collection_detail_new.html:165
-#: templates/telemeta_default/mediaitem_detail.html:308
+#: templates/telemeta_default/mediaitem_detail.html:309
 msgid "Technical data"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:165
 #: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:311
+#: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Media type"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:165
 #: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:311
+#: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Audio"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:170
 #: templates/telemeta_default/collection_detail_new.html:175
-#: templates/telemeta_default/geo_countries.html:14
+#: templates/telemeta_default/geo_countries.html:17
 msgid "Number of items"
 msgstr ""
 
@@ -735,7 +748,7 @@ msgstr ""
 
 #: templates/telemeta_default/collection_list.html:15
 #: templates/telemeta_default/enumeration_edit.html:20
-#: templates/telemeta_default/home.html:68
+#: templates/telemeta_default/home.html:29
 #: templates/telemeta_default/instrument_edit.html:20
 #: templates/telemeta_default/mediaitem_list.html:12
 msgid "Add"
@@ -764,7 +777,7 @@ 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:177
+#: templates/telemeta_default/mediaitem_detail.html:175
 #: templates/telemeta_default/mediaitem_player.html:138
 msgid "Value"
 msgstr ""
@@ -791,11 +804,11 @@ msgstr ""
 msgid "Geographic Navigator"
 msgstr ""
 
-#: templates/telemeta_default/geo_continents.html:24
+#: templates/telemeta_default/geo_continents.html:25
 msgid "Map"
 msgstr ""
 
-#: templates/telemeta_default/geo_continents.html:25
+#: templates/telemeta_default/geo_continents.html:26
 msgid "List"
 msgstr ""
 
@@ -805,81 +818,73 @@ msgstr ""
 msgid "World"
 msgstr ""
 
-#: templates/telemeta_default/geo_countries.html:12
+#: templates/telemeta_default/geo_countries.html:15
 msgid "Country"
 msgstr ""
 
-#: templates/telemeta_default/geo_countries.html:13
+#: templates/telemeta_default/geo_countries.html:16
 msgid "Number of collections"
 msgstr ""
 
-#: templates/telemeta_default/geo_countries.html:22
+#: templates/telemeta_default/geo_countries.html:25
 #, python-format
 msgid "1 collection"
 msgid_plural "%(counter)s collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/telemeta_default/geo_countries.html:29
+#: templates/telemeta_default/geo_countries.html:32
 #, python-format
 msgid "1 item"
 msgid_plural "%(counter)s items "
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/telemeta_default/home.html:26 web/base.py:1073
-msgid "Last changes"
+#: templates/telemeta_default/home.html:27
+#: templates/telemeta_default/profile_detail.html:12
+msgid "Playlists"
 msgstr ""
 
-#: templates/telemeta_default/home.html:30
-msgid "Date"
+#: templates/telemeta_default/home.html:37
+msgid "Delete"
 msgstr ""
 
-#: templates/telemeta_default/home.html:32
-#: templates/telemeta_default/home.html:84
+#: templates/telemeta_default/home.html:50
+#: templates/telemeta_default/inc/module_revisions.html:13
 msgid "Type"
 msgstr ""
 
 #: templates/telemeta_default/home.html:51
-#: templates/telemeta_default/home.html:104
-msgid "deleted"
-msgstr ""
-
-#: templates/telemeta_default/home.html:66
-#: templates/telemeta_default/profile_detail.html:12
-msgid "Playlists"
-msgstr ""
-
-#: templates/telemeta_default/home.html:76
-msgid "Delete"
-msgstr ""
-
-#: templates/telemeta_default/home.html:85
 #: templates/telemeta_default/mediaitem_copy.html:31
-#: templates/telemeta_default/mediaitem_edit.html:26
-#: templates/telemeta_default/inc/collection_list.html:13
+#: templates/telemeta_default/mediaitem_edit.html:27
+#: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:14
 msgid "Code"
 msgstr ""
 
-#: templates/telemeta_default/home.html:87
-#: templates/telemeta_default/search_criteria.html:92
-#: templates/telemeta_default/search_results.html:31
-#: templates/telemeta_default/inc/collection_list.html:16
+#: templates/telemeta_default/home.html:53
+#: templates/telemeta_default/search_criteria.html:94
+#: templates/telemeta_default/search_results.html:33
+#: templates/telemeta_default/inc/collection_list.html:17
 #: templates/telemeta_default/inc/mediaitem_list.html:21
 msgid "Year of recording"
 msgstr ""
 
-#: templates/telemeta_default/home.html:88
-#: templates/telemeta_default/inc/collection_list.html:17
+#: templates/telemeta_default/home.html:54
+#: templates/telemeta_default/inc/collection_list.html:18
 #: templates/telemeta_default/inc/mediaitem_list.html:22
 msgid "Sound"
 msgstr ""
 
-#: templates/telemeta_default/home.html:89
+#: templates/telemeta_default/home.html:55
 msgid "Action"
 msgstr ""
 
+#: templates/telemeta_default/home.html:70
+#: templates/telemeta_default/inc/module_revisions.html:32
+msgid "deleted"
+msgstr ""
+
 #: templates/telemeta_default/index.html:15
 msgid "Open the geographic navigator"
 msgstr ""
@@ -888,7 +893,7 @@ msgstr ""
 msgid "Musical selection"
 msgstr ""
 
-#: templates/telemeta_default/index.html:36
+#: templates/telemeta_default/index.html:38
 msgid "Partenaires"
 msgstr ""
 
@@ -906,11 +911,11 @@ msgstr ""
 msgid "User authentication"
 msgstr ""
 
-#: templates/telemeta_default/login.html:8
+#: templates/telemeta_default/login.html:11
 msgid "Your username and password didn't match. Please try again."
 msgstr ""
 
-#: templates/telemeta_default/login.html:23
+#: templates/telemeta_default/login.html:26
 msgid "Password forgotten"
 msgstr ""
 
@@ -921,55 +926,55 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:105
-#: templates/telemeta_default/paginator.html:4
+#: templates/telemeta_default/mediaitem_detail.html:103
+#: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:106
-#: templates/telemeta_default/paginator.html:22
+#: templates/telemeta_default/mediaitem_detail.html:104
+#: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:166
+#: templates/telemeta_default/mediaitem_detail.html:164
 #: templates/telemeta_default/mediaitem_player.html:128
 msgid "Analysis"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:168
+#: templates/telemeta_default/mediaitem_detail.html:166
 #: templates/telemeta_default/mediaitem_player.html:129
 msgid "Markers"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:176
+#: templates/telemeta_default/mediaitem_detail.html:174
 #: templates/telemeta_default/mediaitem_player.html:137
 msgid "Property"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:178
+#: templates/telemeta_default/mediaitem_detail.html:176
 #: templates/telemeta_default/mediaitem_player.html:139
 msgid "Unit"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:199
+#: templates/telemeta_default/mediaitem_detail.html:197
 #: templates/telemeta_default/mediaitem_player.html:160
 msgid "Download:"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/mediaitem_detail.html:218
 msgid "Recording date"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:232
+#: templates/telemeta_default/mediaitem_detail.html:230
 #: templates/telemeta_default/inc/mediaitem_list.html:17
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:244
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:282
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "General informations"
 msgstr ""
 
@@ -1034,15 +1039,15 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: templates/telemeta_default/search_criteria.html:99
-#: templates/telemeta_default/search_criteria.html:118
-#: templates/telemeta_default/search_results.html:33
-#: templates/telemeta_default/search_results.html:40
+#: templates/telemeta_default/search_criteria.html:101
+#: templates/telemeta_default/search_criteria.html:120
+#: templates/telemeta_default/search_results.html:35
+#: templates/telemeta_default/search_results.html:42
 msgid "to"
 msgstr ""
 
-#: templates/telemeta_default/search_criteria.html:111
-#: templates/telemeta_default/search_results.html:38
+#: templates/telemeta_default/search_criteria.html:113
+#: templates/telemeta_default/search_results.html:40
 msgid "Year of publication"
 msgstr ""
 
@@ -1051,16 +1056,16 @@ msgstr ""
 msgid "Search Results"
 msgstr ""
 
-#: templates/telemeta_default/search_results.html:13
+#: templates/telemeta_default/search_results.html:15
 msgid "Search pattern"
 msgstr ""
 
-#: templates/telemeta_default/inc/collection_list.html:6
+#: templates/telemeta_default/inc/collection_list.html:7
 #, python-format
 msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s"
 msgstr ""
 
-#: templates/telemeta_default/inc/collection_list.html:46
+#: templates/telemeta_default/inc/collection_list.html:47
 msgid "No collection"
 msgstr ""
 
@@ -1081,6 +1086,14 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1079
+msgid "Last changes"
+msgstr ""
+
+#: templates/telemeta_default/inc/module_revisions.html:11
+msgid "Date"
+msgstr ""
+
 #: templates/telemeta_default/registration/password_change_done.html:3
 #: templates/telemeta_default/registration/password_change_form.html:4
 msgid "Documentation"
@@ -1233,25 +1246,25 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: templatetags/telemeta_utils.py:217
+#: templatetags/telemeta_utils.py:218
 #, python-format
 msgid "%(count)d item"
 msgid_plural "%(count)d items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/telemeta_utils.py:220
+#: templatetags/telemeta_utils.py:221
 #, python-format
 msgid "%(count)d collection"
 msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1084
+#: web/base.py:1090
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1086
+#: web/base.py:1092
 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 b93ebb36104edd52e6d789f1cfd3c48fcbfef7ab..0355b2cab5809f5b126106bf135211502e6052fe 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 fbe5d2db96e6403c4f3543f81ec8ffcb7149be5e..113894716a76e10dd685a1598cdbe214dfe324a1 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-04 17:58+0200\n"
+"POT-Creation-Date: 2011-05-11 14:04+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"
@@ -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:94
+#: models/enum.py:57 models/media.py:95
 msgid "archive format"
 msgstr "format d'archivage"
 
-#: models/enum.py:64 models/media.py:98
+#: models/enum.py:64 models/media.py:99
 msgid "secondary edition"
 msgstr "réédition"
 
-#: models/enum.py:71 models/media.py:113
+#: models/enum.py:71 models/media.py:114
 msgid "mode of acquisition"
 msgstr "mode d'acquisition"
 
-#: models/enum.py:78 models/media.py:116
+#: models/enum.py:78 models/media.py:117
 msgid "record author"
 msgstr "rédacteur fiche"
 
-#: models/enum.py:85 models/media.py:118
+#: models/enum.py:85 models/media.py:119
 msgid "record writer"
 msgstr "saisie fiche"
 
-#: models/enum.py:92 models/media.py:120
+#: models/enum.py:92 models/media.py:121
 msgid "legal rights"
 msgstr "droit d'utilisation"
 
-#: models/enum.py:99 models/media.py:125
+#: models/enum.py:99 models/media.py:126
 msgid "recording context"
 msgstr "contexte d'enregistrement"
 
@@ -61,19 +61,19 @@ msgstr "contexte d'enregistrement"
 msgid "A/D conversion"
 msgstr ""
 
-#: models/enum.py:113 models/media.py:232
+#: models/enum.py:113 models/media.py:233
 msgid "vernacular style"
 msgstr "style vernaculaire"
 
-#: models/enum.py:120 models/media.py:240
+#: models/enum.py:120 models/media.py:241
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:307
+#: models/enum.py:127 models/media.py:308
 msgid "keyword"
 msgstr "mot-clé"
 
-#: models/enum.py:134 models/media.py:105
+#: models/enum.py:134 models/media.py:106
 msgid "publisher / status"
 msgstr "éditeur / statut"
 
@@ -81,7 +81,7 @@ msgstr "éditeur / statut"
 msgid "publisher"
 msgstr "éditeur"
 
-#: models/enum.py:152 models/enum.py:156 models/media.py:228
+#: models/enum.py:152 models/enum.py:156 models/media.py:229
 msgid "population / social group"
 msgstr "population / groupe social"
 
@@ -131,7 +131,7 @@ msgid "authoritative"
 msgstr "officiel"
 
 #: models/location.py:111 models/location.py:155 models/location.py:168
-#: models/media.py:225
+#: models/media.py:226
 msgid "location"
 msgstr "lieu"
 
@@ -143,272 +143,272 @@ msgstr "identifiant"
 msgid "ancestor location"
 msgstr "lieu ancêtre"
 
-#: models/media.py:54
+#: models/media.py:55
 msgid "Metadata only"
 msgstr "Métadonnées uniquement"
 
-#: models/media.py:56
+#: models/media.py:57
 msgid "Sound and metadata"
 msgstr "Son et métadonnées"
 
-#: models/media.py:58
+#: models/media.py:59
 msgid "Private data"
 msgstr "Données privées"
 
-#: models/media.py:59 models/media.py:135 models/media.py:246
+#: models/media.py:60 models/media.py:136 models/media.py:247
 msgid "public access"
 msgstr "accès public"
 
-#: models/media.py:88 models/media.py:221
+#: models/media.py:89 models/media.py:222
 msgid "code"
 msgstr "cote"
 
-#: models/media.py:89 models/media.py:220
+#: models/media.py:90 models/media.py:221
 msgid "old code"
 msgstr "ancienne cote"
 
-#: models/media.py:90 models/media.py:242
+#: models/media.py:91 models/media.py:243
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:91 models/media.py:218 models/media.py:331
-#: models/media.py:346 models/media.py:380
+#: models/media.py:92 models/media.py:219 models/media.py:336
+#: models/media.py:351 models/media.py:385
 msgid "title"
 msgstr "titre"
 
-#: models/media.py:92 models/media.py:229
+#: models/media.py:93 models/media.py:230
 msgid "original title / translation"
 msgstr "titre original / traduction"
 
-#: models/media.py:96
+#: models/media.py:97
 msgid "number of components (medium / piece)"
 msgstr "nb de composants (support / pièce)"
 
-#: models/media.py:99
+#: models/media.py:100
 msgid "depositor / contributor"
 msgstr "déposant / contributeur"
 
-#: models/media.py:100
+#: models/media.py:101
 msgid "author of published notice"
 msgstr "auteur de la notice éditée"
 
-#: models/media.py:101
+#: models/media.py:102
 msgid "related documentation"
 msgstr "documentation associée"
 
-#: models/media.py:102 models/media.py:236
+#: models/media.py:103 models/media.py:237
 msgid "recordist"
 msgstr "collecteur"
 
-#: models/media.py:103
+#: models/media.py:104
 msgid "recordist identical to depositor"
 msgstr "collecteur identique au déposant"
 
-#: models/media.py:106
+#: models/media.py:107
 msgid "published"
 msgstr "édité"
 
-#: models/media.py:107
+#: models/media.py:108
 msgid "year published"
 msgstr "année de parution"
 
-#: models/media.py:109
+#: models/media.py:110
 msgid "publisher collection"
 msgstr "collection éditeur"
 
-#: models/media.py:110
+#: models/media.py:111
 msgid "publisher serial number"
 msgstr "numéro dans la série"
 
-#: models/media.py:111
+#: models/media.py:112
 msgid "bibliographic references"
 msgstr "références bibliographiques"
 
-#: models/media.py:114
+#: models/media.py:115
 msgid "comment"
 msgstr "commentaire"
 
-#: models/media.py:121
+#: models/media.py:122
 msgid "copies"
 msgstr "autres exemplaires"
 
-#: models/media.py:122
+#: models/media.py:123
 msgid "recording year (from)"
 msgstr "année d'enregistrement (depuis)"
 
-#: models/media.py:123
+#: models/media.py:124
 msgid "recording year (until)"
 msgstr "année d'enregistrement (jusqu'à)"
 
-#: models/media.py:126 models/media.py:222
+#: models/media.py:127 models/media.py:223
 msgid "approximative duration"
 msgstr "durée approximative"
 
-#: models/media.py:127
+#: models/media.py:128
 msgid "document type"
 msgstr "type de document"
 
-#: models/media.py:128
+#: models/media.py:129
 msgid "archiver notes"
 msgstr "notes de l'archiviste"
 
-#: models/media.py:129
+#: models/media.py:130
 msgid "status"
 msgstr "etat"
 
-#: models/media.py:130
+#: models/media.py:131
 msgid "CNRS depositor"
 msgstr "déposant CNRS"
 
-#: models/media.py:131
+#: models/media.py:132
 msgid "items finished"
 msgstr "fiches items faîtes"
 
-#: models/media.py:132
+#: models/media.py:133
 msgid "a_informer_07_03"
 msgstr "a_informer_07_03"
 
-#: models/media.py:134
+#: models/media.py:135
 msgid "digitization"
 msgstr "numérisation"
 
-#: models/media.py:172
+#: models/media.py:173
 msgid "states / nations"
 msgstr "états / nations"
 
-#: models/media.py:186
+#: models/media.py:187
 msgid "populations / social groups"
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:194 models/media.py:287
+#: models/media.py:195 models/media.py:288
 msgid "computed duration"
 msgstr "durée calculée"
 
-#: models/media.py:217
+#: models/media.py:218
 msgid "collection"
 msgstr "collection"
 
-#: models/media.py:219
+#: models/media.py:220
 msgid "item number"
 msgstr "n° de l'item"
 
-#: models/media.py:223
+#: models/media.py:224
 msgid "recording date (from)"
 msgstr "date d'enregistrement (depuis)"
 
-#: models/media.py:224
+#: models/media.py:225
 msgid "recording date (until)"
 msgstr "date d'enregistrement (jusqu'à)"
 
-#: models/media.py:226
+#: models/media.py:227
 msgid "location details"
 msgstr "précisions lieu"
 
-#: models/media.py:230
+#: models/media.py:231
 msgid "author / compositor"
 msgstr "auteur / compositeur"
 
-#: models/media.py:233
+#: models/media.py:234
 msgid "published reference"
 msgstr "référence éditée"
 
-#: models/media.py:234
+#: models/media.py:235
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:235
+#: models/media.py:236
 msgid "copy of"
 msgstr "copie de"
 
-#: models/media.py:237
+#: models/media.py:238
 msgid "recordist as in collection"
 msgstr "collecteur identique à la collection"
 
-#: models/media.py:238
+#: models/media.py:239
 msgid "cultural area"
 msgstr "aire culturelle"
 
-#: models/media.py:241
+#: models/media.py:242
 msgid "recordist selection"
 msgstr "sélection collecteur"
 
-#: models/media.py:243
+#: models/media.py:244
 msgid "comments"
 msgstr "commentaires"
 
-#: models/media.py:244
+#: models/media.py:245
 msgid "remarks"
 msgstr "remarques"
 
-#: models/media.py:245
+#: models/media.py:246
 msgid "file"
 msgstr "fichier"
 
-#: models/media.py:252 models/media.py:397
+#: models/media.py:253 models/media.py:405
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:306 models/media.py:316 models/media.py:330
-#: models/media.py:377
+#: models/media.py:307 models/media.py:317 models/media.py:335
+#: models/media.py:382
 msgid "item"
 msgstr "item"
 
-#: models/media.py:318
+#: models/media.py:319
 msgid "composition"
 msgstr "formation"
 
-#: models/media.py:320
+#: models/media.py:321
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:321
+#: models/media.py:322
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:322
+#: models/media.py:323
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:332
+#: models/media.py:337
 msgid "start"
 msgstr "début"
 
-#: models/media.py:333
+#: models/media.py:338
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:344 models/media.py:363 models/media.py:378
+#: models/media.py:349 models/media.py:368 models/media.py:383
 #, fuzzy
 msgid "public_id"
 msgstr "édité"
 
-#: models/media.py:347 models/media.py:382
+#: models/media.py:352 models/media.py:387
 msgid "description"
 msgstr ""
 
-#: models/media.py:364
+#: models/media.py:369
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:365
+#: models/media.py:370
 #, fuzzy
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:366
+#: models/media.py:371
 #, fuzzy
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:379 models/system.py:52
+#: models/media.py:384 models/system.py:52
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:381 models/media.py:398
+#: models/media.py:386 models/media.py:406
 msgid "date"
 msgstr ""
 
-#: models/media.py:383
+#: models/media.py:388
 #, fuzzy
 msgid "author"
 msgstr "rédacteur fiche"
@@ -450,8 +450,9 @@ msgstr "Téléphone"
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
+#: templates/admin/base.html:21
 #: templates/telemeta/registration/logged_out.html:4
-#: templates/telemeta_default/base.html:74
+#: templates/telemeta_default/base.html:75
 #: templates/telemeta_default/registration/logged_out.html:4
 #: templates/telemeta_default/registration/password_change_done.html:4
 #: templates/telemeta_default/registration/password_change_form.html:5
@@ -462,6 +463,14 @@ msgstr "Date d'expiration"
 msgid "Home"
 msgstr ""
 
+#: templates/admin/base_site.html:4
+msgid "Telemta site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Telemeta administration"
+msgstr "Administration Telemeta"
+
 #: templates/telemeta/registration/logged_out.html:8
 #: templates/telemeta_default/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
@@ -473,58 +482,53 @@ msgid "Log in again"
 msgstr ""
 
 #: templates/telemeta_default/admin.html:11
-#, fuzzy
 msgid "Administration"
-msgstr "Administration générale"
+msgstr "Administration"
 
-#: templates/telemeta_default/admin.html:15
+#: templates/telemeta_default/admin.html:19
 msgid "General administration"
 msgstr "Administration générale"
 
-#: templates/telemeta_default/admin.html:16
+#: templates/telemeta_default/admin.html:20
 #: templates/telemeta_default/admin_instruments.html:6
 #: templates/telemeta_default/admin_users.html:6
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/telemeta_default/admin.html:17
+#: templates/telemeta_default/admin.html:21
 #: templates/telemeta_default/admin_enumerations.html:6
 msgid "Enumerations"
 msgstr "Énumérations"
 
-#: templates/telemeta_default/admin.html:18
+#: templates/telemeta_default/admin.html:22
 #: templates/telemeta_default/instrument_edit.html:4
 #: templates/telemeta_default/instrument_edit.html:7
 #: templates/telemeta_default/instrument_edit_value.html:4
 #: templates/telemeta_default/instrument_edit_value.html:7
-#, fuzzy
 msgid "Instruments"
-msgstr "instruments"
+msgstr "Instruments"
 
 #: templates/telemeta_default/admin_enumerations.html:12
-#: templates/telemeta_default/home.html:31
-#: templates/telemeta_default/home.html:83
-#: templates/telemeta_default/search_criteria.html:76
-#: templates/telemeta_default/search_results.html:28
-#: templates/telemeta_default/inc/collection_list.html:12
+#: templates/telemeta_default/home.html:49
+#: templates/telemeta_default/search_criteria.html:78
+#: templates/telemeta_default/search_results.html:30
+#: templates/telemeta_default/inc/collection_list.html:13
 #: templates/telemeta_default/inc/mediaitem_list.html:13
+#: templates/telemeta_default/inc/module_revisions.html:12
 msgid "Title"
 msgstr "Titre"
 
 #: templates/telemeta_default/admin_enumerations.html:22
-#, fuzzy
 msgid "No enumerations"
 msgstr "Pas d'énumérations"
 
 #: templates/telemeta_default/admin_instruments.html:15
 #: templates/telemeta_default/admin_users.html:30
-#, fuzzy
 msgid "No users"
 msgstr "Pas d'utilisateurs"
 
 #: templates/telemeta_default/admin_users.html:12
-#: templates/telemeta_default/home.html:33
-#, fuzzy
+#: templates/telemeta_default/inc/module_revisions.html:14
 msgid "User"
 msgstr "Utilisateur"
 
@@ -539,80 +543,81 @@ msgid "Last Name"
 msgstr "Nom"
 
 #: templates/telemeta_default/admin_users.html:15
-#, fuzzy
 msgid "E-mail"
-msgstr "E-mail"
+msgstr "Courriel"
 
-#: templates/telemeta_default/base.html:46
+#: templates/telemeta_default/base.html:47
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: templates/telemeta_default/base.html:52
+#: templates/telemeta_default/base.html:53
 msgid "Account"
 msgstr "Compte"
 
-#: templates/telemeta_default/base.html:53
-#: templates/telemeta_default/base.html:57
+#: templates/telemeta_default/base.html:54
+#: templates/telemeta_default/base.html:58
 msgid "Help"
 msgstr "Aide"
 
-#: templates/telemeta_default/base.html:54
+#: templates/telemeta_default/base.html:55
 msgid "Sign out"
 msgstr "Déconnexion"
 
-#: templates/telemeta_default/base.html:58
-#: templates/telemeta_default/login.html:21
+#: templates/telemeta_default/base.html:59
+#: templates/telemeta_default/login.html:24
 msgid "Sign in"
 msgstr "Connexion"
 
-#: templates/telemeta_default/base.html:66
-#: templates/telemeta_default/search_criteria.html:132
+#: templates/telemeta_default/base.html:67
+#: templates/telemeta_default/search_criteria.html:134
 msgid "Search"
 msgstr "Recherche"
 
-#: templates/telemeta_default/base.html:75
+#: templates/telemeta_default/base.html:76
 msgid "Collections"
 msgstr "Collections"
 
-#: templates/telemeta_default/base.html:76
+#: templates/telemeta_default/base.html:77
 msgid "Items"
 msgstr "Items"
 
-#: templates/telemeta_default/base.html:77
+#: templates/telemeta_default/base.html:78
 #: templates/telemeta_default/index.html:13
 msgid "Geo Navigator"
 msgstr "Géo-Navigateur"
 
-#: templates/telemeta_default/base.html:78
+#: templates/telemeta_default/base.html:79
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: templates/telemeta_default/base.html:80
+#: templates/telemeta_default/base.html:81
 msgid "Admin"
 msgstr "Admin"
 
-#: templates/telemeta_default/base.html:105
+#: templates/telemeta_default/base.html:106
 msgid "Powered by"
 msgstr "Propulsé par"
 
-#: templates/telemeta_default/base.html:106
+#: templates/telemeta_default/base.html:107
 msgid "By"
 msgstr "Par"
 
-#: templates/telemeta_default/base.html:111
+#: templates/telemeta_default/base.html:112
 msgid ""
 "Usage of the archives in the respect of cultural heritage of the original "
 "communities."
-msgstr "Usage des archives réservé dans le respect du patrimoine culturel des communautés d'origine."
+msgstr ""
+"Usage des archives réservé dans le respect du patrimoine culturel des "
+"communautés d'origine."
 
-#: templates/telemeta_default/base.html:117
+#: templates/telemeta_default/base.html:118
 #: templates/telemeta_default/collection_detail.html:111
 #: templates/telemeta_default/collection_detail_new.html:116
 msgid "Legal notices"
 msgstr "Mentions légales"
 
-#: templates/telemeta_default/collection_add.html:7
-#: templates/telemeta_default/collection_add.html:26
+#: templates/telemeta_default/collection_add.html:10
+#: templates/telemeta_default/collection_add.html:28
 #: templates/telemeta_default/collection_edit.html:9
 #: templates/telemeta_default/collection_edit.html:27
 #: templates/telemeta_default/enumeration_edit_value.html:22
@@ -621,20 +626,23 @@ msgstr "Mentions légales"
 #: templates/telemeta_default/mediaitem_add.html:36
 #: templates/telemeta_default/mediaitem_copy.html:15
 #: templates/telemeta_default/mediaitem_copy.html:40
-#: templates/telemeta_default/mediaitem_edit.html:9
-#: templates/telemeta_default/mediaitem_edit.html:38
+#: templates/telemeta_default/mediaitem_edit.html:10
+#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_performances_edit.html:12
+#: templates/telemeta_default/mediaitem_performances_edit.html:43
 #: templates/telemeta_default/profile_edit.html:5
 #: templates/telemeta_default/profile_edit.html:29
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/telemeta_default/collection_add.html:28
+#: 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/mediaitem_add.html:38
 #: templates/telemeta_default/mediaitem_copy.html:42
-#: templates/telemeta_default/mediaitem_edit.html:40
+#: templates/telemeta_default/mediaitem_edit.html:42
+#: templates/telemeta_default/mediaitem_performances_edit.html:45
 #: templates/telemeta_default/profile_edit.html:31
 msgid "Save"
 msgstr "Enregistrer"
@@ -647,20 +655,21 @@ msgstr "Collection"
 
 #: templates/telemeta_default/collection_detail.html:43
 #: templates/telemeta_default/collection_detail_new.html:43
-#: templates/telemeta_default/mediaitem_detail.html:99
+#: templates/telemeta_default/mediaitem_detail.html:97
+#: templates/telemeta_default/mediaitem_detail.html:278
 #: templates/telemeta_default/profile_detail.html:60
 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:100
+#: templates/telemeta_default/mediaitem_detail.html:98
 msgid "Copy"
 msgstr "Copier"
 
 #: templates/telemeta_default/collection_detail.html:47
 #: templates/telemeta_default/collection_detail_new.html:47
-#: templates/telemeta_default/mediaitem_detail.html:103
+#: templates/telemeta_default/mediaitem_detail.html:101
 msgid "Add to playlist"
 msgstr "Ajouter à la liste"
 
@@ -675,45 +684,45 @@ msgstr "Année d'enregistrement"
 
 #: templates/telemeta_default/collection_detail.html:98
 #: templates/telemeta_default/collection_detail_new.html:103
-#: templates/telemeta_default/mediaitem_detail.html:230
+#: templates/telemeta_default/mediaitem_detail.html:228
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
 #: templates/telemeta_default/collection_detail.html:116
 #: templates/telemeta_default/collection_detail_new.html:121
-#: templates/telemeta_default/home.html:86
-#: templates/telemeta_default/inc/collection_list.html:15
+#: templates/telemeta_default/home.html:52
+#: templates/telemeta_default/inc/collection_list.html:16
 #: templates/telemeta_default/inc/mediaitem_list.html:15
 msgid "Recordist"
 msgstr "Collecteur"
 
 #: templates/telemeta_default/collection_detail.html:137
 #: templates/telemeta_default/collection_detail_new.html:142
-#: templates/telemeta_default/mediaitem_detail.html:293
+#: templates/telemeta_default/mediaitem_detail.html:294
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
 #: templates/telemeta_default/collection_detail.html:160
 #: templates/telemeta_default/collection_detail_new.html:165
-#: templates/telemeta_default/mediaitem_detail.html:308
+#: templates/telemeta_default/mediaitem_detail.html:309
 msgid "Technical data"
 msgstr "Données techniques"
 
 #: templates/telemeta_default/collection_detail.html:165
 #: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:311
+#: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Media type"
 msgstr "Type de media"
 
 #: templates/telemeta_default/collection_detail.html:165
 #: templates/telemeta_default/collection_detail_new.html:170
-#: templates/telemeta_default/mediaitem_detail.html:311
+#: templates/telemeta_default/mediaitem_detail.html:312
 msgid "Audio"
 msgstr "Audio"
 
 #: templates/telemeta_default/collection_detail.html:170
 #: templates/telemeta_default/collection_detail_new.html:175
-#: templates/telemeta_default/geo_countries.html:14
+#: templates/telemeta_default/geo_countries.html:17
 msgid "Number of items"
 msgstr "Nombre d'items"
 
@@ -745,7 +754,7 @@ msgstr "Éditées"
 
 #: templates/telemeta_default/collection_list.html:15
 #: templates/telemeta_default/enumeration_edit.html:20
-#: templates/telemeta_default/home.html:68
+#: templates/telemeta_default/home.html:29
 #: templates/telemeta_default/instrument_edit.html:20
 #: templates/telemeta_default/mediaitem_list.html:12
 msgid "Add"
@@ -774,7 +783,7 @@ 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:177
+#: templates/telemeta_default/mediaitem_detail.html:175
 #: templates/telemeta_default/mediaitem_player.html:138
 msgid "Value"
 msgstr "Valeur"
@@ -801,11 +810,11 @@ msgstr "Modification d'une entrée"
 msgid "Geographic Navigator"
 msgstr "Navigateur géographique"
 
-#: templates/telemeta_default/geo_continents.html:24
+#: templates/telemeta_default/geo_continents.html:25
 msgid "Map"
 msgstr "Carte"
 
-#: templates/telemeta_default/geo_continents.html:25
+#: templates/telemeta_default/geo_continents.html:26
 msgid "List"
 msgstr "Liste"
 
@@ -815,82 +824,72 @@ msgstr "Liste"
 msgid "World"
 msgstr "Monde"
 
-#: templates/telemeta_default/geo_countries.html:12
+#: templates/telemeta_default/geo_countries.html:15
 msgid "Country"
 msgstr "Etat/nation"
 
-#: templates/telemeta_default/geo_countries.html:13
+#: templates/telemeta_default/geo_countries.html:16
 msgid "Number of collections"
 msgstr "Nombre de collections"
 
-#: templates/telemeta_default/geo_countries.html:22
+#: templates/telemeta_default/geo_countries.html:25
 #, python-format
 msgid "1 collection"
 msgid_plural "%(counter)s collections"
 msgstr[0] "1 collection"
 msgstr[1] "%(counter)s collections"
 
-#: templates/telemeta_default/geo_countries.html:29
+#: templates/telemeta_default/geo_countries.html:32
 #, python-format
 msgid "1 item"
 msgid_plural "%(counter)s items "
 msgstr[0] "1 item"
 msgstr[1] "%(counter)s items "
 
-#: templates/telemeta_default/home.html:26 web/base.py:1073
-msgid "Last changes"
-msgstr "Dernières modifications"
-
-#: templates/telemeta_default/home.html:30
-msgid "Date"
-msgstr ""
-
-#: templates/telemeta_default/home.html:32
-#: templates/telemeta_default/home.html:84
-msgid "Type"
-msgstr ""
-
-#: templates/telemeta_default/home.html:51
-#: templates/telemeta_default/home.html:104
-msgid "deleted"
-msgstr "supprimé"
-
-#: templates/telemeta_default/home.html:66
+#: templates/telemeta_default/home.html:27
 #: templates/telemeta_default/profile_detail.html:12
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#: templates/telemeta_default/home.html:76
-#, fuzzy
+#: templates/telemeta_default/home.html:37
 msgid "Delete"
-msgstr "Supprimé"
+msgstr "Supprimer"
+
+#: templates/telemeta_default/home.html:50
+#: templates/telemeta_default/inc/module_revisions.html:13
+msgid "Type"
+msgstr ""
 
-#: templates/telemeta_default/home.html:85
+#: templates/telemeta_default/home.html:51
 #: templates/telemeta_default/mediaitem_copy.html:31
-#: templates/telemeta_default/mediaitem_edit.html:26
-#: templates/telemeta_default/inc/collection_list.html:13
+#: templates/telemeta_default/mediaitem_edit.html:27
+#: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:14
 msgid "Code"
 msgstr "Cote"
 
-#: templates/telemeta_default/home.html:87
-#: templates/telemeta_default/search_criteria.html:92
-#: templates/telemeta_default/search_results.html:31
-#: templates/telemeta_default/inc/collection_list.html:16
+#: templates/telemeta_default/home.html:53
+#: templates/telemeta_default/search_criteria.html:94
+#: templates/telemeta_default/search_results.html:33
+#: templates/telemeta_default/inc/collection_list.html:17
 #: templates/telemeta_default/inc/mediaitem_list.html:21
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/home.html:88
-#: templates/telemeta_default/inc/collection_list.html:17
+#: templates/telemeta_default/home.html:54
+#: templates/telemeta_default/inc/collection_list.html:18
 #: templates/telemeta_default/inc/mediaitem_list.html:22
 msgid "Sound"
 msgstr "Son"
 
-#: templates/telemeta_default/home.html:89
-#, fuzzy
+#: templates/telemeta_default/home.html:55
 msgid "Action"
-msgstr "Fonction"
+msgstr "Action"
+
+#: templates/telemeta_default/home.html:70
+#: templates/telemeta_default/inc/module_revisions.html:32
+msgid "deleted"
+msgstr "supprimé"
 
 #: templates/telemeta_default/index.html:15
 msgid "Open the geographic navigator"
@@ -900,19 +899,17 @@ msgstr "Accéder au navigateur géographique"
 msgid "Musical selection"
 msgstr "Sélection musicale"
 
-#: templates/telemeta_default/index.html:36
+#: 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
-#, fuzzy
 msgid "Name"
 msgstr "Nom"
 
 #: templates/telemeta_default/instrument_edit.html:46
-#, fuzzy
 msgid "This instrument list is empty"
 msgstr "Cette énumération est vide"
 
@@ -920,12 +917,12 @@ msgstr "Cette énumération est vide"
 msgid "User authentication"
 msgstr "Identification"
 
-#: templates/telemeta_default/login.html:8
+#: templates/telemeta_default/login.html:11
 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:23
+#: templates/telemeta_default/login.html:26
 msgid "Password forgotten"
 msgstr "Mot de passe oublié"
 
@@ -936,55 +933,55 @@ msgstr "Mot de passe oublié"
 msgid "Item"
 msgstr "Item"
 
-#: templates/telemeta_default/mediaitem_detail.html:105
-#: templates/telemeta_default/paginator.html:4
+#: templates/telemeta_default/mediaitem_detail.html:103
+#: templates/telemeta_default/paginator.html:5
 msgid "Previous"
 msgstr "Précédent"
 
-#: templates/telemeta_default/mediaitem_detail.html:106
-#: templates/telemeta_default/paginator.html:22
+#: templates/telemeta_default/mediaitem_detail.html:104
+#: templates/telemeta_default/paginator.html:23
 msgid "Next"
 msgstr "Suivant"
 
-#: templates/telemeta_default/mediaitem_detail.html:166
+#: templates/telemeta_default/mediaitem_detail.html:164
 #: templates/telemeta_default/mediaitem_player.html:128
 msgid "Analysis"
 msgstr "Analyse"
 
-#: templates/telemeta_default/mediaitem_detail.html:168
+#: templates/telemeta_default/mediaitem_detail.html:166
 #: templates/telemeta_default/mediaitem_player.html:129
 msgid "Markers"
 msgstr "Marqueurs"
 
-#: templates/telemeta_default/mediaitem_detail.html:176
+#: templates/telemeta_default/mediaitem_detail.html:174
 #: templates/telemeta_default/mediaitem_player.html:137
 msgid "Property"
 msgstr "Propriété"
 
-#: templates/telemeta_default/mediaitem_detail.html:178
+#: templates/telemeta_default/mediaitem_detail.html:176
 #: templates/telemeta_default/mediaitem_player.html:139
 msgid "Unit"
 msgstr "Unité"
 
-#: templates/telemeta_default/mediaitem_detail.html:199
+#: templates/telemeta_default/mediaitem_detail.html:197
 #: templates/telemeta_default/mediaitem_player.html:160
 msgid "Download:"
 msgstr "Téléchargement:"
 
-#: templates/telemeta_default/mediaitem_detail.html:220
+#: templates/telemeta_default/mediaitem_detail.html:218
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:232
+#: templates/telemeta_default/mediaitem_detail.html:230
 #: templates/telemeta_default/inc/mediaitem_list.html:17
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:244
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:282
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "General informations"
 msgstr "Informations générales"
 
@@ -998,7 +995,6 @@ msgid "Media Items"
 msgstr "Items"
 
 #: templates/telemeta_default/profile_detail.html:5
-#, fuzzy
 msgid "User Profile"
 msgstr "Profil utilisateur"
 
@@ -1008,9 +1004,8 @@ msgid "User profile"
 msgstr "Profil utilisateur"
 
 #: templates/telemeta_default/profile_detail.html:31
-#, fuzzy
 msgid "Email"
-msgstr "e-mail"
+msgstr "Courriel"
 
 #: templates/telemeta_default/profile_detail.html:37
 msgid "Expiration date"
@@ -1051,15 +1046,15 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: templates/telemeta_default/search_criteria.html:99
-#: templates/telemeta_default/search_criteria.html:118
-#: templates/telemeta_default/search_results.html:33
-#: templates/telemeta_default/search_results.html:40
+#: templates/telemeta_default/search_criteria.html:101
+#: templates/telemeta_default/search_criteria.html:120
+#: templates/telemeta_default/search_results.html:35
+#: templates/telemeta_default/search_results.html:42
 msgid "to"
 msgstr "à"
 
-#: templates/telemeta_default/search_criteria.html:111
-#: templates/telemeta_default/search_results.html:38
+#: templates/telemeta_default/search_criteria.html:113
+#: templates/telemeta_default/search_results.html:40
 msgid "Year of publication"
 msgstr "Année de publication"
 
@@ -1068,16 +1063,16 @@ msgstr "Année de publication"
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
-#: templates/telemeta_default/search_results.html:13
+#: templates/telemeta_default/search_results.html:15
 msgid "Search pattern"
 msgstr "Recherche"
 
-#: templates/telemeta_default/inc/collection_list.html:6
+#: templates/telemeta_default/inc/collection_list.html:7
 #, python-format
 msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s"
 msgstr "Collections %(first_on_page)s à %(last_on_page)s sur %(hits)s"
 
-#: templates/telemeta_default/inc/collection_list.html:46
+#: templates/telemeta_default/inc/collection_list.html:47
 msgid "No collection"
 msgstr "Aucune collection"
 
@@ -1098,6 +1093,14 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1079
+msgid "Last changes"
+msgstr "Dernières modifications"
+
+#: templates/telemeta_default/inc/module_revisions.html:11
+msgid "Date"
+msgstr ""
+
 #: templates/telemeta_default/registration/password_change_done.html:3
 #: templates/telemeta_default/registration/password_change_form.html:4
 #, fuzzy
@@ -1256,25 +1259,25 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: templatetags/telemeta_utils.py:217
+#: templatetags/telemeta_utils.py:218
 #, python-format
 msgid "%(count)d item"
 msgid_plural "%(count)d items"
 msgstr[0] "%(count)d item"
 msgstr[1] "%(count)d items"
 
-#: templatetags/telemeta_utils.py:220
+#: templatetags/telemeta_utils.py:221
 #, python-format
 msgid "%(count)d collection"
 msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1084
+#: web/base.py:1090
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1086
+#: web/base.py:1092
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 266985c10ccdd0d315fe1063ac177844a19db554..ef070462ac583b74507fff348d691c0c99757daa 100644 (file)
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -189,7 +189,7 @@ class DurationField(models.Field):
         return data
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.TimeField}
+        defaults = {'form_class': forms.CharField}
         defaults.update(kwargs)
         return super(DurationField, self).formfield(**defaults)
            

diff --git a/telemeta/pages/fr/help.rst b/telemeta/pages/fr/help.rst
index 9a6d3767d46532f11ccab22109c52391060457b9..f06ce286278b166ee95357e89ebef1de61c68816 100644 (file)
--- a/telemeta/pages/fr/help.rst
+++ b/telemeta/pages/fr/help.rst
@@ -10,6 +10,9 @@ Page d'aide de Telemeta
 Introduction
 ==============
 
+Telemeta est un système de gestion d'archives sonores. Cette plateforme a été conçue par le CREM et Parisson pour satisfaire les besoins de valorisation des archives audio des laboratoires de recherche mais aussi pour permettre aux chercheurs et aux documentalistes de collaborer autour d'un outil commun en réseau.
+
+
 
 
 Prise en main
@@ -31,8 +34,7 @@ ezfezffef
 Déconnexion
 ------------
 
-zefezzfe
-zefzeffe
+
 
 
 Modèles

diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html
index b4f4d1442c456b85e41e0b305a5efa0ad9551d66..ff77b62971691e922b3803c5823cb41ed51b32ff 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_add.html
+++ b/telemeta/templates/telemeta_default/collection_add.html
@@ -13,8 +13,8 @@
 {% block infos %}
         <div class="infos">
         <form method="POST" id ="_addCollectionForm" action="">{% csrf_token %}
-        <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
         <table>
+        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
         {% for field in form %}
             {% if not field.html_name == "copied_from_item" %}
             <tr>

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index 654e06f99a09be308c615f56b4eb8111b6b0fe9e..fa5fd4058f9a2634e33de1eae7dd00a7f3ac2bc2 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -12,8 +12,8 @@
 {% block infos %}
      <div class="infos">
       <form method="POST" id="_editCollectionForm" action="">{% csrf_token %}
-      <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
        <table>
+       <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
        {% for field in form %}
         {% if not field.html_name == "copied_from_item" %}
         <tr>

diff --git a/tools/scripts/telemeta-crem-import.py b/tools/scripts/telemeta-crem-import.py
index 1bdc44302a39a6047e5a10dc9fa310f620e291b0..9ec85d0c5e78dee6863f35d4697a5d46e366a5f9 100755 (executable)
--- a/tools/scripts/telemeta-crem-import.py
+++ b/tools/scripts/telemeta-crem-import.py
@@ -45,48 +45,54 @@ class TelemetaWavImport:
         self.buffer_size = 0x1000
 
     def wav_import(self):
-        from telemeta.models import media
+        from telemeta.models import MediaItem
         for collection in self.collections:
-            self.collection_name = collection.split(os.sep)[-1]
-            msg = '************************ ' + collection + ' ******************************'
-            self.logger.write_info(collection, msg[:70])
+            collection_dir = self.source_dir + os.sep + collection
+            if not '/.' in collection_dir:
+                self.collection_name = collection.split(os.sep)[-1]
+                msg = '************************ ' + collection + ' ******************************'
+                self.logger.write_info(collection, msg[:70])
 
-            collection_files = os.listdir(self.source_dir + os.sep + collection)
-            if not collection + '.csv' in collection_files:
-                msg = 'Le fichier CSV est mal nommé ou inexistant'
-                self.logger.write_error(collection, msg)
-            else:
-                c = csv.reader(open(self.source_dir + os.sep + collection + os.sep + collection + '.csv'), delimiter=';')
-                for row in c:
-                    old_ref = row[0]
-                    new_ref = row[1]
-                    print old_ref + ' : ' + new_ref
-                    filename = new_ref + '.wav'
-                    wav_file = self.source_dir + os.sep + collection + os.sep + filename
-                    items = media.MediaItem.objects.filter(old_code=old_ref)
-                    if len(items) != 0:
-                        item = items[0]
-                        print item.old_code + ' : id = ' + str(item.id) + " : title = " + item.title
-                        f = open(wav_file, 'r')
-                        file_content = ContentFile(f.read())
-                        item.file.save(filename, file_content)
-                        f.close()
-                        item.code = new_ref
-                        item.save()
-                    else:
-                        msg = old_ref + ' : item inexistant dans la base de données !'
-                        print msg
-                        self.logger.write_error(collection, msg)
+                collection_files = os.listdir(collection_dir)
+                if not collection + '.csv' in collection_files:
+                    msg = 'Le fichier CSV est mal nommé ou inexistant'
+                    self.logger.write_error(collection, msg)
+                else:
+                    c = csv.reader(open(self.source_dir + os.sep + collection + os.sep + collection + '.csv'), delimiter=';')
+                    for row in c:
+                        old_ref = row[0]
+                        new_ref = row[1]
+                        print old_ref + ' : ' + new_ref
+                        filename = new_ref + '.wav'
+                        wav_file = self.source_dir + os.sep + collection + os.sep + filename
+                        items = MediaItem.objects.filter(old_code=old_ref)
+                        if len(items) != 0:
+                            item = items[0]
+                            print item.old_code + ' : id = ' + str(item.id) + " : title = " + item.title
+                            if os.path.exists(wav_file):
+                                f = open(wav_file, 'r')
+                                file_content = ContentFile(f.read())
+                                item.file.save(filename, file_content)
+                                f.close()
+                                item.code = new_ref
+                                item.save()
+                            else:
+                                msg = old_ref + ' : fichier audio ' + wav_file + ' inexistant !'
+                                print msg
+                                self.logger.write_error(collection, msg)
+                        else:
+                            msg = old_ref + ' : item inexistant dans la base de données !'
+                            print msg
+                            self.logger.write_error(collection, msg)
 
 
 def print_usage(tool_name):
     print "Usage: "+tool_name+" <project_dir> <source_dir> <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 "  log_file: the log file of the import"
 
 def run():
-    if len(sys.argv) < 4:
+    if len(sys.argv) < 3:
         print_usage(os.path.basename(sys.argv[0]))
         sys.exit(1)
     else: