translations

diff --git a/README b/README
index 61f070779492f1a2037147180cf305a850bf7f02..3e2a0c9610502378aec46297775b06f4b41f72a2 100644 (file)
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ and with these convenient features:
 - Optional exchange filtering plug-ins (blacklists)
 - Multi-recipient writing is possible (can be disabled by configuration)
   with min/max constraints
-- Messages are managed in threads
+- Messages are managed by conversations
 - Messages in folders are sortable by sender|recipient|subject|date
 - 'Archives' folder in addition to classic Inbox, Sent and Trash folders
 - A Quick-Reply form to only ask for a response text

diff --git a/docs/index.rst b/docs/index.rst
index 28140476bce3957c085747ed10eec8e5e65f07fa..cb4ee4bdac744fb38b8e9766e6c3c61901099483 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -29,7 +29,7 @@ Each user has access to a collection of messages, stored in folders:
 \r
 In folders, messages can be presented in two modes:\r
 \r
-* by **thread**, for a compact view: the original message and its replies are grouped in a set\r
+* by **conversation**, for a compact view: the original message and its replies are grouped in a set\r
   to constitute one sole entry.\r
   The lastest message (based on the time) is the representative of the set.\r
 * by **message**, for an expanded view: each message is considered by itself.\r
@@ -43,7 +43,7 @@ Here is a summary of features:
 * Optional exchange filtering plug-ins (blacklists)\r
 * Multi-recipient writing is possible (can be disabled by configuration)\r
   with min/max constraints\r
-* Messages are managed in threads\r
+* Messages are managed by conversations\r
 * Messages in folders are sortable by sender|recipient|subject|date\r
 * 'Archives' folder in addition to classic Inbox, Sent and Trash folders\r
 * A Quick-Reply form to only ask for a response text\r

diff --git a/docs/management.rst b/docs/management.rst
index b7a586cf74b594557e7995bea4c1f3906415840e..a196b4def6e43bb0748233c85d71fd5a4113022f 100644 (file)
--- a/docs/management.rst
+++ b/docs/management.rst
@@ -9,13 +9,13 @@ it is moved to a ``trash`` folder.
 One reason is to allow a message to be undeleted if the user wants to retrieve it.\r
 Another reason is that there is only one copy of a message for both the sender and the recipient,\r
 so the message must be marked for deletion by the two parties before to be considered for a withdraw.\r
-An additional constraint is that a message may be a member of a thread and the reply chain\r
+An additional constraint is that a message may be a member of a conversation and the reply chain\r
 must be kept consistent.\r
 \r
 So there are some criteria to fulfill by a record to be really deleted from the database:\r
 \r
 * both the sender and the recipient must have marked the message as deleted\r
-* if the message is in a thread, all the messages of the thread must be marked for deletion\r
+* if the message is in a conversation, all the messages of the conversation must be marked for deletion\r
 * the action of deletion must have been done enough time ago\r
 \r
 A management command is provided for this purpose:\r
@@ -24,7 +24,7 @@ A management command is provided for this purpose:
 \r
 It can be run as a cron job or directly.\r
 \r
-The ``--days`` option can be used to specify the minimal number of days a message/thread\r
+The ``--days`` option can be used to specify the minimal number of days a message/conversation\r
 must have been marked for deletion.\r
 Default value is 30 days.\r
 \r
@@ -32,7 +32,7 @@ postman_checkup
 ---------------\r
 \r
 A management command to run a test suite on the messages presently in the database.\r
-It checks messages and threads for possible inconsistencies, in a read-only mode.\r
+It checks messages and conversations for possible inconsistencies, in a read-only mode.\r
 No change is made on the data.\r
 \r
 **django-admin.py postman_checkup**\r

diff --git a/postman/locale/en/LC_MESSAGES/django.po b/postman/locale/en/LC_MESSAGES/django.po
index 6a68aa0d011c109b97b3081815003004332872bf..2693ee20499062cf0800b198a490a41daa27bfb0 100644 (file)
--- a/postman/locale/en/LC_MESSAGES/django.po
+++ b/postman/locale/en/LC_MESSAGES/django.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-24 18:38+0100\n"
+"POT-Creation-Date: 2010-12-27 13:35+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"
@@ -57,7 +56,7 @@ msgid "Response date cannot be set without at least one reply."
 msgstr ""
 
 #: .\admin.py:66
