udata 12.0.2.dev10__py3-none-any.whl → 13.0.1.dev21__py3-none-any.whl

udata/translations/sr/LC_MESSAGES/udata.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: udata\n"
 "Report-Msgid-Bugs-To: i18n@opendata.team\n"
-"POT-Creation-Date: 2025-10-08 15:31+0200\n"
-"PO-Revision-Date: 2025-10-08 14:00\n"
+"POT-Creation-Date: 2025-11-05 10:05+0100\n"
+"PO-Revision-Date: 2025-11-05 09:16\n"
 "Last-Translator: Open Data Team <i18n@opendata.team>\n"
 "Language: sr\n"
 "Language-Team: Serbian (Cyrillic)\n"
@@ -30,11 +30,11 @@ msgstr "Молимо, потврдите Ваш е-mail "
 msgid "Login instructions"
 msgstr "Инструкције за приступ"
 
-#: udata/settings.py:132
+#: udata/auth/mails.py:125 udata/settings.py:132
 msgid "Your password has been reset"
 msgstr "Ваша лозинка је ресетована"
 
-#: udata/settings.py:133
+#: udata/auth/mails.py:137 udata/settings.py:133
 msgid "Your password has been changed"
 msgstr "Ваша лозинка је промењена"
 
@@ -42,7 +42,7 @@ msgstr "Ваша лозинка је промењена"
 msgid "Password reset instructions"
 msgstr "Инструкције за ресетовање лозинке"
 
-#: udata/settings.py:547
+#: udata/settings.py:544
 msgid "This dataset has been archived"
 msgstr "Овај скуп података је архивиран"
 
@@ -51,7 +51,7 @@ msgstr "Овај скуп података је архивиран"
 msgid "Invalid URL \"{url}\": {reason}"
 msgstr "Неисправан УРЛ \"{url}\": {reason}"
 
-#: udata/tests/api/test_datasets_api.py:1155 udata/tests/test_model.py:403
+#: udata/tests/api/test_datasets_api.py:1169 udata/tests/test_model.py:402
 #: udata/uris.py:56
 #, python-brace-format
 msgid "Invalid URL \"{url}\""
@@ -85,7 +85,7 @@ msgstr ""
 msgid "is a local URL"
 msgstr ""
 
-#: udata/tests/test_model.py:421 udata/uris.py:159
+#: udata/tests/test_model.py:420 udata/uris.py:159
 msgid "is a private URL"
 msgstr ""
 
@@ -168,6 +168,60 @@ msgstr "Е-маил није исти"
 msgid "Change email"
 msgstr "Промени е-маил"
 
+#: udata/auth/mails.py:67 udata/auth/mails.py:71 udata/auth/mails.py:96
+#: udata/auth/mails.py:99
+msgid "Confirm your email address"
+msgstr ""
+
+#: udata/auth/mails.py:69
+#, python-format
+msgid "Welcome to %(site)s!"
+msgstr "Добро дошли на %(site)s!"
+
+#: udata/auth/mails.py:70 udata/auth/mails.py:98
+msgid "Please confirm your email address."
+msgstr ""
+
+#: udata/auth/mails.py:80
+msgid "Your email address is already associated with an account"
+msgstr ""
+
+#: udata/auth/mails.py:83
+#, python-format
+msgid "Someone (you?) tried to create an account on %(site)s with your email."
+msgstr ""
+
+#: udata/auth/mails.py:86
+msgid "If you forgot your password, you can reset it."
+msgstr ""
+
+#: udata/auth/mails.py:87 udata/auth/mails.py:109 udata/auth/mails.py:116
+#: udata/auth/mails.py:144
+msgid "Reset your password"
+msgstr ""
+
+#: udata/auth/mails.py:112
+#, python-format
+msgid "Someone requested a password reset for your %(site)s account."
+msgstr ""
+
+#: udata/auth/mails.py:115
+msgid "If this wasn't you, please ignore this email."
+msgstr ""
+
+#: udata/auth/mails.py:127
+msgid "Your data.gouv.fr password has been reset."
+msgstr ""
+
+#: udata/auth/mails.py:140
+#, python-format
+msgid "Your %(site)s account password has been changed."
+msgstr ""
+
+#: udata/auth/mails.py:143
+msgid "If you did not change your password, please reset it."
+msgstr ""
+
 #: udata/auth/password_validation.py:26
 #, python-brace-format
 msgid "Password must be at least {pass_length} characters long"
@@ -189,10 +243,6 @@ msgstr "Лозинка мора да има велика слова"
 msgid "Password must contain symbols"
 msgstr "Лозинка мора да има симболе"
 
-#: udata/auth/views.py:52
-msgid "Confirm change of email instructions"
-msgstr ""
-
 #: udata/commands/init.py:32
 msgid "Do you want to create a superadmin user?"
 msgstr "Да ли желите да креирате адмнистраторски налог?"
@@ -214,7 +264,7 @@ msgid "Your udata instance is ready!"
 msgstr "Ваша платформа ја спремна!"
 
 #: udata/core/owned.py:64 udata/forms/fields.py:759
-#: udata/tests/api/test_dataservices_api.py:550
+#: udata/tests/api/test_dataservices_api.py:547
 msgid "You can only set yourself as owner"
 msgstr "Само себе можете да означите као власника"
 
@@ -223,7 +273,7 @@ msgid "Unknown organization"
 msgstr "Непозната организација"
 
 #: udata/core/owned.py:77 udata/forms/fields.py:791
-#: udata/tests/api/test_dataservices_api.py:563
+#: udata/tests/api/test_dataservices_api.py:560
 msgid "Permission denied for this organization"
 msgstr "Дозвола ја ову организацију је одбијена"
 
@@ -242,7 +292,6 @@ msgstr ""
 #: udata/core/contact_point/forms.py:12 udata/core/jobs/forms.py:27
 #: udata/core/organization/forms.py:46 udata/core/post/forms.py:15
 #: udata/core/topic/forms.py:37 udata/harvest/forms.py:78
-#: udata/templates/api/admin.html:10
 msgid "Name"
 msgstr "Име"
 
