--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Fri Sep 02 11:49:35 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Fri Sep 02 11:55:46 2011 +0200
@@ -62,7 +62,9 @@
</table>
</div>
{% if not ldt_id %}
+ {% if contents|length > 1 %}
<input class="selectallprojects" style="width: 35px; text-align: center;" id="check_projects" type="checkbox" checked="true"/>
+ {% endif %}
{% endif %}
</div>
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Fri Sep 02 11:49:35 2011 +0200
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Fri Sep 02 11:55:46 2011 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-28 13:29+0200\n"
+"POT-Creation-Date: 2011-09-02 11:53+0200\n"
"PO-Revision-Date: 2010-02-17 03:53+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,186 +24,213 @@
msgid "Time"
msgstr "Time"
-#: .\ldt_utils\forms.py:38 .\ldt_utils\models.py:101
-msgid "content.content_creation_date"
-msgstr "content creation date"
-
-#: .\ldt_utils\forms.py:39
-msgid "content.media_input_type"
-msgstr "Media source type"
-
-#: .\ldt_utils\forms.py:39
-msgid "file_upload"
-msgstr "file upload"
-
-#: .\ldt_utils\forms.py:39
-msgid "url"
-msgstr "url"
-
-#: .\ldt_utils\forms.py:39
-msgid "existing_media"
-msgstr "existing media"
-
-#: .\ldt_utils\forms.py:39
-msgid "create_media"
-msgstr "create media"
-
-#: .\ldt_utils\forms.py:39
-msgid "none_media"
-msgstr "no media"
-
-#: .\ldt_utils\models.py:27
-msgid "media.external_id"
-msgstr "external id"
-
-#: .\ldt_utils\models.py:28
-msgid "media.external_permalink"
-msgstr "media permalink"
+#: .\ldt_utils\forms.py:25
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:53
+#, fuzzy
+msgid "Search"
+msgstr "search"
-#: .\ldt_utils\models.py:29
-msgid "media.external_publication_url"
-msgstr "media publication url"
-
-#: .\ldt_utils\models.py:30
-msgid "media.external_src_url"
-msgstr "media external source url"
-
-#: .\ldt_utils\models.py:31
-msgid "media.creation_date"
-msgstr "media object creation date"
-
-#: .\ldt_utils\models.py:32
-msgid "media.media_creation_date"
-msgstr "media creation date"
+#: .\ldt_utils\forms.py:26
+msgid "all"
+msgstr ""
-#: .\ldt_utils\models.py:33
-msgid "media.update_date"
-msgstr "update date"
-
-#: .\ldt_utils\models.py:34
-msgid "media.videopath"
-msgstr "videopath"
-
-#: .\ldt_utils\models.py:35
-msgid "media.duration"
-msgstr "duration (ms)"
-
-#: .\ldt_utils\models.py:36
-msgid "media.creator"
-msgstr "media creator"
-
-#: .\ldt_utils\models.py:37
-msgid "description"
-msgstr "description"
-
-#: .\ldt_utils\models.py:38
+#: .\ldt_utils\forms.py:26 .\ldt_utils\models.py:39
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:69
msgid "title"
msgstr "title"
-#: .\ldt_utils\models.py:39
+#: .\ldt_utils\forms.py:26
+msgid "resume"
+msgstr ""
+
+#: .\ldt_utils\forms.py:26
+#, fuzzy
+msgid "tags"
+msgstr "Pages"
+
+#: .\ldt_utils\forms.py:26
+msgid "Fields"
+msgstr ""
+
+#: .\ldt_utils\forms.py:27
+msgid "Display the results in Lignes De Temps"
+msgstr ""
+
+#: .\ldt_utils\forms.py:40 .\ldt_utils\models.py:108
+msgid "content.content_creation_date"
+msgstr "content creation date"
+
+#: .\ldt_utils\forms.py:41
+msgid "content.media_input_type"
+msgstr "Media source type"
+
+#: .\ldt_utils\forms.py:41
+msgid "file_upload"
+msgstr "file upload"
+
+#: .\ldt_utils\forms.py:41
+msgid "url"
+msgstr "url"
+
+#: .\ldt_utils\forms.py:41
+msgid "existing_media"
+msgstr "existing media"
+
+#: .\ldt_utils\forms.py:41
+msgid "create_media"
+msgstr "create media"
+
+#: .\ldt_utils\forms.py:41
+msgid "none_media"
+msgstr "no media"
+
+#: .\ldt_utils\models.py:28
+msgid "media.external_id"
+msgstr "external id"
+
+#: .\ldt_utils\models.py:29
+msgid "media.external_permalink"
+msgstr "media permalink"
+
+#: .\ldt_utils\models.py:30
+msgid "media.external_publication_url"
+msgstr "media publication url"
+
+#: .\ldt_utils\models.py:31
+msgid "media.external_src_url"
+msgstr "media external source url"
+
+#: .\ldt_utils\models.py:32
+msgid "media.creation_date"
+msgstr "media object creation date"
+
+#: .\ldt_utils\models.py:33
+msgid "media.media_creation_date"
+msgstr "media creation date"
+
+#: .\ldt_utils\models.py:34
+msgid "media.update_date"
+msgstr "update date"
+
+#: .\ldt_utils\models.py:35
+msgid "media.videopath"
+msgstr "videopath"
+
+#: .\ldt_utils\models.py:36
+msgid "media.duration"
+msgstr "duration (ms)"
+
+#: .\ldt_utils\models.py:37
+msgid "media.creator"
+msgstr "media creator"
+
+#: .\ldt_utils\models.py:38
+msgid "description"
+msgstr "description"
+
+#: .\ldt_utils\models.py:40
msgid "media.src"
msgstr "media source"
-#: .\ldt_utils\models.py:40
+#: .\ldt_utils\models.py:41
msgid "media.mimetype"
msgstr "mimetype"
-#: .\ldt_utils\models.py:93
+#: .\ldt_utils\models.py:100
msgid "content.iri_id"
msgstr "iri id"
-#: .\ldt_utils\models.py:94
+#: .\ldt_utils\models.py:101
msgid "content.iriurl"
msgstr "iri url"
-#: .\ldt_utils\models.py:95
+#: .\ldt_utils\models.py:102
msgid "content.creation_date"
msgstr "content creation date"
-#: .\ldt_utils\models.py:96
+#: .\ldt_utils\models.py:103
msgid "content.update_date"
msgstr "content update date"
-#: .\ldt_utils\models.py:97
+#: .\ldt_utils\models.py:104
msgid "content.title"
msgstr "title"
-#: .\ldt_utils\models.py:98
+#: .\ldt_utils\models.py:105
msgid "content.description"
msgstr "description"
-#: .\ldt_utils\models.py:99
+#: .\ldt_utils\models.py:106
msgid "content.authors"
msgstr "authors"
-#: .\ldt_utils\models.py:100
+#: .\ldt_utils\models.py:107
msgid "content.duration"
msgstr "duration (ms)"
-#: .\ldt_utils\models.py:289
+#: .\ldt_utils\models.py:306
msgid "created by"
msgstr "created by"
-#: .\ldt_utils\models.py:290
+#: .\ldt_utils\models.py:307
msgid "changed by"
msgstr "changed by"
-#: .\ldt_utils\views.py:76 .\ldt_utils\views.py:353 .\ldt_utils\views.py:399
+#: .\ldt_utils\views.py:147 .\ldt_utils\views.py:540 .\ldt_utils\views.py:586
msgid "You can not access this project"
msgstr "You can not access this project"
-#: .\ldt_utils\views.py:564
+#: .\ldt_utils\views.py:752
#, python-format
msgid "the project %(title)s is published. please unpublish before deleting."
msgstr "the project %(title)s is published. please unpublish before deleting."
-#: .\ldt_utils\views.py:565
+#: .\ldt_utils\views.py:753
msgid "can not delete the project. Please correct the following error"
msgstr "can not delete the project. Please correct the following error"
-#: .\ldt_utils\views.py:566
+#: .\ldt_utils\views.py:754
msgid "title error deleting project"
msgstr "Error when deleting project"
-#: .\ldt_utils\views.py:568
+#: .\ldt_utils\views.py:756
#, python-format
msgid "please confirm deleting project %(title)s"
msgstr "Please confirm deleting project %(title)s"
-#: .\ldt_utils\views.py:569
+#: .\ldt_utils\views.py:757
msgid "confirm deletion"
msgstr "Confirm deletion"
-#: .\ldt_utils\views.py:725
+#: .\ldt_utils\views.py:931
msgid "Problem when downloading file from url : "
msgstr "Problem when downloading file from url: "
-#: .\ldt_utils\views.py:728 .\ldt_utils\views.py:793
+#: .\ldt_utils\views.py:934
msgid "Problem when uploading file : "
msgstr "Problem when uploading file: "
-#: .\ldt_utils\views.py:863
+#: .\ldt_utils\views.py:1003
#, python-format
msgid "There is %(count)d error when deleting content"
msgid_plural "There are %(count)d errors when deleting content"
msgstr[0] "There is %(count)d error when deleting content"
msgstr[1] "There are %(count)d errors when deleting content"
-#: .\ldt_utils\views.py:864
+#: .\ldt_utils\views.py:1004
msgid "title error deleting content"
msgstr "Error when deleting content"
-#: .\ldt_utils\views.py:866
+#: .\ldt_utils\views.py:1006
#, python-format
msgid "Confirm delete content %(titles)s"
msgstr "Confirm delete content %(titles)s"
-#: .\ldt_utils\views.py:867
+#: .\ldt_utils\views.py:1007
msgid "confirm delete content"
msgstr "Confirm delete content"
-#: .\ldt_utils\views.py:901
+#: .\ldt_utils\views.py:1041
#, python-format
msgid ""
"Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -230,8 +257,6 @@
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:55
#: .\templates\admin\page_base.html.py:19
#: .\user\templates\ldt\user\login_form.html.py:33
-#: .\user\templates\ldt\user\space.html.py:6
-#: .\user\templates\ldt\user\space.html.py:9
msgid "Space"
msgstr "Space"
@@ -253,7 +278,7 @@
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:70
#: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:77
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:11
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:10
msgid "create project"
msgstr "Create new project"
@@ -262,7 +287,7 @@
msgstr "Copy your project"
#: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:16
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:38
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:47
msgid "Title"
msgstr "Title"
@@ -270,15 +295,24 @@
msgid "Copy"
msgstr "Copy"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:80
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:41
msgid "Browse"
msgstr "Browse"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:123
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:42
msgid "File uploaded"
msgstr "File uploaded"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:198
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:43
+msgid "Please wait, the upload is not finished yet"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:44
+#, fuzzy
+msgid "Cancel upload"
+msgstr "File uploaded"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:55
msgid ""
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the content form after making the following changes:"
@@ -286,7 +320,7 @@
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the content form after making the following changes:"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:209
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:66
msgid ""
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the media form after making the following changes:"
@@ -294,56 +328,59 @@
"The operation could not be performed because one or more error(s) occurred."
"<br />Please resubmit the media form after making the following changes:"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:219
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:21
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
msgid "Create content"
msgstr "Create content"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:263
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:120
msgid "media file is being processed please wait."
msgstr "media file is being processed please wait."
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:267
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:59
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:73
#: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:49
msgid "close_cancel"
msgstr "Close"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:268
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:125
msgid "delete"
msgstr "Approve delete"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:269
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:126
msgid "write"
msgstr "Write"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:34
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:43
msgid "Update your project"
msgstr "Create your project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:34
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:43
msgid "Create your project"
msgstr "Create your project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:40
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:49
msgid "List of contents"
msgstr "List of contents"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:42
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:51
#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
+#: .\user\templates\ldt\user\change_name.html.py:31
+#: .\user\templates\ldt\user\change_profile.html.py:73
msgid "name"
msgstr "name"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:61
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
msgid "delete_project"
msgstr "delete project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:62
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
msgid "update_project"
msgstr "update project"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:64
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:78
msgid "create_project"
msgstr "Create new project"
@@ -391,6 +428,34 @@
msgid "do_delete"
msgstr "Approve delete"
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:75
+#: .\templates\ldt\ldt_base.html.py:108
+#, fuzzy
+msgid "My groups"
+msgstr "Groups"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:79
+#, fuzzy
+msgid "Click on the line to see the group's projects"
+msgstr "clik here to see the project content"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:95
+#, fuzzy
+msgid "The group's projects"
+msgstr "Copy your project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:97
+#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:71
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:68
+msgid "search"
+msgstr "search"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:105
+msgid "You do not belong to any group."
+msgstr ""
+
#: .\ldt_utils\templates\ldt\ldt_utils\init_ldt_full.html.py:16
msgid ""
"Your current work is modified. Click Cancel and save it one last time before "
@@ -400,48 +465,71 @@
"leaving. Click OK to leave without saving."
#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:77
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:64
msgid "project list"
msgstr "Projects"
-#: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
-#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:55
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:63
+msgid "Submit"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:68
+#: .\templates\ldt\ldt_base.html.py:109
+msgid "Published projects"
+msgstr ""
+
+#: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:69
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:66
-msgid "search"
-msgstr "search"
+msgid "Create project"
+msgstr "Create new project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\search_form.html.py:10
+msgid "The search field can not be empty."
+msgstr ""
#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:53
msgid "content list"
msgstr "Contents"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:12
+#: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:65
+#, fuzzy
+msgid "My projects"
+msgstr "Copy your project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:11
msgid "preview media"
msgstr "preview media"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:13
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:15
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:12
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:14
msgid "open ldt"
msgstr "open ldt"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:16
msgid "copy project"
msgstr "Copy your project"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:18
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:17
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:12
msgid "link json by id"
msgstr "link json by id"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:21
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:20
msgid "Project published, click to unpublish"
msgstr "Project published, click to unpublish"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:23
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:22
msgid "Project not published, click to publish"
msgstr "Project not published, click to publish"
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:40
-msgid "Create project"
-msgstr "Create new project"
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:11
+#, fuzzy
+msgid "copy the project"
+msgstr "Copy your project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:14
+#, fuzzy
+msgid "Project published"
+msgstr " published"
#: .\templates\admin\cms_change_form.html.py:30
msgid "Approve page deletion"
@@ -653,7 +741,7 @@
msgstr "Change password"
#: .\templates\cms\admin\cms\page\change_form.html.py:11
-#: .\templates\ldt\ldt_base.html.py:121
+#: .\templates\ldt\ldt_base.html.py:88
#: .\user\templates\ldt\user\login_form.html.py:34
msgid "Log out"
msgstr "Log out"
@@ -666,38 +754,44 @@
msgid "Order:"
msgstr "Order:"
-#: .\templates\ldt\ldt_base.html.py:95
+#: .\templates\ldt\ldt_base.html.py:81
msgid "header_title"
msgstr "Ldt Platform"
-#: .\templates\ldt\ldt_base.html.py:111
+#: .\templates\ldt\ldt_base.html.py:85
+msgid "Staff"
+msgstr "admin"
+
+#: .\templates\ldt\ldt_base.html.py:107
msgid "home"
msgstr "home"
-#: .\templates\ldt\ldt_base.html.py:112
+#: .\templates\ldt\ldt_base.html.py:110
msgid "contents"
msgstr "Contents"
-#: .\templates\ldt\ldt_base.html.py:113
+#: .\templates\ldt\ldt_base.html.py:111
msgid "indexation projects"
msgstr "indexation projects"
-#: .\templates\ldt\ldt_base.html.py:114
+#: .\templates\ldt\ldt_base.html.py:112
msgid "accounts"
msgstr "accounts"
-#: .\templates\ldt\ldt_base.html.py:115
-#: .\user\templates\ldt\user\change_email.html.py:6
-#: .\user\templates\ldt\user\change_email_done.html.py:6
+#: .\templates\ldt\ldt_base.html.py:113
#: .\user\templates\ldt\user\login_form.html.py:32
#: .\user\templates\registration\password_change_done.html.py:7
#: .\user\templates\registration\password_change_form.html.py:13
msgid "Profiles"
msgstr "Profiles"
-#: .\templates\ldt\ldt_base.html.py:129
-msgid "Langue"
-msgstr "Langue"
+#: .\templates\ldt\ldt_base.html.py:139
+msgid "web"
+msgstr ""
+
+#: .\templates\ldt\ldt_base.html.py:139
+msgid "platform"
+msgstr ""
#: .\templates\ldt\ldt_raw_base.html.py:13
msgid "page_title"
@@ -763,32 +857,55 @@
msgid "Password"
msgstr "Password"
-#: .\user\forms.py:31
+#: .\user\forms.py:28 .\user\templates\ldt\user\change_password.html.py:40
msgid "New password"
msgstr "New password"
-#: .\user\forms.py:33
+#: .\user\forms.py:30 .\user\templates\ldt\user\change_password.html.py:50
msgid "New password confirmation"
msgstr "New password confirmation"
-#: .\user\forms.py:78 .\user\forms.py:79
+#: .\user\forms.py:59 .\user\forms.py:60 .\user\forms.py:100
+#: .\user\forms.py:101
msgid "E-mail"
msgstr "E-mail"
-#: .\user\forms.py:90
+#: .\user\forms.py:71 .\user\forms.py:113
msgid "The two emails didn't match."
msgstr "The two emails didn't match."
-#: .\user\views.py:44 .\user\templates\registration\login.html.py:24
+#: .\user\forms.py:82 .\user\forms.py:98
+msgid "First name"
+msgstr ""
+
+#: .\user\forms.py:83 .\user\forms.py:99
+#, fuzzy
+msgid "Last name"
+msgstr "name"
+
+#: .\user\forms.py:102
+#, fuzzy
+msgid "Username"
+msgstr "Username:"
+
+#: .\user\forms.py:119
+#, python-format
+msgid "username %s is already used."
+msgstr ""
+
+#: .\user\forms.py:125 .\user\forms.py:131
+msgid "Please use only letter, blanks, or dashes."
+msgstr ""
+
+#: .\user\views.py:38 .\user\templates\registration\login.html.py:24
msgid "Sorry, that's not a valid username or password."
msgstr "Sorry, that's not a valid username or password."
-#: .\user\templates\ldt\user\change_email.html.py:7
-#: .\user\templates\ldt\user\change_email.html.py:10
+#: .\user\templates\ldt\user\change_email.html.py:5
msgid "Modification de l'adresse émail"
msgstr "E-mail change"
-#: .\user\templates\ldt\user\change_email.html.py:26
+#: .\user\templates\ldt\user\change_email.html.py:24
msgid ""
"Please enter your new e-mail twice so we can verify you typed it in "
"correctly."
@@ -796,42 +913,117 @@
"Please enter your new e-mail twice so we can verify you typed it in "
"correctly."
-#: .\user\templates\ldt\user\change_email.html.py:32
+#: .\user\templates\ldt\user\change_email.html.py:24
+msgid "Your actual email address is"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_email.html.py:30
+#: .\user\templates\ldt\user\change_profile.html.py:87
msgid "email"
msgstr "email"
-#: .\user\templates\ldt\user\change_email.html.py:41
-msgid "Confirmation de l'adresse émail"
+#: .\user\templates\ldt\user\change_email.html.py:39
+#: .\user\templates\ldt\user\change_profile.html.py:102
+#, fuzzy
+msgid "Confirmation de l'adresse émail"
msgstr "E-mail confirmation"
-#: .\user\templates\ldt\user\change_email.html.py:48
+#: .\user\templates\ldt\user\change_email.html.py:46
msgid "change my e-mail"
msgstr "e-mail change"
-#: .\user\templates\ldt\user\change_email_done.html.py:7
-#: .\user\templates\ldt\user\change_email_done.html.py:10
-msgid "email change"
-msgstr "email change"
+#: .\user\templates\ldt\user\change_email.html.py:50
+#, fuzzy
+msgid "Your new email address has been saved."
+msgstr "Your password has been changed."
+
+#: .\user\templates\ldt\user\change_language.html.py:5
+#: .\user\templates\ldt\user\user_change.html.py:76
+#, fuzzy
+msgid "Language change"
+msgstr "Mail change"
+
+#: .\user\templates\ldt\user\change_language.html.py:16
+msgid "Please change the language"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_language.html.py:20
+#, fuzzy
+msgid "Language"
+msgstr "Langue"
-#: .\user\templates\ldt\user\change_email_done.html.py:12
-msgid "email changed"
-msgstr "changed by"
+#: .\user\templates\ldt\user\change_name.html.py:5
+#: .\user\templates\ldt\user\change_name.html.py:37
+#, fuzzy
+msgid "Name change"
+msgstr "Mail change"
+
+#: .\user\templates\ldt\user\change_name.html.py:17
+msgid "Please change your name"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_name.html.py:23
+#: .\user\templates\ldt\user\change_profile.html.py:59
+msgid "first name"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_name.html.py:41
+#, fuzzy
+msgid "Your name has been modified"
+msgstr "Your password has been changed."
+
+#: .\user\templates\ldt\user\change_password.html.py:31
+#, fuzzy
+msgid "Old password"
+msgstr "Old password:"
-#: .\user\templates\ldt\user\change_email_done.html.py:13
-msgid "back to profile"
-msgstr "back to profile"
+#: .\user\templates\ldt\user\change_password.html.py:44
+#, fuzzy
+msgid "passwords don't match"
+msgstr "password change"
-#: .\user\templates\ldt\user\home.html.py:9
-msgid "Se connecter"
-msgstr "Login"
+#: .\user\templates\ldt\user\change_password.html.py:57
+#: .\user\templates\ldt\user\user_change.html.py:75
+#: .\user\templates\registration\password_change_form.html.py:14
+#: .\user\templates\registration\password_change_form.html.py:17
+msgid "Password change"
+msgstr "Password change"
+
+#: .\user\templates\ldt\user\change_password.html.py:61
+#, fuzzy
+msgid "Your new password has been saved."
+msgstr "Your password has been changed."
+
+#: .\user\templates\ldt\user\change_profile.html.py:39
+#, fuzzy
+msgid "Your profile has been updated"
+msgstr "Your password has been changed."
-#: .\user\templates\ldt\user\home.html.py:10
-msgid "Créer un compte"
-msgstr "Create an account"
+#: .\user\templates\ldt\user\change_profile.html.py:46
+#, fuzzy
+msgid "user name"
+msgstr "Username:"
+
+#: .\user\templates\ldt\user\change_profile.html.py:63
+#: .\user\templates\ldt\user\change_profile.html.py:77
+msgid "Please use only letters, blanks or dashes"
+msgstr ""
-#: .\user\templates\ldt\user\home.html.py:11
-msgid "récupérer mot de passe"
-msgstr "Forget password?"
+#: .\user\templates\ldt\user\change_profile.html.py:91
+#, fuzzy
+msgid "emails don't match"
+msgstr "The two emails didn't match."
+
+#: .\user\templates\ldt\user\change_profile.html.py:92
+#: .\user\templates\ldt\user\change_profile.html.py:106
+msgid "incorrect email"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_profile.html.py:114
+#: .\user\templates\ldt\user\user_change.html.py:74
+#, fuzzy
+msgid "Profile change"
+msgstr "Mail change"
#: .\user\templates\ldt\user\login_form.html.py:50
msgid "create account"
@@ -854,24 +1046,6 @@
msgid "Connection"
msgstr "Login"
-#: .\user\templates\ldt\user\profile.html.py:6
-#: .\user\templates\registration\password_change_form.html.py:14
-#: .\user\templates\registration\password_change_form.html.py:17
-msgid "Password change"
-msgstr "Password change"
-
-#: .\user\templates\ldt\user\profile.html.py:7
-msgid "Mail change"
-msgstr "Mail change"
-
-#: .\user\templates\ldt\user\space.html.py:13
-msgid "Page"
-msgstr "Pages"
-
-#: .\user\templates\ldt\user\space.html.py:16
-msgid "Projets Lignes de temps"
-msgstr "Lignes de temps projects"
-
#: .\user\templates\registration\activate.html.py:6
#: .\user\templates\registration\activate.html.py:9
msgid "Activate account"
@@ -1070,15 +1244,36 @@
"We've e-mailed you instructions for activate your account to the e-mail "
"address you submitted. You should be receiving it shortly."
+#~ msgid "email change"
+#~ msgstr "email change"
+
+#~ msgid "email changed"
+#~ msgstr "changed by"
+
+#~ msgid "back to profile"
+#~ msgstr "back to profile"
+
+#~ msgid "Se connecter"
+#~ msgstr "Login"
+
+#~ msgid "Créer un compte"
+#~ msgstr "Create an account"
+
+#~ msgid "récupérer mot de passe"
+#~ msgstr "Forget password?"
+
+#~ msgid "Page"
+#~ msgstr "Pages"
+
+#~ msgid "Projets Lignes de temps"
+#~ msgstr "Lignes de temps projects"
+
#~ msgid "Create"
#~ msgstr "Create"
#~ msgid "Create new project"
#~ msgstr "Create new project"
-#~ msgid " published"
-#~ msgstr " published"
-
#~ msgid "Changement de l'adresse émail"
#~ msgstr "E-mail change"
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Fri Sep 02 11:49:35 2011 +0200
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Fri Sep 02 11:55:46 2011 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-31 17:46+0200\n"
+"POT-Creation-Date: 2011-09-02 11:52+0200\n"
"PO-Revision-Date: 2010-03-09 15:52+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -337,7 +337,7 @@
msgstr "Le fichier média est en cours de traitement. Veuillez patienter."
#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:124
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:71
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:73
#: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:49
msgid "close_cancel"
msgstr "Fermer"
@@ -367,18 +367,19 @@
#: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
#: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
#: .\user\templates\ldt\user\change_name.html.py:31
+#: .\user\templates\ldt\user\change_profile.html.py:73
msgid "name"
msgstr "nom"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:73
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:75
msgid "delete_project"
msgstr "Effacer"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:74
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
msgid "update_project"
msgstr "Mettre à jour"
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:78
msgid "create_project"
msgstr "Créer un nouveau projet Ligne de Temps"
@@ -754,7 +755,7 @@
#: .\templates\ldt\ldt_base.html.py:85
msgid "Staff"
-msgstr "Partie admin"
+msgstr "admin"
#: .\templates\ldt\ldt_base.html.py:107
msgid "home"
@@ -851,33 +852,48 @@
msgid "Password"
msgstr "Mot de passe"
-#: .\user\forms.py:25 .\user\templates\ldt\user\change_password.html.py:30
+#: .\user\forms.py:28 .\user\templates\ldt\user\change_password.html.py:40
msgid "New password"
msgstr "Nouveau mot de passe"
-#: .\user\forms.py:27 .\user\templates\ldt\user\change_password.html.py:38
+#: .\user\forms.py:30 .\user\templates\ldt\user\change_password.html.py:50
msgid "New password confirmation"
msgstr "Confirmation du nouveau mot de passe"
-#: .\user\forms.py:56 .\user\forms.py:57
+#: .\user\forms.py:59 .\user\forms.py:60 .\user\forms.py:100
+#: .\user\forms.py:101
msgid "E-mail"
msgstr "E-mail"
-#: .\user\forms.py:68
+#: .\user\forms.py:71 .\user\forms.py:113
msgid "The two emails didn't match."
msgstr "les deux emails ne correspondent pas"
-#: .\user\forms.py:79
+#: .\user\forms.py:82 .\user\forms.py:98
#, fuzzy
msgid "First name"
msgstr "prénom :"
-#: .\user\forms.py:80
+#: .\user\forms.py:83 .\user\forms.py:99
#, fuzzy
msgid "Last name"
msgstr "nom :"
-#: .\user\views.py:31 .\user\templates\registration\login.html.py:24
+#: .\user\forms.py:102
+#, fuzzy
+msgid "Username"
+msgstr "Nom de utilisateur :"
+
+#: .\user\forms.py:119
+#, python-format
+msgid "username %s is already used."
+msgstr ""
+
+#: .\user\forms.py:125 .\user\forms.py:131
+msgid "Please use only letter, blanks, or dashes."
+msgstr ""
+
+#: .\user\views.py:38 .\user\templates\registration\login.html.py:24
msgid "Sorry, that's not a valid username or password."
msgstr "Saisissez un nom d'utilisateur et un mot de passe valide."
@@ -899,11 +915,13 @@
msgstr "Votre adresse émail est "
#: .\user\templates\ldt\user\change_email.html.py:30
+#: .\user\templates\ldt\user\change_profile.html.py:87
#, fuzzy
msgid "email"
msgstr "adresse émail"
#: .\user\templates\ldt\user\change_email.html.py:39
+#: .\user\templates\ldt\user\change_profile.html.py:102
#, fuzzy
msgid "Confirmation de l'adresse émail"
msgstr "Confirmation de l'adresse émail"
@@ -918,7 +936,7 @@
msgstr "Votre mot de passe a été changeé."
#: .\user\templates\ldt\user\change_language.html.py:5
-#: .\user\templates\ldt\user\user_base.html.py:19
+#: .\user\templates\ldt\user\user_change.html.py:76
msgid "Language change"
msgstr "Modification de la langue"
@@ -932,7 +950,6 @@
#: .\user\templates\ldt\user\change_name.html.py:5
#: .\user\templates\ldt\user\change_name.html.py:37
-#: .\user\templates\ldt\user\user_base.html.py:17
msgid "Name change"
msgstr "Modification du nom"
@@ -941,6 +958,7 @@
msgstr "Changez votre nom ou votre prénom."
#: .\user\templates\ldt\user\change_name.html.py:23
+#: .\user\templates\ldt\user\change_profile.html.py:59
msgid "first name"
msgstr "prénom"
@@ -948,23 +966,59 @@
msgid "Your name has been modified"
msgstr "Votre nom a été modifié"
-#: .\user\templates\ldt\user\change_password.html.py:22
+#: .\user\templates\ldt\user\change_password.html.py:31
#, fuzzy
msgid "Old password"
msgstr "Ancien mot de passe"
#: .\user\templates\ldt\user\change_password.html.py:44
-#: .\user\templates\ldt\user\user_base.html.py:15
+#, fuzzy
+msgid "passwords don't match"
+msgstr "Changement de mot de passe"
+
+#: .\user\templates\ldt\user\change_password.html.py:57
+#: .\user\templates\ldt\user\user_change.html.py:75
#: .\user\templates\registration\password_change_form.html.py:14
#: .\user\templates\registration\password_change_form.html.py:17
msgid "Password change"
msgstr "Modification du mot de passe"
-#: .\user\templates\ldt\user\change_password.html.py:48
+#: .\user\templates\ldt\user\change_password.html.py:61
#, fuzzy
msgid "Your new password has been saved."
msgstr "Votre mot de passe a été changeé."
+#: .\user\templates\ldt\user\change_profile.html.py:39
+#, fuzzy
+msgid "Your profile has been updated"
+msgstr "Votre nom a été modifié"
+
+#: .\user\templates\ldt\user\change_profile.html.py:46
+#, fuzzy
+msgid "user name"
+msgstr "Nom de utilisateur :"
+
+#: .\user\templates\ldt\user\change_profile.html.py:63
+#: .\user\templates\ldt\user\change_profile.html.py:77
+msgid "Please use only letters, blanks or dashes"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_profile.html.py:91
+#, fuzzy
+msgid "emails don't match"
+msgstr "les deux emails ne correspondent pas"
+
+#: .\user\templates\ldt\user\change_profile.html.py:92
+#: .\user\templates\ldt\user\change_profile.html.py:106
+msgid "incorrect email"
+msgstr ""
+
+#: .\user\templates\ldt\user\change_profile.html.py:114
+#: .\user\templates\ldt\user\user_change.html.py:74
+#, fuzzy
+msgid "Profile change"
+msgstr "Modification de l'adresse émail"
+
#: .\user\templates\ldt\user\login_form.html.py:50
msgid "create account"
msgstr "Créer un compte"
@@ -986,10 +1040,6 @@
msgid "Connection"
msgstr "Connexion"
-#: .\user\templates\ldt\user\user_base.html.py:16
-msgid "Mail change"
-msgstr "Modification de l'adresse émail"
-
#: .\user\templates\registration\activate.html.py:6
#: .\user\templates\registration\activate.html.py:9
msgid "Activate account"
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Fri Sep 02 11:49:35 2011 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Fri Sep 02 11:55:46 2011 +0200
@@ -85,7 +85,7 @@
<a href="{% url admin:index %}">{% trans "Staff" %}</a>|
{% endif %}
{% if user.is_authenticated %}
- <a href="{% url ldt.user.views.profile %}" >{{user.username}}</a>| <a href="{% url ldt.user.views.logout_view %}" >{% trans "Log out" %}</a>
+ <a href="{% url ldt.user.views.profile %}" >{{user.email}}</a>| <a href="{% url ldt.user.views.logout_view %}" >{% trans "Log out" %}</a>
{% endif %}
</div>
{% endblock %}