# HG changeset patch
# User raph
# Date 1264420621 -3600
# Node ID 5afc61269b1036a69caba89c6513da9ef998f3c3
# Parent  5e8dda1b7631dde327fc2cc762427f0ed5207b9b
text meta displays last modif and nb versions (fixes #25)

diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/en/LC_MESSAGES/django.mo
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/en/LC_MESSAGES/django.po
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Mon Jan 25 11:34:22 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Mon Jan 25 12:57:01 2010 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 22:03+0100\n"
+"POT-Creation-Date: 2010-01-25 12:52+0100\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"
@@ -61,7 +61,7 @@
 msgid "unknown"
 msgstr ""
 
-#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:611
+#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617
 msgid "Title"
 msgstr ""
 
@@ -69,7 +69,7 @@
 msgid "Format"
 msgstr ""
 
-#: models.py:177 views/texts.py:702
+#: models.py:177 views/texts.py:708
 msgid "Content"
 msgstr ""
 
@@ -212,7 +212,7 @@
 msgid "Email:"
 msgstr ""
 
-#: notifications.py:60
+#: notifications.py:60 templates/email/activity_notification.txt:1
 msgid "Notification:"
 msgstr ""
 
@@ -224,15 +224,15 @@
 msgid "Class (education)"
 msgstr ""
 
-#: settings.py:105
+#: settings.py:106
 msgid "French"
 msgstr ""
 
-#: settings.py:106
+#: settings.py:107
 msgid "English"
 msgstr ""
 
-#: settings.py:107
+#: settings.py:108
 msgid "Norwegian"
 msgstr ""
 
@@ -348,6 +348,39 @@
 msgid "An error has occurred."
 msgstr ""
 
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, fuzzy, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Ajouter un utilisateur"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr ""
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
 #: templates/site/activate.html:10 templates/site/user_activate.html:10
 #: views/user.py:325
 msgid "Activate your account"
@@ -475,82 +508,82 @@
 msgid "Are you sure you want to approve this comment?"
 msgstr ""
 
-#: templates/site/dashboard.html:148
+#: templates/site/dashboard.html:149
 msgid "Are you sure you want to refuse this comment?"
 msgstr ""
 
-#: templates/site/dashboard.html:166 templates/site/dashboard.html.py:199
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr ""
 
-#: templates/site/dashboard.html:184
+#: templates/site/dashboard.html:186
 msgid "Recent texts"
 msgstr ""
 
-#: templates/site/dashboard.html:184 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
 msgid "all"
 msgstr ""
 
-#: templates/site/dashboard.html:199 templates/site/macros/text_meta.html:4
+#: templates/site/dashboard.html:201
 #, python-format
 msgid "%(nb_comments)s comment"
 msgid_plural "%(nb_comments)s comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/site/dashboard.html:204 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206 templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr ""
 
-#: templates/site/dashboard.html:223
+#: templates/site/dashboard.html:225
 msgid "Workspace activity"
 msgstr ""
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "month"
 msgstr ""
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "week"
 msgstr ""
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "24 hours"
 msgstr ""
 
-#: templates/site/dashboard.html:230
+#: templates/site/dashboard.html:232
 msgid "Access"
 msgstr ""
 
-#: templates/site/dashboard.html:231 templates/site/dashboard.html.py:242
+#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
 #: templates/site/text_list.html:206 templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr ""
 
-#: templates/site/dashboard.html:241
+#: templates/site/dashboard.html:243
 msgid "Commenting"
 msgstr ""
 
-#: templates/site/dashboard.html:258
+#: templates/site/dashboard.html:260
 msgid "Activities"
 msgstr ""
 
-#: templates/site/dashboard.html:261
+#: templates/site/dashboard.html:263
 msgid "texts"
 msgstr ""
 
-#: templates/site/dashboard.html:262 templates/site/text_list.html:139
+#: templates/site/dashboard.html:264 templates/site/text_list.html:139
 msgid "comments"
 msgstr ""
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 #, fuzzy
 msgid "users"
 msgstr "Ajouter un utilisateur"
 
-#: templates/site/dashboard.html:304
+#: templates/site/dashboard.html:306
 msgid "No activities"
 msgstr ""
 
@@ -1137,6 +1170,18 @@
 "sure you want to exit this page?"
 msgstr ""
 
+#: templates/site/macros/text_meta.html:6
+#, python-format
+msgid "last modified %(duration)s ago"
+msgstr ""
+
+#: templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/site/macros/text_tabs.html:15
 msgid "People"
 msgstr ""
@@ -1354,49 +1399,49 @@
 msgid "Text %(text_title)s deleted"
 msgstr ""
 
-#: views/texts.py:615
+#: views/texts.py:621
 msgid "Note (optional)"
 msgstr ""
 
-#: views/texts.py:618
+#: views/texts.py:624
 msgid "Add a note to explain the modifications made to the text"
 msgstr ""
 
-#: views/texts.py:628
-msgid "New version (optional)"
-msgstr ""
-
-#: views/texts.py:631
-msgid "Create a new version of this text (recommended)"
-msgstr ""
-
 #: views/texts.py:634
+msgid "New version (optional)"
+msgstr ""
+
+#: views/texts.py:637
+msgid "Create a new version of this text (recommended)"
+msgstr ""
+
+#: views/texts.py:640
 msgid "Keep comments (optional)"
 msgstr ""
 
-#: views/texts.py:637
+#: views/texts.py:643
 msgid "Keep comments (if not affected by the edit)"
 msgstr ""
 
-#: views/texts.py:700
+#: views/texts.py:706
 msgid "Name (optional)"
 msgstr ""
 
-#: views/texts.py:701
+#: views/texts.py:707
 msgid "Email (optional)"
 msgstr ""
 
-#: views/texts.py:751
+#: views/texts.py:757
 #, python-format
 msgid "A new version (copied from version %(version_id)s) has been created"
 msgstr ""
 
-#: views/texts.py:859 views/user.py:79 views/user.py:99
+#: views/texts.py:865 views/user.py:79 views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr ""
 
-#: views/texts.py:917
+#: views/texts.py:923
 msgid "Text settings updated"
 msgstr ""
 
@@ -1550,9 +1595,5 @@
 "You've been registered, please check your email for the confirm message."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Contact from user: %(name)s / %(email)s"
-#~ msgstr "Ajouter un utilisateur"
-
 #~ msgid "Add user"
 #~ msgstr "Ajouter un utilisateur"
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/fr/LC_MESSAGES/django.mo
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/fr/LC_MESSAGES/django.po
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Mon Jan 25 11:34:22 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Mon Jan 25 12:57:01 2010 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 22:03+0100\n"
+"POT-Creation-Date: 2010-01-25 12:52+0100\n"
 "PO-Revision-Date: 2010-01-20 21:42+0100\n"
 "Last-Translator: renaud bernard <renaud.bernard@sopinspace.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -64,7 +64,7 @@
 msgid "unknown"
 msgstr "inconnu"
 
-#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:611
+#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617
 msgid "Title"
 msgstr "Titre"
 
@@ -72,7 +72,7 @@
 msgid "Format"
 msgstr "Format"
 
-#: models.py:177 views/texts.py:702
+#: models.py:177 views/texts.py:708
 msgid "Content"
 msgstr "Texte"
 
@@ -216,7 +216,7 @@
 msgid "Email:"
 msgstr "Email :"
 
-#: notifications.py:60
+#: notifications.py:60 templates/email/activity_notification.txt:1
 msgid "Notification:"
 msgstr "Notification:"
 
@@ -228,15 +228,15 @@
 msgid "Class (education)"
 msgstr "Classe (éducation)"
 
-#: settings.py:105
+#: settings.py:106
 msgid "French"
 msgstr "Français"
 
-#: settings.py:106
+#: settings.py:107
 msgid "English"
 msgstr "Anglais"
 
-#: settings.py:107
+#: settings.py:108
 msgid "Norwegian"
 msgstr "Norvégien"
 
@@ -352,6 +352,39 @@
 msgid "An error has occurred."
 msgstr "Une erreur s'est produite."
 
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Contact de l'utilisateur %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Votre texte \"%(title)s\" a été créé."
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
 #: templates/site/activate.html:10 templates/site/user_activate.html:10
 #: views/user.py:325
 msgid "Activate your account"
@@ -481,81 +514,81 @@
 msgid "Are you sure you want to approve this comment?"
 msgstr "Etes vous sûr de vouloir valider ce commentaire ?"
 
-#: templates/site/dashboard.html:148
+#: templates/site/dashboard.html:149
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Etes vous sûr de vouloir refuser ce commentaire ?"
 
-#: templates/site/dashboard.html:166 templates/site/dashboard.html.py:199
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "modifié il y a %(duration)s"
 
-#: templates/site/dashboard.html:184
+#: templates/site/dashboard.html:186
 msgid "Recent texts"
 msgstr "Textes récents"
 
-#: templates/site/dashboard.html:184 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "tous"
 
-#: templates/site/dashboard.html:199 templates/site/macros/text_meta.html:4
+#: templates/site/dashboard.html:201
 #, python-format
 msgid "%(nb_comments)s comment"
 msgid_plural "%(nb_comments)s comments"
 msgstr[0] "%(nb_comments)s commentaire"
 msgstr[1] "%(nb_comments)s commentaires"
 
-#: templates/site/dashboard.html:204 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206 templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Aucun texte"
 
-#: templates/site/dashboard.html:223
+#: templates/site/dashboard.html:225
 msgid "Workspace activity"
 msgstr "Activités dans l'espace de travail"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "month"
 msgstr "mois"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "week"
 msgstr "semaine"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "24 hours"
 msgstr "24 heures"
 
-#: templates/site/dashboard.html:230
+#: templates/site/dashboard.html:232
 msgid "Access"
 msgstr "Accès"
 
-#: templates/site/dashboard.html:231 templates/site/dashboard.html.py:242
+#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
 #: templates/site/text_list.html:206 templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Chargement ..."
 
-#: templates/site/dashboard.html:241
+#: templates/site/dashboard.html:243
 msgid "Commenting"
 msgstr "Commentaires"
 
-#: templates/site/dashboard.html:258
+#: templates/site/dashboard.html:260
 msgid "Activities"
 msgstr "Activités"
 
-#: templates/site/dashboard.html:261
+#: templates/site/dashboard.html:263
 msgid "texts"
 msgstr "textes"
 
-#: templates/site/dashboard.html:262 templates/site/text_list.html:139
+#: templates/site/dashboard.html:264 templates/site/text_list.html:139
 msgid "comments"
 msgstr "commentaires"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "users"
 msgstr "utilisateurs"
 
-#: templates/site/dashboard.html:304
+#: templates/site/dashboard.html:306
 msgid "No activities"
 msgstr "Pas d'activités"
 
@@ -1159,6 +1192,18 @@
 "Vous avez tenté de quitter la page. Les modifications non sauvegardées "
 "seront perdues. Etes vous sûr de vouloir quitter cette page ?"
 
+#: templates/site/macros/text_meta.html:6
+#, python-format
+msgid "last modified %(duration)s ago"
+msgstr "modifié il y a %(duration)s"
+
+#: templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "1 version"
+msgstr[1] "%(versions_number)s versions"
+
 #: templates/site/macros/text_tabs.html:15
 msgid "People"
 msgstr "Utilisateurs"
@@ -1389,51 +1434,51 @@
 msgid "Text %(text_title)s deleted"
 msgstr "texte %(text_title)s supprimé"
 
-#: views/texts.py:615
+#: views/texts.py:621
 msgid "Note (optional)"
 msgstr "Note (facultative)"
 
-#: views/texts.py:618
+#: views/texts.py:624
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Ajouter une note pour expliquer les modifications apportées au texte"
 
-#: views/texts.py:628
+#: views/texts.py:634
 msgid "New version (optional)"
 msgstr "Nouvelle version (facultative)"
 
-#: views/texts.py:631
+#: views/texts.py:637
 msgid "Create a new version of this text (recommended)"
 msgstr "créér une nouvelle version de ce texte (recommandé)"
 
-#: views/texts.py:634
+#: views/texts.py:640
 msgid "Keep comments (optional)"
 msgstr "Conserver les commentaires (facultatif)"
 
-#: views/texts.py:637
+#: views/texts.py:643
 msgid "Keep comments (if not affected by the edit)"
 msgstr ""
 "Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
 
-#: views/texts.py:700
+#: views/texts.py:706
 msgid "Name (optional)"
 msgstr "Nom (facultatif)"
 
-#: views/texts.py:701
+#: views/texts.py:707
 msgid "Email (optional)"
 msgstr "Email (facultatif)"
 
-#: views/texts.py:751
+#: views/texts.py:757
 #, python-format
 msgid "A new version (copied from version %(version_id)s) has been created"
 msgstr ""
 "Une nouvelle version (copiée depuis la version %(version_id)s) a été créée"
 
-#: views/texts.py:859 views/user.py:79 views/user.py:99
+#: views/texts.py:865 views/user.py:79 views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr "%(count)i rôle(s) d'utilisateur modifié(s)"
 
-#: views/texts.py:917
+#: views/texts.py:923
 msgid "Text settings updated"
 msgstr "Paramètres mis à jour"
 
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/no/LC_MESSAGES/django.mo
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/locale/no/LC_MESSAGES/django.po
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Mon Jan 25 11:34:22 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Mon Jan 25 12:57:01 2010 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 22:02+0100\n"
+"POT-Creation-Date: 2010-01-25 12:51+0100\n"
 "PO-Revision-Date: 2010-01-16 18:00+0100\n"
 "Last-Translator: Kirill Miazine <km@krot.org>\n"
 "Language-Team: <no@li.org>\n"
@@ -64,7 +64,7 @@
 msgid "unknown"
 msgstr "ukjent"
 
-#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:611
+#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617
 msgid "Title"
 msgstr "Overskrift"
 
@@ -72,7 +72,7 @@
 msgid "Format"
 msgstr "Format"
 
-#: models.py:177 views/texts.py:702
+#: models.py:177 views/texts.py:708
 msgid "Content"
 msgstr "Innhold"
 
@@ -215,7 +215,7 @@
 msgid "Email:"
 msgstr "Epost:"
 
-#: notifications.py:60
+#: notifications.py:60 templates/email/activity_notification.txt:1
 msgid "Notification:"
 msgstr "Varsler:"
 
@@ -227,15 +227,15 @@
 msgid "Class (education)"
 msgstr "Klasse (i skole osv.)"
 
-#: settings.py:105
+#: settings.py:106
 msgid "French"
 msgstr "Fransk"
 
-#: settings.py:106
+#: settings.py:107
 msgid "English"
 msgstr "Engelsk"
 
-#: settings.py:107
+#: settings.py:108
 msgid "Norwegian"
 msgstr "Norsk"
 
@@ -351,6 +351,39 @@
 msgid "An error has occurred."
 msgstr "En feil har oppstått."
 
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, fuzzy, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Kontakt bruker %(username)s"
+
+#: templates/email/text_created.txt:4
+#, fuzzy, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Teksten %(text_title)s har blitt opprettet"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
 #: templates/site/activate.html:10 templates/site/user_activate.html:10
 #: views/user.py:325
 msgid "Activate your account"
@@ -476,81 +509,81 @@
 msgid "Are you sure you want to approve this comment?"
 msgstr "Ønsker du å godkjenne denne merknaden?"
 
-#: templates/site/dashboard.html:148
+#: templates/site/dashboard.html:149
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
 
-#: templates/site/dashboard.html:166 templates/site/dashboard.html.py:199
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "endret for %(duration)s siden"
 
-#: templates/site/dashboard.html:184
+#: templates/site/dashboard.html:186
 msgid "Recent texts"
 msgstr "Nye tekster"
 
-#: templates/site/dashboard.html:184 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "alle"
 
-#: templates/site/dashboard.html:199 templates/site/macros/text_meta.html:4
+#: templates/site/dashboard.html:201
 #, python-format
 msgid "%(nb_comments)s comment"
 msgid_plural "%(nb_comments)s comments"
 msgstr[0] "%(nb_comments)s merknad"
 msgstr[1] "%(nb_comments)s merknader"
 
-#: templates/site/dashboard.html:204 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206 templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Ingen tekster ennå"
 
-#: templates/site/dashboard.html:223
+#: templates/site/dashboard.html:225
 msgid "Workspace activity"
 msgstr "Aktivitet i arbeidsområde"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "month"
 msgstr "måned"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "week"
 msgstr "uke"
 
-#: templates/site/dashboard.html:224
+#: templates/site/dashboard.html:226
 msgid "24 hours"
 msgstr "24 timer"
 
-#: templates/site/dashboard.html:230
+#: templates/site/dashboard.html:232
 msgid "Access"
 msgstr "Tilgang"
 
-#: templates/site/dashboard.html:231 templates/site/dashboard.html.py:242
+#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
 #: templates/site/text_list.html:206 templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Laster..."
 
-#: templates/site/dashboard.html:241
+#: templates/site/dashboard.html:243
 msgid "Commenting"
 msgstr "Kommentering"
 
-#: templates/site/dashboard.html:258
+#: templates/site/dashboard.html:260
 msgid "Activities"
 msgstr "Aktivitetsjournal"
 
-#: templates/site/dashboard.html:261
+#: templates/site/dashboard.html:263
 msgid "texts"
 msgstr "tekster"
 
-#: templates/site/dashboard.html:262 templates/site/text_list.html:139
+#: templates/site/dashboard.html:264 templates/site/text_list.html:139
 msgid "comments"
 msgstr "merknader"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "users"
 msgstr "brukere"
 
-#: templates/site/dashboard.html:304
+#: templates/site/dashboard.html:306
 msgid "No activities"
 msgstr "Ingen aktiviteter"
 
@@ -1150,6 +1183,18 @@
 "Du har forsøkt å forlate denne siden. Endringer som ikke er lagret vil bli "
 "tapt. Ønsker du å forlate denne siden?"
 
+#: templates/site/macros/text_meta.html:6
+#, fuzzy, python-format
+msgid "last modified %(duration)s ago"
+msgstr "endret for %(duration)s siden"
+
+#: templates/site/macros/text_meta.html:8
+#, fuzzy, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "Versjoner"
+msgstr[1] "Versjoner"
+
 #: templates/site/macros/text_tabs.html:15
 msgid "People"
 msgstr "Personer"
@@ -1372,49 +1417,49 @@
 msgid "Text %(text_title)s deleted"
 msgstr "Tekstet %(text_title)s slettet"
 
-#: views/texts.py:615
+#: views/texts.py:621
 msgid "Note (optional)"
 msgstr "Kommentar (valgfritt)"
 
-#: views/texts.py:618
+#: views/texts.py:624
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Legg til en kommentar for å beskrive foretatte endringer i teksten"
 
-#: views/texts.py:628
+#: views/texts.py:634
 msgid "New version (optional)"
 msgstr "Ny versjon (valgfritt)"
 
-#: views/texts.py:631
+#: views/texts.py:637
 msgid "Create a new version of this text (recommended)"
 msgstr "Opprett ny versjon av teksten (anbefales)"
 
-#: views/texts.py:634
+#: views/texts.py:640
 msgid "Keep comments (optional)"
 msgstr "Behold merknader (valgfritt)"
 
-#: views/texts.py:637
+#: views/texts.py:643
 msgid "Keep comments (if not affected by the edit)"
 msgstr "Behold merknadene (dersom de ikke er påvirket av endringene i teksten)"
 
-#: views/texts.py:700
+#: views/texts.py:706
 msgid "Name (optional)"
 msgstr "Navn (valgfritt)"
 
-#: views/texts.py:701
+#: views/texts.py:707
 msgid "Email (optional)"
 msgstr "Epost (valgfritt)"
 
-#: views/texts.py:751
+#: views/texts.py:757
 #, python-format
 msgid "A new version (copied from version %(version_id)s) has been created"
 msgstr "Ny versjon (kopiert fra versjon %(version_id)s) har blitt opprettet"
 
-#: views/texts.py:859 views/user.py:79 views/user.py:99
+#: views/texts.py:865 views/user.py:79 views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr "Roller for %(count)i bruker(e) endret"
 
-#: views/texts.py:917
+#: views/texts.py:923
 msgid "Text settings updated"
 msgstr "Tekstinnstillinger oppdatert"
 
diff -r 5e8dda1b7631 -r 5afc61269b10 src/cm/templates/site/macros/text_meta.html
--- a/src/cm/templates/site/macros/text_meta.html	Mon Jan 25 11:34:22 2010 +0100
+++ b/src/cm/templates/site/macros/text_meta.html	Mon Jan 25 12:57:01 2010 +0100
@@ -1,4 +1,9 @@
 {% load i18n %}
 {% load com %}
 {% nb_comments text as nb_comments %}
-<span class="metadata">{% blocktrans count nb_comments as nb_comments %}{{ nb_comments }} comment{% plural %}{{ nb_comments }} comments{% endblocktrans %}</span>
+
+<span class="metadata">
+<abbr title="{{ text_version.created|local_date:tz }}">{% blocktrans with text_version.created|timesince as duration %}last modified {{ duration }} ago{% endblocktrans %}</abbr>
+/
+{% blocktrans count text.get_versions_number as versions_number %}1 version{% plural%}{{ versions_number }} versions{% endblocktrans %}
+</span>