@@ -259,7 +308,7 @@ msgid "The organization web contact form"
 msgstr ""
 
 #: udata/core/contact_point/forms.py:20 udata/core/dataset/forms.py:115
-#: udata/core/dataset/forms.py:189 udata/core/discussions/forms.py:13
+#: udata/core/dataset/forms.py:191 udata/core/discussions/forms.py:13
 #: udata/core/discussions/forms.py:29 udata/core/topic/forms.py:35
 #: udata/harvest/forms.py:87
 msgid "Publish as"
@@ -281,7 +330,39 @@ msgstr ""
 msgid "Publisher"
 msgstr ""
 
-#: udata/core/contact_point/models.py:26 udata/tests/api/test_contact_points.py:142
+#: udata/core/contact_point/models.py:12
+msgid "Rights Holder"
+msgstr ""
+
+#: udata/core/contact_point/models.py:13
+msgid "Custodian"
+msgstr ""
+
+#: udata/core/contact_point/models.py:14
+msgid "Distributor"
+msgstr ""
+
+#: udata/core/contact_point/models.py:15
+msgid "Originator"
+msgstr ""
+
+#: udata/core/contact_point/models.py:16
+msgid "Principal Investigator"
+msgstr ""
+
+#: udata/core/contact_point/models.py:17
+msgid "Processor"
+msgstr ""
+
+#: udata/core/contact_point/models.py:18
+msgid "Resource Provider"
+msgstr ""
+
+#: udata/core/contact_point/models.py:19
+msgid "User"
+msgstr ""
+
+#: udata/core/contact_point/models.py:34 udata/tests/api/test_contact_points.py:136
 msgid "At least an email or a contact form is required for a contact point"
 msgstr ""
 
@@ -309,12 +390,12 @@ msgstr ""
 msgid "dataservice"
 msgstr ""
 
-#: udata/core/dataservices/models.py:270 udata/core/dataset/models.py:605
+#: udata/core/dataservices/models.py:270 udata/core/dataset/models.py:575
 #: udata/mongo/datetime_fields.py:60
 msgid "Creation date"
 msgstr "Датум креирања"
 
-#: udata/core/dataservices/models.py:276 udata/core/dataset/models.py:610
+#: udata/core/dataservices/models.py:276 udata/core/dataset/models.py:580
 #: udata/mongo/datetime_fields.py:66
 msgid "Last modification date"
 msgstr "Датум последње измене"
@@ -343,7 +424,7 @@ msgstr ""
 msgid "removed a resource from a dataset"
 msgstr ""
 
-#: udata/core/dataset/api.py:328
+#: udata/core/dataset/api.py:332
 msgid "Latest datasets"
 msgstr ""
 
@@ -504,7 +585,11 @@ msgstr ""
 msgid "Other"
 msgstr "Друго"
 
-#: udata/core/dataset/constants.py:74
+#: udata/core/dataset/constants.py:74 udata/tests/test_mail.py:17
+#: udata/tests/test_mail.py:32 udata/tests/test_mail.py:45
+#: udata/tests/test_mail.py:61 udata/tests/test_mail.py:75
+#: udata/tests/test_mail.py:93 udata/tests/test_mail.py:108
+#: udata/tests/test_mail.py:130 udata/tests/test_mail.py:150
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -552,16 +637,13 @@ msgstr "Назив шеме"
 msgid "Version of the schema"
 msgstr "Верзија шеме"
 
-#: udata/core/dataset/forms.py:64 udata/core/dataset/forms.py:146
+#: udata/core/dataset/forms.py:64 udata/core/dataset/forms.py:148
 #: udata/core/discussions/forms.py:14 udata/core/discussions/forms.py:25
 #: udata/core/site/forms.py:12 udata/core/topic/forms.py:13
-#: udata/templates/mail/discussion_closed.html:26
-#: udata/templates/mail/new_discussion.html:25
-#: udata/templates/mail/new_discussion_comment.html:26
 msgid "Title"
 msgstr "Наслов"
 
-#: udata/core/dataset/forms.py:67 udata/core/dataset/forms.py:150
+#: udata/core/dataset/forms.py:67 udata/core/dataset/forms.py:152
 #: udata/core/jobs/forms.py:28 udata/core/organization/forms.py:50
 #: udata/core/topic/forms.py:14 udata/core/topic/forms.py:38
 #: udata/harvest/forms.py:80
@@ -612,148 +694,144 @@ msgstr "Величина датотеке у бајтовима"
 msgid "Related dataset"
 msgstr "Повезани скуп података"
 
-#: udata/core/dataset/forms.py:138 udata/tests/api/test_datasets_api.py:1067
+#: udata/core/dataset/forms.py:140 udata/tests/api/test_datasets_api.py:1081
 msgid "Wrong contact point id or contact point ownership mismatch"
 msgstr ""
 
-#: udata/core/dataset/forms.py:148 udata/core/organization/forms.py:48
+#: udata/core/dataset/forms.py:150 udata/core/organization/forms.py:48
 msgid "Acronym"
 msgstr "Акроним"
 
-#: udata/core/dataset/forms.py:148
+#: udata/core/dataset/forms.py:150
 msgid "An optional acronym"
 msgstr "Опциони акроним"
 
-#: udata/core/dataset/forms.py:152
+#: udata/core/dataset/forms.py:154
 msgid "The details about the dataset (collection process, specifics...)."
 msgstr "Детаљи о скупу података (процес прикупљања, спецификација…)."
 
-#: udata/core/dataset/forms.py:155
+#: udata/core/dataset/forms.py:157
 msgid "Short description"
 msgstr ""
 
-#: udata/core/dataset/forms.py:157
+#: udata/core/dataset/forms.py:159
 msgid "A short description of the dataset."
 msgstr ""
 
-#: udata/core/dataset/forms.py:159
+#: udata/core/dataset/forms.py:161
 msgid "License"
 msgstr "Лиценца"
 
-#: udata/core/dataset/forms.py:161
+#: udata/core/dataset/forms.py:163
 msgid "Update frequency"
 msgstr "Фреквенција ажурирања"
 
-#: udata/core/dataset/forms.py:171
+#: udata/core/dataset/forms.py:173
 msgid "The frequency at which data are updated."
 msgstr "Фреквенција којом се подаци ажурирају."
 
