separate all views, fix urls, fix js trans

diff --git a/de/LC_MESSAGES/django.mo b/de/LC_MESSAGES/django.mo
index 636955b68a8f4a80f8a4d085385ef0ce380cdc8e..e3f75cd76f4e68b395f8b10af959ab81992f5ea3 100644 (file)
Binary files a/de/LC_MESSAGES/django.mo and b/de/LC_MESSAGES/django.mo differ

diff --git a/de/LC_MESSAGES/django.po b/de/LC_MESSAGES/django.po
index 0fabf95224efe54a391f5da9b6fee8596d9b222a..cd9879c0ced655d7e7f3f297f88d3de3a7b75f01 100644 (file)
--- a/de/LC_MESSAGES/django.po
+++ b/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-06-22 12:37+0200\n"
+"POT-Creation-Date: 2011-06-22 14:44+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"
@@ -687,7 +687,7 @@ msgid "Save"
 msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:5
-#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:137
+#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:324
 msgid "Collection"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 
 #: templates/telemeta_default/mediaitem_add.html:5
 #: templates/telemeta_default/mediaitem_copy.html:5
-#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:245
+#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:453
 msgid "Item"
 msgstr ""
 
@@ -1055,7 +1055,7 @@ msgstr ""
 msgid "User Profile"
 msgstr ""
 
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1129
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1154
 msgid "User profile"
 msgstr ""
 
@@ -1151,8 +1151,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1098
-#: web/base.py:1209
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1185
 msgid "Last changes"
 msgstr ""
 
@@ -1326,11 +1325,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:136 web/base.py:244 web/base.py:496 web/base.py:1128
+#: web/base.py:323 web/base.py:452 web/base.py:683 web/base.py:1153
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:138 web/base.py:246 web/base.py:498 web/base.py:1130
+#: web/base.py:325 web/base.py:454 web/base.py:685 web/base.py:1155
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""

diff --git a/de/LC_MESSAGES/djangojs.mo b/de/LC_MESSAGES/djangojs.mo
index 3bdb7f26f1e14bbfea9f466b6152b2ff3f82e3dc..e3f75cd76f4e68b395f8b10af959ab81992f5ea3 100644 (file)
Binary files a/de/LC_MESSAGES/djangojs.mo and b/de/LC_MESSAGES/djangojs.mo differ

diff --git a/de/LC_MESSAGES/djangojs.po b/de/LC_MESSAGES/djangojs.po
index 2b16812067487d73c8cf7cc0f007c62aaf4599b1..6dd7141616d905c98b912abb280b9bbf06263fdd 100644 (file)
--- a/de/LC_MESSAGES/djangojs.po
+++ b/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-29 21:26+0200\n"
+"POT-Creation-Date: 2011-06-22 14:44+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,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: htdocs/js/locale.js:28
+#: htdocs/js/locale.js:2
 msgid "title"
 msgstr ""
 
-#: htdocs/js/locale.js:29
+#: htdocs/js/locale.js:3
 msgid "description"
 msgstr ""
 
-#: htdocs/js/locale.js:30
+#: htdocs/js/locale.js:4
 msgid "delete the marker permanently?"
 msgstr ""
 
-#: htdocs/js/locale.js:31
+#: htdocs/js/locale.js:5
 msgid "marker added to the selected playlist"
 msgstr ""
 
-#: htdocs/js/locale.js:32
+#: htdocs/js/locale.js:6
 msgid "item added to the selected playlist"
 msgstr ""
 
-#: htdocs/js/locale.js:33
+#: htdocs/js/locale.js:7
 msgid "collection added to the selected playlist"
 msgstr ""
 
-#: htdocs/js/locale.js:34
-msgid "there is at least one unsaved marker"
+#: htdocs/js/locale.js:8
+msgid "there are unsaved or modified markers"
 msgstr ""
 
-#: htdocs/js/locale.js:35
+#: htdocs/js/locale.js:9
 msgid "If you exit the page you will loose your changes"
 msgstr ""
 
-#: htdocs/js/locale.js:36
+#: htdocs/js/locale.js:10
 msgid "author"
 msgstr ""

diff --git a/fr/LC_MESSAGES/django.mo b/fr/LC_MESSAGES/django.mo
index fb39a1c54fd4110fff8649f069e6a82048da864c..26d53884562f5efc96474e1c5f7617dbeb7decea 100644 (file)
Binary files a/fr/LC_MESSAGES/django.mo and b/fr/LC_MESSAGES/django.mo differ