-msgid "The message cannot be replied without being in a thread."
+msgid "The message cannot be replied without being in a conversation."
 msgstr ""
 
 #: .\admin.py:88 .\admin.py:157 .\templates\postman\view.html.py:5
@@ -104,28 +103,28 @@ msgstr ""
 msgid "Writing to some users is not possible: {users}."
 msgstr ""
 
-#: .\forms.py:149 .\forms.py:161
+#: .\forms.py:148 .\forms.py:160
 msgid "Recipients"
 msgstr ""
 
-#: .\forms.py:149 .\forms.py:161 .\templates\postman\base_folder.html.py:26
+#: .\forms.py:148 .\forms.py:160 .\templates\postman\base_folder.html.py:26
 #: .\templates\postman\reply.html.py:4
 msgid "Recipient"
 msgstr ""
 
-#: .\forms.py:160
+#: .\forms.py:159
 msgid "Email"
 msgstr ""
 
-#: .\forms.py:176
+#: .\forms.py:175
 msgid "Undefined recipient."
 msgstr ""
 
-#: .\forms.py:195
+#: .\forms.py:194
 msgid "Additional recipients"
 msgstr ""
 
-#: .\forms.py:195
+#: .\forms.py:194
 msgid "Additional recipient"
 msgstr ""
 
@@ -149,87 +148,87 @@ msgstr ""
 msgid "body"
 msgstr ""
 
-#: .\models.py:199 .\models.py:282
+#: .\models.py:199 .\models.py:281
 msgid "sender"
 msgstr ""
 
-#: .\models.py:200 .\models.py:306
+#: .\models.py:200 .\models.py:305
 msgid "recipient"
 msgstr ""
 
-#: .\models.py:202
+#: .\models.py:201
 msgid "visitor"
 msgstr ""
 
-#: .\models.py:203
+#: .\models.py:202
 msgid "parent message"
 msgstr ""
 
-#: .\models.py:204
+#: .\models.py:203
 msgid "root message"
 msgstr ""
 
-#: .\models.py:205
+#: .\models.py:204
 msgid "sent at"
 msgstr ""
 
-#: .\models.py:206
+#: .\models.py:205
 msgid "read at"
 msgstr ""
 
-#: .\models.py:207
+#: .\models.py:206
 msgid "replied at"
 msgstr ""
 
-#: .\models.py:208
+#: .\models.py:207
 msgid "archived by sender"
 msgstr ""
 
-#: .\models.py:209
+#: .\models.py:208
 msgid "archived by recipient"
 msgstr ""
 
-#: .\models.py:210
+#: .\models.py:209
 msgid "deleted by sender at"
 msgstr ""
 
-#: .\models.py:211
+#: .\models.py:210
 msgid "deleted by recipient at"
 msgstr ""
 
-#: .\models.py:213
+#: .\models.py:212
 msgid "status"
 msgstr ""
 
-#: .\models.py:215
+#: .\models.py:214
 msgid "moderator"
 msgstr ""
 
-#: .\models.py:216
+#: .\models.py:215
 msgid "moderated at"
 msgstr ""
 
-#: .\models.py:217
+#: .\models.py:216
 msgid "rejection reason"
 msgstr ""
 
-#: .\models.py:222
+#: .\models.py:221
 msgid "message"
 msgstr ""
 
-#: .\models.py:223
+#: .\models.py:222
 msgid "messages"
 msgstr ""
 
-#: .\models.py:334
+#: .\models.py:333
 msgid "Undefined sender."
 msgstr ""
 
-#: .\models.py:478
+#: .\models.py:473
 msgid "pending message"
 msgstr ""
 
-#: .\models.py:479
+#: .\models.py:474
 msgid "pending messages"
 msgstr ""
 
@@ -257,20 +256,20 @@ msgstr ""
 msgid "Message rejected for at least one recipient."
 msgstr ""
 
-#: .\views.py:277
+#: .\views.py:276
 msgid "Select at least one object."
 msgstr ""
 
-#: .\views.py:283
-msgid "Message(s) or thread(s) successfully archived."
+#: .\views.py:282
+msgid "Message(s) or conversation(s) successfully archived."
 msgstr ""
 
-#: .\views.py:288
-msgid "Message(s) or thread(s) successfully deleted."
+#: .\views.py:287
+msgid "Message(s) or conversation(s) successfully deleted."
 msgstr ""
 
-#: .\views.py:293
-msgid "Message(s) or thread(s) successfully recovered."
+#: .\views.py:292
+msgid "Message(s) or conversation(s) successfully recovered."
 msgstr ""
 
 #: .\management\__init__.py:14