-#: udata/core/dataset/forms.py:173
+#: udata/core/dataset/forms.py:175
 msgid "Expected frequency date"
 msgstr "Датум очекиване фреквенције"
 
-#: udata/core/dataset/forms.py:177
+#: udata/core/dataset/forms.py:179
 msgid "Temporal coverage"
 msgstr "Временска покривеност"
 
-#: udata/core/dataset/forms.py:177
+#: udata/core/dataset/forms.py:179
 msgid "The period covered by the data"
 msgstr "Период покривен подацима"
 
-#: udata/core/dataset/forms.py:180 udata/core/spatial/forms.py:85
+#: udata/core/dataset/forms.py:182 udata/core/spatial/forms.py:85
 #: udata/core/topic/forms.py:86
 msgid "Spatial coverage"
 msgstr "Просторна покривеност"
 
-#: udata/core/dataset/forms.py:180 udata/core/topic/forms.py:86
+#: udata/core/dataset/forms.py:182 udata/core/topic/forms.py:86
 msgid "The geographical area covered by the data."
 msgstr "Географска област покривена подацима."
 
-#: udata/core/dataset/forms.py:182 udata/core/post/forms.py:26
+#: udata/core/dataset/forms.py:184 udata/core/post/forms.py:26
 #: udata/core/site/forms.py:13 udata/core/topic/forms.py:15
 #: udata/core/topic/forms.py:89
 msgid "Tags"
 msgstr "Ознаке"
 
-#: udata/core/dataset/forms.py:182
+#: udata/core/dataset/forms.py:184
 msgid "Some taxonomy keywords"
 msgstr "Неке кључне речи у таксономији"
 
-#: udata/core/dataset/forms.py:184 udata/core/topic/forms.py:90
+#: udata/core/dataset/forms.py:186 udata/core/topic/forms.py:90
 msgid "Private"
 msgstr "Приватно"
 
-#: udata/core/dataset/forms.py:185
+#: udata/core/dataset/forms.py:187
 msgid "Restrict the dataset visibility to you or your organization only."
 msgstr "Ограничите видљивост скупа података само на себе или своју организацију."
 
-#: udata/core/dataset/models.py:67
+#: udata/core/dataset/models.py:66
 msgid "Pivotal data"
 msgstr "Кључни подаци"
 
-#: udata/core/dataset/models.py:68
+#: udata/core/dataset/models.py:67
 msgid "Reference data public service"
 msgstr ""
 
-#: udata/core/dataset/models.py:69
+#: udata/core/dataset/models.py:68
 msgid "Inspire"
 msgstr ""
 
-#: udata/core/dataset/models.py:70
+#: udata/core/dataset/models.py:69
 msgid "High value datasets"
 msgstr ""
 
-#: udata/core/dataset/models.py:71
+#: udata/core/dataset/models.py:70
 msgid "Certified statistic series"
 msgstr ""
 
-#: udata/core/dataset/models.py:72
+#: udata/core/dataset/models.py:71
 msgid "Statistical series of general interest"
 msgstr ""
 
-#: udata/core/dataset/models.py:152
+#: udata/core/dataset/models.py:151
 msgid "A schema must contains a name or an URL when a version is provided."
 msgstr ""
 
-#: udata/core/dataset/models.py:184 udata/tests/api/test_datasets_api.py:1163
-#: udata/tests/api/test_datasets_api.py:1174
+#: udata/core/dataset/models.py:183 udata/tests/api/test_datasets_api.py:1177
+#: udata/tests/api/test_datasets_api.py:1188
 #, python-brace-format
 msgid "Schema name \"{schema}\" is not an allowed value. Allowed values: {values}"
 msgstr "Име шеме \"{schema}\" није дозвољена вредност. Дозвољене вредности: {values}"
 
-#: udata/core/dataset/models.py:203 udata/tests/api/test_datasets_api.py:1186
+#: udata/core/dataset/models.py:202 udata/tests/api/test_datasets_api.py:1200
 #, python-brace-format
 msgid "Version \"{version}\" is not an allowed value for the schema \"{name}\". Allowed versions: {values}"
 msgstr ""
 
-#: udata/core/dataset/models.py:481 udata/core/dataset/rdf.py:595
-#: udata/tests/dataset/test_dataset_rdf.py:722
-#: udata/tests/dataset/test_dataset_rdf.py:735
+#: udata/core/dataset/models.py:451 udata/core/dataset/rdf.py:595
+#: udata/tests/dataset/test_dataset_rdf.py:908
+#: udata/tests/dataset/test_dataset_rdf.py:921
 msgid "Nameless resource"
 msgstr "Ресурс без имена"
 
-#: udata/core/dataset/models.py:584
+#: udata/core/dataset/models.py:554
 msgid "Future date of update"
 msgstr "Будући датум ажурирања"
 
-#: udata/core/dataset/models.py:616
+#: udata/core/dataset/models.py:586
 msgid "Last update of the dataset resources"
 msgstr ""
 
-#: udata/core/dataset/models.py:671
+#: udata/core/dataset/models.py:641
 msgid "dataset"
 msgstr "скуп података"
 
-#: udata/core/dataset/rdf.py:593 udata/tests/dataset/test_dataset_rdf.py:692
-#: udata/tests/dataset/test_dataset_rdf.py:709
+#: udata/core/dataset/rdf.py:593 udata/tests/dataset/test_dataset_rdf.py:878
+#: udata/tests/dataset/test_dataset_rdf.py:895
 #, python-brace-format
 msgid "{format} resource"
 msgstr "{format} ресурс"
 
-#: udata/core/dataset/tasks.py:104
-msgid "You need to update some frequency-based datasets"
-msgstr "Потребно је да ажурирате неке скупове података засноване на фреквенцији"
-
 #: udata/core/discussions/forms.py:16 udata/core/discussions/forms.py:31
 #: udata/core/discussions/forms.py:37 udata/core/organization/forms.py:83
 #: udata/core/organization/forms.py:87 udata/harvest/forms.py:97
@@ -764,20 +842,52 @@ msgstr "Коментар"
 msgid "Subject"
 msgstr "Тема"
 
