From 1e905ea8f933c74c93ba094ce329817be3e78fdd Mon Sep 17 00:00:00 2001 From: Patrick Samson Date: Mon, 27 Dec 2010 13:46:43 +0100 Subject: [PATCH] translations --- README | 2 +- docs/index.rst | 4 +- docs/management.rst | 8 +-- postman/locale/en/LC_MESSAGES/django.po | 79 +++++++++++---------- postman/locale/fr/LC_MESSAGES/django.mo | Bin 9841 -> 9830 bytes postman/locale/fr/LC_MESSAGES/django.po | 88 ++++++++++++------------ 6 files changed, 90 insertions(+), 91 deletions(-) diff --git a/README b/README index 61f0707..3e2a0c9 100644 --- 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 2814047..cb4ee4b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,7 +29,7 @@ Each user has access to a collection of messages, stored in folders: In folders, messages can be presented in two modes: -* by **thread**, for a compact view: the original message and its replies are grouped in a set +* by **conversation**, for a compact view: the original message and its replies are grouped in a set to constitute one sole entry. The lastest message (based on the time) is the representative of the set. * by **message**, for an expanded view: each message is considered by itself. @@ -43,7 +43,7 @@ Here is a summary of 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/management.rst b/docs/management.rst index b7a586c..a196b4d 100644 --- 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. Another reason is that there is only one copy of a message for both the sender and the recipient, so the message must be marked for deletion by the two parties before to be considered for a withdraw. -An additional constraint is that a message may be a member of a thread and the reply chain +An additional constraint is that a message may be a member of a conversation and the reply chain must be kept consistent. So there are some criteria to fulfill by a record to be really deleted from the database: * both the sender and the recipient must have marked the message as deleted -* if the message is in a thread, all the messages of the thread must be marked for deletion +* if the message is in a conversation, all the messages of the conversation must be marked for deletion * the action of deletion must have been done enough time ago A management command is provided for this purpose: @@ -24,7 +24,7 @@ A management command is provided for this purpose: It can be run as a cron job or directly. -The ``--days`` option can be used to specify the minimal number of days a message/thread +The ``--days`` option can be used to specify the minimal number of days a message/conversation must have been marked for deletion. Default value is 30 days. @@ -32,7 +32,7 @@ postman_checkup --------------- A management command to run a test suite on the messages presently in the database. -It checks messages and threads for possible inconsistencies, in a read-only mode. +It checks messages and conversations for possible inconsistencies, in a read-only mode. No change is made on the data. **django-admin.py postman_checkup** diff --git a/postman/locale/en/LC_MESSAGES/django.po b/postman/locale/en/LC_MESSAGES/django.po index 6a68aa0..2693ee2 100644 --- 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 , 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 \n" "Language-Team: LANGUAGE \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 "" msgstr "" diff --git a/postman/locale/fr/LC_MESSAGES/django.mo b/postman/locale/fr/LC_MESSAGES/django.mo index 19c9a0a4375567765a564407416b0a64bd230bae..1b80e8f607deb71a18380af73d9a7c6eb76bd89e 100644 GIT binary patch delta 2605 zcmY+_drVhl9LMp8Ux0uh#YOJ$i@VC5xN2&k$jt&_8YTtm4}=nkTVt)A)s(qfq5J(& zf54W1IajL*t!6g5C#_XebJk|Ft;yC_V&&GXwR(TfIXF4<`+Ggl!#U4+&iDDA_}ox@%DF}7k1lhhGs< z6~2uH_+GfN>nDCDe^(P&Yb-%FHb4ytAk$ z{RFwES-=Xsf_kt>CXt&k3HvM>O8rsPL@#0io^Z!MLM`ZX%)(2kl;6e-EQ)fTq#aA> z@59YFg}U)KxE6z>orR@f4E+pb3S(8$(8?Pz1=~<7dm8m5FJmG4QG5BR`}bgG(GAiu z0r#RZHj1hEI_kO)F&3AQwU{6}df<2@>6S^Mp;YE$99AOdnil5-<3sJ$7;2% zZpLQh62CijGXRLVx&{v@i3 zr%(&LjLO7SR7!tAZP^Xf-rhoGCYV(z1F@*_G~A8FXtmQgMnfz65q-Fb2eFyQ+=*vU zTk;<&LopPHiZmHjoK2|AbhzVvsEoXZs*!iG5^uQX@U&C(yOPQO1dW>vXixgNif@M* zLrwTR9>Np&DE^K0*hZRk{xojHQ@90xMlC2K&3OxoQ5hLR%{PvA?V!%{r&-Puon$~y zb{dtcGpGyB;lub9s`?YX&W$>ee`basT{n+f_!roS7g6IW_d6-i!b18LSckp19^bNP zXoWxEX1s2wz40eF1ghb=1VVi(a!3)RQNmSHs9Im^xI7eW>$C zP&M`}>ii>)mN`yCRXUBT_BW7kjG4zEyolPf?@{MnM@?|c?VD_;ABn1oBn-lA*F4mX zOHf<75%nNV7-0ObtV;AX)7?eX5gsC+&_TK0Ido|kp(W~2JwHYqR>wWG^LoKpnZ0S+ zVI8$Zsy`wm$$HT4J3pmvy9f6Y!Gwx=oX}QR6FMFz^b%;h%LzVL_7TXhN?{M7#PB>O zhtM0Rt<}*=6x%KP$FhH$_#GhhCiU7QPR6Nm`+wVeu!CqLYKSL@PGXc$DeNHfh~?uc zw=w3b>{5pIZfIyH(MJ^NYui9$nCK^TsMeMbYTy1(Y`Nd-c?=*h;9dHJ6Sp z{@bBR0fqk9uwTP#2M5M|!z10JeS-tDt6M$c2ksj1?}=Eqa$qtdcg4WmI}yJHt{CwT zMCJOwjaok&?eWCjJ(<}*;XUjd8R_oz%|*v{2V{n|Jkp+DJM6RXoxiPn)K~2-DJm|? uFD}V1sqhw;R+pB~onPzqtXSmSV*GcZbLZ1rJn<`LAL<^yGksxJO~C&y4H01g delta 2603 zcmYk-ZERCj9LMp~+HLF!WEj9^&~7VxVr$cO7~bqA zh7jK9AWaMzBohpf5hKwq1|n}v^aY7g%w7;5NJNSA0S$^Ta0c=FYj2|`{P#KM^xkvN z`JZzyKkWE@$MMsa%NXOxHzo_SF%Ju{5X&$dtME~*!?oCqtMOITeedFKoWfSjDKMr5 zJ5ax$#vDA04R{eX-j@Z&N>zTQqmGWh(T&wST^DY~dW@nE-@*u9$9=eIt}(edftvUv zGK87JKKux`VC}s0#3QJQT*Qs|{yfW=Mk@E{U`$iPv{qmM=U_L^$AhQ`jiMfO43(J# z>bh~%O5aAFX(lm%mr)D5YwKaK3fkLInLl7r(LjUPfKmI0GpGrj$10pcrTi;git~%o zD``YO?Pgqq5!8bxu@rBi#=no6;6p6Itm5>-EH@RcpbkCQh?-#=>V`1-a0Iod=j`8q zL_NsGXbW*2Ds%1l7`}$O?+h-$FOX-O8Pv*WkxW|VAr+-IkE_bC1nDw$$gY@8s6A^% zO|%2G$6cuV!l;xVMqPgl$+kI(x^EJ7-FtTbho~+56m|a04Jt~}ZPX3F*zJ3Ed)C%T zKJ|b+)FE}_c?TIoW$qhhuT0FM6HCg|87xD!J*WkEZEG-_=NmtjN?eOdUAuk32r6Zx zcKZZwp*@b8@VBT`&Y-sH4stxqAE=DDn2lCmjOzDbJNj@B9z{zt`kG1zZ(|Q`XL&pE z5^5_RpfXd$!O$UfqYmdbR7UpN{k^D6yoov+Q@952*jBO1G1~j_F#c9a{;&*28Vg__XfMaHa0A1WimsPW>cGjjxW-3io!CKg%g z$^|-R5at8_zYGqF{TN7kZm**sF`0zP4E-cTk<(_?#ztc{|_#sJ%^7&71pCB(uNwp z6E*%gvYX~RT#MENDmr`t?$%8AAlWuYa3!8a{XUJl@h)oMe4e6}7o%RcMd-zq$ZnWc zRH`GW>qk*%?I`NLv9y*sMMbCe0_wDXfP7obHO#`Bs0@6My6!G&fQNQFe|fs?MxBl2 zn1!os1E>c#qqcS{Y9a0DFo`#E+@a@a?k2VnPNI%b(Pf#UTUGQTspx!n5<_a(Wm~3# z+N2u0-GZJ(;hYL<9km|2*Kd0OUnH`LCW3XPwp!bxvY*h|;xm-`ze;bUii^+@*h?re zDy_t7LT_EBXcz5brQFHiVM6DjH`SBQyteHL;t`^QXd^ZeFBAI+y^*}hse`-%RpP|K zRE_^4Y!@QOIkg+=+ClUaK7DQV8b^r%LPcjQQ@m7GWg7U3U4Q(4eH*Da6TFzIqPJ<6 zU5{ayc#=3o=-BXH7Y$jB?h^GmCN4g1>mk51t^yaD56H5usys0Jzi4BAf zw#HIfpZF`c!qJdekas6JH-DEiJKh%!1$z<$g*BP#L}9gEO->j7>dJJ#UR0g`1<1UNR!Xk)gSK~=^hNl8^Y0EUnCYB^7RY^ zhkL{Ik#HD;{GL!oFa81D}cC$B7N hb9yrmiv*+I?(l!Vn%GDr673&Ke73AK*;2L4@h^z?6rTV9 diff --git a/postman/locale/fr/LC_MESSAGES/django.po b/postman/locale/fr/LC_MESSAGES/django.po index 1fca51c..d4b73bf 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "" msgstr "" -- 2.39.5