diff --git a/fr/LC_MESSAGES/django.po b/fr/LC_MESSAGES/django.po
index f370c200e41c86b8c07bc2597d4f23d7de5ee24f..9152948db2202ec75d9ca487f537318d095f2466 100644 (file)
--- a/fr/LC_MESSAGES/django.po
+++ b/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-06-22 12:37+0200\n"
+"POT-Creation-Date: 2011-06-22 14:44+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"
@@ -695,7 +695,7 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: templates/telemeta_default/collection_detail.html:5
-#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:137
+#: templates/telemeta_default/collection_detail_dc.html:5 web/base.py:324
 msgid "Collection"
 msgstr "Collection"
 
@@ -976,7 +976,7 @@ msgstr "Mot de passe oublié"
 
 #: templates/telemeta_default/mediaitem_add.html:5
 #: templates/telemeta_default/mediaitem_copy.html:5
-#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:245
+#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:453
 msgid "Item"
 msgstr "Item"
 
@@ -1064,7 +1064,7 @@ msgstr "Formation"
 msgid "User Profile"
 msgstr "Profil utilisateur"
 
-#: templates/telemeta_default/profile_detail.html:8 web/base.py:1129
+#: templates/telemeta_default/profile_detail.html:8 web/base.py:1154
 msgid "User profile"
 msgstr "Profil utilisateur"
 
@@ -1160,8 +1160,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1098
-#: web/base.py:1209
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1185
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1341,18 +1340,17 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:136 web/base.py:244 web/base.py:496 web/base.py:1128
+#: web/base.py:323 web/base.py:452 web/base.py:683 web/base.py:1153
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:138 web/base.py:246 web/base.py:498 web/base.py:1130
+#: web/base.py:325 web/base.py:454 web/base.py:685 web/base.py:1155
 msgid ""
 "Please login or contact the website administator to get a private access."
 msgstr ""
 "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site "
 "pour obtenir un accès privé."
 
-
 #~ msgid "username"
 #~ msgstr "nom d'utilisateur"
 

diff --git a/fr/LC_MESSAGES/djangojs.mo b/fr/LC_MESSAGES/djangojs.mo
index 8fbb815560e7fd64abb3803c139db5845098bc8e..75dca43e8be0bd7256022fa14ef6752e874c1c68 100644 (file)
Binary files a/fr/LC_MESSAGES/djangojs.mo and b/fr/LC_MESSAGES/djangojs.mo differ

diff --git a/fr/LC_MESSAGES/djangojs.po b/fr/LC_MESSAGES/djangojs.po
index 052fb472c6414c3caa9d888bdf3302f12f176a02..e2faab1bba8446c4bd22befec253d219d2083073 100644 (file)
--- a/fr/LC_MESSAGES/djangojs.po
+++ b/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-29 21:26+0200\n"
+"POT-Creation-Date: 2011-06-22 14:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1\n"
 
-#: htdocs/js/locale.js:28
+#: htdocs/js/locale.js:2
 msgid "title"
 msgstr "titre"
 
-#: htdocs/js/locale.js:29
+#: htdocs/js/locale.js:3
 msgid "description"
 msgstr "description"
 
-#: htdocs/js/locale.js:30
+#: htdocs/js/locale.js:4
 msgid "delete the marker permanently?"
 msgstr "supprimer le marqueur définitivement ?"
 
-#: htdocs/js/locale.js:31
+#: htdocs/js/locale.js:5
 msgid "marker added to the selected playlist"
 msgstr "marqueur ajouté à la liste de lecture"
 
-#: htdocs/js/locale.js:32
+#: htdocs/js/locale.js:6
 msgid "item added to the selected playlist"
 msgstr "item ajouté à la liste de lecture"
 
-#: htdocs/js/locale.js:33
+#: htdocs/js/locale.js:7
 msgid "collection added to the selected playlist"
 msgstr "collection ajoutée à la liste de lecture"
 
-#: htdocs/js/locale.js:34
-msgid "there is at least one unsaved marker"
-msgstr "il y a au moins un marqueur non sauvegardé"
+#: htdocs/js/locale.js:8
+msgid "there are unsaved or modified markers"
+msgstr "il y a des marqueurs modifiés ou non sauvegardés"
 
-#: htdocs/js/locale.js:35
+#: htdocs/js/locale.js:9
 msgid "If you exit the page you will loose your changes"
 msgstr "Si vous sortez de la page, vous perdrez vos modifications"
 
-#: htdocs/js/locale.js:36
+#: htdocs/js/locale.js:10
 msgid "author"
 msgstr "auteur"