-#: udata/core/discussions/tasks.py:26
+#: udata/core/discussions/mails.py:9
 #, python-format
-msgid "Your %(type)s have a new discussion"
-msgstr "Ваши %(type)s имају нову дискусију"
+msgid "A new discussion has been opened on your %(type)s"
+msgstr ""
 
-#: udata/core/discussions/tasks.py:45
+#: udata/core/discussions/mails.py:15
 #, python-format
-msgid "%(user)s commented your discussion"
-msgstr "Корисник %(user)s је коментарисао вашу дискусију"
+msgid "You have a new discussion from %(user_or_org)s on your %(type)s %(object)s"
+msgstr ""
 
-#: udata/core/discussions/tasks.py:61
+#: udata/core/discussions/mails.py:21 udata/core/discussions/mails.py:40
+#: udata/core/discussions/mails.py:59
+msgid "Discussion title:"
+msgstr ""
+
+#: udata/core/discussions/mails.py:22 udata/core/discussions/mails.py:41
+#: udata/core/discussions/mails.py:60
+msgid "Comment:"
+msgstr ""
+
+#: udata/core/discussions/mails.py:23 udata/core/discussions/mails.py:42
+msgid "Reply"
+msgstr ""
+
+#: udata/core/discussions/mails.py:30
+msgid "A new comment has been added to a discussion"
+msgstr ""
+
+#: udata/core/discussions/mails.py:34
+#, python-format
+msgid "You have a new comment from %(user_or_org)s on your %(type)s %(object)s"
+msgstr ""
+
+#: udata/core/discussions/mails.py:49
 msgid "A discussion has been closed"
 msgstr "Дискусија је затворена"
 
+#: udata/core/discussions/mails.py:53
+#, python-format
+msgid "The discussion you participated in on the %(type)s %(object)s has been closed by %(user_or_org)s."
+msgstr ""
+
+#: udata/core/discussions/mails.py:61
+msgid "View the discussion"
+msgstr ""
+
 #: udata/core/jobs/forms.py:29
 msgid "Tasks"
 msgstr "Задаци"
@@ -828,17 +938,17 @@ msgid "Refused"
 msgstr "Одбијено"
 
 #: udata/core/organization/forms.py:25
-#: udata/tests/api/test_organizations_api.py:164
+#: udata/tests/api/test_organizations_api.py:159
 msgid "A siret number is made of 14 digits"
 msgstr ""
 
 #: udata/core/organization/forms.py:36
-#: udata/tests/api/test_organizations_api.py:176
+#: udata/tests/api/test_organizations_api.py:171
 msgid "A siret number is only made of digits"
 msgstr ""
 
 #: udata/core/organization/forms.py:39
-#: udata/tests/api/test_organizations_api.py:170
+#: udata/tests/api/test_organizations_api.py:165
 msgid "Invalid Siret number"
 msgstr ""
 
@@ -870,62 +980,120 @@ msgstr ""
 msgid "Business identification number"
 msgstr ""
 
-#: udata/core/organization/models.py:38
-msgid "Public Service"
-msgstr "Јавни сервис"
+#: udata/core/organization/mails.py:9
+msgid "New membership request"
+msgstr "Нови захтев за чланство"
 
-#: udata/core/organization/models.py:39
-msgid "Certified"
-msgstr "Сертификовано"
+#: udata/core/organization/mails.py:13
+#, python-format
+msgid "You received a membership request from %(user)s for your organization %(org)s"
+msgstr ""
 
-#: udata/core/organization/models.py:40
-msgid "Association"
+#: udata/core/organization/mails.py:18
+msgid "Reason for the request:"
 msgstr ""
 
-#: udata/core/organization/models.py:41
-msgid "Company"
-msgstr "Компанија"
+#: udata/core/organization/mails.py:19
+msgid "See the request"
+msgstr "Погледајте захтев"
 
-#: udata/core/organization/models.py:42
-msgid "Local authority"
+#: udata/core/organization/mails.py:26
+msgid "Membership refused"
+msgstr "Чланство је одбијено"
+
+#: udata/core/organization/mails.py:30
+#, python-format
+msgid "Your membership for the organization %(org)s has been refused"
 msgstr ""
 
-#: udata/core/organization/tasks.py:52
-msgid "New membership request"
-msgstr "Нови захтев за чланство"
+#: udata/core/organization/mails.py:40
+msgid "Your invitation to join an organization has been accepted"
+msgstr ""
 
-#: udata/core/organization/tasks.py:62 udata/core/organization/tasks.py:74
+#: udata/core/organization/mails.py:44
 #, python-format
-msgid "You are now a member of the organization \"%(org)s\""
-msgstr "Сада сте члан организације \"%(org)s\""
+msgid "Good news! Your request to join the organization %(org)s has been approved."
+msgstr ""
 
-#: udata/core/organization/tasks.py:65
-msgid "Membership refused"
-msgstr "Чланство је одбијено"
+#: udata/core/organization/mails.py:49 udata/core/organization/mails.py:66
+#: udata/core/organization/mails.py:82 udata/core/organization/mails.py:97
+#: udata/core/organization/mails.py:112 udata/core/organization/mails.py:127
+#: udata/core/organization/mails.py:142
+msgid "View the organization"
+msgstr ""
+
+#: udata/core/organization/mails.py:57
+msgid "You have been added as a member of an organization"
+msgstr ""
 
-#: udata/core/organization/tasks.py:85
+#: udata/core/organization/mails.py:61
 #, python-format
-msgid "Your organization \"%(name)s\" has been certified"
-msgstr "Ваша организација\"%(name)s\" је сертификована"
+msgid "Good news! You are now a member of %(org)s."
+msgstr ""
 
-#: udata/core/organization/tasks.py:102
+#: udata/core/organization/mails.py:74
+msgid "Your organization has been certified"
+msgstr ""
+
+#: udata/core/organization/mails.py:78
 #, python-format
-msgid "Your organization \"%(name)s\" has been identified as public service"
-msgstr "Ваша организација \"%(name)s\" је индентификована као јавни сервис"
+msgid "Good news! Your organization %(org)s has been certified by our team. A badge is now associated with your organization."
+msgstr ""
+
+#: udata/core/organization/mails.py:89
+msgid "Your organization has been identified as a public service"
+msgstr ""
 