@@ -350,7 +349,7 @@ msgid "Sorry, this page number is invalid."
 msgstr ""
 
 #: .\templates\postman\base_folder.html.py:12
-msgid "by thread"
+msgid "by conversation"
 msgstr ""
 
 #: .\templates\postman\base_folder.html.py:13
@@ -506,7 +505,7 @@ msgid ""
 msgstr ""
 
 #: .\templates\postman\view.html.py:5
-msgid "Thread"
+msgid "Conversation"
 msgstr ""
 
 #: .\templates\postman\view.html.py:13
@@ -517,6 +516,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: .\templatetags\postman_tags.py:34
+#: .\templatetags\postman_tags.py:35
 msgid "<me>"
 msgstr ""

diff --git a/postman/locale/fr/LC_MESSAGES/django.mo b/postman/locale/fr/LC_MESSAGES/django.mo
index 19c9a0a4375567765a564407416b0a64bd230bae..1b80e8f607deb71a18380af73d9a7c6eb76bd89e 100644 (file)
Binary files a/postman/locale/fr/LC_MESSAGES/django.mo and b/postman/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/postman/locale/fr/LC_MESSAGES/django.po b/postman/locale/fr/LC_MESSAGES/django.po
index 1fca51c5500f5b250724f3f499d39be596ad46f2..d4b73bf9526786a4f9c3ae2c5c000dec61d318dd 100644 (file)
--- a/postman/locale/fr/LC_MESSAGES/django.po
+++ b/postman/locale/fr/LC_MESSAGES/django.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: django-postman 1.0.0\n"
-"Report-Msgid-Bugs-To: http://bitbucket.org/psam/django-postman/issues\n"
-"POT-Creation-Date: 2010-12-22 22:57+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-27 13:36+0100\n"
 "PO-Revision-Date: 2010-12-15 17:19+0100\n"
 "Last-Translator: Patrick Samson <maxcom@laposte.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,7 +64,7 @@ msgstr ""
 "La date de réponse ne peut pas être positionnée sans au moins une réponse."
 
 #: .\admin.py:66
-msgid "The message cannot be replied without being in a thread."
+msgid "The message cannot be replied without being in a conversation."
 msgstr "Le message ne peut pas être répondu sans être dans une conversation."
 
 #: .\admin.py:88 .\admin.py:157 .\templates\postman\view.html.py:5
@@ -115,28 +115,28 @@ msgstr "{user.username} ({reason})"
 msgid "Writing to some users is not possible: {users}."
 msgstr "Écrire à certains utilisateurs n'est pas possible : {users}."
 
-#: .\forms.py:149 .\forms.py:161
+#: .\forms.py:148 .\forms.py:160
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: .\forms.py:149 .\forms.py:161 .\templates\postman\base_folder.html.py:26
+#: .\forms.py:148 .\forms.py:160 .\templates\postman\base_folder.html.py:26
 #: .\templates\postman\reply.html.py:4
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: .\forms.py:160
+#: .\forms.py:159
 msgid "Email"
 msgstr "Courriel"
 
-#: .\forms.py:176
+#: .\forms.py:175
 msgid "Undefined recipient."
 msgstr "Destinataire indéfini."
 
-#: .\forms.py:195
+#: .\forms.py:194
 msgid "Additional recipients"
 msgstr "Destinataires supplémentaires"
 
-#: .\forms.py:195
+#: .\forms.py:194
 msgid "Additional recipient"
 msgstr "Destinataire supplémentaire"
 
@@ -152,95 +152,95 @@ msgstr "Accepté"
 msgid "Rejected"
 msgstr "Rejeté"
 
-#: .\models.py:200
+#: .\models.py:197
 msgid "subject"
 msgstr "objet"
 
-#: .\models.py:201
+#: .\models.py:198
 msgid "body"
 msgstr "contenu"
 
-#: .\models.py:202 .\models.py:285
+#: .\models.py:199 .\models.py:281
 msgid "sender"
 msgstr "expéditeur"
 
-#: .\models.py:203 .\models.py:309
+#: .\models.py:200 .\models.py:305
 msgid "recipient"
 msgstr "destinataire"
 
-#: .\models.py:205
+#: .\models.py:201
 msgid "visitor"
 msgstr "visiteur"
 
-#: .\models.py:206
+#: .\models.py:202
 msgid "parent message"
 msgstr "message parent"
 
