diff --git a/django_messages/forms.py b/django_messages/forms.py index 79a0238..30eec81 100644 --- a/django_messages/forms.py +++ b/django_messages/forms.py @@ -8,7 +8,7 @@ else: notification = None -from django_messages.models import Message +from django_messages.models import Message, Attachment from django_messages.fields import CommaSeparatedUserField class ComposeForm(forms.Form): @@ -19,6 +19,11 @@ class ComposeForm(forms.Form): subject = forms.CharField(label=_(u"Subject"), max_length=140) body = forms.CharField(label=_(u"Body"), widget=forms.Textarea(attrs={'rows': '12', 'cols':'55'})) + attachments = forms.FileField( + label=_('Attachments'), + widget=forms.ClearableFileInput(attrs={'multiple': True}), + required=False + ) def __init__(self, *args, **kwargs): @@ -28,7 +33,7 @@ def __init__(self, *args, **kwargs): self.fields['recipient']._recipient_filter = recipient_filter - def save(self, sender, parent_msg=None): + def save(self, sender, parent_msg=None, files=[]): recipients = self.cleaned_data['recipient'] subject = self.cleaned_data['subject'] body = self.cleaned_data['body'] @@ -45,6 +50,9 @@ def save(self, sender, parent_msg=None): parent_msg.replied_at = timezone.now() parent_msg.save() msg.save() + for f in files: + attachment = Attachment(file=f, message=msg) + attachment.save() message_list.append(msg) if notification: if parent_msg is not None: diff --git a/django_messages/locale/ar/LC_MESSAGES/django.mo b/django_messages/locale/ar/LC_MESSAGES/django.mo index 5c16012..3480c0f 100644 Binary files a/django_messages/locale/ar/LC_MESSAGES/django.mo and b/django_messages/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/ar/LC_MESSAGES/django.po b/django_messages/locale/ar/LC_MESSAGES/django.po index 027edb1..7b2776b 100644 --- a/django_messages/locale/ar/LC_MESSAGES/django.po +++ b/django_messages/locale/ar/LC_MESSAGES/django.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-14 04:23+0300\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2009-11-02 00:41+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,43 +18,47 @@ msgstr "" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:8 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "المستلم" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "مجموعة" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "ينشئ الرسالة اختياريا لجميع المستخدمين او لمجموعة من المستخدمين." -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "جميع المستخدمين" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "الرسالة" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "التاريخ/الوقت" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "الرسائل" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "أسماء المستخدمين التالي ذكرهم غير صحيحة: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:8 -#: templates/messages/outbox.html:8 templates/messages/trash.html:8 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "المستلم" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "الموضوع" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "المحتوى" @@ -105,119 +110,102 @@ msgstr "تم استرجاع الرسالة" msgid "you have undeleted a message" msgstr "قمت باسترجاع رسالة" -#: models.py:51 templates/messages/inbox.html:8 -#: templates/messages/trash.html:8 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "المرسل" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "الرسالة الأساسية" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "أرسلت في" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "قُرأت في" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "رُدّ عليها في" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "حذفها المُرسل في" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "حذفها المستلم في" -#: models.py:89 -msgid "Messages" -msgstr "الرسائل" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "رسالة جديدة: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "تم إرسال الرسالة بنجاح." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"كتب %(sender)s:\n" -"%(body)s" -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "رد: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "تم حذف الرسالة بنجاح." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "تم استرجاع الرسالة بنجاح." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "الوارد" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "الرسائل المرسلة" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "رسالة جديدة" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "الحاوية" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "أكتب رسالة" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "أرسل" -#: templates/messages/inbox.html:8 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "استُلمت" -#: templates/messages/inbox.html:8 templates/messages/outbox.html:8 -#: templates/messages/trash.html:8 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "إجراء" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 -#: templates/messages/trash.html:17 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/messages/inbox.html:21 templates/messages/outbox.html:18 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "حذف" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "لا توجد رسائل." -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -230,61 +218,96 @@ msgstr "" "وصلتك رسالة خاصة من %(sender)s\n" "تحتوي ما يلي:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "أرسلت من %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "رد" -#: templates/messages/outbox.html:8 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "أرسل" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "الرسائل المحذوفة" -#: templates/messages/trash.html:8 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "التاريخ" -#: templates/messages/trash.html:18 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "استرجاع" -#: templates/messages/trash.html:27 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." msgstr "" -"تتم إزالة الرسائل المحذوفة من الحاوية على فترات زمنيّة متفاوتة، " -"فلا تعتمد على هذه الميزة للتخزين الطويل المدى." +"تتم إزالة الرسائل المحذوفة من الحاوية على فترات زمنيّة متفاوتة، فلا تعتمد على " +"هذه الميزة للتخزين الطويل المدى." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "مشاهدة الرسالة" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "حذف" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "قمت بحذف رسالة" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "قمت بحذف الرسالة %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "أرسل لك %(message_sender)s رداً على %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"وصلتك الرسالة %(message)s " -"من %(message_sender)s." +"وصلتك الرسالة %(message)s من " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "قمت باسترجاع الرسالة %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -292,26 +315,95 @@ msgid "" "You have recovered the message %(message)s." msgstr "قمت باسترجاع الرسالة %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"قمت بالرد الرسائل %(message_parent_msg)s من " +"%(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"قمت بالرد الرسائل %(message_parent_msg)s " -"من %(message_recipient)s." +"قمت بالرد الرسائل %(message_parent_msg)s من " +"%(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "أرسل لك %(message_sender)s رداً على %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"قمت بإرسالة الرسالة %(message)s إلى " +"%(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" -"قمت بإرسالة الرسالة %(message)s إلى %" -"(message_recipient)s." +"قمت بإرسالة الرسالة %(message)s إلى " +"%(message_recipient)s." +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"كتب %(sender)s:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "رد: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "رسالة جديدة: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "تم إرسال الرسالة بنجاح." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "رد: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "تم حذف الرسالة بنجاح." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "تم استرجاع الرسالة بنجاح." diff --git a/django_messages/locale/ca/LC_MESSAGES/django.mo b/django_messages/locale/ca/LC_MESSAGES/django.mo index 47a5b77..d6340c1 100644 Binary files a/django_messages/locale/ca/LC_MESSAGES/django.mo and b/django_messages/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/ca/LC_MESSAGES/django.po b/django_messages/locale/ca/LC_MESSAGES/django.po index c559488..f5e272e 100644 --- a/django_messages/locale/ca/LC_MESSAGES/django.po +++ b/django_messages/locale/ca/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-12 00:29+0200\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "Crea el missatge opcionalment per a tots els usuaris o per un grup" msgid "All users" msgstr "Tots els usuaris" -#: admin.py:48 models.py:91 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Missatge" @@ -39,7 +39,7 @@ msgstr "Missatge" msgid "Date/time" msgstr "Data" -#: apps.py:6 models.py:92 +#: apps.py:6 models.py:95 msgid "Messages" msgstr "Missatges" @@ -48,18 +48,18 @@ msgstr "Missatges" msgid "The following usernames are incorrect: %(users)s" msgstr "" -#: forms.py:18 models.py:55 templates/django_messages/outbox.html:9 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 #: templates/django_messages/view.html:13 msgid "Recipient" msgstr "Destinatari" -#: forms.py:19 models.py:52 templates/django_messages/inbox.html:9 +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 #: templates/django_messages/outbox.html:9 #: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Assumpte" -#: forms.py:20 models.py:53 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Cos" @@ -111,35 +111,47 @@ msgstr "Missatge recuperat" msgid "you have undeleted a message" msgstr "has recuperat el missatge" -#: models.py:54 templates/django_messages/inbox.html:9 +#: models.py:58 templates/django_messages/inbox.html:9 #: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Emissor" -#: models.py:56 +#: models.py:60 msgid "Parent message" msgstr "Missatge pare" -#: models.py:57 +#: models.py:61 msgid "sent at" msgstr "enviat" -#: models.py:58 +#: models.py:62 msgid "read at" msgstr "llegit el" -#: models.py:59 +#: models.py:63 msgid "replied at" msgstr "respost el" -#: models.py:60 +#: models.py:64 msgid "Sender deleted at" msgstr "Emissor borrat" -#: models.py:61 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinatari borrat" +#: models.py:106 +msgid "File" +msgstr "" + +#: models.py:117 +msgid "Attachment" +msgstr "" + +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" + #: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 #: templates/django_messages/new_message.html:12 msgid "Inbox" @@ -213,7 +225,7 @@ msgid "Sent from %(site_url)s" msgstr "Enviat des de %(site_url)s" #: templates/django_messages/new_message.html:13 -#: templates/django_messages/view.html:19 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Respondre" @@ -246,7 +258,7 @@ msgstr "" msgid "View Message" msgstr "Veure Missatge" -#: templates/django_messages/view.html:21 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Borrar" @@ -359,7 +371,7 @@ msgstr "" "Has enviat el missatge %(message)s a " "%(message_recipient)s." -#: utils.py:26 +#: utils.py:25 #, python-format msgid "" "%(sender)s wrote:\n" @@ -368,29 +380,29 @@ msgstr "" "%(sender)s escrigué:\n" "%(body)s" -#: utils.py:54 +#: utils.py:53 #, python-format msgid "Re%(prefix)s: %(subject)s" msgstr "Re%(prefix)s: %(subject)s" -#: utils.py:60 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "Nou missatge: %(subject)s" -#: views.py:79 views.py:116 +#: views.py:92 views.py:133 msgid "Message successfully sent." msgstr "Missatge enviat" -#: views.py:98 views.py:194 +#: views.py:111 views.py:211 #, python-format msgid "Re: %(subject)s" msgstr "Re: %(subject)s" -#: views.py:159 +#: views.py:176 msgid "Message successfully deleted." msgstr "Missatge borrat" -#: views.py:186 +#: views.py:203 msgid "Message successfully recovered." msgstr "Missatge recuperat" diff --git a/django_messages/locale/cs/LC_MESSAGES/django.mo b/django_messages/locale/cs/LC_MESSAGES/django.mo index deeec2f..11f663b 100644 Binary files a/django_messages/locale/cs/LC_MESSAGES/django.mo and b/django_messages/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/cs/LC_MESSAGES/django.po b/django_messages/locale/cs/LC_MESSAGES/django.po index 9818544..2e60b88 100644 --- a/django_messages/locale/cs/LC_MESSAGES/django.po +++ b/django_messages/locale/cs/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-01 12:29+0100\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2015-01-01 12:29+0100\n" "Last-Translator: Radim Sückr \n" "Language-Team: \n" @@ -28,7 +28,7 @@ msgstr "Volitelně vytváří zprávu pro všechny uživatele nebo skupinu uživ msgid "All users" msgstr "Všichni uživatelé" -#: admin.py:48 models.py:91 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Zpráva" @@ -36,7 +36,7 @@ msgstr "Zpráva" msgid "Date/time" msgstr "Datum/čas" -#: apps.py:6 models.py:92 +#: apps.py:6 models.py:95 msgid "Messages" msgstr "Zprávy" @@ -45,19 +45,18 @@ msgstr "Zprávy" msgid "The following usernames are incorrect: %(users)s" msgstr "Následující uživatelská jména nejsou správně: %(users)s" -#: forms.py:18 models.py:55 templates/django_messages/outbox.html:10 -#: templates/django_messages/view.html:14 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 msgid "Recipient" msgstr "Příjemce" -#: forms.py:19 models.py:52 templates/django_messages/inbox.html:10 -#: templates/django_messages/outbox.html:10 -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:8 +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Předmět" -#: forms.py:20 models.py:53 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Obsah" @@ -109,43 +108,54 @@ msgstr "Zpráva obnovena" msgid "you have undeleted a message" msgstr "obnovili jste smazanou zprávu" -#: models.py:54 templates/django_messages/inbox.html:10 -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:10 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Odesílatel" -#: models.py:56 +#: models.py:60 msgid "Parent message" msgstr "Předchozí zpráva" -#: models.py:57 +#: models.py:61 msgid "sent at" msgstr "odesláno" -#: models.py:58 +#: models.py:62 msgid "read at" msgstr "přečteno" -#: models.py:59 +#: models.py:63 msgid "replied at" msgstr "zodpovězeno" -#: models.py:60 +#: models.py:64 msgid "Sender deleted at" msgstr "Odesílatel smazal zprávu" -#: models.py:61 +#: models.py:65 msgid "Recipient deleted at" msgstr "Příjemce smazal zprávu" -#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:6 -#: templates/django_messages/new_message.html:13 +#: models.py:106 +msgid "File" +msgstr "" + +#: models.py:117 +msgid "Attachment" +msgstr "" + +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" + +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Příchozí zprávy" #: templates/django_messages/base.html:9 -#: templates/django_messages/outbox.html:6 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Odchozí zprávy" @@ -157,43 +167,43 @@ msgstr "Nová zpráva" msgid "Trash" msgstr "Koš" -#: templates/django_messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Napsat zprávu" -#: templates/django_messages/compose.html:10 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Odeslat" -#: templates/django_messages/inbox.html:10 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Přijato" -#: templates/django_messages/inbox.html:10 -#: templates/django_messages/outbox.html:10 -#: templates/django_messages/trash.html:10 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Akce" -#: templates/django_messages/inbox.html:22 -#: templates/django_messages/outbox.html:19 -#: templates/django_messages/trash.html:19 -#: templates/django_messages/view.html:13 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j. E Y, H:i" -#: templates/django_messages/inbox.html:23 -#: templates/django_messages/outbox.html:20 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "smazat" -#: templates/django_messages/inbox.html:29 -#: templates/django_messages/outbox.html:26 -#: templates/django_messages/trash.html:26 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Žádné zprávy." -#: templates/django_messages/new_message.html:4 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -206,34 +216,34 @@ msgstr "" "máte novou soukromou zprávu od %(sender)s\n" "s následujícím obsahem:" -#: templates/django_messages/new_message.html:12 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Odesláno z %(site_url)s" -#: templates/django_messages/new_message.html:14 -#: templates/django_messages/view.html:20 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Odpovědět" -#: templates/django_messages/outbox.html:10 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Odesláno" -#: templates/django_messages/trash.html:6 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Smazané zprávy" -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:12 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Datum" -#: templates/django_messages/trash.html:20 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "obnovit" -#: templates/django_messages/trash.html:29 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -241,11 +251,11 @@ msgstr "" "Smazané zprávy jsou z koše odstraňovány v nepravidelných intervalech, " "nespoléhejte se na koš jako dlouhodobé úložiště." -#: templates/django_messages/view.html:6 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Zobrazit zprávu" -#: templates/django_messages/view.html:22 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Smazat" @@ -258,8 +268,7 @@ msgstr "Smazali jste zprávu '%(message)s'." #, python-format msgid "" "You have deleted the message %(message)s." -msgstr "" -"Smazali jste zprávu %(message)s." +msgstr "Smazali jste zprávu %(message)s." #: templates/notification/messages_received/full.txt:1 #, python-format @@ -286,8 +295,8 @@ msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Přišla vám zpráva %(message)s " -"od %(message_sender)s." +"Přišla vám zpráva %(message)s od " +"%(message_sender)s." #: templates/notification/messages_received/short.txt:1 #: templates/notification/messages_reply_received/short.txt:1 @@ -304,15 +313,13 @@ msgstr "Obnovili jste zprávu '%(message)s'." #, python-format msgid "" "You have recovered the message %(message)s." -msgstr "" -"Obnovili jste zprávu %(message)s." +msgstr "Obnovili jste zprávu %(message)s." #: templates/notification/messages_replied/full.txt:1 #, python-format msgid "" "You have replied to '%(message_parent_msg)s' from %(message_recipient)s." -msgstr "" -"Odpověděli jste na '%(message_parent_msg)s' od %(message_recipient)s." +msgstr "Odpověděli jste na '%(message_parent_msg)s' od %(message_recipient)s." #: templates/notification/messages_replied/notice.html:2 #, python-format @@ -320,8 +327,8 @@ msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Odpověděli jste na %(message_parent_msg)s " -"od %(message_recipient)s." +"Odpověděli jste na %(message_parent_msg)s od " +"%(message_recipient)s." #: templates/notification/messages_reply_received/full.txt:1 #, python-format @@ -361,7 +368,7 @@ msgstr "" "Odeslali jste zprávu %(message)s uživateli " "%(message_recipient)s." -#: utils.py:26 +#: utils.py:25 #, python-format msgid "" "%(sender)s wrote:\n" @@ -370,29 +377,29 @@ msgstr "" "%(sender)s napsal:\n" "%(body)s" -#: utils.py:54 +#: utils.py:53 #, python-format msgid "Re%(prefix)s: %(subject)s" msgstr "Re%(prefix)s: %(subject)s" -#: utils.py:60 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "Nová zpráva: %(subject)s" -#: views.py:79 views.py:116 +#: views.py:92 views.py:133 msgid "Message successfully sent." msgstr "Zpráva úspěšně odeslána." -#: views.py:98 views.py:194 +#: views.py:111 views.py:211 #, python-format msgid "Re: %(subject)s" msgstr "Re: %(subject)s" -#: views.py:159 +#: views.py:176 msgid "Message successfully deleted." msgstr "Zpráva úspěšně smazána." -#: views.py:186 +#: views.py:203 msgid "Message successfully recovered." msgstr "Zpráva úspěšně obnovena." diff --git a/django_messages/locale/da/LC_MESSAGES/django.mo b/django_messages/locale/da/LC_MESSAGES/django.mo index 591819e..93436f6 100644 Binary files a/django_messages/locale/da/LC_MESSAGES/django.mo and b/django_messages/locale/da/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/da/LC_MESSAGES/django.po b/django_messages/locale/da/LC_MESSAGES/django.po index 1689cd8..c5ba27b 100644 --- a/django_messages/locale/da/LC_MESSAGES/django.po +++ b/django_messages/locale/da/LC_MESSAGES/django.po @@ -9,51 +9,56 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Modtager" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "gruppe" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "Skaber beskeden for alle brugere eller en gruppe af brugere." -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Alle brugere" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Beskeder" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Dato/tid" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Beskeder" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "De følgende brugernavne er forkerte: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Modtager" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Emne" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Indhold" @@ -105,114 +110,104 @@ msgstr "Besked Genskabt" msgid "you have undeleted a message" msgstr "du har genskabt en besked" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Afsender" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Stambesked" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "sendt" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "læst" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "besvaret" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Afsender slettet" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Modtager slettet" -#: models.py:89 -msgid "Messages" -msgstr "Beskeder" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Ny besked: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Besked sendt succesfuldt." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s skrev:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "SV: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Besked slettet succesfuldt." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Besked genskabt succesfuldt." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Indboks" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Sendte Beskeder" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Ny Besked" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Papirkurv" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Skriv Ny Besked" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Send" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Modtaget" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Handling" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "slet" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Beskeder" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -225,32 +220,34 @@ msgstr "" "du har modtaget en privat besked fra %(sender)s med\n" "følgende indhold:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Sendt fra %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Besvar" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Sendt" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Slettede Beskeder" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Dato" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "genskab" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -258,28 +255,63 @@ msgstr "" "Slettede beskeder fjernes fra papirkurven med jævne mellemrum. Lad være med " "at regne med denne funktion til langtidslagring." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Læs Besked" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Slet" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +msgid "You have deleted the message '%(message)s'." +msgstr "Du har slettet beskeden '%(message)s'." + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "Du har slettet beskeden %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s har sendt dig en besked:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Du har modtaget beskeden %(message)s fra %" -"(message_sender)s." +"Du har modtaget beskeden %(message)s fra " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "%(notice)s af %(message_sender)s" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +msgid "You have recovered the message '%(message)s'." +msgstr "Du har genskabt beskeden '%(message)s'." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -287,14 +319,39 @@ msgid "" "You have recovered the message %(message)s." msgstr "Du har genskabt beskeden %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "Du har besvaret '%(message_parent_msg)s' fra %(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Du har besvaret %(message_parent_msg)s fra %" -"(message_recipient)s." +"Du har besvaret %(message_parent_msg)s fra " +"%(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s besvarede '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" #: templates/notification/messages_reply_received/notice.html:2 #, python-format @@ -302,66 +359,53 @@ msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" "%(message_sender)s har sendt dig en besvarelse på %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "Du har sendt beskeden '%(message)s' til %(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" -"Du har sendt beskeden %(message)s til %" -"(message_recipient)s." +"Du har sendt beskeden %(message)s til " +"%(message_recipient)s." -#, fuzzy -#~ msgid "You have deleted the message '%(message)s'." -#~ msgstr "Du har slettet beskeden '%(message)s'." +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s skrev:\n" +"%(body)s" -#, fuzzy -#~ msgid "" -#~ "%(message_sender)s has sent you a message:\n" -#~ "\n" -#~ "%(message)s\n" -#~ "\n" -#~ "%(message_body)s\n" -#~ "\n" -#~ "http://%(current_site)s%(message_url)s" -#~ msgstr "" -#~ "%(message_sender)s har sendt dig en besked:\n" -#~ "\n" -#~ "%(message)s\n" -#~ "\n" -#~ "%(message_body)s\n" -#~ "\n" -#~ "http://%(current_site)s%(message_url)s" - -#~ msgid "%(notice)s by %(message_sender)s" -#~ msgstr "%(notice)s af %(message_sender)s" +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "SV: %(subject)s" -#, fuzzy -#~ msgid "You have recovered the message '%(message)s'." -#~ msgstr "Du har genskabt beskeden '%(message)s'." +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Ny besked: %(subject)s" -#, fuzzy -#~ msgid "" -#~ "You have replied to '%(message_parent_msg)s' from %(message_recipient)s." -#~ msgstr "Du har besvaret '%(message_parent_msg)s' fra %(message_recipient)s." - -#~ msgid "" -#~ "%(message_sender)s replied to '%(message_parent_msg)s':\n" -#~ "\n" -#~ "%(message)s\n" -#~ "\n" -#~ "%(message_body)s\n" -#~ "\n" -#~ "http://%(current_site)s%(message_url)s" -#~ msgstr "" -#~ "%(message_sender)s besvarede '%(message_parent_msg)s':\n" -#~ "\n" -#~ "%(message)s\n" -#~ "\n" -#~ "%(message_body)s\n" -#~ "\n" -#~ "http://%(current_site)s%(message_url)s" +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Besked sendt succesfuldt." -#, fuzzy -#~ msgid "You have sent the message '%(message)s' to %(message_recipient)s." -#~ msgstr "Du har sendt beskeden '%(message)s' til %(message_recipient)s." +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "SV: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Besked slettet succesfuldt." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Besked genskabt succesfuldt." diff --git a/django_messages/locale/de/LC_MESSAGES/django.mo b/django_messages/locale/de/LC_MESSAGES/django.mo index 1e4e5c8..af2933d 100644 Binary files a/django_messages/locale/de/LC_MESSAGES/django.mo and b/django_messages/locale/de/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/de/LC_MESSAGES/django.po b/django_messages/locale/de/LC_MESSAGES/django.po index 29ec615..df55480 100644 --- a/django_messages/locale/de/LC_MESSAGES/django.po +++ b/django_messages/locale/de/LC_MESSAGES/django.po @@ -8,53 +8,58 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Empfänger" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "Gruppe" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "" "Fügt die Nachricht wahlweise für jeden Benutzer der ausgewählten Gruppe " "hinzu." -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Alle Benutzer" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Nachricht" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Datum/Zeit" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Nachrichten" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Die folgenden Benutzernamen sind nicht korrekt: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Empfänger" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Betreff" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Inhalt" @@ -106,119 +111,102 @@ msgstr "Nachricht wiederhergestellt" msgid "you have undeleted a message" msgstr "Du hast eine Nachricht wiederhergestellt" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Absender" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Übergeordnete Nachricht" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "gesendet am" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "gelesen am" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "beantwortet am" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Vom Absender gelöscht" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Vom Empfänger gelöscht" -#: models.py:89 -msgid "Messages" -msgstr "Nachrichten" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Neue Nachricht: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Nachricht erfolgreich gesendet." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s schrieb:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Nachricht erfolgreich gelöscht." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Nachricht erfolgreich wiederhergestellt." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Posteingang" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Gesendete Nachrichten" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Neue Nachricht" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Papierkorb" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Nachricht verfassen" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Senden" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Erhalten" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Aktion" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j. N Y, H:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "löschen" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Keine Nachrichten." -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -231,32 +219,34 @@ msgstr "" "du hast eine private Nachricht von %(sender)s mit\n" "dem folgenden Inhalt erhalten:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Gesendet von %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Antworten" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Gesendet" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Gelöschte Nachrichten" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Datum" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "wiederherstellen" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -264,14 +254,20 @@ msgstr "" "Gelöschte Nachrichten werden in unregelmäßigen Intervallen entfernt, verlass " "dich nicht drauf, dass diese Nachrichten hier lange gespeichert werden." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Nachrichtendetails" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Löschen" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "Du hast eine Nachricht gelöscht" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" @@ -279,14 +275,44 @@ msgid "" msgstr "" "Du hast die Nachricht %(message)s gelöscht." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s hat dir eine Antwort auf %(message_parent_msg)s gesendet." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Du hast die Nachricht %(message)s von %" -"(message_sender)s erhalten." +"Du hast die Nachricht %(message)s von " +"%(message_sender)s erhalten." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "" +"Du hast die Nachricht %(message)s " +"wiederhergestellt." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -296,14 +322,37 @@ msgstr "" "Du hast die Nachricht %(message)s " "wiederhergestellt." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Du hast auf die Nachricht " +"%(message_parent_msg)s von %(message_recipient)s geantwortet." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Du hast auf die Nachricht %(message_parent_msg)" -"s von %(message_recipient)s geantwortet." +"Du hast auf die Nachricht " +"%(message_parent_msg)s von %(message_recipient)s geantwortet." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format @@ -311,11 +360,58 @@ msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" "%(message_sender)s hat dir eine Antwort auf %(message_parent_msg)s gesendet." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Du hast die Nachricht %(message)s an " +"%(message_recipient)s gesendet." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" -"Du hast die Nachricht %(message)s an %" -"(message_recipient)s gesendet." +"Du hast die Nachricht %(message)s an " +"%(message_recipient)s gesendet." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s schrieb:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Neue Nachricht: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Nachricht erfolgreich gesendet." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Nachricht erfolgreich gelöscht." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Nachricht erfolgreich wiederhergestellt." diff --git a/django_messages/locale/el/LC_MESSAGES/django.mo b/django_messages/locale/el/LC_MESSAGES/django.mo index cecfd01..c27e1f4 100644 Binary files a/django_messages/locale/el/LC_MESSAGES/django.mo and b/django_messages/locale/el/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/el/LC_MESSAGES/django.po b/django_messages/locale/el/LC_MESSAGES/django.po index fe21014..2c7397e 100644 --- a/django_messages/locale/el/LC_MESSAGES/django.po +++ b/django_messages/locale/el/LC_MESSAGES/django.po @@ -2,56 +2,62 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2009-09-08 15:50+0200\n" "Last-Translator: markos \n" "Language-Team: Markos Gogoulos \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Αποδέκτης" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "ομάδα" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." -msgstr "Δημιουργεί το μήνυμα προαιρετικά για όλους τους χρήστες ή για ομάδα χρηστών." +msgstr "" +"Δημιουργεί το μήνυμα προαιρετικά για όλους τους χρήστες ή για ομάδα χρηστών." -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Όλοι οι χρήστες" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Μήνυμα" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Ημερομηνία/Ώρα" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Μηνύματα" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Τα παρακάτω usernames δεν είναι σωστά: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Αποδέκτης" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Θέμα" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Κυρίως μέρος" @@ -103,114 +109,104 @@ msgstr "Το μήνυμα έχει ανακληθεί" msgid "you have undeleted a message" msgstr "έχετε ανακτήσει ένα μήνυμα" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Αποστολέας" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Μήνυμα Γονέας" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "εστάλει στις" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "αναγνώστηκε στις" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "απαντήθηκε στις" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Ο αποστολέας το διέγραψε στις" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Ο αποδέκτης το διέγραψε στις" -#: models.py:89 -msgid "Messages" -msgstr "Μηνύματα" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "καινούργιο μήνυμα: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Το μήνυμα έχει αποσταλεί με επιτυχία." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s έγραψε:\n" -"%(body)s" -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Το μήνυμα διεγράφει." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Το μήνυμα έχει ανακληθεί επιτυχημένα" +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Εισερχόμενα" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Σταλμένα μηνύματα" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Νέο μήνυμα" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Άχρηστα" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Συντάξτε μήνυμα" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Στείλτε" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Ελήφθη" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Ενέργεια" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "διαγράφω" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Μηνύματα" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -223,69 +219,194 @@ msgstr "" "έχετε λάβει ένα προσωπικό μήνυμα από τον/την %(sender)s με\n" "το ακόλουθο περιεχόμενο:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Εστάλει απο %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Απαντήστε" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Απεσταλμένα" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Διαγραμμένα μηνύματα" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Ημερομηνία" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "ξεδιαγράψτε" -#: templates/messages/trash.html:23 -msgid "Deleted Messages are removed from the trash at unregular intervals, don't rely on this feature for long-time storage." -msgstr "Τα διαγραμμένα μηνύματα απομακρύνονται απο τα Άχρηστα σε μη τακτά διαστήματα, μη βασίζεστε σε αυτά για μακροχρόνια αποθήκευση." +#: templates/django_messages/trash.html:28 +msgid "" +"Deleted Messages are removed from the trash at unregular intervals, don't " +"rely on this feature for long-time storage." +msgstr "" +"Τα διαγραμμένα μηνύματα απομακρύνονται απο τα Άχρηστα σε μη τακτά " +"διαστήματα, μη βασίζεστε σε αυτά για μακροχρόνια αποθήκευση." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Προβολή Μηνύματος" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Διαγραφή" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "διαγράψατε ένα μήνυμα" + #: templates/notification/messages_deleted/notice.html:1 #, python-format -msgid "You have deleted the message %(message)s." +msgid "" +"You have deleted the message %(message)s." msgstr "Έχετε διαγράψει το μήνυμα %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"Ο/η %(message_sender)s σας έστειλε μια απάντηση στο %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format -msgid "You have received the message %(message)s from %(message_sender)s." -msgstr "Έχετε λάβει το μήνυμα %(message)s από τον/την %(message_sender)s." +msgid "" +"You have received the message %(message)s " +"from %(message_sender)s." +msgstr "" +"Έχετε λάβει το μήνυμα %(message)s από τον/" +"την %(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "Έχετε ανακτήσει το μήνυμα %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format -msgid "You have recovered the message %(message)s." +msgid "" +"You have recovered the message %(message)s." msgstr "Έχετε ανακτήσει το μήνυμα %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Έχετε απαντήσει στο %(message_parent_msg)sαπό τον/την %(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format -msgid "You have replied to %(message_parent_msg)s from %(message_recipient)s." -msgstr "Έχετε απαντήσει στο %(message_parent_msg)sαπό τον/την %(message_recipient)s." +msgid "" +"You have replied to %(message_parent_msg)s " +"from %(message_recipient)s." +msgstr "" +"Έχετε απαντήσει στο %(message_parent_msg)sαπό τον/την %(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." -msgstr "Ο/η %(message_sender)s σας έστειλε μια απάντηση στο %(message_parent_msg)s." +msgstr "" +"Ο/η %(message_sender)s σας έστειλε μια απάντηση στο %(message_parent_msg)s." + +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Έχετε στείλει το μήνυμα %(message)s στον/" +"στην %(message_recipient)s." #: templates/notification/messages_sent/notice.html:2 #, python-format -msgid "You have sent the message %(message)s to %(message_recipient)s." -msgstr "Έχετε στείλει το μήνυμα %(message)s στον/στην %(message_recipient)s." +msgid "" +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"Έχετε στείλει το μήνυμα %(message)s στον/" +"στην %(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s έγραψε:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "καινούργιο μήνυμα: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Το μήνυμα έχει αποσταλεί με επιτυχία." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Το μήνυμα διεγράφει." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Το μήνυμα έχει ανακληθεί επιτυχημένα" diff --git a/django_messages/locale/es/LC_MESSAGES/django.mo b/django_messages/locale/es/LC_MESSAGES/django.mo index 7805790..764db0b 100644 Binary files a/django_messages/locale/es/LC_MESSAGES/django.mo and b/django_messages/locale/es/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/es/LC_MESSAGES/django.po b/django_messages/locale/es/LC_MESSAGES/django.po index 49d27b3..8c892fd 100644 --- a/django_messages/locale/es/LC_MESSAGES/django.po +++ b/django_messages/locale/es/LC_MESSAGES/django.po @@ -10,52 +10,57 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Destinatario" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "" -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Mensaje" -#: admin.py:45 +#: admin.py:55 #, fuzzy msgid "Date/time" msgstr "Fecha" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Mensajes" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Los siguientes usuarios son incorrectos: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Destinatario" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Asunto" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Cuerpo" @@ -107,114 +112,104 @@ msgstr "Mensaje Recuperado" msgid "you have undeleted a message" msgstr "ha recuperado un mensaje" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Emisor" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Mensaje padre" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "enviado" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "leído" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "respondido" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Emisor borrado" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinatario borrado" -#: models.py:89 -msgid "Messages" -msgstr "Mensajes" +#: models.py:106 +msgid "File" +msgstr "Archivo" -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Nuevo Mensaje: %(subject)s" +#: models.py:117 +msgid "Attachment" +msgstr "Adjunto" -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Se envió con éxito el mensaje." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "Adjuntos" -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" -msgstr "" -"%(sender)s escribió:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Se eliminó con éxito el mensaje." - -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Se recuperó con éxito el mensaje." - -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Bandeja de entrada" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Mensajes Enviados" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nuevo Mensaje" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Papelera" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Redactar Mensaje" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Enviar" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Recibido" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Acción" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "eliminar" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Mensajes" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -227,32 +222,34 @@ msgstr "" "ha recibido un mensaje de %(sender)s con\n" "el siguiente contenido:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Enviado desde %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Responder" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Enviado" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Mensajes Eliminados" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Fecha" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "recuperar" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -260,28 +257,62 @@ msgstr "" "Los Mensajes Eliminados son borrados de la Papelera a intérvalos irregulares," "no se confíe en esta característica para almacenamiento a largo plazo." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Ver Mensaje" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Eliminar" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "ha eliminado un mensaje" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "ha borrado el mensaje %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s le ha enviado una respuesta a %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"ha recibido el mensaje %(message)s de %" -"(message_sender)s." +"ha recibido el mensaje %(message)s de " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "ha recuperado el mensaje %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -289,14 +320,37 @@ msgid "" "You have recovered the message %(message)s." msgstr "ha recuperado el mensaje %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"ha respondido a %(message_parent_msg)s de " +"%(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"ha respondido a %(message_parent_msg)s de %" -"(message_recipient)s." +"ha respondido a %(message_parent_msg)s de " +"%(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format @@ -304,11 +358,58 @@ msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" "%(message_sender)s le ha enviado una respuesta a %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"ha enviado el mensaje %(message)s a " +"%(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" -"ha enviado el mensaje %(message)s a %" -"(message_recipient)s." +"ha enviado el mensaje %(message)s a " +"%(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s escribió:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Nuevo Mensaje: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Se envió con éxito el mensaje." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Se eliminó con éxito el mensaje." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Se recuperó con éxito el mensaje." diff --git a/django_messages/locale/es_AR/LC_MESSAGES/django.mo b/django_messages/locale/es_AR/LC_MESSAGES/django.mo index d0d9df8..d3d59cf 100644 Binary files a/django_messages/locale/es_AR/LC_MESSAGES/django.mo and b/django_messages/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/es_AR/LC_MESSAGES/django.po b/django_messages/locale/es_AR/LC_MESSAGES/django.po index 6de0f0f..c7b035a 100644 --- a/django_messages/locale/es_AR/LC_MESSAGES/django.po +++ b/django_messages/locale/es_AR/LC_MESSAGES/django.po @@ -10,52 +10,57 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Destinatario" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "" -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Mensaje" -#: admin.py:45 +#: admin.py:55 #, fuzzy msgid "Date/time" msgstr "Fecha" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Mensajes" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Destinatario" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Asunto" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Cuerpo" @@ -107,114 +112,104 @@ msgstr "Mensaje Recuperado" msgid "you have undeleted a message" msgstr "ha recuperado un mensaje" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Emisor" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Mensaje padre" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "enviado" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "leído" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "respondido" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Emisor borrado" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinatario borrado" -#: models.py:89 -msgid "Messages" -msgstr "Mensajes" - -#: utils.py:27 -#, fuzzy, python-format -msgid "New Message: %(subject)s" -msgstr "Re: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Se envió con éxito el mensaje." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" -msgstr "" -"%(sender)s escribió:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" +#: models.py:106 +msgid "File" +msgstr "Archivo" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Se eliminó con éxito el mensaje." +#: models.py:117 +msgid "Attachment" +msgstr "Adjunto" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Se recuperó con éxito el mensaje." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "Adjuntos" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Bandeja de entrada" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Mensajes Enviados" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nuevo Mensaje" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Papelera" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Redactar Mensaje" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Enviar" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Recibido" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Acción" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "eliminar" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Mensajes" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -223,32 +218,34 @@ msgid "" "the following contents:" msgstr "" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Enviado desde %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Responder" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Enviado" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Mensajes Eliminados" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Fecha" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "recuperar" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -256,20 +253,38 @@ msgstr "" "Los Mensajes Eliminados son borrados de la Papelera a intérvalos irregulares," "no se confíe en esta característica para almacenamiento a largo plazo." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Ver Mensaje" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Eliminar" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "ha eliminado un mensaje" + #: templates/notification/messages_deleted/notice.html:1 #, fuzzy, python-format msgid "" "You have deleted the message %(message)s." msgstr "ha eliminado el mensaje %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(sender)s le ha enviado una respuesta a %(message)s." + #: templates/notification/messages_received/notice.html:2 #, fuzzy, python-format msgid "" @@ -277,12 +292,29 @@ msgid "" "from %(message_sender)s." msgstr "ha recibido un mensaje de %(sender)s." +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +msgid "You have recovered the message '%(message)s'." +msgstr "ha recuperado el mensaje %(message)s." + #: templates/notification/messages_recovered/notice.html:1 #, fuzzy, python-format msgid "" "You have recovered the message %(message)s." msgstr "ha recuperado el mensaje %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "ha respondido a %(message)s de %(recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, fuzzy, python-format msgid "" @@ -290,23 +322,75 @@ msgid "" "from %(message_recipient)s." msgstr "ha respondido a %(message)s de %(recipient)s." +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" + #: templates/notification/messages_reply_received/notice.html:2 #, fuzzy, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "%(sender)s le ha enviado una respuesta a %(message)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "you have sent a message to %(recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "ha enviado un mensaje a %(recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s escribió:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, fuzzy, python-format +msgid "New Message: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Se envió con éxito el mensaje." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Se eliminó con éxito el mensaje." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Se recuperó con éxito el mensaje." + #~ msgid "There is no user with this username." #~ msgstr "No hay ningún usuario con ese nombre." -#~ msgid "you have sent a message to %(recipient)s." -#~ msgstr "ha enviado un mensaje a %(recipient)s." - #~ msgid "New Message:" #~ msgstr "Mensaje Nuevo" diff --git a/django_messages/locale/eu/LC_MESSAGES/django.mo b/django_messages/locale/eu/LC_MESSAGES/django.mo index 49a82a0..86086e5 100644 Binary files a/django_messages/locale/eu/LC_MESSAGES/django.mo and b/django_messages/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/eu/LC_MESSAGES/django.po b/django_messages/locale/eu/LC_MESSAGES/django.po index 3c39bac..468d62a 100644 --- a/django_messages/locale/eu/LC_MESSAGES/django.po +++ b/django_messages/locale/eu/LC_MESSAGES/django.po @@ -9,52 +9,57 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Hartzailea" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "taldea" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "Erabiltzaile bat edo talde batentzat mezua sortzen du aukeran" -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Erabiltzaile guztiak" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Mezua" -#: admin.py:45 +#: admin.py:55 #, fuzzy msgid "Date/time" msgstr "Data/ordua" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Mezuak" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Erabiltzaile hauek okerrak dira: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Hartzailea" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Gaia" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Testua" @@ -106,114 +111,104 @@ msgstr "Mezua berreskuratuta" msgid "you have undeleted a message" msgstr "mezu bat berreskuratu duzu" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Igorlea" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Mezu gurasoa" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "bidalita" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "irakurrita" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "erantzunda" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Igorlea ezabatuta" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Hartzailea ezabatuta" -#: models.py:89 -msgid "Messages" -msgstr "Mezuak" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Mezu berria: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Mezua arrakastaz bidali da." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s idatzi du:\n" -"%(body)s" -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Mezua arrakastaz ezabatu da." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Mezua arrakastaz berreskuratu da." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Sarrera-ontzia" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Bidalitako mezuak" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Mezu berria" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Zaborrontzia" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Idatzi mezua" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Bidali" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Jasota" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Ekintza" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "ezabatu" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Mezuak" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -226,62 +221,98 @@ msgstr "" "%(sender)s-(r)en mezu bat jaso duzu\n" "ondorengo edukiarekin:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "%(site_url)s-(e)tik bidalita" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Erantzun" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Bidalita" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Ezabatutako mezuak" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "berreskuratu" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." msgstr "" -"Ezabatutako mezuak periodo irregularretan ezabatzen dira zaborrontzitik," -"ez zaitez fidatu luzerako gordeko direla pentsatuz." +"Ezabatutako mezuak periodo irregularretan ezabatzen dira zaborrontzitik,ez " +"zaitez fidatu luzerako gordeko direla pentsatuz." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Ikusi mezua" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Eliminar" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "mezu bat ezabatu duzu" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "%(message)s mezua ezabatu duzu." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s-(e)k erantzun bat bidali dizu %(message_parent_msg)s " +"mezura." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"%(message_sender)s erabiltzailearen " -"%(message)s mezua ezabatu duzu." +"%(message_sender)s erabiltzailearen %(message)s mezua ezabatu duzu." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "%(message)s mezua berreskuratu duzu." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -289,27 +320,97 @@ msgid "" "You have recovered the message %(message)s." msgstr "%(message)s mezua berreskuratu duzu." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"%(message_recipient)s-(r)en " +"%(message_parent_msg)s mezua erantzun duzu." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"%(message_recipient)s-(r)en " -"%(message_parent_msg)s mezua erantzun duzu." +"%(message_recipient)s-(r)en " +"%(message_parent_msg)s mezua erantzun duzu." +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" -"%(message_sender)s-(e)k erantzun bat bidali dizu %(message_parent_msg)s mezura." +"%(message_sender)s-(e)k erantzun bat bidali dizu %(message_parent_msg)s " +"mezura." + +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"%(message_recipient)s-(r)i %(message)s mezua " +"bidali diozu." #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"%(message_recipient)s-(r)i %(message)s mezua " +"bidali diozu." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" msgstr "" -"%(message_recipient)s-(r)i " -"%(message)s mezua bidali diozu." +"%(sender)s idatzi du:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Mezu berria: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Mezua arrakastaz bidali da." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Mezua arrakastaz ezabatu da." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Mezua arrakastaz berreskuratu da." diff --git a/django_messages/locale/fa/LC_MESSAGES/django.mo b/django_messages/locale/fa/LC_MESSAGES/django.mo index a61d884..1f259c1 100644 Binary files a/django_messages/locale/fa/LC_MESSAGES/django.mo and b/django_messages/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/fa/LC_MESSAGES/django.po b/django_messages/locale/fa/LC_MESSAGES/django.po index b7932d4..fc40813 100644 --- a/django_messages/locale/fa/LC_MESSAGES/django.po +++ b/django_messages/locale/fa/LC_MESSAGES/django.po @@ -8,23 +8,17 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-27 12:44+0430\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"First-Translator: Mohammad Hamidi Esfahani" -"Last-Translator: Hassan Zamani \n" "Language-Team: LANGUAGE \n" "Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"First-Translator: Mohammad Hamidi EsfahaniLast-Translator: Hassan Zamani " +"\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:19 forms.py:20 models.py:52 -#: templates/django_messages/outbox.html:8 -#: templates/django_messages/view.html:12 -msgid "Recipient" -msgstr "گیرنده" - #: admin.py:21 msgid "group" msgstr "گروه" @@ -33,35 +27,42 @@ msgstr "گروه" msgid "Creates the message optionally for all users or a group of users." msgstr "ارسال پیام به همه کاربران یا گروهی از آن‌ها." -#: admin.py:29 +#: admin.py:30 msgid "All users" msgstr "تمامی کاربران" -#: admin.py:44 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "پیام" -#: admin.py:51 +#: admin.py:55 msgid "Date/time" msgstr "تاریخ/ساعت" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "پیام ها" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "این کاربرها صحیح نمی‌باشند: %(users)s" -#: forms.py:21 models.py:49 templates/django_messages/inbox.html:8 -#: templates/django_messages/outbox.html:8 -#: templates/django_messages/trash.html:8 -#: templates/django_messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "گیرنده" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "موضوع" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "متن" - #: management.py:9 msgid "Message Received" msgstr "پیام دریافت‌شد" @@ -110,84 +111,54 @@ msgstr "پیام بازیابی‌شد" msgid "you have undeleted a message" msgstr "شما یک پیام را بازیابی کردید" -#: models.py:51 templates/django_messages/inbox.html:8 -#: templates/django_messages/trash.html:8 -#: templates/django_messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "فرستنده" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "پیام مرجع" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "ارسال شده در" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "خوانده شده در" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "پاسخ داده شده در" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "فرستنده حذف‌شده در" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "گیرنده خذف‌شده در" -#: models.py:89 -msgid "Messages" -msgstr "پیام ها" - -#: utils.py:26 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s گفت:\n" -"%(body)s" - -#: utils.py:54 -#, python-format -msgid "Re%(prefix)s: %(subject)s" -msgstr "پاسخ%(prefix)s: %(subject)s" - -#: utils.py:60 -#, python-format -msgid "New Message: %(subject)s" -msgstr "پیام جدید: %(subject)s" -#: views.py:78 views.py:114 -msgid "Message successfully sent." -msgstr "پیام با موفقیت ارسال‌شد." - -#: views.py:121 -#, python-format -msgid "Re: %(subject)s" -msgstr "پاسخ: %(subject)s" - -#: views.py:157 -msgid "Message successfully deleted." -msgstr "پیام با موفقیت حذف‌شد." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:184 -msgid "Message successfully recovered." -msgstr "پیام با موفقیت بازیابی‌شد." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/django_messages/base.html:8 -#: templates/django_messages/inbox.html:4 -#: templates/django_messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "صندوق دریافتی" #: templates/django_messages/base.html:9 -#: templates/django_messages/outbox.html:4 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "پیام‌های ارسال‌شده" @@ -199,107 +170,145 @@ msgstr "پیام جدید" msgid "Trash" msgstr "پیام‌های حذف‌شده" -#: templates/django_messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "ایجاد پیام جدید" -#: templates/django_messages/compose.html:10 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "بفرست" -#: templates/django_messages/inbox.html:8 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "دریافت‌شد" -#: templates/django_messages/inbox.html:8 -#: templates/django_messages/outbox.html:8 -#: templates/django_messages/trash.html:8 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "عمل" -#: templates/django_messages/inbox.html:20 -#: templates/django_messages/outbox.html:17 -#: templates/django_messages/trash.html:17 -#: templates/django_messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates/django_messages/inbox.html:21 -#: templates/django_messages/outbox.html:18 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "حذف" -#: templates/django_messages/inbox.html:27 -#: templates/django_messages/outbox.html:24 -#: templates/django_messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "پیامی وجود ندارد." -#: templates/django_messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" "\n" "you received a private message from %(sender)s with\n" "the following contents:" -msgstr "سلام %(recipient)s,\n" +msgstr "" +"سلام %(recipient)s,\n" "\n" "شما یک پیام خصوصی از %(sender)s دریافت کرده‌اید:" -#: templates/django_messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "ارسال شده از %(site_url)s" -#: templates/django_messages/new_message.html:11 -#: templates/django_messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "پاسخ" -#: templates/django_messages/outbox.html:8 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "ارسال‌شد" -#: templates/django_messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "پیام های حذف‌شده" -#: templates/django_messages/trash.html:8 -#: templates/django_messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "تاریخ" -#: templates/django_messages/trash.html:18 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "بازیابی" -#: templates/django_messages/trash.html:27 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." msgstr "" -"پیام‌های حذف‌شده در بازه‌های زمانی مشخصی از اینجا حذف می‌شوند، بنابراین برای نگهداری طولانی مدت از این‌جا استفاده نکنید." +"پیام‌های حذف‌شده در بازه‌های زمانی مشخصی از اینجا حذف می‌شوند، بنابراین برای " +"نگهداری طولانی مدت از این‌جا استفاده نکنید." -#: templates/django_messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "نمایش پیام" -#: templates/django_messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "حذف" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "شما یک پیام حذف کردید" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "شما پیام %(message)s را حذف کردید." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s پاسخی به %(message_parent_msg)s برای شما ارسال کرده." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." -msgstr "شما پیام جدید %(message)s را از %(message_sender)s دریافت کردید." +msgstr "" +"شما پیام جدید %(message)s را از " +"%(message_sender)s دریافت کردید." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "شما پیام %(message)s را بازیابی کردید." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -307,24 +316,98 @@ msgid "" "You have recovered the message %(message)s." msgstr "شما پیام %(message)s را بازیابی کردید." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"شما به پیام %(message_parent_msg)s از " +"%(message_recipient)s پاسخ‌دادید." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." -msgstr "شما به پیام %(message_parent_msg)s از %(message_recipient)s پاسخ‌دادید." +msgstr "" +"شما به پیام %(message_parent_msg)s از " +"%(message_recipient)s پاسخ‌دادید." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." -msgstr "%(message_sender)s پاسخی به %(message_parent_msg)s برای شما ارسال کرده." +msgstr "" +"%(message_sender)s پاسخی به %(message_parent_msg)s برای شما ارسال کرده." + +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"شما پیام %(message)s را به " +"%(message_recipient)s ارسال‌کردید." #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" "You have sent the message %(message)s to " "%(message_recipient)s." -msgstr "شما پیام %(message)s را به %(message_recipient)s ارسال‌کردید." +msgstr "" +"شما پیام %(message)s را به " +"%(message_recipient)s ارسال‌کردید." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s گفت:\n" +"%(body)s" + +#: utils.py:53 +#, python-format +msgid "Re%(prefix)s: %(subject)s" +msgstr "پاسخ%(prefix)s: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "پیام جدید: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "پیام با موفقیت ارسال‌شد." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "پاسخ: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "پیام با موفقیت حذف‌شد." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "پیام با موفقیت بازیابی‌شد." #~ msgid "context" #~ msgstr "متن پیام" diff --git a/django_messages/locale/fr/LC_MESSAGES/django.mo b/django_messages/locale/fr/LC_MESSAGES/django.mo index 2d03c91..8ac6e15 100644 Binary files a/django_messages/locale/fr/LC_MESSAGES/django.mo and b/django_messages/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/fr/LC_MESSAGES/django.po b/django_messages/locale/fr/LC_MESSAGES/django.po index 207d87f..82ff30f 100644 --- a/django_messages/locale/fr/LC_MESSAGES/django.po +++ b/django_messages/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-18 17:46+0100\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2008-08-09 21:58+0100\n" "Last-Translator: Roland Frédéric \n" "Language-Team: Frédéric Roland \n" @@ -31,7 +31,7 @@ msgstr "" msgid "All users" msgstr "Tous les utilisateurs" -#: admin.py:48 models.py:91 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Message" @@ -39,7 +39,7 @@ msgstr "Message" msgid "Date/time" msgstr "Date/heure" -#: apps.py:6 models.py:92 +#: apps.py:6 models.py:95 msgid "Messages" msgstr "Messages" @@ -48,19 +48,18 @@ msgstr "Messages" msgid "The following usernames are incorrect: %(users)s" msgstr "Les noms d'utilisateurs suivants sont incorrects : %(users)s" -#: forms.py:18 models.py:55 templates/django_messages/outbox.html:10 -#: templates/django_messages/view.html:14 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 msgid "Recipient" msgstr "Destinataire" -#: forms.py:19 models.py:52 templates/django_messages/inbox.html:10 -#: templates/django_messages/outbox.html:10 -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:8 +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Sujet" -#: forms.py:20 models.py:53 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Message" @@ -112,44 +111,54 @@ msgstr "Message Récupéré" msgid "you have undeleted a message" msgstr "vous avez récupéré un message" -#: models.py:54 templates/django_messages/inbox.html:10 -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:10 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Expéditeur" -#: models.py:56 +#: models.py:60 msgid "Parent message" msgstr "Message parent" -#: models.py:57 +#: models.py:61 msgid "sent at" msgstr "envoyé à" -#: models.py:58 +#: models.py:62 msgid "read at" msgstr "lu à" -#: models.py:59 +#: models.py:63 msgid "replied at" msgstr "répondu à" -#: models.py:60 +#: models.py:64 msgid "Sender deleted at" msgstr "Expéditeur effacé à" -#: models.py:61 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinataire effacé à" -#: templates/django_messages/base.html:8 -#: templates/django_messages/inbox.html:6 -#: templates/django_messages/new_message.html:13 +#: models.py:106 +msgid "File" +msgstr "Fichier" + +#: models.py:117 +msgid "Attachment" +msgstr "Pièce jointe" + +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "Pièces jointes" + +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Boîte de réception" #: templates/django_messages/base.html:9 -#: templates/django_messages/outbox.html:6 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Messages envoyés" @@ -161,43 +170,43 @@ msgstr "Nouveau Message" msgid "Trash" msgstr "Poubelle" -#: templates/django_messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Composer Message" -#: templates/django_messages/compose.html:10 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Envoyer" -#: templates/django_messages/inbox.html:10 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Reçu" -#: templates/django_messages/inbox.html:10 -#: templates/django_messages/outbox.html:10 -#: templates/django_messages/trash.html:10 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Action" -#: templates/django_messages/inbox.html:22 -#: templates/django_messages/outbox.html:19 -#: templates/django_messages/trash.html:19 -#: templates/django_messages/view.html:13 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j F Y, G:i" -#: templates/django_messages/inbox.html:23 -#: templates/django_messages/outbox.html:20 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "effacer" -#: templates/django_messages/inbox.html:29 -#: templates/django_messages/outbox.html:26 -#: templates/django_messages/trash.html:26 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Aucun message." -#: templates/django_messages/new_message.html:4 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -210,34 +219,34 @@ msgstr "" "vous avez reçu un message privé de %(sender)s avec\n" "le contenu suivant :" -#: templates/django_messages/new_message.html:12 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Envoyé depuis %(site_url)s" -#: templates/django_messages/new_message.html:14 -#: templates/django_messages/view.html:20 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Répondre" -#: templates/django_messages/outbox.html:10 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Envoyé" -#: templates/django_messages/trash.html:6 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Messages Effacés" -#: templates/django_messages/trash.html:10 -#: templates/django_messages/view.html:12 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Date" -#: templates/django_messages/trash.html:20 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "restaurer" -#: templates/django_messages/trash.html:29 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -245,11 +254,11 @@ msgstr "" "Les Messages Effacés sont enlevé de la poubelle a intervalles irréguliers, " "ne comptez pas sur cette fonctionnalité pour du stockage à long terme." -#: templates/django_messages/view.html:6 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Voir Message" -#: templates/django_messages/view.html:22 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Effacer" @@ -354,7 +363,7 @@ msgstr "" "Vous avez envoyé le message %(message)s à " "%(message_recipient)s." -#: utils.py:26 +#: utils.py:25 #, python-format msgid "" "%(sender)s wrote:\n" @@ -363,31 +372,31 @@ msgstr "" "%(sender)s a écrit:\n" "%(body)s" -#: utils.py:54 +#: utils.py:53 #, fuzzy, python-format #| msgid "Re: %(subject)s" msgid "Re%(prefix)s: %(subject)s" msgstr "Re: %(subject)s" -#: utils.py:60 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "Nouveau message: %(subject)s" -#: views.py:79 views.py:116 +#: views.py:92 views.py:133 msgid "Message successfully sent." msgstr "Message envoyé avec succès." -#: views.py:98 views.py:194 +#: views.py:111 views.py:211 #, python-format msgid "Re: %(subject)s" msgstr "Re: %(subject)s" -#: views.py:159 +#: views.py:176 msgid "Message successfully deleted." msgstr "Message effacé avec succès." -#: views.py:186 +#: views.py:203 msgid "Message successfully recovered." msgstr "Message récupéré avec succès." diff --git a/django_messages/locale/id/LC_MESSAGES/django.mo b/django_messages/locale/id/LC_MESSAGES/django.mo index 0dbb42f..6c2d4e9 100644 Binary files a/django_messages/locale/id/LC_MESSAGES/django.mo and b/django_messages/locale/id/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/id/LC_MESSAGES/django.po b/django_messages/locale/id/LC_MESSAGES/django.po index 9966d7c..53b098f 100644 --- a/django_messages/locale/id/LC_MESSAGES/django.po +++ b/django_messages/locale/id/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-26 14:34+0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,188 +17,196 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: django_messages/admin.py:21 + +#: admin.py:21 msgid "group" msgstr "grup" -#: django_messages/admin.py:22 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." -msgstr "Membuat pesan secara opsional untuk semua pengguna atau sekelompok pengguna." +msgstr "" +"Membuat pesan secara opsional untuk semua pengguna atau sekelompok pengguna." -#: django_messages/admin.py:30 +#: admin.py:30 msgid "All users" msgstr "Semua pengguna" -#: django_messages/admin.py:48 django_messages/models.py:91 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Pesan" -#: django_messages/admin.py:55 +#: admin.py:55 msgid "Date/time" msgstr "Tanggal/waktu" -#: django_messages/apps.py:6 django_messages/models.py:92 +#: apps.py:6 models.py:95 msgid "Messages" msgstr "Pesan" -#: django_messages/fields.py:56 +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Username pengguna berikut salah: %(users)s" -#: django_messages/forms.py:18 django_messages/models.py:55 -#: django_messages/templates/django_messages/outbox.html:9 -#: django_messages/templates/django_messages/view.html:13 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 msgid "Recipient" msgstr "Penerima" -#: django_messages/forms.py:19 django_messages/models.py:52 -#: django_messages/templates/django_messages/inbox.html:9 -#: django_messages/templates/django_messages/outbox.html:9 -#: django_messages/templates/django_messages/trash.html:9 -#: django_messages/templates/django_messages/view.html:7 +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Subyek" -#: django_messages/forms.py:20 django_messages/models.py:53 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Isi Pesan" -#: django_messages/management.py:9 +#: management.py:9 msgid "Message Received" msgstr "Pesan Diterima" -#: django_messages/management.py:9 +#: management.py:9 msgid "you have received a message" msgstr "anda mendapatkan sebuah pesan baru" -#: django_messages/management.py:10 +#: management.py:10 msgid "Message Sent" msgstr "Pesan Terkirim" -#: django_messages/management.py:10 +#: management.py:10 msgid "you have sent a message" msgstr "anda telah mengirim pesan" -#: django_messages/management.py:11 +#: management.py:11 msgid "Message Replied" msgstr "Pesan Dibalas" -#: django_messages/management.py:11 +#: management.py:11 msgid "you have replied to a message" msgstr "anda telah membalas pesan" -#: django_messages/management.py:12 +#: management.py:12 msgid "Reply Received" msgstr "Balas Pesan" -#: django_messages/management.py:12 +#: management.py:12 msgid "you have received a reply to a message" msgstr "anda telah menerima balasan pesan" -#: django_messages/management.py:13 +#: management.py:13 msgid "Message Deleted" msgstr "Pesan Dihapus" -#: django_messages/management.py:13 +#: management.py:13 msgid "you have deleted a message" msgstr "anda telah menghapus pesan" -#: django_messages/management.py:14 +#: management.py:14 msgid "Message Recovered" msgstr "Pesan Dipulihkan" -#: django_messages/management.py:14 +#: management.py:14 msgid "you have undeleted a message" msgstr "anda telah membatalkan penghapusan pesan" -#: django_messages/models.py:54 -#: django_messages/templates/django_messages/inbox.html:9 -#: django_messages/templates/django_messages/trash.html:9 -#: django_messages/templates/django_messages/view.html:9 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Pengirim" -#: django_messages/models.py:56 +#: models.py:60 msgid "Parent message" msgstr "Pesan Induk" -#: django_messages/models.py:57 +#: models.py:61 msgid "sent at" msgstr "dikirim pada" -#: django_messages/models.py:58 +#: models.py:62 msgid "read at" msgstr "dibaca pada" -#: django_messages/models.py:59 +#: models.py:63 msgid "replied at" msgstr "dibalas pada" -#: django_messages/models.py:60 +#: models.py:64 msgid "Sender deleted at" msgstr "Pengirim menghapus pada" -#: django_messages/models.py:61 +#: models.py:65 msgid "Recipient deleted at" msgstr "Penerima menghapus pada" -#: django_messages/templates/django_messages/base.html:8 -#: django_messages/templates/django_messages/inbox.html:5 -#: django_messages/templates/django_messages/new_message.html:12 +#: models.py:106 +msgid "File" +msgstr "" + +#: models.py:117 +msgid "Attachment" +msgstr "" + +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" + +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Kotak Masuk" -#: django_messages/templates/django_messages/base.html:9 -#: django_messages/templates/django_messages/outbox.html:5 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Pesan Terkirim" -#: django_messages/templates/django_messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Pesan Baru" -#: django_messages/templates/django_messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Sampah" -#: django_messages/templates/django_messages/compose.html:5 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Menulis Pesan" -#: django_messages/templates/django_messages/compose.html:11 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Kirim" -#: django_messages/templates/django_messages/inbox.html:9 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Diterima" -#: django_messages/templates/django_messages/inbox.html:9 -#: django_messages/templates/django_messages/outbox.html:9 -#: django_messages/templates/django_messages/trash.html:9 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Tindakan" -#: django_messages/templates/django_messages/inbox.html:21 -#: django_messages/templates/django_messages/outbox.html:18 -#: django_messages/templates/django_messages/trash.html:18 -#: django_messages/templates/django_messages/view.html:12 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: django_messages/templates/django_messages/inbox.html:22 -#: django_messages/templates/django_messages/outbox.html:19 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "hapus" -#: django_messages/templates/django_messages/inbox.html:28 -#: django_messages/templates/django_messages/outbox.html:25 -#: django_messages/templates/django_messages/trash.html:25 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Tidak ada pesan." -#: django_messages/templates/django_messages/new_message.html:3 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -211,62 +219,62 @@ msgstr "" "anda mendapatkan pesan pribadi dari %(sender)s dengan\n" "isi berikut:" -#: django_messages/templates/django_messages/new_message.html:11 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Dikirim dari %(site_url)s" -#: django_messages/templates/django_messages/new_message.html:13 -#: django_messages/templates/django_messages/view.html:19 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Balas" -#: django_messages/templates/django_messages/outbox.html:9 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Terkirim" -#: django_messages/templates/django_messages/trash.html:5 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Pesan Dihapus" -#: django_messages/templates/django_messages/trash.html:9 -#: django_messages/templates/django_messages/view.html:11 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Tanggal" -#: django_messages/templates/django_messages/trash.html:19 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "batalkan penghapusan" -#: django_messages/templates/django_messages/trash.html:28 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." msgstr "" -"Pesan yang dihapus, dihapus dari sampah pada interval yang tidak teratur, jangan " -"bergantung pada penggunaan fitur ini untuk penyimpanan jangka panjang." +"Pesan yang dihapus, dihapus dari sampah pada interval yang tidak teratur, " +"jangan bergantung pada penggunaan fitur ini untuk penyimpanan jangka panjang." -#: django_messages/templates/django_messages/view.html:5 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Buka Pesan" -#: django_messages/templates/django_messages/view.html:21 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Hapus" -#: django_messages/templates/notification/messages_deleted/full.txt:1 +#: templates/notification/messages_deleted/full.txt:1 #, python-format msgid "You have deleted the message '%(message)s'." msgstr "Anda telah menghapus pesan '%(message)s'." -#: django_messages/templates/notification/messages_deleted/notice.html:1 +#: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "" "Anda telah menghapus pesan %(message)s." -#: django_messages/templates/notification/messages_received/full.txt:1 +#: templates/notification/messages_received/full.txt:1 #, python-format msgid "" "%(message_sender)s has sent you a message:\n" @@ -285,50 +293,50 @@ msgstr "" "\n" "http://%(current_site)s%(message_url)s" -#: django_messages/templates/notification/messages_received/notice.html:2 +#: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Anda mendapatkan pesan %(message)s " -"dari %(message_sender)s." +"Anda mendapatkan pesan %(message)s dari " +"%(message_sender)s." -#: django_messages/templates/notification/messages_received/short.txt:1 -#: django_messages/templates/notification/messages_reply_received/short.txt:1 +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 #, python-format msgid "%(notice)s by %(message_sender)s" msgstr "%(notice)s oleh %(message_sender)s" -#: django_messages/templates/notification/messages_recovered/full.txt:1 +#: templates/notification/messages_recovered/full.txt:1 #, python-format msgid "You have recovered the message '%(message)s'." msgstr "Anda telah memulihkan pesan '%(message)s'." -#: django_messages/templates/notification/messages_recovered/notice.html:1 +#: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" "You have recovered the message %(message)s." msgstr "" "Anda telah memulihkan pesan %(message)s." -#: django_messages/templates/notification/messages_replied/full.txt:1 +#: templates/notification/messages_replied/full.txt:1 #, python-format msgid "" "You have replied to '%(message_parent_msg)s' from %(message_recipient)s." msgstr "" "Anda telah membalas ke '%(message_parent_msg)s' dari %(message_recipient)s." -#: django_messages/templates/notification/messages_replied/notice.html:2 +#: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Anda telah membalas ke %(message_parent_msg)s " -"dari %(message_recipient)s." +"Anda telah membalas ke %(message_parent_msg)s dari %(message_recipient)s." -#: django_messages/templates/notification/messages_reply_received/full.txt:1 +#: templates/notification/messages_reply_received/full.txt:1 #, python-format msgid "" "%(message_sender)s replied to '%(message_parent_msg)s':\n" @@ -347,17 +355,18 @@ msgstr "" "\n" "http://%(current_site)s%(message_url)s" -#: django_messages/templates/notification/messages_reply_received/notice.html:2 +#: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." -msgstr "%(message_sender)s telah mengirimkan anda balasan ke %(message_parent_msg)s." +msgstr "" +"%(message_sender)s telah mengirimkan anda balasan ke %(message_parent_msg)s." -#: django_messages/templates/notification/messages_sent/full.txt:1 +#: templates/notification/messages_sent/full.txt:1 #, python-format msgid "You have sent the message '%(message)s' to %(message_recipient)s." msgstr "Anda telah mengirimkan pesan '%(message)s' ke %(message_recipient)s." -#: django_messages/templates/notification/messages_sent/notice.html:2 +#: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" "You have sent the message %(message)s to " @@ -366,7 +375,7 @@ msgstr "" "Anda telah mengirimkan pesan %(message)s ke " "%(message_recipient)s." -#: django_messages/utils.py:26 +#: utils.py:25 #, python-format msgid "" "%(sender)s wrote:\n" @@ -375,29 +384,29 @@ msgstr "" "%(sender)s menulis:\n" "%(body)s" -#: django_messages/utils.py:54 +#: utils.py:53 #, python-format msgid "Re%(prefix)s: %(subject)s" msgstr "" -#: django_messages/utils.py:60 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "Pesan Baru: %(subject)s" -#: django_messages/views.py:79 django_messages/views.py:116 +#: views.py:92 views.py:133 msgid "Message successfully sent." msgstr "Pesan berhasil terkirim." -#: django_messages/views.py:98 django_messages/views.py:194 +#: views.py:111 views.py:211 #, python-format msgid "Re: %(subject)s" msgstr "" -#: django_messages/views.py:159 +#: views.py:176 msgid "Message successfully deleted." msgstr "Pesan berhasil dihapus." -#: django_messages/views.py:186 +#: views.py:203 msgid "Message successfully recovered." msgstr "Pesan berhasil dipulihkan." diff --git a/django_messages/locale/it/LC_MESSAGES/django.mo b/django_messages/locale/it/LC_MESSAGES/django.mo index 451a8aa..a290dfd 100644 Binary files a/django_messages/locale/it/LC_MESSAGES/django.mo and b/django_messages/locale/it/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/it/LC_MESSAGES/django.po b/django_messages/locale/it/LC_MESSAGES/django.po index caf7f9d..fafb352 100644 --- a/django_messages/locale/it/LC_MESSAGES/django.po +++ b/django_messages/locale/it/LC_MESSAGES/django.po @@ -2,37 +2,65 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Sergio Morstabilini , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-03 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2010-03-03 21:58+0100\n" "Last-Translator: Sergio Morstabilini \n" "Language-Team: Sergio Morstabilini \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Italian\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Destinatario" +#: admin.py:21 +msgid "group" +msgstr "gruppo" + +#: admin.py:22 +msgid "Creates the message optionally for all users or a group of users." +msgstr "" +"Crea il messaggio facoltativamente per tutti gli utenti o per un gruppo di " +"utenti." + +#: admin.py:30 +msgid "All users" +msgstr "Tutti gli utenti" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Messaggio" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: admin.py:55 +msgid "Date/time" +msgstr "Data/ora" + +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Messaggi" + +#: fields.py:56 +#, python-format +msgid "The following usernames are incorrect: %(users)s" +msgstr "I seguenti nomi utente sono incorretti: %(users)s" + +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Destinatario" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Oggetto" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Messaggio" @@ -84,234 +112,307 @@ msgstr "Messaggio Ripristinato" msgid "you have undeleted a message" msgstr "hai ripristinato un messaggio" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Mittente" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "In risposta a" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "inviato il" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "letto il" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "risposto il" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Mittente cancellato il" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinatario cancellato il" -#: models.py:89 -msgid "Messages" -msgstr "Messaggi" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Messaggio inviato con successo." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" -msgstr "" -"%(sender)s ha scritto:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" +#: models.py:106 +msgid "File" +msgstr "File" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Messaggio cancellato con successo." +#: models.py:117 +msgid "Attachment" +msgstr "Allegato" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Messaggio recuperato con successo." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "Allegati" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Messaggi Ricevuti" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Messaggi Inviati" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nuovo Messaggio" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Cestino" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Scrivi Messaggio" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Invia" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Ricevuto" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Azione" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j F Y, G:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "cancella" -#: templates/messages/new_message.html:9 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Messaggi" + +#: templates/django_messages/new_message.html:3 +#, python-format +msgid "" +"Hello %(recipient)s,\n" +"\n" +"you received a private message from %(sender)s with\n" +"the following contents:" +msgstr "" +"Ciao %(recipient)s,\n" +"\n" +"hai ricevuto un messaggio privato da %(sender)s con\n" +"il seguente contenuto:" + +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Spedito da %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Rispondi" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Spedito" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Messaggi Cancellati" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "ripristina" -#: templates/messages/trash.html:23 -msgid "Deleted Messages are removed from the trash at unregular intervals, don't rely on this feature for long-time storage." -msgstr "I messaggi cancellati sono rimossi dal cestino ad intervalli irregolari, non affidatevi a questa cartella per salvare messaggi a lungo termine." +#: templates/django_messages/trash.html:28 +msgid "" +"Deleted Messages are removed from the trash at unregular intervals, don't " +"rely on this feature for long-time storage." +msgstr "" +"I messaggi cancellati sono rimossi dal cestino ad intervalli irregolari, non " +"affidatevi a questa cartella per salvare messaggi a lungo termine." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Vedi Messaggio" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Cancella" -#: templates/notification/messages_deleted/notice.html:1 +#: templates/notification/messages_deleted/full.txt:1 #, python-format -msgid "You have deleted the message %(message)s." -msgstr "Hai cancellato il messaggio %(message)s." +msgid "You have deleted the message '%(message)s'." +msgstr "Hai cancellato il messaggio '%(message)s'." -#: templates/notification/messages_recovered/notice.html:1 +#: templates/notification/messages_deleted/notice.html:1 #, python-format -msgid "You have recovered the message %(message)s." -msgstr "Hai ripristinato il messaggio %(message)s." +msgid "" +"You have deleted the message %(message)s." +msgstr "" +"Hai cancellato il messaggio %(message)s." + +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s ha mandato una risposta a %(message_parent_msg)s." #: templates/notification/messages_received/notice.html:2 #, python-format -msgid "You have received the message %(message)s from %(message_sender)s." -msgstr "Hai ricevuto il messaggio %(message)s da %(message_sender)s." +msgid "" +"You have received the message %(message)s " +"from %(message_sender)s." +msgstr "" +"Hai ricevuto il messaggio %(message)s da " +"%(message_sender)s." -#: templates/notification/messages_reply_received/notice.html:2 +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 #, python-format -msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." -msgstr "%(message_sender)s ha mandato una risposta a %(message_parent_msg)s." +msgid "%(notice)s by %(message_sender)s" +msgstr "" -#: templates/notification/messages_sent/notice.html:2 +#: templates/notification/messages_recovered/full.txt:1 +#, python-format +msgid "You have recovered the message '%(message)s'." +msgstr "Hai ripristinato il messaggio '%(message)s'." + +#: templates/notification/messages_recovered/notice.html:1 #, python-format -msgid "You have sent the message %(message)s to %(message_recipient)s." -msgstr "Hai inviato il messaggio %(message)s a %(message_recipient)s." +msgid "" +"You have recovered the message %(message)s." +msgstr "" +"Hai ripristinato il messaggio %(message)s." + +#: templates/notification/messages_replied/full.txt:1 +#, python-format +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Hai risposto a '%(message_parent_msg)s' ricevuto da %(message_recipient)s." #: templates/notification/messages_replied/notice.html:2 #, python-format -msgid "You have replied to %(message_parent_msg)s from %(message_recipient)s." -msgstr "Hai risposto a %(message_parent_msg)s ricevuto da %(message_recipient)s." +msgid "" +"You have replied to %(message_parent_msg)s " +"from %(message_recipient)s." +msgstr "" +"Hai risposto a %(message_parent_msg)s " +"ricevuto da %(message_recipient)s." -#: templates/messages/new_message.html:1 +#: templates/notification/messages_reply_received/full.txt:1 #, python-format msgid "" -"Hello %(recipient)s,\n" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" "\n" -"you received a private message from %(sender)s with\n" -"the following contents:" -msgstr "" -"Ciao %(recipient)s,\n" +"%(message)s\n" "\n" -"hai ricevuto un messaggio privato da %(sender)s con\n" -"il seguente contenuto:" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" -#: admin.py:16 -msgid "Creates the message optionally for all users or a group of users." -msgstr "Crea il messaggio facoltativamente per tutti gli utenti o per un gruppo di utenti." +#: templates/notification/messages_reply_received/notice.html:2 +#, python-format +msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgstr "%(message_sender)s ha mandato una risposta a %(message_parent_msg)s." -#: admin.py:15 -msgid "group" -msgstr "gruppo" +#: templates/notification/messages_sent/full.txt:1 +#, python-format +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "Hai spedito il messaggio '%(message)s' a %(message_recipient)s." -#: admin.py:23 -msgid "All users" -msgstr "Tutti gli utenti" +#: templates/notification/messages_sent/notice.html:2 +#, python-format +msgid "" +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"Hai inviato il messaggio %(message)s a " +"%(message_recipient)s." -#: fields.py:53 +#: utils.py:25 #, python-format -msgid "The following usernames are incorrect: %(users)s" -msgstr "I seguenti nomi utente sono incorretti: %(users)s" +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s ha scritto:\n" +"%(body)s" -#: admin.py:45 -msgid "Date/time" -msgstr "Data/ora" +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" -#: utils.py:27 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "Nuovo Messaggio: %(subject)s" +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Messaggio inviato con successo." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Messaggio cancellato con successo." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Messaggio recuperato con successo." + #~ msgid "There is no user with this username." #~ msgstr "Non esiste un utente con questo nome." #~ msgid "New Message:" #~ msgstr "Nuovo Messaggio:" -#~ msgid "You have deleted the message '%(message)s'." -#~ msgstr "Hai cancellato il messaggio '%(message)s'." - #~ msgid "You have received a message from %(message_sender)s." #~ msgstr "Hai ricevuto un messaggio da %(message_sender)s." -#~ msgid "You have recovered the message '%(message)s'." -#~ msgstr "Hai ripristinato il messaggio '%(message)s'." - -#~ msgid "You have replied to '%(message_parent_msg)s' from %(message_recipient)s." -#~ msgstr "Hai risposto a '%(message_parent_msg)s' ricevuto da %(message_recipient)s." - -#~ msgid "%(message_sender)s has sent you a reply to '%(message_parent_msg)s'." -#~ msgstr "%(message_sender)s ha risposto a '%(message_parent_msg)s'." - -#~ msgid "You have sent the message '%(message)s' to %(message_recipient)s." -#~ msgstr "Hai spedito il messaggio '%(message)s' a %(message_recipient)s." +#~ msgid "" +#~ "%(message_sender)s has sent you a reply to " +#~ "'%(message_parent_msg)s'." +#~ msgstr "" +#~ "%(message_sender)s ha risposto a '%(message_parent_msg)s'." diff --git a/django_messages/locale/ko/LC_MESSAGES/django.mo b/django_messages/locale/ko/LC_MESSAGES/django.mo index 1660a88..b335a6e 100644 Binary files a/django_messages/locale/ko/LC_MESSAGES/django.mo and b/django_messages/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/ko/LC_MESSAGES/django.po b/django_messages/locale/ko/LC_MESSAGES/django.po index 4e810c7..6d3f378 100644 --- a/django_messages/locale/ko/LC_MESSAGES/django.po +++ b/django_messages/locale/ko/LC_MESSAGES/django.po @@ -2,36 +2,62 @@ # Copyright (C) 2012 Jeong YunWon # This file is distributed under the same license as the django-messages package. # Jeong YunWon , 2012. -# +# msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2012-02-04 10:58+0900\n" "Last-Translator: Jeong YunWon \n" "Language-Team: Jeong YunWon \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Korean\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "받는이" +#: admin.py:21 +msgid "group" +msgstr "그룹" -#: admin.py:38 models.py:88 +#: admin.py:22 +msgid "Creates the message optionally for all users or a group of users." +msgstr "Creates the message optionally for all users or a group of users." + +#: admin.py:30 +msgid "All users" +msgstr "모든 사용자" + +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "쪽지" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: admin.py:55 +msgid "Date/time" +msgstr "날짜/시각" + +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "쪽지" + +#: fields.py:56 +#, python-format +msgid "The following usernames are incorrect: %(users)s" +msgstr "올바르지 않은 사용자 이름을 입력하였습니다: %(users)s" + +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "받는이" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "제목" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "내용" @@ -83,210 +109,301 @@ msgstr "쪽지 되살림" msgid "you have undeleted a message" msgstr "쪽지를 되살렸습니다" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "보낸이" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "이전 쪽지" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "보낸 시각:" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "읽은 시각:" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "답장 시각:" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "보낸이가 지운 시각:" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "받는이가 지운 시각:" -#: models.py:89 -msgid "Messages" -msgstr "쪽지" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "쪽지를 보냈습니다." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s 님의 글:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "쪽지를 지웠습니다." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "쪽지를 되살렸습니다." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "받은 편지함" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "보낸 편지함" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "새 쪽지" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "휴지통" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "새 쪽지 쓰기" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "보내기" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "받은 시각" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "할일" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "Y-m-d G:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "지우기" -#: templates/messages/new_message.html:9 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "쪽지" + +#: templates/django_messages/new_message.html:3 +#, python-format +msgid "" +"Hello %(recipient)s,\n" +"\n" +"you received a private message from %(sender)s with\n" +"the following contents:" +msgstr "" +"%(recipient)s 님\n" +"\n" +"%(sender)s 님께 다음 내용으로 쪽지를 받았습니다:" + +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "%(site_url)s 에서 보냄" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "답장" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "보낸 시각" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "지운 쪽지" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "날짜" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "되살리기" -#: templates/messages/trash.html:23 -msgid "Deleted Messages are removed from the trash at unregular intervals, don't rely on this feature for long-time storage." -msgstr "지운 쪽지는 비정기적으로 휴지통에서 완전히 삭제됩니다. 오래 보관해야 하는 쪽지에 이 기능을 사용하지 마세요." +#: templates/django_messages/trash.html:28 +msgid "" +"Deleted Messages are removed from the trash at unregular intervals, don't " +"rely on this feature for long-time storage." +msgstr "" +"지운 쪽지는 비정기적으로 휴지통에서 완전히 삭제됩니다. 오래 보관해야 하는 쪽" +"지에 이 기능을 사용하지 마세요." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "쪽지 보기" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "지우기" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "쪽지를 지웠습니다" + #: templates/notification/messages_deleted/notice.html:1 #, python-format -msgid "You have deleted the message %(message)s." +msgid "" +"You have deleted the message %(message)s." msgstr "%(message)s 지윘습니다." -#: templates/notification/messages_recovered/notice.html:1 -#, python-format -msgid "You have recovered the message %(message)s." -msgstr "%(message)s 되살렸습니다." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s 님이 %(message_parent_msg)s 에 답장을 보냈습니다." #: templates/notification/messages_received/notice.html:2 #, python-format -msgid "You have received the message %(message)s from %(message_sender)s." -msgstr "%(message_sender)s 님에게 %(message)s 받았습니다." +msgid "" +"You have received the message %(message)s " +"from %(message_sender)s." +msgstr "" +"%(message_sender)s 님에게 %(message)s 받았습" +"니다." -#: templates/notification/messages_reply_received/notice.html:2 +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 #, python-format -msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." -msgstr "%(message_sender)s 님이 %(message_parent_msg)s 에 답장을 보냈습니다." +msgid "%(notice)s by %(message_sender)s" +msgstr "" -#: templates/notification/messages_sent/notice.html:2 +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "%(message)s 되살렸습니다." + +#: templates/notification/messages_recovered/notice.html:1 #, python-format -msgid "You have sent the message %(message)s to %(message_recipient)s." -msgstr "%(message_recipient)s 님에게 %(message)s 보냈습니다." +msgid "" +"You have recovered the message %(message)s." +msgstr "%(message)s 되살렸습니다." + +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"%(message_recipient)s 님의 " +"%(message_parent_msg)s 에 답장하였습니다." #: templates/notification/messages_replied/notice.html:2 #, python-format -msgid "You have replied to %(message_parent_msg)s from %(message_recipient)s." -msgstr "%(message_recipient)s 님의 %(message_parent_msg)s 에 답장하였습니다." +msgid "" +"You have replied to %(message_parent_msg)s " +"from %(message_recipient)s." +msgstr "" +"%(message_recipient)s 님의 " +"%(message_parent_msg)s 에 답장하였습니다." -#: templates/messages/new_message.html:1 +#: templates/notification/messages_reply_received/full.txt:1 #, python-format msgid "" -"Hello %(recipient)s,\n" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" "\n" -"you received a private message from %(sender)s with\n" -"the following contents:" -msgstr "" -"%(recipient)s 님\n" +"%(message)s\n" "\n" -"%(sender)s 님께 다음 내용으로 쪽지를 받았습니다:" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" -#: admin.py:16 -msgid "Creates the message optionally for all users or a group of users." -msgstr "Creates the message optionally for all users or a group of users." +#: templates/notification/messages_reply_received/notice.html:2 +#, python-format +msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgstr "%(message_sender)s 님이 %(message_parent_msg)s 에 답장을 보냈습니다." -#: admin.py:15 -msgid "group" -msgstr "그룹" +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"%(message_recipient)s 님에게 %(message)s 보냈" +"습니다." -#: admin.py:23 -msgid "All users" -msgstr "모든 사용자" +#: templates/notification/messages_sent/notice.html:2 +#, python-format +msgid "" +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"%(message_recipient)s 님에게 %(message)s 보냈" +"습니다." -#: fields.py:53 +#: utils.py:25 #, python-format -msgid "The following usernames are incorrect: %(users)s" -msgstr "올바르지 않은 사용자 이름을 입력하였습니다: %(users)s" +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s 님의 글:\n" +"%(body)s" -#: admin.py:45 -msgid "Date/time" -msgstr "날짜/시각" +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" -#: utils.py:27 +#: utils.py:59 #, python-format msgid "New Message: %(subject)s" msgstr "새 쪽지: %(subject)s" +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "쪽지를 보냈습니다." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "쪽지를 지웠습니다." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "쪽지를 되살렸습니다." diff --git a/django_messages/locale/lt/LC_MESSAGES/django.mo b/django_messages/locale/lt/LC_MESSAGES/django.mo index 3760c76..c9483d0 100644 Binary files a/django_messages/locale/lt/LC_MESSAGES/django.mo and b/django_messages/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/lt/LC_MESSAGES/django.po b/django_messages/locale/lt/LC_MESSAGES/django.po index 14a833f..e47b073 100644 --- a/django_messages/locale/lt/LC_MESSAGES/django.po +++ b/django_messages/locale/lt/LC_MESSAGES/django.po @@ -8,53 +8,56 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2015-03-24 10:53+0200\n" "Last-Translator: Saulius Zemaitaitis \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Gavėjas" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "Grupė" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." -msgstr "" -"Sukuria žinutę visiems vartotojams arba grupei pasirinktinai " - +msgstr "Sukuria žinutę visiems vartotojams arba grupei pasirinktinai " -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Visi vartotojai" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Žinutė" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Data/Laikas" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Žinutės" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Šie vartotojų vardai yra neteisingi: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Gavėjas" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Tema" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Turinys" @@ -106,119 +109,102 @@ msgstr "Žinutė Atstatyta" msgid "you have undeleted a message" msgstr "jūs atstatėte ištrintą žinutę" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Siuntėjas" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Pirminė žinutė" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "išsiųsta" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "perskaityta" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "atsakyta" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Siuntėjas ištrynė" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Gavėjas ištrynė" -#: models.py:89 -msgid "Messages" -msgstr "Žinutės" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Nauja žinutė: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Žinutė sėkmingai išsiųsta." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s parašė:\n" -"%(body)s" -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Ats: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Žinutė sėkmingai ištrinta." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Žinutė sėkmingai atstatyta." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Gautos" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Išsiųstos žinutės" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nauja žinutė" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Ištrintos" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Kurti žinutę" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Siųsti" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Gauta" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Veiksmas" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "Y j. N, H:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "ištrinti" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Žinučių nėra." -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -231,32 +217,34 @@ msgstr "" "Gavote asmeninę žinutę nuo %(sender)s su\n" "šiuo turiniu:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Siųsta iš %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Atsakyti" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Išsiųsta" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Ištrintos žinutės" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "atstatyti" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -264,20 +252,38 @@ msgstr "" "Ištrintos žinutės pašalinamos periodiškai, nelaikykite ilgalaikių žinučių " "šiukšliadėžėje." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Peržiūrėti žinutę" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Ištrinti" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "jūs ištrynėte žinutę" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." -msgstr "" -"Ištrynėte žinutę %(message)s." +msgstr "Ištrynėte žinutę %(message)s." + +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s atsiuntė atsakymą į %(message_parent_msg)s." #: templates/notification/messages_received/notice.html:2 #, python-format @@ -285,15 +291,39 @@ msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Gavote žinutę %(message)s nuo %" -"(message_sender)s." +"Gavote žinutę %(message)s nuo " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "Atstatėte žinutę %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" "You have recovered the message %(message)s." +msgstr "Atstatėte žinutę %(message)s." + +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." msgstr "" -"Atstatėte žinutę %(message)s." +"Jūs atsakėte į žinutę %(message_parent_msg)s " +"nuo %(message_recipient)s." #: templates/notification/messages_replied/notice.html:2 #, python-format @@ -301,20 +331,78 @@ msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Jūs atsakėte į žinutę %(message_parent_msg)" -"s nuo %(message_recipient)s." +"Jūs atsakėte į žinutę %(message_parent_msg)s " +"nuo %(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgstr "%(message_sender)s atsiuntė atsakymą į %(message_parent_msg)s." + +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." msgstr "" -"%(message_sender)s atsiuntė atsakymą į %(message_parent_msg)s." +"Išsiuntėte žinutę %(message)s " +"%(message_recipient)s." #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"Išsiuntėte žinutę %(message)s " +"%(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" msgstr "" -"Išsiuntėte žinutę %(message)s %" -"(message_recipient)s." +"%(sender)s parašė:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Ats: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Nauja žinutė: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Žinutė sėkmingai išsiųsta." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Ats: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Žinutė sėkmingai ištrinta." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Žinutė sėkmingai atstatyta." diff --git a/django_messages/locale/nl/LC_MESSAGES/django.mo b/django_messages/locale/nl/LC_MESSAGES/django.mo index cc71ed8..401a452 100755 Binary files a/django_messages/locale/nl/LC_MESSAGES/django.mo and b/django_messages/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/nl/LC_MESSAGES/django.po b/django_messages/locale/nl/LC_MESSAGES/django.po index c5b7981..4f3fb06 100755 --- a/django_messages/locale/nl/LC_MESSAGES/django.po +++ b/django_messages/locale/nl/LC_MESSAGES/django.po @@ -8,52 +8,57 @@ msgid "" msgstr "" "Project-Id-Version: django-messages-0.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: krisje8 \n" "Language-Team: krisje8 %(message)s verwijderd." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" +"%(message_sender)s heeft je een antwoord op %(message_parent_msg)s gestuurd." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" @@ -282,6 +299,21 @@ msgstr "" "Je hebt het bericht %(message)s ontvangen " "van %(message_sender)s." +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "" +"Je hebt het bericht %(message)s hersteld." + #: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" @@ -289,14 +321,37 @@ msgid "" msgstr "" "Je hebt het bericht %(message)s hersteld." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Je hebt op %(message_parent_msg)s van " +"%(message_recipient)s geantwoord." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Je hebt op %(message_parent_msg)s van %" -"(message_recipient)s geantwoord." +"Je hebt op %(message_parent_msg)s van " +"%(message_recipient)s geantwoord." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format @@ -304,11 +359,58 @@ msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" "%(message_sender)s heeft je een antwoord op %(message_parent_msg)s gestuurd." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Je hebt het bericht %(message)s naar " +"%(message_recipient)s gestuurd." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"Je hebt het bericht %(message)s naar " +"%(message_recipient)s gestuurd." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" msgstr "" -"Je hebt het bericht %(message)s naar %" -"(message_recipient)s gestuurd." +"%(sender)s schreef:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Antw: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Nieuw Bericht: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Bericht succesvol verstuurd." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Antw: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Bericht succesvol verwijderd." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Bericht succesvol hersteld." diff --git a/django_messages/locale/pl/LC_MESSAGES/django.mo b/django_messages/locale/pl/LC_MESSAGES/django.mo index 2279254..d121dba 100644 Binary files a/django_messages/locale/pl/LC_MESSAGES/django.mo and b/django_messages/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/pl/LC_MESSAGES/django.po b/django_messages/locale/pl/LC_MESSAGES/django.po index bb15d5b..acb7e1a 100644 --- a/django_messages/locale/pl/LC_MESSAGES/django.po +++ b/django_messages/locale/pl/LC_MESSAGES/django.po @@ -8,52 +8,57 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Odbiorca" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "" -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Wiadomość" -#: admin.py:45 +#: admin.py:55 #, fuzzy msgid "Date/time" msgstr "Data" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Wiadomości" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Te nazwy użytkowników są niewłaściwe: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Odbiorca" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Temat" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Treść" @@ -105,114 +110,104 @@ msgstr "Wiadomość odzyskana" msgid "you have undeleted a message" msgstr "Odzyskałeś skasowaną wiadomość" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Nadawca" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Poprzednia wiadomość" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "wysłano" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "przeczytano" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "odpowiedziano" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Nadawcę skasowano" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Adresata skasowano" -#: models.py:89 -msgid "Messages" -msgstr "Wiadomości" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Nowa wiadomość: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Wiadomość wysłana" - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s napisał:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Odp: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Wiadomość skasowana" +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Wiadomość odzyskana" +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Wiadomości otrzymane" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Wiadomości wysłane" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nowa wiadomość" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Kosz" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Stwórz wiadomość" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Wyślij" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Otrzymane" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "akcja" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "usuń" -#: templates/messages/new_message.html:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "Wiadomości" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -225,32 +220,34 @@ msgstr "" "otrzymałeś od użytkownika %(sender)s wiadomość\n" "o następującej treści:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Wysłane z adresu %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Odpowiedz" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Wiadomości wysłane" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Wiadomości skasowane" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "odzyskaj" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -258,20 +255,38 @@ msgstr "" "Wiadomości są usuwane z Kosza nieregularnie. Nie licz, że zastaniesz je " "tutaj po dłuższym czasie" -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Zobacz wiadomość" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Usuń" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "skasowałeś wiadomość" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "" +#: templates/notification/messages_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" @@ -279,12 +294,30 @@ msgid "" "from %(message_sender)s." msgstr "" +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "you have received a message" +msgid "You have recovered the message '%(message)s'." +msgstr "otrzymałeś wiadomość" + #: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" "You have recovered the message %(message)s." msgstr "" +#: templates/notification/messages_replied/full.txt:1 +#, python-format +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" @@ -292,14 +325,68 @@ msgid "" "from %(message_recipient)s." msgstr "" +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" + #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "" +#: templates/notification/messages_sent/full.txt:1 +#, python-format +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" msgstr "" +"%(sender)s napisał:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Odp: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Nowa wiadomość: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Wiadomość wysłana" + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Odp: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Wiadomość skasowana" + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Wiadomość odzyskana" diff --git a/django_messages/locale/pt_BR/LC_MESSAGES/django.mo b/django_messages/locale/pt_BR/LC_MESSAGES/django.mo index 83e5704..4f78fb1 100644 Binary files a/django_messages/locale/pt_BR/LC_MESSAGES/django.mo and b/django_messages/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/pt_BR/LC_MESSAGES/django.po b/django_messages/locale/pt_BR/LC_MESSAGES/django.po index ef36d4f..79aebb8 100644 --- a/django_messages/locale/pt_BR/LC_MESSAGES/django.po +++ b/django_messages/locale/pt_BR/LC_MESSAGES/django.po @@ -2,24 +2,20 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Diego Martins , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-01 10:24+0100\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:19 forms.py:20 models.py:52 templates/messages/outbox.html:8 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Usuário" - #: admin.py:21 msgid "group" msgstr "grupo" @@ -28,30 +24,39 @@ msgstr "grupo" msgid "Creates the message optionally for all users or a group of users." msgstr "Cria a mensagem para todos os usuários ou para um grupo de usuários." -#: admin.py:29 +#: admin.py:30 msgid "All users" msgstr "Todos os usuários" -#: admin.py:44 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Mensagem" -#: admin.py:51 +#: admin.py:55 msgid "Date/time" msgstr "Data/Hora" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Mensagens" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Os seguintes nome de usuário estão incorretos: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:8 -#: templates/messages/outbox.html:8 templates/messages/trash.html:8 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Usuário" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Assunto" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Mensagem" @@ -103,119 +108,102 @@ msgstr "Mensagem Recuperada" msgid "you have undeleted a message" msgstr "Você recuperou uma mensagem" -#: models.py:51 templates/messages/inbox.html:8 -#: templates/messages/trash.html:8 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Remetente" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Mensagem pai" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "enviado à" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "lido à" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "respondido à" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Remetente excluiu à" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Destinatário excluiu à" -#: models.py:89 -msgid "Messages" -msgstr "Mensagens" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Nova Mensagem: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Mensagem enviada com sucesso." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s escreveu:\n" -"%(body)s" -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" - -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Mensagem excluida com sucesso." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Mensagem recuperada com sucesso." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Caixa de Entrada" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Mensagens Enviadas" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Nova Mensagem" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Lixeira" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Escrever Mensagem" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Enviar" -#: templates/messages/inbox.html:8 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Recebida" -#: templates/messages/inbox.html:8 templates/messages/outbox.html:8 -#: templates/messages/trash.html:8 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Ação" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 -#: templates/messages/trash.html:17 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/messages/inbox.html:21 templates/messages/outbox.html:18 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "excluir" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "" -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -228,32 +216,34 @@ msgstr "" "Você recebeu uma mensagem privada de %(sender)s com\n" "o seguinte conteúdo:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Enviado de %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Responder" -#: templates/messages/outbox.html:8 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Enviada" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Mensagens Excluidas" -#: templates/messages/trash.html:8 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:18 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "recuperar" -#: templates/messages/trash.html:27 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -261,28 +251,61 @@ msgstr "" "Mensagens excluidas são removidas da lixeira em intervalos de tempo não " "regulares,não use a lixeira para armazenar mensagens por muito tempo." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Ver Mensagem" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Excluir" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "Você excluiu uma mensagem" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "Você excluiu a mensagem %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s lhe enviou uma resposta a %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Você recebeu a mensagem %(message)s de %" -"(message_sender)s." +"Você recebeu a mensagem %(message)s de " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "Você recuperou a mensagem %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -290,25 +313,95 @@ msgid "" "You have recovered the message %(message)s." msgstr "Você recuperou a mensagem %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Você respondeu a mensagem " +"%(message_parent_msg)s de %(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Você respondeu a mensagem %(message_parent_msg)" -"s de %(message_recipient)s." +"Você respondeu a mensagem " +"%(message_parent_msg)s de %(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "%(message_sender)s lhe enviou uma resposta a %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Você enviou a mensagem %(message)s para " +"%(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." +msgstr "" +"Você enviou a mensagem %(message)s para " +"%(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" msgstr "" -"Você enviou a mensagem %(message)s para %" -"(message_recipient)s." +"%(sender)s escreveu:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Nova Mensagem: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Mensagem enviada com sucesso." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Mensagem excluida com sucesso." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Mensagem recuperada com sucesso." diff --git a/django_messages/locale/ro/LC_MESSAGES/django.mo b/django_messages/locale/ro/LC_MESSAGES/django.mo index 7993e9e..c059c48 100644 Binary files a/django_messages/locale/ro/LC_MESSAGES/django.mo and b/django_messages/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/ro/LC_MESSAGES/django.po b/django_messages/locale/ro/LC_MESSAGES/django.po index 9098732..fbf2ae4 100644 --- a/django_messages/locale/ro/LC_MESSAGES/django.po +++ b/django_messages/locale/ro/LC_MESSAGES/django.po @@ -7,54 +7,59 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: 2014-05-14 16:59+0200\n" "Last-Translator: Eduard Luca \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Destinatar" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "grup" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "" "Creaza mesajul optional pentru toti utilizatorii sau pentru un grup de " "utilizatori." -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Toti utilizatorii" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Mesaj" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Data/ora" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Mesaje" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Urmatoarele nume de utilizatori nu sunt corecte: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Destinatar" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Subiect" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Continut" @@ -106,119 +111,102 @@ msgstr "Mesaj Recuperat" msgid "you have undeleted a message" msgstr "ati recuperat un mesaj" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Expeditor" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Mesaj parinte" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "trimis" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "citit" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "raspuns in" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Sters la expeditor" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Sters la destinatar" -#: models.py:89 -msgid "Messages" -msgstr "Mesaje" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Mesaj Nou: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Mesaj trimis cu succes." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s a scris:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Mesaj sters cu succes." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Mesaj recuperat cu succes." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Primite" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Trimise" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Mesaj Nou" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Cos de Gunoi" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Scrie un Mesaj" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Trimite" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Primit" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Actiune" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j. N Y, H:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "sterge" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Nu sunt mesaje." -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -231,32 +219,34 @@ msgstr "" "ati primit un mesaj privat de la %(sender)s cu\n" "continutul:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Trimis de %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Raspunde" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Trimis" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Mesaje Sterse" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Data" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "recupereaza" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -264,20 +254,39 @@ msgstr "" "Mesajele sterse sunt inlaturate din sistem la intervale neregulate, nu va " "bazati pe stocarea acestor date." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Vizualizati Mesaj" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Stergere" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "ati sters un mesaj" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "Ati sters mesajul %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s a raspuns la mesajul %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" @@ -287,12 +296,37 @@ msgstr "" "Ati primit mesajul %(message)s von " "%(message_sender)s." +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "Ati recuperat mesajul %(message)s." + #: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" "You have recovered the message %(message)s." msgstr "Ati recuperat mesajul %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Ati raspuns la mesajul %(message_parent_msg)s von %(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" @@ -302,11 +336,33 @@ msgstr "" "Ati raspuns la mesajul %(message_parent_msg)s von %(message_recipient)s." +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" + #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "%(message_sender)s a raspuns la mesajul %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Ati trimis mesajul %(message)s an " +"%(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" @@ -315,3 +371,40 @@ msgid "" msgstr "" "Ati trimis mesajul %(message)s an " "%(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s a scris:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Mesaj Nou: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Mesaj trimis cu succes." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Mesaj sters cu succes." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Mesaj recuperat cu succes." diff --git a/django_messages/locale/ru/LC_MESSAGES/django.mo b/django_messages/locale/ru/LC_MESSAGES/django.mo index 90aeca4..4356a44 100644 Binary files a/django_messages/locale/ru/LC_MESSAGES/django.mo and b/django_messages/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/ru/LC_MESSAGES/django.po b/django_messages/locale/ru/LC_MESSAGES/django.po index 34b76b6..1a8ad80 100644 --- a/django_messages/locale/ru/LC_MESSAGES/django.po +++ b/django_messages/locale/ru/LC_MESSAGES/django.po @@ -2,57 +2,62 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Michail Sychev m.sychev@axion-rti.ru, 2009 -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-11 12:31-0700\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:13 forms.py:20 models.py:52 templates/messages/outbox.html:7 -#: templates/messages/view.html:12 -msgid "Recipient" -msgstr "Получатель" - -#: admin.py:15 +#: admin.py:21 msgid "group" msgstr "Группа" -#: admin.py:16 +#: admin.py:22 msgid "Creates the message optionally for all users or a group of users." msgstr "Создать сообщения опционально для всех пользователей или группы" -#: admin.py:23 +#: admin.py:30 msgid "All users" msgstr "Все пользователи" -#: admin.py:38 models.py:88 +#: admin.py:48 models.py:94 models.py:112 msgid "Message" msgstr "Сообщение" -#: admin.py:45 +#: admin.py:55 msgid "Date/time" msgstr "Дата/Время" -#: fields.py:53 +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "Сообщения" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "Некорректные имена пользователей: %(users)s" -#: forms.py:21 models.py:49 templates/messages/inbox.html:7 -#: templates/messages/outbox.html:7 templates/messages/trash.html:7 -#: templates/messages/view.html:6 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 +msgid "Recipient" +msgstr "Получатель" + +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "Тема" -#: forms.py:22 models.py:50 +#: forms.py:20 models.py:57 msgid "Body" msgstr "Сообщение" @@ -104,119 +109,102 @@ msgstr "Сообщение восстановлено" msgid "you have undeleted a message" msgstr "вы восстановили сообщение" -#: models.py:51 templates/messages/inbox.html:7 -#: templates/messages/trash.html:7 templates/messages/view.html:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "Отправитель" -#: models.py:53 +#: models.py:60 msgid "Parent message" msgstr "Родительское сообщение" -#: models.py:54 +#: models.py:61 msgid "sent at" msgstr "отправлено" -#: models.py:55 +#: models.py:62 msgid "read at" msgstr "прочитано" -#: models.py:56 +#: models.py:63 msgid "replied at" msgstr "отвечено" -#: models.py:57 +#: models.py:64 msgid "Sender deleted at" msgstr "Отправитель удалил" -#: models.py:58 +#: models.py:65 msgid "Recipient deleted at" msgstr "Получатель удалил" -#: models.py:89 -msgid "Messages" -msgstr "Сообщения" - -#: utils.py:27 -#, python-format -msgid "New Message: %(subject)s" -msgstr "Новое сообщение: %(subject)s" - -#: views.py:78 views.py:112 -msgid "Message successfully sent." -msgstr "Сообщение успешно отправлено." - -#: views.py:118 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s написал:\n" -"%(body)s" - -#: views.py:122 -#, python-format -msgid "Re: %(subject)s" -msgstr "Re: %(subject)s" -#: views.py:158 -msgid "Message successfully deleted." -msgstr "Сообщение успешно удалено." +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:185 -msgid "Message successfully recovered." -msgstr "Сообщение успешно восстановлено." +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates/messages/base.html:8 templates/messages/inbox.html:4 -#: templates/messages/new_message.html:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "Входящие" -#: templates/messages/base.html:9 templates/messages/outbox.html:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "Исходящие" -#: templates/messages/base.html:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "Новое сообщение" -#: templates/messages/base.html:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "Удалённые" -#: templates/messages/compose.html:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "Новое сообщение" -#: templates/messages/compose.html:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "Отправить" -#: templates/messages/inbox.html:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "Получено" -#: templates/messages/inbox.html:7 templates/messages/outbox.html:7 -#: templates/messages/trash.html:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "Действия" -#: templates/messages/inbox.html:19 templates/messages/outbox.html:16 -#: templates/messages/trash.html:16 templates/messages/view.html:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "j. N Y, H:i" -#: templates/messages/inbox.html:20 templates/messages/outbox.html:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "удалить" -#: templates/messages/inbox.html:27 templates/messages/outbox.html:24 -#: templates/messages/trash.html:24 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 msgid "No messages." msgstr "Сообщений нет." -#: templates/messages/new_message.html:1 +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -229,32 +217,34 @@ msgstr "" "Вы получили сообщение от %(sender)s\n" "со следующим содержанием:" -#: templates/messages/new_message.html:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "Отправлено %(site_url)s" -#: templates/messages/new_message.html:11 templates/messages/view.html:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "Ответить" -#: templates/messages/outbox.html:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "Отправлено" -#: templates/messages/trash.html:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "Удалённые сообщения" -#: templates/messages/trash.html:7 templates/messages/view.html:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "Дата" -#: templates/messages/trash.html:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "восстановить" -#: templates/messages/trash.html:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." @@ -262,28 +252,61 @@ msgstr "" "Удалённые сообщения очищаются из корзины через произвольные интервалы,не " "используйте эту возможность как долгосрочное хранилище." -#: templates/messages/view.html:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "Просмотр сообщений" -#: templates/messages/view.html:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "Удалить" +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "вы удалили сообщение" + #: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "Вы удалили сообщение %(message)s." +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s ответил на %(message_parent_msg)s." + #: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" -"Вы получили сообщение %(message)s от %" -"(message_sender)s." +"Вы получили сообщение %(message)s от " +"%(message_sender)s." + +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "Вы восстановили сообщение %(message)s." #: templates/notification/messages_recovered/notice.html:1 #, python-format @@ -291,25 +314,95 @@ msgid "" "You have recovered the message %(message)s." msgstr "Вы восстановили сообщение %(message)s." +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"Вы ответили на %(message_parent_msg)s от " +"%(message_recipient)s." + #: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"Вы ответили на %(message_parent_msg)s от %" -"(message_recipient)s." +"Вы ответили на %(message_parent_msg)s от " +"%(message_recipient)s." + +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" #: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." msgstr "%(message_sender)s ответил на %(message_parent_msg)s." +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"Вы отправили сообщение %(message)s " +"получателям %(message_recipient)s." + #: templates/notification/messages_sent/notice.html:2 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" "Вы отправили сообщение %(message)s " "получателям %(message_recipient)s." + +#: utils.py:25 +#, python-format +msgid "" +"%(sender)s wrote:\n" +"%(body)s" +msgstr "" +"%(sender)s написал:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "Re: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "Новое сообщение: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "Сообщение успешно отправлено." + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "Re: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "Сообщение успешно удалено." + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "Сообщение успешно восстановлено." diff --git a/django_messages/locale/zh_CN/LC_MESSAGES/django.mo b/django_messages/locale/zh_CN/LC_MESSAGES/django.mo index 455e489..ac220e8 100644 Binary files a/django_messages/locale/zh_CN/LC_MESSAGES/django.mo and b/django_messages/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django_messages/locale/zh_CN/LC_MESSAGES/django.po b/django_messages/locale/zh_CN/LC_MESSAGES/django.po index 6d91738..0ae2af8 100644 --- a/django_messages/locale/zh_CN/LC_MESSAGES/django.po +++ b/django_messages/locale/zh_CN/LC_MESSAGES/django.po @@ -9,196 +9,209 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-04 12:00-0000\n" +"POT-Creation-Date: 2019-09-21 12:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: GENE WU \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: fields.py:39 +#: admin.py:21 +msgid "group" +msgstr "" + +#: admin.py:22 +msgid "Creates the message optionally for all users or a group of users." +msgstr "" + +#: admin.py:30 +msgid "All users" +msgstr "" + +#: admin.py:48 models.py:94 models.py:112 +msgid "Message" +msgstr "消息" + +#: admin.py:55 +#, fuzzy +#| msgid "Date" +msgid "Date/time" +msgstr "日期" + +#: apps.py:6 models.py:95 +msgid "Messages" +msgstr "消息" + +#: fields.py:56 #, python-format msgid "The following usernames are incorrect: %(users)s" msgstr "以下用户名不正确: %(users)s" -#: forms.py:23 models.py:53 templates\messages\outbox.html.py:7 -#: templates\messages\view.html.py:12 +#: forms.py:18 models.py:59 templates/django_messages/outbox.html:9 +#: templates/django_messages/view.html:13 msgid "Recipient" msgstr "收信人" -#: forms.py:24 models.py:50 templates\messages\inbox.html.py:7 -#: templates\messages\outbox.html.py:7 templates\messages\trash.html.py:7 -#: templates\messages\view.html.py:6 +#: forms.py:19 models.py:56 templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:7 msgid "Subject" msgstr "主题" -#: forms.py:25 models.py:51 +#: forms.py:20 models.py:57 msgid "Body" msgstr "消息主体" -#: management.py:10 +#: management.py:9 msgid "Message Received" msgstr "收到的消息" -#: management.py:10 +#: management.py:9 msgid "you have received a message" msgstr "你受到了一条消息" -#: management.py:11 +#: management.py:10 msgid "Message Sent" msgstr "消息已发出" -#: management.py:11 +#: management.py:10 msgid "you have sent a message" msgstr "你已发出了一条消息" -#: management.py:12 +#: management.py:11 msgid "Message Replied" msgstr "消息已回复" -#: management.py:12 +#: management.py:11 msgid "you have replied to a message" msgstr "你已回复了一条消息" -#: management.py:13 +#: management.py:12 msgid "Reply Received" msgstr "回复已收到" -#: management.py:13 +#: management.py:12 msgid "you have received a reply to a message" msgstr "你已收到了消息的一条回复" -#: management.py:14 +#: management.py:13 msgid "Message Deleted" msgstr "消息已删除" -#: management.py:14 +#: management.py:13 msgid "you have deleted a message" msgstr "你已删除了一条消息" -#: management.py:15 +#: management.py:14 msgid "Message Recovered" msgstr "消息已恢复" -#: management.py:15 -msgid "you have undelete a message" +#: management.py:14 +#, fuzzy +#| msgid "you have undelete a message" +msgid "you have undeleted a message" msgstr "你已恢复了一条消息" -#: models.py:52 templates\messages\inbox.html.py:7 -#: templates\messages\trash.html.py:7 templates\messages\view.html.py:8 +#: models.py:58 templates/django_messages/inbox.html:9 +#: templates/django_messages/trash.html:9 templates/django_messages/view.html:9 msgid "Sender" msgstr "发信人" -#: models.py:54 +#: models.py:60 msgid "Parent message" msgstr "原消息" -#: models.py:55 +#: models.py:61 msgid "sent at" msgstr "发送于" -#: models.py:56 +#: models.py:62 msgid "read at" msgstr "阅读于" -#: models.py:57 +#: models.py:63 msgid "replied at" msgstr "回复于" -#: models.py:58 +#: models.py:64 msgid "Sender deleted at" msgstr "发信人删除于" -#: models.py:59 +#: models.py:65 msgid "Recipient deleted at" msgstr "收件人删除于" -#: models.py:89 -msgid "Message" -msgstr "消息" - -#: models.py:90 -msgid "Messages" -msgstr "消息" - -#: utils.py:29 -#, python-format -msgid "New Message: %(subject)s" -msgstr "新消息: %(subject)s" - -#: views.py:80 views.py:108 -msgid "Message successfully sent." -msgstr "消息已成功发送。" - -#: views.py:114 -#, python-format -msgid "" -"%(sender)s wrote:\n" -"%(body)s" +#: models.py:106 +msgid "File" msgstr "" -"%(sender)s 写道:\n" -"%(body)s" - -#: views.py:118 -#, python-format -msgid "Re: %(subject)s" -msgstr "回复: %(subject)s" -#: views.py:154 -msgid "Message successfully deleted." -msgstr "消息已成功删除。" +#: models.py:117 +msgid "Attachment" +msgstr "" -#: views.py:181 -msgid "Message successfully recovered." -msgstr "消息已成功恢复。" +#: models.py:118 templates/django_messages/view.html:18 +msgid "Attachments" +msgstr "" -#: templates\messages\base.html.py:8 templates\messages\inbox.html.py:4 -#: templates\messages\new_message.html.py:10 +#: templates/django_messages/base.html:8 templates/django_messages/inbox.html:5 +#: templates/django_messages/new_message.html:12 msgid "Inbox" msgstr "收件箱" -#: templates\messages\base.html.py:9 templates\messages\outbox.html.py:4 +#: templates/django_messages/base.html:9 +#: templates/django_messages/outbox.html:5 msgid "Sent Messages" msgstr "发送的消息" -#: templates\messages\base.html.py:10 +#: templates/django_messages/base.html:10 msgid "New Message" msgstr "新消息" -#: templates\messages\base.html.py:11 +#: templates/django_messages/base.html:11 msgid "Trash" msgstr "回收站" -#: templates\messages\compose.html.py:4 +#: templates/django_messages/compose.html:5 msgid "Compose Message" msgstr "撰写消息" -#: templates\messages\compose.html.py:9 +#: templates/django_messages/compose.html:11 msgid "Send" msgstr "发送" -#: templates\messages\inbox.html.py:7 +#: templates/django_messages/inbox.html:9 msgid "Received" msgstr "受到于" -#: templates\messages\inbox.html.py:7 templates\messages\outbox.html.py:7 -#: templates\messages\trash.html.py:7 +#: templates/django_messages/inbox.html:9 +#: templates/django_messages/outbox.html:9 +#: templates/django_messages/trash.html:9 msgid "Action" msgstr "动作" -#: templates\messages\inbox.html.py:19 -#: templates\messages\outbox.html.py:16 -#: templates\messages\trash.html.py:16 templates\messages\view.html.py:11 +#: templates/django_messages/inbox.html:21 +#: templates/django_messages/outbox.html:18 +#: templates/django_messages/trash.html:18 +#: templates/django_messages/view.html:12 msgid "DATETIME_FORMAT" msgstr "" -#: templates\messages\inbox.html.py:20 -#: templates\messages\outbox.html.py:17 +#: templates/django_messages/inbox.html:22 +#: templates/django_messages/outbox.html:19 msgid "delete" msgstr "删除" -#: templates\messages\new_message.html.py:1 +#: templates/django_messages/inbox.html:28 +#: templates/django_messages/outbox.html:25 +#: templates/django_messages/trash.html:25 +#, fuzzy +#| msgid "Messages" +msgid "No messages." +msgstr "消息" + +#: templates/django_messages/new_message.html:3 #, python-format msgid "" "Hello %(recipient)s,\n" @@ -211,89 +224,189 @@ msgstr "" "你受到一条从%(sender)s发出的私人信息有\n" "以下内容:" -#: templates\messages\new_message.html.py:9 +#: templates/django_messages/new_message.html:11 #, python-format msgid "Sent from %(site_url)s" msgstr "消息已从%(site_url)s发出" -#: templates\messages\new_message.html.py:11 -#: templates\messages\view.html.py:18 +#: templates/django_messages/new_message.html:13 +#: templates/django_messages/view.html:27 msgid "Reply" msgstr "回复" -#: templates\messages\outbox.html.py:7 +#: templates/django_messages/outbox.html:9 msgid "Sent" msgstr "已发出" -#: templates\messages\trash.html.py:4 +#: templates/django_messages/trash.html:5 msgid "Deleted Messages" msgstr "删除的消息" -#: templates\messages\trash.html.py:7 templates\messages\view.html.py:10 +#: templates/django_messages/trash.html:9 +#: templates/django_messages/view.html:11 msgid "Date" msgstr "日期" -#: templates\messages\trash.html.py:17 +#: templates/django_messages/trash.html:19 msgid "undelete" msgstr "恢复" -#: templates\messages\trash.html.py:23 +#: templates/django_messages/trash.html:28 msgid "" "Deleted Messages are removed from the trash at unregular intervals, don't " "rely on this feature for long-time storage." -msgstr "" -"删除的消息将定期删除，不要依赖此功能作为长期存储。" -"" +msgstr "删除的消息将定期删除，不要依赖此功能作为长期存储。" -#: templates\messages\view.html.py:4 +#: templates/django_messages/view.html:5 msgid "View Message" msgstr "浏览消息" -#: templates\messages\view.html.py:20 +#: templates/django_messages/view.html:29 msgid "Delete" msgstr "删除" -#: templates\notification\messages_deleted\notice.html.py:1 +#: templates/notification/messages_deleted/full.txt:1 +#, fuzzy, python-format +#| msgid "you have deleted a message" +msgid "You have deleted the message '%(message)s'." +msgstr "你已删除了一条消息" + +#: templates/notification/messages_deleted/notice.html:1 #, python-format msgid "" "You have deleted the message %(message)s." msgstr "你已删除了消息%(message)s." -#: templates\notification\messages_received\notice.html.py:2 +#: templates/notification/messages_received/full.txt:1 +#, fuzzy, python-format +#| msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgid "" +"%(message_sender)s has sent you a message:\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "%(message_sender)s已回复你发出的消息：%(message_parent_msg)s." + +#: templates/notification/messages_received/notice.html:2 #, python-format msgid "" "You have received the message %(message)s " "from %(message_sender)s." msgstr "" "你已收到%(message_sender)s的消息%(message)s。" -"" -#: templates\notification\messages_recovered\notice.html.py:1 +#: templates/notification/messages_received/short.txt:1 +#: templates/notification/messages_reply_received/short.txt:1 +#, python-format +msgid "%(notice)s by %(message_sender)s" +msgstr "" + +#: templates/notification/messages_recovered/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have recovered the message %(message)s." +msgid "You have recovered the message '%(message)s'." +msgstr "你已恢复了消息%(message)s." + +#: templates/notification/messages_recovered/notice.html:1 #, python-format msgid "" "You have recovered the message %(message)s." msgstr "你已恢复了消息%(message)s." -#: templates\notification\messages_replied\notice.html.py:2 +#: templates/notification/messages_replied/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have replied to %(message_parent_msg)s from %(message_recipient)s." +msgid "" +"You have replied to '%(message_parent_msg)s' from %(message_recipient)s." +msgstr "" +"你已回复了%(message_recipient)s.发出的消息" +"%(message_parent_msg)s" + +#: templates/notification/messages_replied/notice.html:2 #, python-format msgid "" "You have replied to %(message_parent_msg)s " "from %(message_recipient)s." msgstr "" -"你已回复了%(message_recipient)s.发出的消息%(message_parent_msg)s" -"" +"你已回复了%(message_recipient)s.发出的消息" +"%(message_parent_msg)s" -#: templates\notification\messages_reply_received\notice.html.py:2 +#: templates/notification/messages_reply_received/full.txt:1 +#, python-format +msgid "" +"%(message_sender)s replied to '%(message_parent_msg)s':\n" +"\n" +"%(message)s\n" +"\n" +"%(message_body)s\n" +"\n" +"http://%(current_site)s%(message_url)s" +msgstr "" + +#: templates/notification/messages_reply_received/notice.html:2 #, python-format msgid "%(message_sender)s has sent you a reply to %(message_parent_msg)s." +msgstr "%(message_sender)s已回复你发出的消息：%(message_parent_msg)s." + +#: templates/notification/messages_sent/full.txt:1 +#, fuzzy, python-format +#| msgid "" +#| "You have sent the message %(message)s to " +#| "%(message_recipient)s." +msgid "You have sent the message '%(message)s' to %(message_recipient)s." +msgstr "" +"你已发送消息%(message)s" +"到%(message_recipient)s." + +#: templates/notification/messages_sent/notice.html:2 +#, python-format +msgid "" +"You have sent the message %(message)s to " +"%(message_recipient)s." msgstr "" -"%(message_sender)s已回复你发出的消息：%(message_parent_msg)s." +"你已发送消息%(message)s" +"到%(message_recipient)s." -#: templates\notification\messages_sent\notice.html.py:2 +#: utils.py:25 #, python-format msgid "" -"You have sent the message %(message)s to %" -"(message_recipient)s." +"%(sender)s wrote:\n" +"%(body)s" msgstr "" -"你已发送消息%(message)s到%" -"(message_recipient)s." +"%(sender)s 写道:\n" +"%(body)s" + +#: utils.py:53 +#, fuzzy, python-format +#| msgid "Re: %(subject)s" +msgid "Re%(prefix)s: %(subject)s" +msgstr "回复: %(subject)s" + +#: utils.py:59 +#, python-format +msgid "New Message: %(subject)s" +msgstr "新消息: %(subject)s" + +#: views.py:92 views.py:133 +msgid "Message successfully sent." +msgstr "消息已成功发送。" + +#: views.py:111 views.py:211 +#, python-format +msgid "Re: %(subject)s" +msgstr "回复: %(subject)s" + +#: views.py:176 +msgid "Message successfully deleted." +msgstr "消息已成功删除。" + +#: views.py:203 +msgid "Message successfully recovered." +msgstr "消息已成功恢复。" diff --git a/django_messages/migrations/0004_attachment.py b/django_messages/migrations/0004_attachment.py new file mode 100644 index 0000000..8da7ab1 --- /dev/null +++ b/django_messages/migrations/0004_attachment.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.8 on 2019-09-21 08:18 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('django_messages', '0003_auto_20190617_1316'), + ] + + operations = [ + migrations.CreateModel( + name='Attachment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('file', models.FileField(upload_to='attachments', verbose_name='File')), + ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='django_messages.Message', verbose_name='Message')), + ], + options={ + 'verbose_name': 'Attachment', + 'verbose_name_plural': 'Attachments', + }, + ), + ] diff --git a/django_messages/models.py b/django_messages/models.py index eee3096..a4a0da1 100644 --- a/django_messages/models.py +++ b/django_messages/models.py @@ -9,6 +9,9 @@ from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ +from django_messages.utils import get_storage_backend + + AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') @@ -95,6 +98,33 @@ class Meta: verbose_name_plural = _("Messages") +@python_2_unicode_compatible +class Attachment(models.Model): + """ + A message attachment. You can configure where attachments are stored with + the ``DJANGO_MESSAGES_UPLOAD_TO`` setting, note that this setting is + relative to your ``MEDIA_ROOT`` setting. + """ + file = models.FileField( + _('File'), + upload_to=getattr(settings, 'DJANGO_MESSAGES_UPLOAD_TO', 'attachments'), + storage=get_storage_backend() + ) + message = models.ForeignKey( + Message, + on_delete=models.CASCADE, + verbose_name=_('Message'), + related_name='attachments' + ) + + class Meta: + verbose_name = _("Attachment") + verbose_name_plural = _("Attachments") + + def __str__(self): + return self.file.name if self.file else '' + + def inbox_count_for(user): """ returns the number of unread messages for the given user but does not diff --git a/django_messages/templates/django_messages/compose.html b/django_messages/templates/django_messages/compose.html index 5e4bbeb..012031d 100644 --- a/django_messages/templates/django_messages/compose.html +++ b/django_messages/templates/django_messages/compose.html @@ -3,7 +3,7 @@ {% block content %}

{% trans "Compose Message"%}

-
+ {% csrf_token %} {{ form.as_table }} diff --git a/django_messages/templates/django_messages/view.html b/django_messages/templates/django_messages/view.html index 6a0b496..82adcce 100644 --- a/django_messages/templates/django_messages/view.html +++ b/django_messages/templates/django_messages/view.html @@ -13,7 +13,15 @@

{% trans "View Message" %}

{% trans "Recipient" %}
{{ message.recipient }}
-{{ message.body|linebreaksbr }}

+{{ message.body|linebreaksbr }} +{% if message.attachments.count %} +

{% trans "Attachments" %}

+
    + {% for attachment in message.attachments.all %}
  • {{ attachment }}
    • {% endfor %} +
+{% else %} +

+{% endif %} {% ifequal message.recipient.pk user.pk %} {% trans "Reply" %} @@ -32,4 +40,4 @@

{% trans "Compose reply"%}

{% endif %} {% endcomment %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django_messages/utils.py b/django_messages/utils.py index c356094..c3e93c4 100644 --- a/django_messages/utils.py +++ b/django_messages/utils.py @@ -1,8 +1,13 @@ import re import django +from django.conf import settings +from django.core.exceptions import ImproperlyConfigured +try: + from django.utils.importlib import import_module +except ImportError: + from importlib import import_module from django.utils.text import wrap from django.utils.translation import ugettext, ugettext_lazy as _ -from django.contrib.sites.models import Site from django.template.loader import render_to_string from django.conf import settings @@ -73,6 +78,7 @@ def new_message_email(sender, instance, signal, if 'created' in kwargs and kwargs['created']: try: + from django.contrib.sites.models import Site current_domain = Site.objects.get_current().domain subject = subject_prefix % {'subject': instance.subject} message = render_to_string(template_name, { @@ -101,3 +107,33 @@ def get_username_field(): return get_user_model().USERNAME_FIELD else: return 'username' + + +def get_storage_backend(): + """ + Return an instance of ``django.core.files.storage.Storage``. + + The instance is built from ``DJANGO_MESSAGES_STORAGE_BACKEND`` + string variable and ``DJANGO_MESSAGES_STORAGE_BACKEND_KWARGS`` + dictionary variable. + """ + path = getattr(settings, 'DJANGO_MESSAGES_STORAGE_BACKEND', None) + + if path is None: + return None + try: + mod_name, klass_name = path.rsplit('.', 1) + mod = import_module(mod_name) + except AttributeError as e: + raise ImproperlyConfigured( + 'Error importing storage backend %s: "%s"' % (mod_name, e) + ) + try: + klass = getattr(mod, klass_name) + except AttributeError: + raise ImproperlyConfigured( + 'Module "%s" does not define a "%s" class' % + (mod_name, klass_name) + ) + kwargs = getattr(settings, 'DJANGO_MESSAGES_STORAGE_BACKEND_KWARGS', {}) + return klass(**kwargs) diff --git a/django_messages/views.py b/django_messages/views.py index 4f1d4ff..f7dc3ea 100644 --- a/django_messages/views.py +++ b/django_messages/views.py @@ -83,9 +83,12 @@ def compose(request, recipient=None, form_class=ComposeForm, """ if request.method == "POST": sender = request.user - form = form_class(request.POST, recipient_filter=recipient_filter) + form = form_class(request.POST, request.FILES, recipient_filter=recipient_filter) if form.is_valid(): - form.save(sender=request.user) + form.save( + sender=request.user, + files=request.FILES.getlist('attachments') + ) messages.info(request, _(u"Message successfully sent.")) if success_url is None: success_url = reverse('messages_inbox') @@ -120,9 +123,13 @@ def reply(request, message_id, form_class=ComposeForm, if request.method == "POST": sender = request.user - form = form_class(request.POST, recipient_filter=recipient_filter) + form = form_class(request.POST, request.FILES, recipient_filter=recipient_filter) if form.is_valid(): - form.save(sender=request.user, parent_msg=parent) + form.save( + sender=request.user, + parent_msg=parent, + files=request.FILES.getlist('attachments') + ) messages.info(request, _(u"Message successfully sent.")) if success_url is None: success_url = reverse('messages_inbox') diff --git a/docs/usage.txt b/docs/usage.txt index 7e4405c..b7a9fdb 100644 --- a/docs/usage.txt +++ b/docs/usage.txt @@ -95,3 +95,25 @@ If you do want to disable django-messages from sending either a not installed' then set the following in your django settings:: DJANGO_MESSAGES_NOTIFY = False + +By default, message attachments are stored in a "attachments" folder relative +to your project ``MEDIA_ROOT``, you can change this folder with the +``DJANGO_MESSAGES_UPLOAD_TO`` setting, for example:: + + DJANGO_MESSAGES_UPLOAD_TO = "subfolder/message_attachments" + +.. danger:: + Storing attachments in the default MEDIA_ROOT directory is not secure + because, if not secured properly, everyone can access the files just by + knowing its URL. + + It is highly recommanded that you define a secure storage backend for + messages attachment (see below). + +If you want to use a custom backend for attachments, you can use the +following settings variables:: + + DJANGO_MESSAGES_STORAGE_BACKEND = 'some.module.backends.MyCustomBackend' + DJANGO_MESSAGES_STORAGE_BACKEND_KWARGS = { + 'foo': 'bar', + }