-#: udata/core/organization/tasks.py:119
+#: udata/core/organization/mails.py:93
 #, python-format
-msgid "Your organization \"%(name)s\" has been identified as a company"
+msgid "Good news! Your organization %(org)s has been identified by our team as a public service. A badge is now associated with your organization."
 msgstr ""
 
-#: udata/core/organization/tasks.py:132
+#: udata/core/organization/mails.py:104
+msgid "Your organization has been identified as a local authority"
+msgstr ""
+
+#: udata/core/organization/mails.py:108
 #, python-format
-msgid "Your organization \"%(name)s\" has been identified as an association"
+msgid "Good news! Your organization %(org)s has been identified by our team as a local authority. A badge is now associated with your organization."
 msgstr ""
 
-#: udata/core/organization/tasks.py:150
+#: udata/core/organization/mails.py:119
+msgid "Your organization has been identified as a company"
+msgstr ""
+
+#: udata/core/organization/mails.py:123
 #, python-format
-msgid "Your organization \"%(name)s\" has been identified as a local authority"
+msgid "Your organization %(org)s has been identified by our team as a company. A badge is now associated with your organization."
+msgstr ""
+
+#: udata/core/organization/mails.py:134
+msgid "Your organization has been identified as an association"
+msgstr ""
+
+#: udata/core/organization/mails.py:138
+#, python-format
+msgid "Your organization %(org)s has been identified by our team as an association. A badge is now associated with your organization."
+msgstr ""
+
+#: udata/core/organization/models.py:38
+msgid "Public Service"
+msgstr "Јавни сервис"
+
+#: udata/core/organization/models.py:39
+msgid "Certified"
+msgstr "Сертификовано"
+
+#: udata/core/organization/models.py:40
+msgid "Association"
+msgstr ""
+
+#: udata/core/organization/models.py:41
+msgid "Company"
+msgstr "Компанија"
+
+#: udata/core/organization/models.py:42
+msgid "Local authority"
 msgstr ""
 
 #: udata/core/post/api.py:118
@@ -1048,7 +1216,7 @@ msgstr "Визуелизација"
 msgid "Connected device"
 msgstr "Повезани уређај"
 
-#: udata/core/reuse/constants.py:15 udata/tests/reuse/test_reuse_model.py:110
+#: udata/core/reuse/constants.py:15 udata/tests/reuse/test_reuse_model.py:109
 msgid "Health"
 msgstr "Здравље"
 
@@ -1104,6 +1272,23 @@ msgstr "Закон и право"
 msgid "Open data tools"
 msgstr "Алати отворених података"
 
+#: udata/core/reuse/mails.py:9
+msgid "New reuse on your dataset"
+msgstr ""
+
+#: udata/core/reuse/mails.py:13
+#, python-format
+msgid "A new reuse has been published by %(user_or_org)s on your dataset %(dataset)s"
+msgstr ""
+
+#: udata/core/reuse/mails.py:18
+msgid "Reuse title:"
+msgstr ""
+
+#: udata/core/reuse/mails.py:19
+msgid "View the reuse"
+msgstr ""
+
 #: udata/core/reuse/models.py:39
 msgid "This URL is already registered"
 msgstr "Овај URL је већ регистрован"
@@ -1112,10 +1297,6 @@ msgstr "Овај URL је већ регистрован"
 msgid "reuse"
 msgstr "пример употребе"
 
-#: udata/core/reuse/tasks.py:48
-msgid "New reuse"
-msgstr "Нови пример употребе"
-
 #: udata/core/site/forms.py:13
 msgid "Some SEO keywords"
 msgstr "Неке SEO кључне речи"
@@ -1241,7 +1422,7 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: udata/core/topic/forms.py:26
+#: udata/core/topic/forms.py:26 udata/tests/apiv2/test_topics.py:720
 msgid "A topic element must have a title or an element."
 msgstr ""
 
@@ -1293,10 +1474,48 @@ msgstr "Основни подаци"
 msgid "Roles"
 msgstr "Улоге"
 
-#: udata/core/user/models.py:298 udata/tests/api/test_me_api.py:297
+#: udata/core/user/mails.py:10 udata/tests/api/test_me_api.py:295
 msgid "Account deletion"
 msgstr "Брисање налога"
 
+#: udata/core/user/mails.py:11
+msgid "Your account has now been deleted"
+msgstr "Ваш налог је обрисан"
+
+#: udata/core/user/mails.py:18
+#, python-format
+msgid "Deletion of your inactive %(site)s account"
+msgstr ""
+
+#: udata/core/user/mails.py:22
+#, python-format
+msgid "Your account on %(site)s has been deleted due to inactivity"
+msgstr ""
+
+#: udata/core/user/mails.py:33 udata/tests/user/test_user_tasks.py:36
+#, python-brace-format
+msgid "Inactivity of your {site} account"
+msgstr ""
+
+#: udata/core/user/mails.py:36
+#, python-format
+msgid "We have noticed that your account associated to (%(user_email)s) has been inactive for %(inactivity_years)d years or more on %(site)s, the open platform for public data."
+msgstr ""
+
+#: udata/core/user/mails.py:42
+msgid "If you want to keep your account, please log in with your account."
+msgstr ""
+
+#: udata/core/user/mails.py:46
+#, python-format
+msgid "Without logging in, your account will be deleted within %(notify_delay)d days."
+msgstr ""
+
+#: udata/core/user/mails.py:50
+#, python-format
+msgid "This account is not tied to your other administration accounts and you can always re-create an account on the %(site)s platform if necessary."
+msgstr ""
+
 #: udata/core/user/permissions.py:5
 msgid "System administrator"
 msgstr "Администратор система"
@@ -1309,18 +1528,8 @@ msgstr "Колумниста на сајту"
 msgid "Site moderator"
 msgstr "Модератор сајта"
 