-#: .\models.py:207
+#: .\models.py:203
 msgid "root message"
 msgstr "message racine"
 
-#: .\models.py:208
+#: .\models.py:204
 msgid "sent at"
 msgstr "envoyé le"
 
-#: .\models.py:209
+#: .\models.py:205
 msgid "read at"
 msgstr "lu le"
 
-#: .\models.py:210
+#: .\models.py:206
 msgid "replied at"
 msgstr "répondu le"
 
-#: .\models.py:211
+#: .\models.py:207
 msgid "archived by sender"
 msgstr "archivé par l'expéditeur"
 
-#: .\models.py:212
+#: .\models.py:208
 msgid "archived by recipient"
 msgstr "archivé par le destinataire"
 
-#: .\models.py:213
+#: .\models.py:209
 msgid "deleted by sender at"
 msgstr "supprimé par l'expéditeur le"
 
-#: .\models.py:214
+#: .\models.py:210
 msgid "deleted by recipient at"
 msgstr "supprimé par le destinataire le"
 
-#: .\models.py:216
+#: .\models.py:212
 msgid "status"
 msgstr "état"
 
-#: .\models.py:218
+#: .\models.py:214
 msgid "moderator"
 msgstr "modérateur"
 
-#: .\models.py:219
+#: .\models.py:215
 msgid "moderated at"
 msgstr "modéré le"
 
-#: .\models.py:220
+#: .\models.py:216
 msgid "rejection reason"
 msgstr "motif de rejet"
 
-#: .\models.py:225
+#: .\models.py:221
 msgid "message"
 msgstr "message"
 
-#: .\models.py:226
+#: .\models.py:222
 msgid "messages"
 msgstr "messages"
 
-#: .\models.py:337
+#: .\models.py:333
 msgid "Undefined sender."
 msgstr "Expéditeur indéfini."
 
-#: .\models.py:481
+#: .\models.py:473
 msgid "pending message"
 msgstr "message en attente"
 
-#: .\models.py:482
+#: .\models.py:474
 msgid "pending messages"
 msgstr "messages en attente"
 
@@ -264,28 +264,28 @@ msgstr ""
 msgid "Re: {subject}"
 msgstr "Re: {subject}"
 
-#: .\views.py:121 .\views.py:187
+#: .\views.py:129 .\views.py:187
 msgid "Message successfully sent."
 msgstr "Message envoyé avec succès."
 
-#: .\views.py:123 .\views.py:189
+#: .\views.py:131 .\views.py:189
 msgid "Message rejected for at least one recipient."
 msgstr "Message rejeté pour au moins un destinataire."
 
-#: .\views.py:272
+#: .\views.py:276
 msgid "Select at least one object."
 msgstr "Sélectionner au moins un objet."
 
-#: .\views.py:278
-msgid "Message(s) or thread(s) successfully archived."
+#: .\views.py:282
+msgid "Message(s) or conversation(s) successfully archived."
 msgstr "Message(s) ou conversation(s) archivé(s) avec succès."
 
-#: .\views.py:283
-msgid "Message(s) or thread(s) successfully deleted."
+#: .\views.py:287
+msgid "Message(s) or conversation(s) successfully deleted."
 msgstr "Message(s) ou conversation(s) supprimé(s) avec succès."
 
-#: .\views.py:288
-msgid "Message(s) or thread(s) successfully recovered."
+#: .\views.py:292
+msgid "Message(s) or conversation(s) successfully recovered."
 msgstr "Message(s) ou conversation(s) restauré(s) avec succès."
 
 #: .\management\__init__.py:14
@@ -367,7 +367,7 @@ msgid "Sorry, this page number is invalid."
 msgstr "Désolé, ce numéro de page est invalide."
 
 #: .\templates\postman\base_folder.html.py:12
-msgid "by thread"
+msgid "by conversation"
 msgstr "par conversation"
 
 #: .\templates\postman\base_folder.html.py:13
@@ -530,7 +530,7 @@ msgstr ""
 "stockage à long terme, utilisez plutôt le dossier d'archivage."
 
 #: .\templates\postman\view.html.py:5
-msgid "Thread"
+msgid "Conversation"
 msgstr "Conversation"
 
 #: .\templates\postman\view.html.py:13
@@ -541,6 +541,6 @@ msgstr " :"
 msgid "Back"
 msgstr "Retour"
 
-#: .\templatetags\postman_tags.py:34
+#: .\templatetags\postman_tags.py:35
 msgid "<me>"
 msgstr "<moi>"