-#: udata/core/user/tasks.py:19
-msgid "Test mail"
-msgstr "Пробна порука"
-
-#: udata/core/user/tasks.py:45 udata/tests/user/test_user_tasks.py:36
-#, python-brace-format
-msgid "Inactivity of your {site} account"
-msgstr ""
-
-#: udata/core/user/tasks.py:88 udata/tests/user/test_user_tasks.py:109
-#, python-brace-format
-msgid "Deletion of your inactive {site} account"
+#: udata/flask_mongoengine/fields.py:85
+msgid "Not a valid choice"
 msgstr ""
 
 #: udata/forms/fields.py:127
@@ -1350,8 +1559,8 @@ msgstr "Ознака \"%(tag)s\" мора да буде дужине измеђ
 msgid "{0} does not exists"
 msgstr "{0} не постоји"
 
-#: udata/forms/fields.py:494 udata/tests/forms/test_model_field.py:333
-#: udata/tests/forms/test_model_field.py:349
+#: udata/forms/fields.py:494 udata/tests/forms/test_model_field.py:331
+#: udata/tests/forms/test_model_field.py:347
 msgid "Missing \"id\" field"
 msgstr ""
 
@@ -1360,8 +1569,8 @@ msgstr ""
 msgid "Expect a \"{0}\" class but \"{1}\" was found"
 msgstr ""
 
-#: udata/forms/fields.py:507 udata/tests/forms/test_model_field.py:41
-#: udata/tests/forms/test_model_field.py:56
+#: udata/forms/fields.py:507 udata/tests/forms/test_model_field.py:39
+#: udata/tests/forms/test_model_field.py:54
 msgid "Expect both class and identifier"
 msgstr "Очекуј класу и идентификатор"
 
@@ -1380,7 +1589,7 @@ msgid "Unable to parse date range"
 msgstr "Није могуће рашчланити опсег датума"
 
 #: udata/forms/fields.py:752 udata/forms/fields.py:784
-#: udata/tests/forms/test_publish_as_field.py:214
+#: udata/tests/forms/test_publish_as_field.py:212
 msgid "Cannot change owner after creation. Please use transfer feature."
 msgstr ""
 
@@ -1469,87 +1678,20 @@ msgstr ""
 msgid "A CKAN tag name"
 msgstr ""
 
-#: udata/templates/404.html:6
+#: udata/templates/404.html:6 udata/tests/frontend/test_error_handlers.py:22
+#: udata/tests/frontend/test_error_handlers.py:48
 msgid "Page not found"
 msgstr ""
 
-#: udata/templates/404.html:39
+#: udata/templates/404.html:39 udata/tests/frontend/test_error_handlers.py:22
+#: udata/tests/frontend/test_error_handlers.py:48
 msgid "The page you are looking for does not exist."
 msgstr ""
 
-#: udata/templates/404.html:40
+#: udata/templates/404.html:40 udata/tests/frontend/test_error_handlers.py:26
 msgid "Back to home"
 msgstr ""
 
-#: udata/templates/admin.html:7
-msgid "Admin"
-msgstr "Администратор"
-
-#: udata/templates/base.html:7
-msgid "You must be connected to do this action."
-msgstr ""
-
-#: udata/templates/api/admin.html:11
-msgid "Maintainer"
-msgstr "Одржава"
-
-#: udata/templates/api/admin.html:31
-msgid "Edit"
-msgstr "Измени"
-
-#: udata/templates/api/admin.html:34
-msgid "Delete"
-msgstr "Избриши"
-
-#: udata/templates/api/admin.html:42
-msgid "No OAuth clients"
-msgstr "Нема OAuth клијената"
-
-#: udata/templates/api/admin.html:53
-msgid "Add a client"
-msgstr "Додајте клијента"
-
-#: udata/templates/api/oauth_authorize.html:23
-#, python-format
-msgid "%(app)s want to access your %(site)s account."
-msgstr "%(app)s жели да приступи налогу вашег сајта %(site)s."
-
-#: udata/templates/api/oauth_authorize.html:35
-msgid "Details"
-msgstr "Детаљи"
-
-#: udata/templates/api/oauth_authorize.html:45
-msgid "Access your profile"
-msgstr "Приступите свом профилу"
-
-#: udata/templates/api/oauth_authorize.html:46
-msgid "Read your profile, the orgnization you belong to, your publications"
-msgstr "Прочитајте детаље профила, организацију којој припадате и своје публикације"
-
-#: udata/templates/api/oauth_authorize.html:54
-msgid "Publish data"
-msgstr "Објављивање података"
-
-#: udata/templates/api/oauth_authorize.html:55
-msgid "Publish datasets, reuses, follow or unfollow"
-msgstr "Објавите скупове података, примере употребе, пратите или опозовите праћење"
-
-#: udata/templates/api/oauth_authorize.html:65
-msgid "Accept"
-msgstr "Прихвати"
-
-#: udata/templates/api/oauth_authorize.html:67
-msgid "Refuse"
-msgstr "Одбиј"
-
-#: udata/templates/api/oauth_error.html:15
-msgid "OAuth Authentication Error"
-msgstr "Грешка у OAuth потврди идентитета"
-
-#: udata/templates/api/oauth_error.html:20 udata/templates/macros/metadata.html:2
-msgid "Home"
-msgstr "Почетак"
-
 #: udata/templates/comments/dataset_archived.txt:1
 msgid "This dataset has been archived by our administration team.\n\n"
 "An archived dataset is considered out of date by a combination of factors.\n"
@@ -1560,184 +1702,33 @@ msgstr "Овај скуп података су архивирали наши а
 "Не појављује се у резултатима претраге и има упозорење упућено корисницима сајта.\n\n"
 "Ако сматрате да је ово грешка контактирајте администратора портала."
 
-#: udata/templates/macros/metadata.html:3
-msgid "Share, improve and reuse public data"
-msgstr "Дељење, унапређивање и примери употребе јавних података"
-
-#: udata/templates/mail/account_deleted.html:4
-msgid "Your account has now been deleted"
-msgstr "Ваш налог је обрисан"
-
-#: udata/templates/mail/account_inactivity.html:6
-#, python-format
-msgid "We have noticed that your account associated to (%(user_email)s) has been inactive for %(inactivity_years)d years or more on %(site)s, the open platform for public data."
-msgstr ""
-
-#: udata/templates/mail/account_inactivity.html:17
-#, python-format
-msgid "If you want to keep your account, please log in with your account on %(home)s."
-msgstr ""
-
-#: udata/templates/mail/account_inactivity.html:25
-#, python-format
-msgid "Without logging in, your account will be deleted within %(notify_delay)d days."
-msgstr ""
-
-#: udata/templates/mail/account_inactivity.html:33
-#, python-format
-msgid "This account is not tied to your other administration accounts and you can always re-create an account on the %(site)s platform if necessary."
-msgstr ""
-
-#: udata/templates/mail/badge_added_association.html:6
-#, python-format
-msgid "%(user)s has identified your organization \"%(name)s\" as an association"
-msgstr ""
-
-#: udata/templates/mail/badge_added_association.html:27
-#: udata/templates/mail/badge_added_certified.html:27
-#: udata/templates/mail/badge_added_company.html:27
-#: udata/templates/mail/badge_added_local_authority.html:27
-#: udata/templates/mail/badge_added_public_service.html:27
-msgid "See the badge"
-msgstr "Погледајте беџ"
-
-#: udata/templates/mail/badge_added_certified.html:6
-#, python-format
-msgid "%(user)s has certified your organization \"%(name)s\""
-msgstr "%(user)s је сертификовао вашу организацију \"%(name)s\""
-
-#: udata/templates/mail/badge_added_company.html:6
-#, python-format
-msgid "%(user)s has identified your organization \"%(name)s\" as a company"
-msgstr ""
-
-#: udata/templates/mail/badge_added_local_authority.html:6
-#, python-format
-msgid "%(user)s has identified your organization \"%(name)s\" as a local authority"
-msgstr ""
-
-#: udata/templates/mail/badge_added_public_service.html:6
-#, python-format
-msgid "%(user)s has identified your organization \"%(name)s\" as public service"
-msgstr "%(user)s је индентификовао вашу организацију \"%(name)s\" као јавни сервис"
-
-#: udata/templates/mail/base.html:45 udata/templates/security/email/base.html:45
+#: udata/templates/mail/base.html:45
 msgid "on your browser."
 msgstr "на вашем претраживачу."
 
-#: udata/templates/mail/base.html:48 udata/templates/security/email/base.html:48
+#: udata/templates/mail/base.html:48
 #, python-format
 msgid "View this email %(link)s"
 msgstr "Видети од овог мејла %(link)s"
 
-#: udata/templates/mail/base.html:76 udata/templates/security/email/base.html:76
+#: udata/templates/mail/base.html:76 udata/templates/mail/message.html:41
 #, python-format
 msgid "Hi %(user)s"
 msgstr "Здраво, %(user)s"
 
-#: udata/templates/mail/base.html:87 udata/templates/security/email/base.html:87
+#: udata/templates/mail/base.html:87
 msgid "See you soon on the platform"
 msgstr "Видимо се ускоро на порталу"
 
-#: udata/templates/mail/base.html:88 udata/templates/security/email/base.html:88
+#: udata/templates/mail/base.html:88 udata/templates/mail/message.html:63
 #, python-format
 msgid "The %(site)s team"
 msgstr "%(site)s - администратор"
 
-#: udata/templates/mail/discussion_closed.html:6
-#, python-format
-msgid "%(user)s closed an discussion on your %(type)s %(subject)s"
-msgstr "Корисник %(user)s је затворио дискусију на тему %(type)s %(subject)s"
-
-#: udata/templates/mail/discussion_closed.html:32
-#: udata/templates/mail/new_discussion.html:30
-#: udata/templates/mail/new_discussion_comment.html:31
-msgid "Message"
-msgstr "Порука"
-
-#: udata/templates/mail/discussion_closed.html:41
-#: udata/templates/mail/new_discussion.html:38
-#: udata/templates/mail/new_discussion_comment.html:39
-msgid "See the discussion"
-msgstr "Погледајте дискусију"
-
-#: udata/templates/mail/frequency_reminder.html:6
-msgid "Some of your datasets need to be updated according to the frequency you set:"
-msgstr "Неке од ваших скупова података треба ажурирати у складу са фреквенцијом коју сте подесили:"
-
-#: udata/templates/mail/frequency_reminder.html:12
-#, python-format
-msgid "Dataset \"%(dataset_title)s\" last update is on %(published_date)s."
-msgstr "Скуп података \"%(dataset_title)s\" последњи пут је ажуриран %(published_date)s."
-
-#: udata/templates/mail/frequency_reminder.html:17
-#, python-format
-msgid "Given the set frequency (%(dataset_frequency)s) update was due %(due_update_days)s days ago."
-msgstr "Узимајући у обзир подешену фреквенцију (%(dataset_frequency)s), ажурирање је требало обавити пре %(due_update_days)s дан(а)."
-
-#: udata/templates/mail/frequency_reminder.html:25
-msgid "Update the dataset and associated resources"
-msgstr "Ажурирање скупа података и повезаних ресурса"
-
-#: udata/templates/mail/inactive_account_deleted.html:4
-#, python-format
-msgid "Your account on %(site)s has been deleted due to inactivity"
+#: udata/templates/mail/message.html:62
+msgid "Have a great day"
 msgstr ""
 
-#: udata/templates/mail/membership_refused.html:7
-#, python-format
-msgid "Your membership for the organization \"%(org)s\" has been refused"
-msgstr "Ваше чланство у организацији \"%(org)s\" није прихваћено"
-
-#: udata/templates/mail/membership_refused.html:18
-msgid "Refusal reason"
-msgstr "Разлог одбијања"
-
-#: udata/templates/mail/membership_request.html:8
-#, python-format
-msgid "As an administrator of \"%(org)s\" you are being informed than a new membership request from %(user)s is pending for validation"
-msgstr "Као администратор \"%(org)s\", обавештени сте да нови захтев за чланством корисника %(user)s чека на потврду"
-
-#: udata/templates/mail/membership_request.html:40
-msgid "See the request"
-msgstr "Погледајте захтев"
-
-#: udata/templates/mail/new_discussion.html:6
-#, python-format
-msgid "%(user)s submitted a new discussion on your %(type)s %(subject)s"
-msgstr "Корисник %(user)s је проследио нову дискусију на тему %(type)s %(subject)s"
-
-#: udata/templates/mail/new_discussion_comment.html:6
-#, python-format
-msgid "%(user)s commented an discussion on your %(type)s %(subject)s"
-msgstr "Корисник %(user)s је коментарисао дискусију на тему %(type)s %(subject)s"
-
-#: udata/templates/mail/new_member.html:7
-#, python-format
-msgid "Congratulations, you are now a member of the organization \"%(org)s\""
-msgstr "Честитамо, постали сте члан организације \"%(org)s\""
-
-#: udata/templates/mail/new_member.html:21
-msgid "See the organization page"
-msgstr "Погледајте страницу организације"
-
-#: udata/templates/mail/new_reuse.html:7
-#, python-format
-msgid "A new reuse of your dataset %(dataset)s has been published"
-msgstr "Објављен је нови пример употребе скупа података %(dataset)s"
-
-#: udata/templates/mail/new_reuse.html:31
-msgid "See the reuse"
-msgstr "Погледајте пример употребе"
-
-#: udata/templates/mail/test.html:4
-msgid "This is a test mail"
-msgstr "Ово је пробна порука"
-
-#: udata/templates/mail/test.html:5
-msgid "If you read this, your mail configuration is working"
-msgstr "Ако сте ово прочитали, ваша конфигурација поште функционише"
-
 #: udata/templates/security/change_password.html:9
 #: udata/templates/security/change_password.html:16
 msgid "Change Password"
@@ -1803,91 +1794,29 @@ msgstr "Поново пошаљи инструкције"
 msgid "Submit"
 msgstr "Сачувај"
 
-#: udata/templates/security/email/change_notice.html:6
-msgid "Your password has been changed."
-msgstr "Ваша лозинка је промењена."
-
-#: udata/templates/security/email/change_notice.html:10
-msgid "If you did not change your password, click below to reset it."
-msgstr "Ако Ви нисте променили лозинку ресетујте је на линк доле."
-
-#: udata/templates/security/email/change_notice.html:15
-msgid "Reset password"
-msgstr "Ресетуј лозинку"
-
-#: udata/templates/security/email/confirmation_instructions.html:6
-msgid "Please confirm your email through the link below:"
-msgstr "Молимо Вас потврдите e-mail на линк доле:"
-
-#: udata/templates/security/email/confirmation_instructions.html:14
-msgid "Confirm my account"
-msgstr "Потврди мој налог"
-
-#: udata/templates/security/email/login_instructions.html:6
-msgid "You can log into your account through the link below:"
-msgstr "Можете се улоговати на Ваш налог линком доле:"
-
-#: udata/templates/security/email/login_instructions.html:13
-msgid "Login now"
-msgstr "Улогуј се"
-
-#: udata/templates/security/email/reset_instructions.html:7
-#, python-format
-msgid "Someone has requested a password reset for your %(site)s account. If you didn't, please ignore this email."
-msgstr "Неко је затражио ресетовање лозинке за ваш налог на сајту %(site)s. Ако то нисте ви, занемарите ову поруку"
-
-#: udata/templates/security/email/reset_instructions.html:10
-msgid "To reset your password, please confirm your request through the link below:"
-msgstr "Да бисте ресетовали лозинку, потврдите захтев помоћу следеће везе:"
-
-#: udata/templates/security/email/reset_instructions.html:18
-msgid "Reset my password"
-msgstr "Ресетуј моју лозинку"
-
-#: udata/templates/security/email/reset_notice.html:7
-#, python-format
-msgid "Your password for %(site)s has been reset."
-msgstr "Ваша лозинка за сајт %(site)s је ресетована."
-
-#: udata/templates/security/email/welcome.html:7
-#, python-format
-msgid "Welcome to %(site)s!"
-msgstr "Добро дошли на %(site)s!"
-
-#: udata/templates/security/email/welcome.html:10
-msgid "To activate your account, please confirm your email address through the link below:"
-msgstr "Да бисте активирали свој налог, потврдите своју е-адресу помоћу следеће везе:"
-
-#: udata/templates/security/email/welcome.html:18
-msgid "Confirm now"
-msgstr "Потврди"
-
-#: udata/templates/security/email/welcome_existing.html:7
-#, python-format
-msgid "Hello %(email)s!"
+#: udata/tests/test_mail.py:17 udata/tests/test_mail.py:32
+#: udata/tests/test_mail.py:45 udata/tests/test_mail.py:61
+msgid "Some text"
 msgstr ""
 
-#: udata/templates/security/email/welcome_existing.html:10
-msgid "Someone (you?) tried to register this email - which is already in our system."
-msgstr ""
-
-#: udata/templates/security/email/welcome_existing.html:14
+#: udata/tests/test_mail.py:76 udata/tests/test_mail.py:151
 #, python-format
-msgid "This account also has the following username associated with it: %(username)s."
+msgid "Some text %(org)s"
 msgstr ""
 
-#: udata/templates/security/email/welcome_existing.html:19
-msgid "If you forgot your password you can reset it"
+#: udata/tests/test_mail.py:94 udata/tests/test_mail.py:111
+#: udata/tests/test_mail.py:133
+msgid "Some text:"
 msgstr ""
 
-#: udata/templates/security/email/welcome_existing.html:25
-msgid "Here"
-msgstr "Овде"
-
-#: udata/tests/forms/test_model_field.py:165
+#: udata/tests/forms/test_model_field.py:163
 msgid "Expect a \"Target\" class but \"Wrong\" was found"
 msgstr ""
 
+#: udata/tests/frontend/test_error_handlers.py:26
+msgid "Home"
+msgstr "Почетак"
+
 #: udata/tests/search/test_adapter.py:31
 msgid "Never reused"
 msgstr "Никада коришћено"
@@ -1904,3 +1833,8 @@ msgstr "Често коришћено"
 msgid "Heavily reused"
 msgstr "Популарно"
 
+#: udata/tests/user/test_user_tasks.py:108
+#, python-brace-format
+msgid "Deletion of your inactive {site} account"
+msgstr ""
+